diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 723f141db..97d25b1d8 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -117,19 +117,19 @@ -keep class com.netease.** {*;} # Presenter 相关 --keep class com.yizhuan.habu.base.** { *; } --keep public class * extends com.yizhuan.habu.base.BaseMvpPresenter --keep public class * extends com.yizhuan.xchat_android_library.base.factory.AbstractMvpPresenter +-keep class com.chwl.app.base.** { *; } +-keep public class * extends com.chwl.app.base.BaseMvpPresenter +-keep public class * extends com.chwl.library.base.factory.AbstractMvpPresenter # 云信自定义 ViewHolder 配置 --dontwarn com.yizhuan.habu.ui.im.recent.holder.** --keep class com.yizhuan.habu.ui.im.recent.holder.** {*;} --keep class com.yizhuan.habu.ui.im.chat.** {*;} --keep class com.yizhuan.habu.luckymoney.viewholder.** {*;} --keep class com.yizhuan.habu.share.viewholder.** {*;} --keep class com.yizhuan.habu.public_chat_hall.msg.viewholder.** {*;} --keep class com.yizhuan.habu.module_hall.im.msgholder.** {*;} --keep class com.yizhuan.habu.mentoring_relationship.viewholder.** {*;} +-dontwarn com.chwl.app.ui.im.recent.holder.** +-keep class com.chwl.app.ui.im.recent.holder.** {*;} +-keep class com.chwl.app.ui.im.chat.** {*;} +-keep class com.chwl.app.luckymoney.viewholder.** {*;} +-keep class com.chwl.app.share.viewholder.** {*;} +-keep class com.chwl.app.public_chat_hall.msg.viewholder.** {*;} +-keep class com.chwl.app.module_hall.im.msgholder.** {*;} +-keep class com.chwl.app.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 {*;} @@ -201,8 +201,8 @@ (...); } --dontwarn com.yizhuan.habu.bindadapter.** --keep class com.yizhuan.habu.bindadapter.** {*;} +-dontwarn com.chwl.app.bindadapter.** +-keep class com.chwl.app.bindadapter.** {*;} # Ping++ 混淆过滤 -dontwarn com.pingplusplus.** @@ -233,10 +233,10 @@ # TODO 网络加载 一些业务bean gson 时候混淆问题 -keep class org.json.** {*;} --dontwarn com.yizhuan.xchat_android_core.** --keep class com.yizhuan.xchat_android_core.** {*;} --keep class com.yizhuan.treasure_box.bean.** {*;} --keep class com.yizhuan.habu.avroom.bean.** {*;} +-dontwarn com.chwl.core.** +-keep class com.chwl.core.** {*;} +-keep class com.chwl.treasure_box.bean.** {*;} +-keep class com.chwl.app.avroom.bean.** {*;} #百度统计 @@ -310,8 +310,8 @@ -keep class com.autonavi.aps.amapapi.model.**{*;} #暂时keep这个View排查华为oom问题 --keep class com.yizhuan.habu.avroom.widget.MicroView{*;} --keep class com.yizhuan.habu.ui.widget.rollviewpager.RollPagerView{*;} +-keep class com.chwl.app.avroom.widget.MicroView{*;} +-keep class com.chwl.app.ui.widget.rollviewpager.RollPagerView{*;} #linkedMe -keep class com.microquation.linkedme.android.** { *; } @@ -369,7 +369,7 @@ -dontwarn com.meizu.cloud.** -keep class com.meizu.cloud.** {*;} --keep class com.yizhuan.habu.ui.widget.AppBarLayoutBehavior {*;} +-keep class com.chwl.app.ui.widget.AppBarLayoutBehavior {*;} #ViewBinding使用的反射生成的对应Binding -keepclassmembers class * implements androidx.viewbinding.ViewBinding { @@ -454,7 +454,7 @@ } ## EasyPhotos --keep class com.yizhuan.xchat_android_library.easyphoto.models.** { *; } +-keep class com.chwl.library.easyphoto.models.** { *; } ## 图片裁剪UCrop -dontwarn com.yalantis.ucrop.** diff --git a/app/src/androidTest/java/com/yizhuan/erban/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/chwl/app/ExampleInstrumentedTest.java similarity index 85% rename from app/src/androidTest/java/com/yizhuan/erban/ExampleInstrumentedTest.java rename to app/src/androidTest/java/com/chwl/app/ExampleInstrumentedTest.java index 31b742a6c..5655ec672 100644 --- a/app/src/androidTest/java/com/yizhuan/erban/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/chwl/app/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu; +package com.chwl.app; import static org.junit.Assert.assertEquals; @@ -22,7 +22,7 @@ public class ExampleInstrumentedTest { // Context of the app under test. Context appContext = InstrumentationRegistry.getTargetContext(); - assertEquals("com.yizhuan.habu_android_client", appContext.getPackageName()); + assertEquals("com.chwl.app_android_client", appContext.getPackageName()); } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2672e123e..9c8df4c57 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + package="com.chwl.app"> @@ -260,12 +260,12 @@ android:label="房间流水" android:screenOrientation="portrait" /> @@ -659,26 +659,26 @@ android:launchMode="singleTask" android:screenOrientation="portrait" /> + android:screenOrientation="portrait" /> { diff --git a/app/src/main/java/com/yizhuan/habu/avroom/activity/RoomRankListActivity.java b/app/src/main/java/com/chwl/app/avroom/activity/RoomRankListActivity.java similarity index 84% rename from app/src/main/java/com/yizhuan/habu/avroom/activity/RoomRankListActivity.java rename to app/src/main/java/com/chwl/app/avroom/activity/RoomRankListActivity.java index c46d48212..17bc10c7d 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/activity/RoomRankListActivity.java +++ b/app/src/main/java/com/chwl/app/avroom/activity/RoomRankListActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.activity; +package com.chwl.app.avroom.activity; import android.content.Context; import android.content.Intent; @@ -8,13 +8,13 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentStatePagerAdapter; import androidx.viewpager.widget.ViewPager; -import com.yizhuan.habu.R; -import com.yizhuan.habu.avroom.fragment.RoomCharmListFragment; -import com.yizhuan.habu.avroom.fragment.RoomContributeListFragment; -import com.yizhuan.habu.base.BaseBindingActivity; -import com.yizhuan.habu.databinding.ActivityRoomRankListBinding; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; +import com.chwl.app.R; +import com.chwl.app.avroom.fragment.RoomCharmListFragment; +import com.chwl.app.avroom.fragment.RoomContributeListFragment; +import com.chwl.app.base.BaseBindingActivity; +import com.chwl.app.databinding.ActivityRoomRankListBinding; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.library.annatation.ActLayoutRes; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/activity/RoomSettingActivity.java b/app/src/main/java/com/chwl/app/avroom/activity/RoomSettingActivity.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/avroom/activity/RoomSettingActivity.java rename to app/src/main/java/com/chwl/app/avroom/activity/RoomSettingActivity.java index a372b02aa..cd4fd2443 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/activity/RoomSettingActivity.java +++ b/app/src/main/java/com/chwl/app/avroom/activity/RoomSettingActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.activity; +package com.chwl.app.avroom.activity; import android.annotation.SuppressLint; import android.content.Context; @@ -16,43 +16,43 @@ 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.habu.R; -import com.yizhuan.habu.avroom.dialog.SelectLabelDialog; -import com.yizhuan.habu.avroom.presenter.RoomSettingPresenter; -import com.yizhuan.habu.avroom.view.IRoomSettingView; -import com.yizhuan.habu.avroom.widget.EditRoomTitleDialog; -import com.yizhuan.habu.base.BaseMvpActivity; -import com.yizhuan.habu.common.widget.dialog.DialogManager; -import com.yizhuan.habu.databinding.ActivityRoomSettingBinding; -import com.yizhuan.habu.ui.webview.CommonWebViewActivity; -import com.yizhuan.habu.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.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.ResUtil; -import com.yizhuan.xchat_android_library.utils.codec.DESUtils; +import com.chwl.app.R; +import com.chwl.app.avroom.dialog.SelectLabelDialog; +import com.chwl.app.avroom.presenter.RoomSettingPresenter; +import com.chwl.app.avroom.view.IRoomSettingView; +import com.chwl.app.avroom.widget.EditRoomTitleDialog; +import com.chwl.app.base.BaseMvpActivity; +import com.chwl.app.common.widget.dialog.DialogManager; +import com.chwl.app.databinding.ActivityRoomSettingBinding; +import com.chwl.app.ui.webview.CommonWebViewActivity; +import com.chwl.app.utils.RegexUtil; +import com.chwl.core.UriProvider; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.auth.event.KickOutEvent; +import com.chwl.core.bean.RoomQueueInfo; +import com.chwl.core.im.custom.bean.CustomAttachment; +import com.chwl.core.im.custom.bean.RoomNoticeAttachment; +import com.chwl.core.kick.KickModel; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.manager.IMNetEaseManager; +import com.chwl.core.manager.RoomEvent; +import com.chwl.core.room.bean.RoomInfo; +import com.chwl.core.room.bean.RoomMessageViewNoticeInfo; +import com.chwl.core.room.bean.RoomSettingTabInfo; +import com.chwl.core.room.bean.SingleRoomSortInfo; +import com.chwl.core.room.giftvalue.GiftValueModel; +import com.chwl.core.room.giftvalue.helper.GiftValueMrg; +import com.chwl.core.room.model.AvRoomModel; +import com.chwl.core.room.model.RoomSettingModel; +import com.chwl.core.room.queue.bean.MicMemberInfo; +import com.chwl.core.utils.net.BeanObserver; +import com.chwl.library.base.factory.CreatePresenter; +import com.chwl.library.net.rxnet.callback.CallBack; +import com.chwl.library.utils.CommonUtils; +import com.chwl.library.utils.JavaUtil; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.codec.DESUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/activity/RoomTitleEditActivity.java b/app/src/main/java/com/chwl/app/avroom/activity/RoomTitleEditActivity.java similarity index 89% rename from app/src/main/java/com/yizhuan/habu/avroom/activity/RoomTitleEditActivity.java rename to app/src/main/java/com/chwl/app/avroom/activity/RoomTitleEditActivity.java index 7bb95db31..f21f09cb1 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/activity/RoomTitleEditActivity.java +++ b/app/src/main/java/com/chwl/app/avroom/activity/RoomTitleEditActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.activity; +package com.chwl.app.avroom.activity; import android.app.Activity; import android.content.Intent; @@ -8,17 +8,17 @@ import android.text.TextWatcher; import android.view.View; import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseBindingActivity; -import com.yizhuan.habu.common.widget.dialog.DialogManager; -import com.yizhuan.habu.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.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseBindingActivity; +import com.chwl.app.common.widget.dialog.DialogManager; +import com.chwl.app.databinding.ActivityRoomTitleEditBinding; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.room.bean.RoomInfo; +import com.chwl.core.room.model.RoomSettingModel; +import com.chwl.library.annatation.ActLayoutRes; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; import io.reactivex.disposables.CompositeDisposable; import io.reactivex.disposables.Disposable; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/adapter/AuctionListAdapter.java b/app/src/main/java/com/chwl/app/avroom/adapter/AuctionListAdapter.java similarity index 84% rename from app/src/main/java/com/yizhuan/habu/avroom/adapter/AuctionListAdapter.java rename to app/src/main/java/com/chwl/app/avroom/adapter/AuctionListAdapter.java index 417fac230..c375b7893 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/adapter/AuctionListAdapter.java +++ b/app/src/main/java/com/chwl/app/avroom/adapter/AuctionListAdapter.java @@ -1,7 +1,7 @@ -package com.yizhuan.habu.avroom.adapter; +package com.chwl.app.avroom.adapter; -import com.yizhuan.xchat_android_library.list.ArrayListAdapter; -import com.yizhuan.xchat_android_library.list.ListItem; +import com.chwl.library.list.ArrayListAdapter; +import com.chwl.library.list.ListItem; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/adapter/AuctionListEmptyItem.java b/app/src/main/java/com/chwl/app/avroom/adapter/AuctionListEmptyItem.java similarity index 84% rename from app/src/main/java/com/yizhuan/habu/avroom/adapter/AuctionListEmptyItem.java rename to app/src/main/java/com/chwl/app/avroom/adapter/AuctionListEmptyItem.java index 2c6b5c9b1..a3fbebde1 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/adapter/AuctionListEmptyItem.java +++ b/app/src/main/java/com/chwl/app/avroom/adapter/AuctionListEmptyItem.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.adapter; +package com.chwl.app.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.habu.R; -import com.yizhuan.xchat_android_library.list.BaseGroupItem; -import com.yizhuan.xchat_android_library.list.ViewHolder; +import com.chwl.app.R; +import com.chwl.library.list.BaseGroupItem; +import com.chwl.library.list.ViewHolder; /** * Created by chenran on 2017/8/9. diff --git a/app/src/main/java/com/yizhuan/habu/avroom/adapter/AuctionListHeaderItem.java b/app/src/main/java/com/chwl/app/avroom/adapter/AuctionListHeaderItem.java similarity index 89% rename from app/src/main/java/com/yizhuan/habu/avroom/adapter/AuctionListHeaderItem.java rename to app/src/main/java/com/chwl/app/avroom/adapter/AuctionListHeaderItem.java index b32d64dfa..3ed048e1c 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/adapter/AuctionListHeaderItem.java +++ b/app/src/main/java/com/chwl/app/avroom/adapter/AuctionListHeaderItem.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.adapter; +package com.chwl.app.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.habu.R; -import com.yizhuan.xchat_android_library.list.BaseGroupItem; -import com.yizhuan.xchat_android_library.list.ViewHolder; +import com.chwl.app.R; +import com.chwl.library.list.BaseGroupItem; +import com.chwl.library.list.ViewHolder; /** * Created by chenran on 2017/8/9. diff --git a/app/src/main/java/com/yizhuan/habu/avroom/adapter/AuctionListItem.java b/app/src/main/java/com/chwl/app/avroom/adapter/AuctionListItem.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/avroom/adapter/AuctionListItem.java rename to app/src/main/java/com/chwl/app/avroom/adapter/AuctionListItem.java index 68a78576b..9b809ed0d 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/adapter/AuctionListItem.java +++ b/app/src/main/java/com/chwl/app/avroom/adapter/AuctionListItem.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.adapter; +package com.chwl.app.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.habu.R; -import com.yizhuan.habu.common.widget.CircleImageView; -import com.yizhuan.habu.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.chwl.app.R; +import com.chwl.app.common.widget.CircleImageView; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.core.room.auction.bean.AuctionListUserInfo; +import com.chwl.library.list.BaseGroupItem; +import com.chwl.library.list.ViewHolder; /** * Created by chenran on 2017/8/9. diff --git a/app/src/main/java/com/yizhuan/habu/avroom/adapter/BaseMicroViewAdapter.java b/app/src/main/java/com/chwl/app/avroom/adapter/BaseMicroViewAdapter.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/avroom/adapter/BaseMicroViewAdapter.java rename to app/src/main/java/com/chwl/app/avroom/adapter/BaseMicroViewAdapter.java index b3641308e..05f7bfd51 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/adapter/BaseMicroViewAdapter.java +++ b/app/src/main/java/com/chwl/app/avroom/adapter/BaseMicroViewAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.adapter; +package com.chwl.app.avroom.adapter; import android.content.Context; import android.graphics.Color; @@ -19,29 +19,29 @@ import androidx.recyclerview.widget.RecyclerView; import com.coorchice.library.SuperTextView; import com.netease.nim.uikit.common.util.string.StringUtil; import com.opensource.svgaplayer.SVGAImageView; -import com.yizhuan.habu.R; -import com.yizhuan.habu.common.widget.CircleImageView; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.habu.ui.webview.DialogWebViewActivity; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.habu.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.ResUtil; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.chwl.app.R; +import com.chwl.app.common.widget.CircleImageView; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.app.ui.webview.DialogWebViewActivity; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.utils.RegexUtil; +import com.chwl.core.UriProvider; +import com.chwl.core.bean.RoomMicInfo; +import com.chwl.core.bean.RoomQueueInfo; +import com.chwl.core.decoration.headwear.bean.HeadWearInfo; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.noble.NobleResourceType; +import com.chwl.core.noble.NobleUtil; +import com.chwl.core.room.bean.RoomInfo; +import com.chwl.core.room.giftvalue.bean.GiftValueData; +import com.chwl.core.room.giftvalue.helper.GiftValueFormat; +import com.chwl.core.room.pk.bean.PKTeamInfo; +import com.chwl.core.room.queue.bean.MicMemberInfo; +import com.chwl.core.user.UserModel; +import com.chwl.core.utils.ActivityUtil; +import com.chwl.core.utils.StringExtensionKt; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.config.BasicConfig; /** * @author xiaoyu diff --git a/app/src/main/java/com/yizhuan/habu/avroom/adapter/CommonVPAdapter.kt b/app/src/main/java/com/chwl/app/avroom/adapter/CommonVPAdapter.kt similarity index 93% rename from app/src/main/java/com/yizhuan/habu/avroom/adapter/CommonVPAdapter.kt rename to app/src/main/java/com/chwl/app/avroom/adapter/CommonVPAdapter.kt index 450fd6492..4218776aa 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/adapter/CommonVPAdapter.kt +++ b/app/src/main/java/com/chwl/app/avroom/adapter/CommonVPAdapter.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.adapter +package com.chwl.app.avroom.adapter import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager diff --git a/app/src/main/java/com/yizhuan/habu/avroom/adapter/CpMicroViewAdapter.java b/app/src/main/java/com/chwl/app/avroom/adapter/CpMicroViewAdapter.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/avroom/adapter/CpMicroViewAdapter.java rename to app/src/main/java/com/chwl/app/avroom/adapter/CpMicroViewAdapter.java index 066c99d62..d6bdc8995 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/adapter/CpMicroViewAdapter.java +++ b/app/src/main/java/com/chwl/app/avroom/adapter/CpMicroViewAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.adapter; +package com.chwl.app.avroom.adapter; import android.content.Context; import android.view.LayoutInflater; @@ -11,9 +11,9 @@ import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.core.bean.RoomQueueInfo; +import com.chwl.library.utils.ResUtil; public class CpMicroViewAdapter extends BaseMicroViewAdapter { diff --git a/app/src/main/java/com/yizhuan/habu/avroom/adapter/CreateRoomGameAdapter.kt b/app/src/main/java/com/chwl/app/avroom/adapter/CreateRoomGameAdapter.kt similarity index 73% rename from app/src/main/java/com/yizhuan/habu/avroom/adapter/CreateRoomGameAdapter.kt rename to app/src/main/java/com/chwl/app/avroom/adapter/CreateRoomGameAdapter.kt index b556009d9..4d8efbc87 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/adapter/CreateRoomGameAdapter.kt +++ b/app/src/main/java/com/chwl/app/avroom/adapter/CreateRoomGameAdapter.kt @@ -1,11 +1,11 @@ -package com.yizhuan.habu.avroom.adapter +package com.chwl.app.avroom.adapter import android.widget.ImageView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.xchat_android_core.room.game.GameInfo +import com.chwl.app.R +import com.chwl.app.ui.utils.load +import com.chwl.core.room.game.GameInfo class CreateRoomGameAdapter : BaseQuickAdapter(R.layout.item_room_create_game) { diff --git a/app/src/main/java/com/yizhuan/habu/avroom/adapter/CreateRoomGameGuideAdapter.kt b/app/src/main/java/com/chwl/app/avroom/adapter/CreateRoomGameGuideAdapter.kt similarity index 63% rename from app/src/main/java/com/yizhuan/habu/avroom/adapter/CreateRoomGameGuideAdapter.kt rename to app/src/main/java/com/chwl/app/avroom/adapter/CreateRoomGameGuideAdapter.kt index 1db368f5c..e6f7bb4fe 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/adapter/CreateRoomGameGuideAdapter.kt +++ b/app/src/main/java/com/chwl/app/avroom/adapter/CreateRoomGameGuideAdapter.kt @@ -1,11 +1,11 @@ -package com.yizhuan.habu.avroom.adapter +package com.chwl.app.avroom.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.xchat_android_library.common.glide.GlideUtils -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.xchat_android_core.room.game.GameInfo +import com.chwl.app.R +import com.chwl.library.common.glide.GlideUtils +import com.chwl.app.ui.utils.ImageLoadUtilsV2 +import com.chwl.core.room.game.GameInfo class CreateRoomGameGuideAdapter : BaseQuickAdapter(R.layout.item_room_create_game_guide) { diff --git a/app/src/main/java/com/yizhuan/habu/avroom/adapter/DatingMicroViewAdapter.kt b/app/src/main/java/com/chwl/app/avroom/adapter/DatingMicroViewAdapter.kt similarity index 95% rename from app/src/main/java/com/yizhuan/habu/avroom/adapter/DatingMicroViewAdapter.kt rename to app/src/main/java/com/chwl/app/avroom/adapter/DatingMicroViewAdapter.kt index 25d11762a..b094e8d42 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/adapter/DatingMicroViewAdapter.kt +++ b/app/src/main/java/com/chwl/app/avroom/adapter/DatingMicroViewAdapter.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.adapter +package com.chwl.app.avroom.adapter import android.annotation.SuppressLint import android.content.Context @@ -12,14 +12,14 @@ import androidx.core.view.isVisible import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.ui.utils.load +import com.chwl.app.utils.UserUtils +import com.chwl.core.Constants +import com.chwl.core.bean.RoomQueueInfo +import com.chwl.core.manager.AvRoomDataManager +import com.chwl.core.room.bean.RoomInfo +import com.chwl.library.utils.ResUtil /** diff --git a/app/src/main/java/com/yizhuan/habu/avroom/adapter/ExitRoomAdapter.kt b/app/src/main/java/com/chwl/app/avroom/adapter/ExitRoomAdapter.kt similarity index 71% rename from app/src/main/java/com/yizhuan/habu/avroom/adapter/ExitRoomAdapter.kt rename to app/src/main/java/com/chwl/app/avroom/adapter/ExitRoomAdapter.kt index fa7666429..680b438c7 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/adapter/ExitRoomAdapter.kt +++ b/app/src/main/java/com/chwl/app/avroom/adapter/ExitRoomAdapter.kt @@ -1,11 +1,11 @@ -package com.yizhuan.habu.avroom.adapter +package com.chwl.app.avroom.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot +import com.chwl.app.R +import com.chwl.app.ui.utils.ImageLoadUtils +import com.chwl.core.home.bean.HomeRoomInfo +import com.chwl.core.utils.subAndReplaceDot class ExitRoomAdapter : BaseQuickAdapter(R.layout.item_exit_room) { diff --git a/app/src/main/java/com/yizhuan/habu/avroom/adapter/GameMicroViewAdapter.kt b/app/src/main/java/com/chwl/app/avroom/adapter/GameMicroViewAdapter.kt similarity index 93% rename from app/src/main/java/com/yizhuan/habu/avroom/adapter/GameMicroViewAdapter.kt rename to app/src/main/java/com/chwl/app/avroom/adapter/GameMicroViewAdapter.kt index 6eef91c9b..cb855e427 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/adapter/GameMicroViewAdapter.kt +++ b/app/src/main/java/com/chwl/app/avroom/adapter/GameMicroViewAdapter.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.adapter +package com.chwl.app.avroom.adapter import android.annotation.SuppressLint import android.content.Context @@ -11,10 +11,10 @@ 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.habu.R -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.core.bean.RoomQueueInfo +import com.chwl.core.manager.AvRoomDataManager +import com.chwl.library.utils.ResUtil /** diff --git a/app/src/main/java/com/yizhuan/habu/avroom/adapter/GameMiniMicroViewAdapter.kt b/app/src/main/java/com/chwl/app/avroom/adapter/GameMiniMicroViewAdapter.kt similarity index 90% rename from app/src/main/java/com/yizhuan/habu/avroom/adapter/GameMiniMicroViewAdapter.kt rename to app/src/main/java/com/chwl/app/avroom/adapter/GameMiniMicroViewAdapter.kt index 0abf65fc1..3a6f3d4d6 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/adapter/GameMiniMicroViewAdapter.kt +++ b/app/src/main/java/com/chwl/app/avroom/adapter/GameMiniMicroViewAdapter.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.adapter +package com.chwl.app.avroom.adapter import android.annotation.SuppressLint import android.content.Context @@ -7,9 +7,9 @@ import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.yizhuan.habu.R -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager +import com.chwl.app.R +import com.chwl.core.bean.RoomQueueInfo +import com.chwl.core.manager.AvRoomDataManager /** diff --git a/app/src/main/java/com/yizhuan/habu/avroom/adapter/HomePartyPageAdapter.java b/app/src/main/java/com/chwl/app/avroom/adapter/HomePartyPageAdapter.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/avroom/adapter/HomePartyPageAdapter.java rename to app/src/main/java/com/chwl/app/avroom/adapter/HomePartyPageAdapter.java index 79e7f1f8e..101bc82f5 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/adapter/HomePartyPageAdapter.java +++ b/app/src/main/java/com/chwl/app/avroom/adapter/HomePartyPageAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.adapter; +package com.chwl.app.avroom.adapter; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/adapter/InviteFriendListAdapter.java b/app/src/main/java/com/chwl/app/avroom/adapter/InviteFriendListAdapter.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/avroom/adapter/InviteFriendListAdapter.java rename to app/src/main/java/com/chwl/app/avroom/adapter/InviteFriendListAdapter.java index 4a400cfb6..5aac44198 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/adapter/InviteFriendListAdapter.java +++ b/app/src/main/java/com/chwl/app/avroom/adapter/InviteFriendListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.adapter; +package com.chwl.app.avroom.adapter; import android.app.Activity; import android.text.TextUtils; @@ -9,15 +9,15 @@ import androidx.appcompat.widget.AppCompatImageView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.R; -import com.yizhuan.habu.public_chat_hall.bean.PublicChatHallFriendInfo; -import com.yizhuan.habu.public_chat_hall.event.AitFriendEvent; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.habu.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.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.app.public_chat_hall.bean.PublicChatHallFriendInfo; +import com.chwl.app.public_chat_hall.event.AitFriendEvent; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.app.ui.widget.NobleAvatarView; +import com.chwl.core.noble.NobleUtil; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/adapter/MicQueueAdapter.java b/app/src/main/java/com/chwl/app/avroom/adapter/MicQueueAdapter.java similarity index 89% rename from app/src/main/java/com/yizhuan/habu/avroom/adapter/MicQueueAdapter.java rename to app/src/main/java/com/chwl/app/avroom/adapter/MicQueueAdapter.java index bbd4b22d1..87cdebefa 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/adapter/MicQueueAdapter.java +++ b/app/src/main/java/com/chwl/app/avroom/adapter/MicQueueAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.adapter; +package com.chwl.app.avroom.adapter; import android.graphics.drawable.GradientDrawable; import android.widget.TextView; @@ -8,13 +8,13 @@ import androidx.appcompat.widget.AppCompatImageView; 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.habu.R; -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.common.widget.CircleImageView; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.room.queuing_mic.bean.GroupType; +import com.chwl.core.room.queuing_mic.bean.QueuingMicMemeberInfo; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/adapter/MicroViewAdapter.java b/app/src/main/java/com/chwl/app/avroom/adapter/MicroViewAdapter.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/avroom/adapter/MicroViewAdapter.java rename to app/src/main/java/com/chwl/app/avroom/adapter/MicroViewAdapter.java index c0c6d1f4a..0642612c2 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/adapter/MicroViewAdapter.java +++ b/app/src/main/java/com/chwl/app/avroom/adapter/MicroViewAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.adapter; +package com.chwl.app.avroom.adapter; import android.annotation.SuppressLint; import android.content.Context; @@ -11,10 +11,10 @@ import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.core.bean.RoomQueueInfo; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.library.utils.ResUtil; /** * @author xiaoyu diff --git a/app/src/main/java/com/yizhuan/habu/avroom/adapter/OnMicroItemClickListener.java b/app/src/main/java/com/chwl/app/avroom/adapter/OnMicroItemClickListener.java similarity index 71% rename from app/src/main/java/com/yizhuan/habu/avroom/adapter/OnMicroItemClickListener.java rename to app/src/main/java/com/chwl/app/avroom/adapter/OnMicroItemClickListener.java index 444723a62..e60e800d9 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/adapter/OnMicroItemClickListener.java +++ b/app/src/main/java/com/chwl/app/avroom/adapter/OnMicroItemClickListener.java @@ -1,6 +1,6 @@ -package com.yizhuan.habu.avroom.adapter; +package com.chwl.app.avroom.adapter; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; +import com.chwl.core.room.queue.bean.MicMemberInfo; /** * Created by lvzebiao on 2018/11/5. diff --git a/app/src/main/java/com/yizhuan/habu/avroom/adapter/OnlineUserAdapter.java b/app/src/main/java/com/chwl/app/avroom/adapter/OnlineUserAdapter.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/avroom/adapter/OnlineUserAdapter.java rename to app/src/main/java/com/chwl/app/avroom/adapter/OnlineUserAdapter.java index a98d1d6b9..150e8348c 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/adapter/OnlineUserAdapter.java +++ b/app/src/main/java/com/chwl/app/avroom/adapter/OnlineUserAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.adapter; +package com.chwl.app.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.habu.R; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.habu.ui.widget.NobleAvatarView; -import com.yizhuan.habu.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.chwl.app.R; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.app.ui.widget.NobleAvatarView; +import com.chwl.app.utils.RegexUtil; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.level.UserLevelResourceType; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.manager.IMNetEaseManager; +import com.chwl.core.manager.RoomEvent; +import com.chwl.core.noble.NobleResourceType; +import com.chwl.core.noble.NobleUtil; +import com.chwl.core.room.bean.OnlineChatMember; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.library.utils.ListUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/adapter/PKMicQueueAdapter.java b/app/src/main/java/com/chwl/app/avroom/adapter/PKMicQueueAdapter.java similarity index 89% rename from app/src/main/java/com/yizhuan/habu/avroom/adapter/PKMicQueueAdapter.java rename to app/src/main/java/com/chwl/app/avroom/adapter/PKMicQueueAdapter.java index 24eed0538..a8a7ea0b5 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/adapter/PKMicQueueAdapter.java +++ b/app/src/main/java/com/chwl/app/avroom/adapter/PKMicQueueAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.adapter; +package com.chwl.app.avroom.adapter; import android.view.View; import android.widget.TextView; @@ -8,13 +8,13 @@ import androidx.appcompat.widget.AppCompatImageView; 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.habu.R; -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.common.widget.CircleImageView; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.room.pk.bean.PKQueuingMicMemberInfo; +import com.chwl.core.room.pk.bean.PKTeamInfo; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/adapter/RecordForPKAdapter.java b/app/src/main/java/com/chwl/app/avroom/adapter/RecordForPKAdapter.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/avroom/adapter/RecordForPKAdapter.java rename to app/src/main/java/com/chwl/app/avroom/adapter/RecordForPKAdapter.java index 5d062454e..39df1f332 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/adapter/RecordForPKAdapter.java +++ b/app/src/main/java/com/chwl/app/avroom/adapter/RecordForPKAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.adapter; +package com.chwl.app.avroom.adapter; import android.content.Context; import android.graphics.drawable.GradientDrawable; @@ -10,13 +10,13 @@ import androidx.annotation.Nullable; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.core.room.pk.bean.PKRecordInfo; +import com.chwl.core.room.pk.bean.PKTeamInfo; +import com.chwl.core.room.pk.bean.PKTeamMember; +import com.chwl.core.room.pk.bean.RoomPkData; +import com.chwl.library.utils.FormatUtils; +import com.chwl.library.utils.ResUtil; import java.text.SimpleDateFormat; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/adapter/RoomBlackListAdapter.java b/app/src/main/java/com/chwl/app/avroom/adapter/RoomBlackListAdapter.java similarity index 84% rename from app/src/main/java/com/yizhuan/habu/avroom/adapter/RoomBlackListAdapter.java rename to app/src/main/java/com/chwl/app/avroom/adapter/RoomBlackListAdapter.java index 2c57f91b0..b50d9997a 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/adapter/RoomBlackListAdapter.java +++ b/app/src/main/java/com/chwl/app/avroom/adapter/RoomBlackListAdapter.java @@ -1,13 +1,13 @@ -package com.yizhuan.habu.avroom.adapter; +package com.chwl.app.avroom.adapter; import android.content.Context; 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.habu.R; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.R; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; /** diff --git a/app/src/main/java/com/yizhuan/habu/avroom/adapter/RoomConsumeListAdapter.java b/app/src/main/java/com/chwl/app/avroom/adapter/RoomConsumeListAdapter.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/avroom/adapter/RoomConsumeListAdapter.java rename to app/src/main/java/com/chwl/app/avroom/adapter/RoomConsumeListAdapter.java index 00bb034f5..c5d7bb2ac 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/adapter/RoomConsumeListAdapter.java +++ b/app/src/main/java/com/chwl/app/avroom/adapter/RoomConsumeListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.adapter; +package com.chwl.app.avroom.adapter; import android.content.Context; import android.text.TextUtils; @@ -12,16 +12,16 @@ import androidx.appcompat.widget.AppCompatImageView; import com.chad.library.adapter.base.BaseMultiItemQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.habu.ui.widget.NobleAvatarView; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.app.ui.widget.NobleAvatarView; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.utils.RegexUtil; +import com.chwl.core.noble.NobleInfo; +import com.chwl.core.noble.NobleUtil; +import com.chwl.core.room.bean.RoomContributeUserInfo; +import com.chwl.core.room.bean.RoomRankMultiItem; +import com.chwl.library.utils.ResUtil; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/adapter/RoomConsumerListAdapterTemp.java b/app/src/main/java/com/chwl/app/avroom/adapter/RoomConsumerListAdapterTemp.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/avroom/adapter/RoomConsumerListAdapterTemp.java rename to app/src/main/java/com/chwl/app/avroom/adapter/RoomConsumerListAdapterTemp.java index 3a62ff017..27ffc0332 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/adapter/RoomConsumerListAdapterTemp.java +++ b/app/src/main/java/com/chwl/app/avroom/adapter/RoomConsumerListAdapterTemp.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.adapter; +package com.chwl.app.avroom.adapter; import android.content.Context; import android.text.TextUtils; @@ -11,12 +11,12 @@ import androidx.appcompat.widget.AppCompatImageView; import com.chad.library.adapter.base.BaseMultiItemQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.R; -import com.yizhuan.habu.common.widget.CircleImageView; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.habu.utils.RegexUtil; -import com.yizhuan.xchat_android_core.room.bean.RoomContributeUserInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomRankMultiItem; +import com.chwl.app.R; +import com.chwl.app.common.widget.CircleImageView; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.app.utils.RegexUtil; +import com.chwl.core.room.bean.RoomContributeUserInfo; +import com.chwl.core.room.bean.RoomRankMultiItem; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/adapter/RoomContributeListAdapter.java b/app/src/main/java/com/chwl/app/avroom/adapter/RoomContributeListAdapter.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/avroom/adapter/RoomContributeListAdapter.java rename to app/src/main/java/com/chwl/app/avroom/adapter/RoomContributeListAdapter.java index c523c9599..7a4c391e6 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/adapter/RoomContributeListAdapter.java +++ b/app/src/main/java/com/chwl/app/avroom/adapter/RoomContributeListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.adapter; +package com.chwl.app.avroom.adapter; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/adapter/RoomInviteAdapter.java b/app/src/main/java/com/chwl/app/avroom/adapter/RoomInviteAdapter.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/avroom/adapter/RoomInviteAdapter.java rename to app/src/main/java/com/chwl/app/avroom/adapter/RoomInviteAdapter.java index d07bf6137..4d2d5ab94 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/adapter/RoomInviteAdapter.java +++ b/app/src/main/java/com/chwl/app/avroom/adapter/RoomInviteAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.adapter; +package com.chwl.app.avroom.adapter; import android.content.Context; import android.view.LayoutInflater; @@ -15,13 +15,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.habu.R; -import com.yizhuan.habu.avroom.ChatMemberDiffUtilCallback; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -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.ListUtils; +import com.chwl.app.R; +import com.chwl.app.avroom.ChatMemberDiffUtilCallback; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.manager.IMNetEaseManager; +import com.chwl.core.manager.RoomEvent; +import com.chwl.library.utils.ListUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/adapter/RoomNormalListAdapter.java b/app/src/main/java/com/chwl/app/avroom/adapter/RoomNormalListAdapter.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/avroom/adapter/RoomNormalListAdapter.java rename to app/src/main/java/com/chwl/app/avroom/adapter/RoomNormalListAdapter.java index a23fa1c12..08c9e18b8 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/adapter/RoomNormalListAdapter.java +++ b/app/src/main/java/com/chwl/app/avroom/adapter/RoomNormalListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.adapter; +package com.chwl.app.avroom.adapter; import android.content.Context; import android.view.LayoutInflater; @@ -9,9 +9,9 @@ import android.widget.TextView; import androidx.recyclerview.widget.RecyclerView; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; -import com.yizhuan.habu.R; -import com.yizhuan.habu.common.widget.CircleImageView; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; +import com.chwl.app.R; +import com.chwl.app.common.widget.CircleImageView; +import com.chwl.app.ui.utils.ImageLoadUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/adapter/RoomRankFragmentPageAdapter.java b/app/src/main/java/com/chwl/app/avroom/adapter/RoomRankFragmentPageAdapter.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/avroom/adapter/RoomRankFragmentPageAdapter.java rename to app/src/main/java/com/chwl/app/avroom/adapter/RoomRankFragmentPageAdapter.java index c5a679303..9d41f98e8 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/adapter/RoomRankFragmentPageAdapter.java +++ b/app/src/main/java/com/chwl/app/avroom/adapter/RoomRankFragmentPageAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.adapter; +package com.chwl.app.avroom.adapter; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/adapter/RoomRankHalfHourListAdapter.java b/app/src/main/java/com/chwl/app/avroom/adapter/RoomRankHalfHourListAdapter.java similarity index 85% rename from app/src/main/java/com/yizhuan/habu/avroom/adapter/RoomRankHalfHourListAdapter.java rename to app/src/main/java/com/chwl/app/avroom/adapter/RoomRankHalfHourListAdapter.java index 024f13a2f..9e027d8a1 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/adapter/RoomRankHalfHourListAdapter.java +++ b/app/src/main/java/com/chwl/app/avroom/adapter/RoomRankHalfHourListAdapter.java @@ -1,16 +1,16 @@ -package com.yizhuan.habu.avroom.adapter; +package com.chwl.app.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.habu.R; -import com.yizhuan.habu.avroom.fragment.RoomRankDialogUtils; -import com.yizhuan.habu.common.widget.CircleImageView; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.room.bean.RoomRankHalfHourRankInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomRankMultiItem; +import com.chwl.app.R; +import com.chwl.app.avroom.fragment.RoomRankDialogUtils; +import com.chwl.app.common.widget.CircleImageView; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.core.room.bean.RoomRankHalfHourRankInfo; +import com.chwl.core.room.bean.RoomRankMultiItem; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/adapter/RoomVPAdapter.java b/app/src/main/java/com/chwl/app/avroom/adapter/RoomVPAdapter.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/avroom/adapter/RoomVPAdapter.java rename to app/src/main/java/com/chwl/app/avroom/adapter/RoomVPAdapter.java index f0f1061d5..0f81213fd 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/adapter/RoomVPAdapter.java +++ b/app/src/main/java/com/chwl/app/avroom/adapter/RoomVPAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.adapter; +package com.chwl.app.avroom.adapter; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/adapter/SelectGameAdapter.kt b/app/src/main/java/com/chwl/app/avroom/adapter/SelectGameAdapter.kt similarity index 73% rename from app/src/main/java/com/yizhuan/habu/avroom/adapter/SelectGameAdapter.kt rename to app/src/main/java/com/chwl/app/avroom/adapter/SelectGameAdapter.kt index d9c901364..a87872c45 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/adapter/SelectGameAdapter.kt +++ b/app/src/main/java/com/chwl/app/avroom/adapter/SelectGameAdapter.kt @@ -1,9 +1,9 @@ -package com.yizhuan.habu.avroom.adapter +package com.chwl.app.avroom.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.xchat_android_core.room.game.GameInfo +import com.chwl.app.R +import com.chwl.core.room.game.GameInfo class SelectGameAdapter : BaseQuickAdapter(R.layout.item_room_select_game) { diff --git a/app/src/main/java/com/yizhuan/habu/avroom/adapter/SendBroadcastAdapter.kt b/app/src/main/java/com/chwl/app/avroom/adapter/SendBroadcastAdapter.kt similarity index 83% rename from app/src/main/java/com/yizhuan/habu/avroom/adapter/SendBroadcastAdapter.kt rename to app/src/main/java/com/chwl/app/avroom/adapter/SendBroadcastAdapter.kt index 6a55164db..aa4e236be 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/adapter/SendBroadcastAdapter.kt +++ b/app/src/main/java/com/chwl/app/avroom/adapter/SendBroadcastAdapter.kt @@ -1,8 +1,8 @@ -package com.yizhuan.habu.avroom.adapter +package com.chwl.app.avroom.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R +import com.chwl.app.R class SendBroadcastAdapter : BaseQuickAdapter(R.layout.item_send_broadcast) { diff --git a/app/src/main/java/com/yizhuan/habu/avroom/adapter/SingleAnchorMicroViewAdapter.kt b/app/src/main/java/com/chwl/app/avroom/adapter/SingleAnchorMicroViewAdapter.kt similarity index 96% rename from app/src/main/java/com/yizhuan/habu/avroom/adapter/SingleAnchorMicroViewAdapter.kt rename to app/src/main/java/com/chwl/app/avroom/adapter/SingleAnchorMicroViewAdapter.kt index 5497385a3..c02c3850b 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/adapter/SingleAnchorMicroViewAdapter.kt +++ b/app/src/main/java/com/chwl/app/avroom/adapter/SingleAnchorMicroViewAdapter.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.adapter +package com.chwl.app.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.habu.R -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo +import com.chwl.app.R +import com.chwl.core.bean.RoomQueueInfo /** * @author xiaoyu diff --git a/app/src/main/java/com/yizhuan/habu/avroom/adapter/SingleRoomPKMicroViewAdapter.kt b/app/src/main/java/com/chwl/app/avroom/adapter/SingleRoomPKMicroViewAdapter.kt similarity index 90% rename from app/src/main/java/com/yizhuan/habu/avroom/adapter/SingleRoomPKMicroViewAdapter.kt rename to app/src/main/java/com/chwl/app/avroom/adapter/SingleRoomPKMicroViewAdapter.kt index 6a2ae30e4..3a8308873 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/adapter/SingleRoomPKMicroViewAdapter.kt +++ b/app/src/main/java/com/chwl/app/avroom/adapter/SingleRoomPKMicroViewAdapter.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.adapter +package com.chwl.app.avroom.adapter import android.content.Context import android.view.LayoutInflater @@ -10,15 +10,15 @@ import androidx.core.view.isGone import androidx.core.view.isVisible import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.yizhuan.habu.R -import com.yizhuan.habu.common.widget.CircleImageView -import com.yizhuan.habu.ui.utils.ImageLoadUtils -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.utils.toast -import com.yizhuan.xchat_android_library.utils.ResUtil -import com.yizhuan.xchat_android_library.utils.config.BasicConfig +import com.chwl.app.R +import com.chwl.app.common.widget.CircleImageView +import com.chwl.app.ui.utils.ImageLoadUtils +import com.chwl.core.bean.RoomQueueInfo +import com.chwl.core.manager.AvRoomDataManager +import com.chwl.core.praise.PraiseModel +import com.chwl.core.utils.toast +import com.chwl.library.utils.ResUtil +import com.chwl.library.utils.config.BasicConfig class SingleRoomPKMicroViewAdapter(context: Context?) : BaseMicroViewAdapter(context) { diff --git a/app/src/main/java/com/yizhuan/habu/avroom/adapter/UpMicAdapter.java b/app/src/main/java/com/chwl/app/avroom/adapter/UpMicAdapter.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/avroom/adapter/UpMicAdapter.java rename to app/src/main/java/com/chwl/app/avroom/adapter/UpMicAdapter.java index 63e1d917c..be9c79cc8 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/adapter/UpMicAdapter.java +++ b/app/src/main/java/com/chwl/app/avroom/adapter/UpMicAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.adapter; +package com.chwl.app.avroom.adapter; import android.annotation.SuppressLint; import android.content.Context; @@ -7,11 +7,11 @@ import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.core.Constants; +import com.chwl.core.bean.RoomQueueInfo; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.library.utils.ResUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/anotherroompk/RoomPKBoardView.kt b/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKBoardView.kt similarity index 88% rename from app/src/main/java/com/yizhuan/habu/avroom/anotherroompk/RoomPKBoardView.kt rename to app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKBoardView.kt index 7888e1e21..62b66fc1e 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/anotherroompk/RoomPKBoardView.kt +++ b/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKBoardView.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.anotherroompk +package com.chwl.app.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.habu.R -import com.yizhuan.habu.avroom.activity.AVRoomActivity -import com.yizhuan.habu.common.widget.DragLayout -import com.yizhuan.habu.databinding.LayoutRoomPkBoardViewBinding -import com.yizhuan.habu.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.chwl.app.R +import com.chwl.app.avroom.activity.AVRoomActivity +import com.chwl.app.common.widget.DragLayout +import com.chwl.app.databinding.LayoutRoomPkBoardViewBinding +import com.chwl.app.ui.utils.ImageLoadUtils +import com.chwl.core.im.custom.bean.RoomPkBean +import com.chwl.core.manager.AvRoomDataManager +import com.chwl.core.room.anotherroompk.ShowGiftDialogEvent +import com.chwl.core.room.anotherroompk.ShowUserInfoDialogEvent +import com.chwl.core.utils.CurrentTimeUtils +import com.chwl.core.utils.subAndReplaceDot +import com.chwl.library.rxbus.RxBus +import com.chwl.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/habu/avroom/anotherroompk/RoomPKCreateActivity.kt b/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKCreateActivity.kt similarity index 84% rename from app/src/main/java/com/yizhuan/habu/avroom/anotherroompk/RoomPKCreateActivity.kt rename to app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKCreateActivity.kt index d8c4ce13d..3f0ecbc3d 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/anotherroompk/RoomPKCreateActivity.kt +++ b/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKCreateActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.anotherroompk +package com.chwl.app.avroom.anotherroompk import android.annotation.SuppressLint import android.content.Context @@ -7,20 +7,20 @@ import android.text.Editable import android.view.Gravity import android.view.WindowManager import androidx.core.view.isVisible -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingActivity -import com.yizhuan.habu.databinding.ActivityRoomPkCreateBinding -import com.yizhuan.habu.ui.utils.ImageLoadUtils -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingActivity +import com.chwl.app.databinding.ActivityRoomPkCreateBinding +import com.chwl.app.ui.utils.ImageLoadUtils +import com.chwl.app.ui.widget.TextWatcherSimple +import com.chwl.core.auth.AuthModel +import com.chwl.core.manager.AvRoomDataManager +import com.chwl.core.room.anotherroompk.RoomPKModel +import com.chwl.core.room.anotherroompk.SimpleRoomInfo +import com.chwl.core.utils.ifNotNullOrEmpty +import com.chwl.core.utils.subAndReplaceDot +import com.chwl.core.utils.toIntOrDef +import com.chwl.core.utils.toast +import com.chwl.library.utils.ResUtil class RoomPKCreateActivity : BaseViewBindingActivity() { diff --git a/app/src/main/java/com/yizhuan/habu/avroom/anotherroompk/RoomPKRankListView.kt b/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKRankListView.kt similarity index 86% rename from app/src/main/java/com/yizhuan/habu/avroom/anotherroompk/RoomPKRankListView.kt rename to app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKRankListView.kt index 73e458d9a..e77909360 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/anotherroompk/RoomPKRankListView.kt +++ b/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKRankListView.kt @@ -1,16 +1,16 @@ -package com.yizhuan.habu.avroom.anotherroompk +package com.chwl.app.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.habu.R -import com.yizhuan.habu.databinding.LayoutRoomPkRankListViewBinding -import com.yizhuan.habu.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.chwl.app.R +import com.chwl.app.databinding.LayoutRoomPkRankListViewBinding +import com.chwl.app.ui.utils.ImageLoadUtils +import com.chwl.core.im.custom.bean.RoomPkBean +import com.chwl.core.room.anotherroompk.ShowUserInfoDialogEvent +import com.chwl.library.rxbus.RxBus class RoomPKRankListView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 diff --git a/app/src/main/java/com/yizhuan/habu/avroom/anotherroompk/RoomPKSearchActivity.kt b/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKSearchActivity.kt similarity index 84% rename from app/src/main/java/com/yizhuan/habu/avroom/anotherroompk/RoomPKSearchActivity.kt rename to app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKSearchActivity.kt index e183d1820..159956217 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/anotherroompk/RoomPKSearchActivity.kt +++ b/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKSearchActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.anotherroompk +package com.chwl.app.avroom.anotherroompk import android.annotation.SuppressLint import android.app.Activity @@ -7,17 +7,17 @@ import android.view.Gravity import android.view.WindowManager import android.widget.CheckBox import androidx.recyclerview.widget.LinearLayoutManager -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingActivity -import com.yizhuan.habu.common.EmptyViewHelper -import com.yizhuan.habu.databinding.ActivityRoomPkSearchBinding -import com.yizhuan.habu.ui.user.activity.UserInfoActivity -import com.yizhuan.habu.ui.utils.RVDelegate -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.toast -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingActivity +import com.chwl.app.common.EmptyViewHelper +import com.chwl.app.databinding.ActivityRoomPkSearchBinding +import com.chwl.app.ui.user.activity.UserInfoActivity +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.core.manager.AvRoomDataManager +import com.chwl.core.room.anotherroompk.RoomPKModel +import com.chwl.core.room.anotherroompk.SimpleRoomInfo +import com.chwl.core.utils.toast +import com.chwl.library.utils.ResUtil class RoomPKSearchActivity : BaseViewBindingActivity() { diff --git a/app/src/main/java/com/yizhuan/habu/avroom/anotherroompk/RoomPKSearchAdapter.kt b/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKSearchAdapter.kt similarity index 71% rename from app/src/main/java/com/yizhuan/habu/avroom/anotherroompk/RoomPKSearchAdapter.kt rename to app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKSearchAdapter.kt index e36de4b37..10d8e47d9 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/anotherroompk/RoomPKSearchAdapter.kt +++ b/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKSearchAdapter.kt @@ -1,11 +1,11 @@ -package com.yizhuan.habu.avroom.anotherroompk +package com.chwl.app.avroom.anotherroompk import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.room.anotherroompk.SimpleRoomInfo -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot +import com.chwl.app.R +import com.chwl.app.ui.utils.ImageLoadUtils +import com.chwl.core.room.anotherroompk.SimpleRoomInfo +import com.chwl.core.utils.subAndReplaceDot class RoomPKSearchAdapter : BaseQuickAdapter(R.layout.item_room_pk_search) { diff --git a/app/src/main/java/com/yizhuan/habu/avroom/anotherroompk/RoomPkFinishDialog.kt b/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPkFinishDialog.kt similarity index 92% rename from app/src/main/java/com/yizhuan/habu/avroom/anotherroompk/RoomPkFinishDialog.kt rename to app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPkFinishDialog.kt index 2f7ffa4bb..f80917e11 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/anotherroompk/RoomPkFinishDialog.kt +++ b/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPkFinishDialog.kt @@ -1,15 +1,15 @@ -package com.yizhuan.habu.avroom.anotherroompk +package com.chwl.app.avroom.anotherroompk import android.annotation.SuppressLint import android.os.Bundle import android.view.WindowManager import androidx.core.view.isVisible -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.databinding.DialogRoomPkFinishBinding -import com.yizhuan.habu.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot +import com.chwl.app.R +import com.chwl.app.base.BaseDialog +import com.chwl.app.databinding.DialogRoomPkFinishBinding +import com.chwl.app.ui.utils.ImageLoadUtils +import com.chwl.core.im.custom.bean.RoomPkBean +import com.chwl.core.utils.subAndReplaceDot class RoomPkFinishDialog : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/habu/avroom/anotherroompk/RoomPkForceFinishDialog.kt b/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPkForceFinishDialog.kt similarity index 80% rename from app/src/main/java/com/yizhuan/habu/avroom/anotherroompk/RoomPkForceFinishDialog.kt rename to app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPkForceFinishDialog.kt index 9d7dd2e8d..a96b3ba41 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/anotherroompk/RoomPkForceFinishDialog.kt +++ b/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPkForceFinishDialog.kt @@ -1,14 +1,14 @@ -package com.yizhuan.habu.avroom.anotherroompk +package com.chwl.app.avroom.anotherroompk import android.annotation.SuppressLint import android.os.Bundle import android.view.WindowManager -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.databinding.DialogRoomPkForceFinishBinding -import com.yizhuan.habu.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot +import com.chwl.app.R +import com.chwl.app.base.BaseDialog +import com.chwl.app.databinding.DialogRoomPkForceFinishBinding +import com.chwl.app.ui.utils.ImageLoadUtils +import com.chwl.core.im.custom.bean.RoomPkBean +import com.chwl.core.utils.subAndReplaceDot class RoomPkForceFinishDialog : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/habu/avroom/anotherroompk/RoomPkReceivedDialog.kt b/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPkReceivedDialog.kt similarity index 80% rename from app/src/main/java/com/yizhuan/habu/avroom/anotherroompk/RoomPkReceivedDialog.kt rename to app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPkReceivedDialog.kt index 96881622a..17c6f7cdd 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/anotherroompk/RoomPkReceivedDialog.kt +++ b/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPkReceivedDialog.kt @@ -1,16 +1,16 @@ -package com.yizhuan.habu.avroom.anotherroompk +package com.chwl.app.avroom.anotherroompk import android.annotation.SuppressLint import android.os.Bundle import androidx.core.view.isVisible -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.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.chwl.app.base.BaseDialog +import com.chwl.app.databinding.DialogRoomPkReceivedBinding +import com.chwl.core.im.custom.bean.RoomPkBean +import com.chwl.core.manager.AvRoomDataManager +import com.chwl.core.room.anotherroompk.RoomPKModel +import com.chwl.core.utils.ifNotNullOrEmpty +import com.chwl.core.utils.subAndReplaceDot +import com.chwl.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/habu/avroom/anotherroompk/RoomPkRuleDialog.kt b/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPkRuleDialog.kt similarity index 68% rename from app/src/main/java/com/yizhuan/habu/avroom/anotherroompk/RoomPkRuleDialog.kt rename to app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPkRuleDialog.kt index a85c997b6..70ef8afc8 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/anotherroompk/RoomPkRuleDialog.kt +++ b/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPkRuleDialog.kt @@ -1,7 +1,7 @@ -package com.yizhuan.habu.avroom.anotherroompk +package com.chwl.app.avroom.anotherroompk -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.databinding.DialogRoomPkRuleBinding +import com.chwl.app.base.BaseDialog +import com.chwl.app.databinding.DialogRoomPkRuleBinding class RoomPkRuleDialog : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/habu/avroom/bean/RoomAlbumPhotoInfo.kt b/app/src/main/java/com/chwl/app/avroom/bean/RoomAlbumPhotoInfo.kt similarity index 87% rename from app/src/main/java/com/yizhuan/habu/avroom/bean/RoomAlbumPhotoInfo.kt rename to app/src/main/java/com/chwl/app/avroom/bean/RoomAlbumPhotoInfo.kt index 5bd1f8476..923487289 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/bean/RoomAlbumPhotoInfo.kt +++ b/app/src/main/java/com/chwl/app/avroom/bean/RoomAlbumPhotoInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.bean +package com.chwl.app.avroom.bean data class RoomAlbumPhotoInfo( val giftId: Int, diff --git a/app/src/main/java/com/yizhuan/habu/avroom/bean/RoomPlayBean.kt b/app/src/main/java/com/chwl/app/avroom/bean/RoomPlayBean.kt similarity index 80% rename from app/src/main/java/com/yizhuan/habu/avroom/bean/RoomPlayBean.kt rename to app/src/main/java/com/chwl/app/avroom/bean/RoomPlayBean.kt index e06348633..cfac18a89 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/bean/RoomPlayBean.kt +++ b/app/src/main/java/com/chwl/app/avroom/bean/RoomPlayBean.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.bean +package com.chwl.app.avroom.bean import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage diff --git a/app/src/main/java/com/yizhuan/habu/avroom/core/AudioRoomContext.kt b/app/src/main/java/com/chwl/app/avroom/core/AudioRoomContext.kt similarity index 62% rename from app/src/main/java/com/yizhuan/habu/avroom/core/AudioRoomContext.kt rename to app/src/main/java/com/chwl/app/avroom/core/AudioRoomContext.kt index 84c3b51e9..f7cb253d8 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/core/AudioRoomContext.kt +++ b/app/src/main/java/com/chwl/app/avroom/core/AudioRoomContext.kt @@ -1,8 +1,8 @@ -package com.yizhuan.habu.avroom.core +package com.chwl.app.avroom.core -import com.yizhuan.habu.avroom.redpackage.RedPackageHandler -import com.yizhuan.xchat_android_core.support.room.RoomAbility -import com.yizhuan.xchat_android_core.support.room.RoomContext +import com.chwl.app.avroom.redpackage.RedPackageHandler +import com.chwl.core.support.room.RoomAbility +import com.chwl.core.support.room.RoomContext /** * Created by Max on 2023/10/26 15:41 diff --git a/app/src/main/java/com/yizhuan/habu/avroom/dialog/AttentionHintDialog.java b/app/src/main/java/com/chwl/app/avroom/dialog/AttentionHintDialog.java similarity index 80% rename from app/src/main/java/com/yizhuan/habu/avroom/dialog/AttentionHintDialog.java rename to app/src/main/java/com/chwl/app/avroom/dialog/AttentionHintDialog.java index 631d7b3fe..20eba4f0c 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/dialog/AttentionHintDialog.java +++ b/app/src/main/java/com/chwl/app/avroom/dialog/AttentionHintDialog.java @@ -1,16 +1,16 @@ -package com.yizhuan.habu.avroom.dialog; +package com.chwl.app.avroom.dialog; import android.content.Context; import android.widget.ImageView; import android.widget.TextView; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseBsDialog; -import com.yizhuan.habu.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.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseBsDialog; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.praise.PraiseModel; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; import io.reactivex.disposables.Disposable; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/dialog/CreateGameRoomDialog.kt b/app/src/main/java/com/chwl/app/avroom/dialog/CreateGameRoomDialog.kt similarity index 67% rename from app/src/main/java/com/yizhuan/habu/avroom/dialog/CreateGameRoomDialog.kt rename to app/src/main/java/com/chwl/app/avroom/dialog/CreateGameRoomDialog.kt index 39339e149..47ab964c6 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/dialog/CreateGameRoomDialog.kt +++ b/app/src/main/java/com/chwl/app/avroom/dialog/CreateGameRoomDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.dialog +package com.chwl.app.avroom.dialog import android.annotation.SuppressLint import android.view.Gravity @@ -7,20 +7,20 @@ import androidx.core.view.isInvisible import androidx.core.view.isVisible import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager -import com.yizhuan.habu.R -import com.yizhuan.habu.avroom.adapter.CreateRoomGameAdapter -import com.yizhuan.habu.avroom.adapter.CreateRoomGameGuideAdapter -import com.yizhuan.habu.base.BaseActivity -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.databinding.DialogCreateGameRoomBinding -import com.yizhuan.habu.databinding.DialogCreateRoomBinding -import com.yizhuan.habu.home.helper.OpenRoomHelper -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.avroom.adapter.CreateRoomGameAdapter +import com.chwl.app.avroom.adapter.CreateRoomGameGuideAdapter +import com.chwl.app.base.BaseActivity +import com.chwl.app.base.BaseDialog +import com.chwl.app.databinding.DialogCreateGameRoomBinding +import com.chwl.app.databinding.DialogCreateRoomBinding +import com.chwl.app.home.helper.OpenRoomHelper +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.core.room.bean.RoomInfo +import com.chwl.core.room.game.GameInfo +import com.chwl.core.room.game.GameModel +import com.chwl.core.utils.toast +import com.chwl.library.utils.ResUtil class CreateGameRoomDialog : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/habu/avroom/dialog/CreateRoomDialog.kt b/app/src/main/java/com/chwl/app/avroom/dialog/CreateRoomDialog.kt similarity index 84% rename from app/src/main/java/com/yizhuan/habu/avroom/dialog/CreateRoomDialog.kt rename to app/src/main/java/com/chwl/app/avroom/dialog/CreateRoomDialog.kt index 364f85429..542cea865 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/dialog/CreateRoomDialog.kt +++ b/app/src/main/java/com/chwl/app/avroom/dialog/CreateRoomDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.dialog +package com.chwl.app.avroom.dialog import android.annotation.SuppressLint import android.view.Gravity @@ -6,18 +6,18 @@ import android.view.WindowManager import androidx.core.view.isInvisible import androidx.core.view.isVisible import androidx.recyclerview.widget.LinearLayoutManager -import com.yizhuan.habu.R -import com.yizhuan.habu.avroom.adapter.CreateRoomGameAdapter -import com.yizhuan.habu.base.BaseActivity -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.databinding.DialogCreateRoomBinding -import com.yizhuan.habu.home.helper.OpenRoomHelper -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.avroom.adapter.CreateRoomGameAdapter +import com.chwl.app.base.BaseActivity +import com.chwl.app.base.BaseDialog +import com.chwl.app.databinding.DialogCreateRoomBinding +import com.chwl.app.home.helper.OpenRoomHelper +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.core.room.bean.RoomInfo +import com.chwl.core.room.game.GameInfo +import com.chwl.core.room.game.GameModel +import com.chwl.core.utils.toast +import com.chwl.library.utils.ResUtil class CreateRoomDialog : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/habu/avroom/dialog/DatingVipRuleDialog.java b/app/src/main/java/com/chwl/app/avroom/dialog/DatingVipRuleDialog.java similarity index 74% rename from app/src/main/java/com/yizhuan/habu/avroom/dialog/DatingVipRuleDialog.java rename to app/src/main/java/com/chwl/app/avroom/dialog/DatingVipRuleDialog.java index 3104726f2..b2fb9d424 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/dialog/DatingVipRuleDialog.java +++ b/app/src/main/java/com/chwl/app/avroom/dialog/DatingVipRuleDialog.java @@ -1,13 +1,13 @@ -package com.yizhuan.habu.avroom.dialog; +package com.chwl.app.avroom.dialog; import android.content.Context; import android.text.method.ScrollingMovementMethod; import android.view.View; -import com.yizhuan.habu.R; -import com.yizhuan.habu.databinding.DialogDatingVipRuleBinding; -import com.yizhuan.habu.treasure_box.widget.dialog.BaseBindingDialog; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; +import com.chwl.app.R; +import com.chwl.app.databinding.DialogDatingVipRuleBinding; +import com.chwl.app.treasure_box.widget.dialog.BaseBindingDialog; +import com.chwl.library.annatation.ActLayoutRes; @ActLayoutRes(R.layout.dialog_dating_vip_rule) diff --git a/app/src/main/java/com/yizhuan/habu/avroom/dialog/ExitRoomPopupWindow.kt b/app/src/main/java/com/chwl/app/avroom/dialog/ExitRoomPopupWindow.kt similarity index 87% rename from app/src/main/java/com/yizhuan/habu/avroom/dialog/ExitRoomPopupWindow.kt rename to app/src/main/java/com/chwl/app/avroom/dialog/ExitRoomPopupWindow.kt index c22fb046e..6eafbb229 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/dialog/ExitRoomPopupWindow.kt +++ b/app/src/main/java/com/chwl/app/avroom/dialog/ExitRoomPopupWindow.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.dialog +package com.chwl.app.avroom.dialog import android.annotation.SuppressLint import android.graphics.Color @@ -13,18 +13,18 @@ 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.habu.R -import com.yizhuan.habu.avroom.activity.AVRoomActivity -import com.yizhuan.habu.avroom.adapter.ExitRoomAdapter -import com.yizhuan.habu.avroom.presenter.HomePartyPresenter -import com.yizhuan.habu.common.widget.dialog.DialogManager.LambdaOkDialogListener -import com.yizhuan.habu.common.widget.dialog.DialogManager.OkCancelDialogListener -import com.yizhuan.habu.ui.utils.RVDelegate -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.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.avroom.activity.AVRoomActivity +import com.chwl.app.avroom.adapter.ExitRoomAdapter +import com.chwl.app.avroom.presenter.HomePartyPresenter +import com.chwl.app.common.widget.dialog.DialogManager.LambdaOkDialogListener +import com.chwl.app.common.widget.dialog.DialogManager.OkCancelDialogListener +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.core.home.bean.HomeRoomInfo +import com.chwl.core.manager.AvRoomDataManager +import com.chwl.core.room.model.AvRoomModel +import com.chwl.library.annatation.ActLayoutRes +import com.chwl.library.utils.ResUtil import io.reactivex.disposables.Disposable diff --git a/app/src/main/java/com/yizhuan/habu/avroom/dialog/MicQueueDialog.java b/app/src/main/java/com/chwl/app/avroom/dialog/MicQueueDialog.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/avroom/dialog/MicQueueDialog.java rename to app/src/main/java/com/chwl/app/avroom/dialog/MicQueueDialog.java index 4fba32c5d..a8ded6c6d 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/dialog/MicQueueDialog.java +++ b/app/src/main/java/com/chwl/app/avroom/dialog/MicQueueDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.dialog; +package com.chwl.app.avroom.dialog; import android.content.Context; import android.graphics.Color; @@ -21,31 +21,31 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; -import com.yizhuan.habu.R; -import com.yizhuan.habu.avroom.adapter.MicQueueAdapter; -import com.yizhuan.habu.common.util.Utils; -import com.yizhuan.habu.home.helper.LoadPageDataHelper; -import com.yizhuan.habu.ui.widget.dialog.BaseDialog; -import com.yizhuan.habu.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.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.app.avroom.adapter.MicQueueAdapter; +import com.chwl.app.common.util.Utils; +import com.chwl.app.home.helper.LoadPageDataHelper; +import com.chwl.app.ui.widget.dialog.BaseDialog; +import com.chwl.app.ui.widget.recyclerview.decoration.ColorDecoration; +import com.chwl.core.Constants; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.bean.RoomQueueInfo; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.room.bean.RoomInfo; +import com.chwl.core.room.giftvalue.helper.GiftValueMrg; +import com.chwl.core.room.model.HomePartyModel; +import com.chwl.core.room.model.MicQueueModel; +import com.chwl.core.room.queuing_mic.bean.GroupType; +import com.chwl.core.room.queuing_mic.bean.QueuingMicMemeberInfo; +import com.chwl.core.room.queuing_mic.bean.RespQueuingMicListInfo; +import com.chwl.core.user.bean.BaseInfo; +import com.chwl.core.utils.net.BeanObserver; +import com.chwl.library.net.rxnet.callback.CallBack; +import com.chwl.library.utils.CommonUtils; +import com.chwl.library.utils.JavaUtil; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/dialog/NewUserGiftDialog.kt b/app/src/main/java/com/chwl/app/avroom/dialog/NewUserGiftDialog.kt similarity index 60% rename from app/src/main/java/com/yizhuan/habu/avroom/dialog/NewUserGiftDialog.kt rename to app/src/main/java/com/chwl/app/avroom/dialog/NewUserGiftDialog.kt index e427672c1..536a11ddf 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/dialog/NewUserGiftDialog.kt +++ b/app/src/main/java/com/chwl/app/avroom/dialog/NewUserGiftDialog.kt @@ -1,9 +1,9 @@ -package com.yizhuan.habu.avroom.dialog +package com.chwl.app.avroom.dialog -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.databinding.DialogNewUserGiftBinding -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo +import com.chwl.app.base.BaseDialog +import com.chwl.app.databinding.DialogNewUserGiftBinding +import com.chwl.app.ui.utils.load +import com.chwl.core.gift.bean.GiftInfo class NewUserGiftDialog(val giftInfo: GiftInfo) : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/habu/avroom/dialog/PKMicQueueDialog.java b/app/src/main/java/com/chwl/app/avroom/dialog/PKMicQueueDialog.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/avroom/dialog/PKMicQueueDialog.java rename to app/src/main/java/com/chwl/app/avroom/dialog/PKMicQueueDialog.java index 916120514..57b72f395 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/dialog/PKMicQueueDialog.java +++ b/app/src/main/java/com/chwl/app/avroom/dialog/PKMicQueueDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.dialog; +package com.chwl.app.avroom.dialog; import android.content.Context; import android.graphics.Color; @@ -20,29 +20,29 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; -import com.yizhuan.habu.R; -import com.yizhuan.habu.avroom.adapter.PKMicQueueAdapter; -import com.yizhuan.habu.home.helper.LoadPageDataHelper; -import com.yizhuan.habu.ui.widget.dialog.BaseDialog; -import com.yizhuan.habu.ui.widget.dialog.CommonLoadingDialog; -import com.yizhuan.habu.common.util.Utils; -import com.yizhuan.habu.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.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.app.avroom.adapter.PKMicQueueAdapter; +import com.chwl.app.home.helper.LoadPageDataHelper; +import com.chwl.app.ui.widget.dialog.BaseDialog; +import com.chwl.app.ui.widget.dialog.CommonLoadingDialog; +import com.chwl.app.common.util.Utils; +import com.chwl.app.ui.widget.recyclerview.decoration.ColorDecoration; +import com.chwl.core.Constants; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.bean.RoomQueueInfo; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.room.bean.RoomInfo; +import com.chwl.core.room.pk.bean.PKMemberInfo; +import com.chwl.core.room.pk.bean.PKQueuingMicMemberInfo; +import com.chwl.core.room.pk.bean.PKRespQueuingMicListInfo; +import com.chwl.core.room.pk.bean.PKTeamInfo; +import com.chwl.core.room.pk.bean.RoomPKInvitedUpMicMember; +import com.chwl.core.room.pk.model.PkModel; +import com.chwl.core.utils.net.BeanObserver; +import com.chwl.library.utils.JavaUtil; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; import java.util.ArrayList; import java.util.Collections; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/dialog/PKResultDialog.java b/app/src/main/java/com/chwl/app/avroom/dialog/PKResultDialog.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/avroom/dialog/PKResultDialog.java rename to app/src/main/java/com/chwl/app/avroom/dialog/PKResultDialog.java index cdef70f53..cf149f422 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/dialog/PKResultDialog.java +++ b/app/src/main/java/com/chwl/app/avroom/dialog/PKResultDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.dialog; +package com.chwl.app.avroom.dialog; import android.content.Context; import android.graphics.Color; @@ -18,17 +18,17 @@ import androidx.recyclerview.widget.RecyclerView; 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.habu.R; -import com.yizhuan.habu.common.widget.CircleImageView; -import com.yizhuan.habu.ui.widget.dialog.BaseDialog; -import com.yizhuan.habu.common.util.Utils; -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.common.widget.CircleImageView; +import com.chwl.app.ui.widget.dialog.BaseDialog; +import com.chwl.app.common.util.Utils; +import com.chwl.app.ui.widget.recyclerview.decoration.ColorDecoration; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.room.pk.bean.PKTeamInfo; +import com.chwl.core.room.pk.bean.PKTeamMember; +import com.chwl.core.room.pk.bean.RoomPkData; +import com.chwl.library.utils.FormatUtils; +import com.chwl.library.utils.ResUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/dialog/PKScoreBoardDialog.java b/app/src/main/java/com/chwl/app/avroom/dialog/PKScoreBoardDialog.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/avroom/dialog/PKScoreBoardDialog.java rename to app/src/main/java/com/chwl/app/avroom/dialog/PKScoreBoardDialog.java index 44de377e0..5a9d64f4e 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/dialog/PKScoreBoardDialog.java +++ b/app/src/main/java/com/chwl/app/avroom/dialog/PKScoreBoardDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.dialog; +package com.chwl.app.avroom.dialog; import android.content.Context; import android.os.Bundle; @@ -7,24 +7,24 @@ import android.widget.ProgressBar; import android.widget.TextView; import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.habu.R; -import com.yizhuan.habu.common.widget.CircleImageView; -import com.yizhuan.habu.ui.widget.dialog.BaseDialog; -import com.yizhuan.habu.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.super_admin.util.SuperAdminUtil; -import com.yizhuan.xchat_android_library.utils.FormatUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.common.widget.CircleImageView; +import com.chwl.app.ui.widget.dialog.BaseDialog; +import com.chwl.app.ui.widget.dialog.CommonTipDialog; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.manager.IMNetEaseManager; +import com.chwl.core.manager.RoomEvent; +import com.chwl.core.room.pk.bean.PKMemberInfo; +import com.chwl.core.room.pk.bean.PKTeamInfo; +import com.chwl.core.room.pk.bean.PKTeamMember; +import com.chwl.core.room.pk.bean.RoomPkData; +import com.chwl.core.room.pk.event.PKDataUpdateEvent; +import com.chwl.core.room.pk.event.PKTimeFinishEvent; +import com.chwl.core.room.pk.event.PKTimeTickEvent; +import com.chwl.core.room.pk.model.PkModel; +import com.chwl.core.super_admin.util.SuperAdminUtil; +import com.chwl.library.utils.FormatUtils; +import com.chwl.library.utils.ResUtil; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/dialog/PKSelectPeopleDialog.java b/app/src/main/java/com/chwl/app/avroom/dialog/PKSelectPeopleDialog.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/avroom/dialog/PKSelectPeopleDialog.java rename to app/src/main/java/com/chwl/app/avroom/dialog/PKSelectPeopleDialog.java index eb8098af7..db79234ea 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/dialog/PKSelectPeopleDialog.java +++ b/app/src/main/java/com/chwl/app/avroom/dialog/PKSelectPeopleDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.dialog; +package com.chwl.app.avroom.dialog; import android.content.Context; import android.graphics.Rect; @@ -15,16 +15,16 @@ import androidx.recyclerview.widget.RecyclerView; 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.habu.R; -import com.yizhuan.habu.common.widget.CircleImageView; -import com.yizhuan.habu.ui.widget.dialog.BaseDialog; -import com.yizhuan.habu.common.util.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.common.widget.CircleImageView; +import com.chwl.app.ui.widget.dialog.BaseDialog; +import com.chwl.app.common.util.Utils; +import com.chwl.core.bean.RoomQueueInfo; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.room.pk.bean.PKMemberInfo; +import com.chwl.core.room.pk.model.PkModel; +import com.chwl.core.room.queue.bean.MicMemberInfo; +import com.chwl.library.utils.ResUtil; import java.util.ArrayList; import java.util.Arrays; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/dialog/PKTimePickerDialog.java b/app/src/main/java/com/chwl/app/avroom/dialog/PKTimePickerDialog.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/avroom/dialog/PKTimePickerDialog.java rename to app/src/main/java/com/chwl/app/avroom/dialog/PKTimePickerDialog.java index 97827c2e7..f838a514f 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/dialog/PKTimePickerDialog.java +++ b/app/src/main/java/com/chwl/app/avroom/dialog/PKTimePickerDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.dialog; +package com.chwl.app.avroom.dialog; import android.content.Context; import android.os.Bundle; @@ -15,9 +15,9 @@ 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.habu.R; -import com.yizhuan.habu.ui.widget.dialog.BaseDialog; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.ui.widget.dialog.BaseDialog; +import com.chwl.library.utils.ResUtil; import java.util.ArrayList; import java.util.Arrays; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/dialog/RequestUpMicDialog.kt b/app/src/main/java/com/chwl/app/avroom/dialog/RequestUpMicDialog.kt similarity index 67% rename from app/src/main/java/com/yizhuan/habu/avroom/dialog/RequestUpMicDialog.kt rename to app/src/main/java/com/chwl/app/avroom/dialog/RequestUpMicDialog.kt index 403c9376d..74ac61f4f 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/dialog/RequestUpMicDialog.kt +++ b/app/src/main/java/com/chwl/app/avroom/dialog/RequestUpMicDialog.kt @@ -1,15 +1,15 @@ -package com.yizhuan.habu.avroom.dialog +package com.chwl.app.avroom.dialog import android.content.Context import android.view.View -import com.yizhuan.habu.R -import com.yizhuan.habu.databinding.DialogRequestUpmicBinding -import com.yizhuan.habu.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.chwl.app.R +import com.chwl.app.databinding.DialogRequestUpmicBinding +import com.chwl.app.treasure_box.widget.dialog.BaseBindingDialog +import com.chwl.core.manager.AvRoomDataManager +import com.chwl.core.manager.IMNetEaseManager +import com.chwl.core.user.bean.BaseInfo +import com.chwl.core.user.bean.UserInfo +import com.chwl.library.annatation.ActLayoutRes @ActLayoutRes(R.layout.dialog_request_upmic) class RequestUpMicDialog(context: Context) : diff --git a/app/src/main/java/com/yizhuan/habu/avroom/dialog/RoomFreeGiftDialog.java b/app/src/main/java/com/chwl/app/avroom/dialog/RoomFreeGiftDialog.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/avroom/dialog/RoomFreeGiftDialog.java rename to app/src/main/java/com/chwl/app/avroom/dialog/RoomFreeGiftDialog.java index dd7335005..ce1689b3c 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/dialog/RoomFreeGiftDialog.java +++ b/app/src/main/java/com/chwl/app/avroom/dialog/RoomFreeGiftDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.dialog; +package com.chwl.app.avroom.dialog; import android.content.Context; import android.os.Bundle; @@ -10,11 +10,11 @@ import android.view.WindowManager; import androidx.databinding.DataBindingUtil; import com.google.android.material.bottomsheet.BottomSheetDialog; -import com.yizhuan.habu.R; -import com.yizhuan.habu.databinding.DialogRoomFreeGiftBinding; -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2; -import com.yizhuan.xchat_android_core.gift.bean.GiftFreeInfo; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.chwl.app.R; +import com.chwl.app.databinding.DialogRoomFreeGiftBinding; +import com.chwl.app.ui.utils.ImageLoadUtilsV2; +import com.chwl.core.gift.bean.GiftFreeInfo; +import com.chwl.library.utils.TimeUtils; /** * 房间免费礼物弹窗 diff --git a/app/src/main/java/com/yizhuan/habu/avroom/dialog/RoomImposeDialog.java b/app/src/main/java/com/chwl/app/avroom/dialog/RoomImposeDialog.java similarity index 87% rename from app/src/main/java/com/yizhuan/habu/avroom/dialog/RoomImposeDialog.java rename to app/src/main/java/com/chwl/app/avroom/dialog/RoomImposeDialog.java index 79d60440a..eb65acbf5 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/dialog/RoomImposeDialog.java +++ b/app/src/main/java/com/chwl/app/avroom/dialog/RoomImposeDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.dialog; +package com.chwl.app.avroom.dialog; import android.content.Context; import android.content.Intent; @@ -14,20 +14,20 @@ import androidx.databinding.DataBindingUtil; import com.google.android.material.bottomsheet.BottomSheetBehavior; import com.google.android.material.bottomsheet.BottomSheetDialog; -import com.yizhuan.habu.R; -import com.yizhuan.habu.avroom.activity.CpRoomInviteActivity; -import com.yizhuan.habu.avroom.widget.EditRoomTitleDialog; -import com.yizhuan.habu.databinding.DialogRoomImposeBinding; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.habu.common.util.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.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.codec.DESUtils; +import com.chwl.app.R; +import com.chwl.app.avroom.activity.CpRoomInviteActivity; +import com.chwl.app.avroom.widget.EditRoomTitleDialog; +import com.chwl.app.databinding.DialogRoomImposeBinding; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.common.util.Utils; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.room.bean.RoomInfo; +import com.chwl.core.room.model.RoomSettingModel; +import com.chwl.core.utils.net.DontWarnObserver; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; +import com.chwl.library.utils.codec.DESUtils; public class RoomImposeDialog extends BottomSheetDialog implements View.OnClickListener { private Context context; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/dialog/RoomOperationDialog.java b/app/src/main/java/com/chwl/app/avroom/dialog/RoomOperationDialog.java similarity index 92% rename from app/src/main/java/com/yizhuan/habu/avroom/dialog/RoomOperationDialog.java rename to app/src/main/java/com/chwl/app/avroom/dialog/RoomOperationDialog.java index 7abb6810a..932d6bcc4 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/dialog/RoomOperationDialog.java +++ b/app/src/main/java/com/chwl/app/avroom/dialog/RoomOperationDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.dialog; +package com.chwl.app.avroom.dialog; import android.annotation.SuppressLint; import android.content.Context; @@ -17,45 +17,45 @@ import com.chad.library.adapter.base.BaseViewHolder; import com.coorchice.library.utils.LogUtils; import com.google.android.material.bottomsheet.BottomSheetDialog; import com.hjq.toast.ToastUtils; -import com.yizhuan.habu.sadmin.RoomSAdminManagerActivity; -import com.yizhuan.habu.R; -import com.yizhuan.habu.UIHelper; -import com.yizhuan.habu.avroom.activity.CreatePKActivity; -import com.yizhuan.habu.avroom.activity.RoomSettingActivity; -import com.yizhuan.habu.avroom.anotherroompk.RoomPKCreateActivity; -import com.yizhuan.habu.avroom.giftvalue.GiftValueDialogUiHelper; -import com.yizhuan.habu.avroom.room_album.RoomAlbumActivity; -import com.yizhuan.habu.avroom.singleroompk.SingleRoomPKCreateActivity; -import com.yizhuan.habu.common.util.Utils; -import com.yizhuan.habu.common.widget.dialog.DialogManager; -import com.yizhuan.habu.ui.widget.ButtonItem; -import com.yizhuan.habu.ui.widget.recyclerview.decoration.ColorDecoration; -import com.yizhuan.habu.ui.widget.recyclerview.layoutmanager.FullyGridLayoutManager; -import com.yizhuan.habu.vip.dialog.VipBroadcastDialog; -import com.yizhuan.habu.room_chat.activity.RoomInviteFansActivity; +import com.chwl.app.sadmin.RoomSAdminManagerActivity; +import com.chwl.app.R; +import com.chwl.app.UIHelper; +import com.chwl.app.avroom.activity.CreatePKActivity; +import com.chwl.app.avroom.activity.RoomSettingActivity; +import com.chwl.app.avroom.anotherroompk.RoomPKCreateActivity; +import com.chwl.app.avroom.giftvalue.GiftValueDialogUiHelper; +import com.chwl.app.avroom.room_album.RoomAlbumActivity; +import com.chwl.app.avroom.singleroompk.SingleRoomPKCreateActivity; +import com.chwl.app.common.util.Utils; +import com.chwl.app.common.widget.dialog.DialogManager; +import com.chwl.app.ui.widget.ButtonItem; +import com.chwl.app.ui.widget.recyclerview.decoration.ColorDecoration; +import com.chwl.app.ui.widget.recyclerview.layoutmanager.FullyGridLayoutManager; +import com.chwl.app.vip.dialog.VipBroadcastDialog; +import com.chwl.app.room_chat.activity.RoomInviteFansActivity; import com.yizhuan.xchat_android_constants.XChatConstants; -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.event.RoomExitEvent; -import com.yizhuan.xchat_android_core.room.event.RoomShieldEvent; -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.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.utils.CurrentTimeUtils; -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.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.im.custom.bean.RoomPkBean; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.manager.IMNetEaseManager; +import com.chwl.core.redpackage.RedPackageModel; +import com.chwl.core.room.anotherroompk.SingleRoomPKModel; +import com.chwl.core.room.bean.RoomInfo; +import com.chwl.core.room.event.RoomExitEvent; +import com.chwl.core.room.event.RoomShieldEvent; +import com.chwl.core.room.giftvalue.GiftValueModel; +import com.chwl.core.room.model.AvRoomModel; +import com.chwl.core.room.model.HomePartyModel; +import com.chwl.core.room.queuing_mic.event.HasAnimationEffect; +import com.chwl.core.super_admin.model.SuperAdminModel; +import com.chwl.core.super_admin.util.SuperAdminUtil; +import com.chwl.core.user.UserModel; +import com.chwl.core.utils.CurrentTimeUtils; +import com.chwl.core.utils.net.BeanObserver; +import com.chwl.core.utils.net.DontWarnObserver; +import com.chwl.core.utils.net.RxHelper; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/dialog/SelectLabelDialog.kt b/app/src/main/java/com/chwl/app/avroom/dialog/SelectLabelDialog.kt similarity index 80% rename from app/src/main/java/com/yizhuan/habu/avroom/dialog/SelectLabelDialog.kt rename to app/src/main/java/com/chwl/app/avroom/dialog/SelectLabelDialog.kt index 193fe143c..7b85f5d9f 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/dialog/SelectLabelDialog.kt +++ b/app/src/main/java/com/chwl/app/avroom/dialog/SelectLabelDialog.kt @@ -1,12 +1,12 @@ -package com.yizhuan.habu.avroom.dialog +package com.chwl.app.avroom.dialog import android.content.Context import android.view.View import com.donkingliang.labels.LabelsView -import com.yizhuan.habu.R -import com.yizhuan.habu.databinding.DialogSelectLabelBinding -import com.yizhuan.habu.treasure_box.widget.dialog.BaseBindingDialog -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes +import com.chwl.app.R +import com.chwl.app.databinding.DialogSelectLabelBinding +import com.chwl.app.treasure_box.widget.dialog.BaseBindingDialog +import com.chwl.library.annatation.ActLayoutRes @ActLayoutRes(R.layout.dialog_select_label) class SelectLabelDialog( diff --git a/app/src/main/java/com/yizhuan/habu/avroom/dialog/SendBroadcastDialog.kt b/app/src/main/java/com/chwl/app/avroom/dialog/SendBroadcastDialog.kt similarity index 87% rename from app/src/main/java/com/yizhuan/habu/avroom/dialog/SendBroadcastDialog.kt rename to app/src/main/java/com/chwl/app/avroom/dialog/SendBroadcastDialog.kt index 8269548a2..ed806d920 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/dialog/SendBroadcastDialog.kt +++ b/app/src/main/java/com/chwl/app/avroom/dialog/SendBroadcastDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.dialog +package com.chwl.app.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.habu.avroom.adapter.SendBroadcastAdapter -import com.yizhuan.habu.base.BaseActivity -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.databinding.DialogSendBroadcastBinding -import com.yizhuan.habu.ui.utils.RVDelegate -import com.yizhuan.habu.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.chwl.app.avroom.adapter.SendBroadcastAdapter +import com.chwl.app.base.BaseActivity +import com.chwl.app.base.BaseDialog +import com.chwl.app.databinding.DialogSendBroadcastBinding +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.app.utils.SpannableBuilder +import com.chwl.core.manager.AvRoomDataManager +import com.chwl.core.room.bean.BroadcastInfo +import com.chwl.core.room.model.AvRoomModel +import com.chwl.core.utils.toast +import com.chwl.library.utils.CommonUtils +import com.chwl.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/habu/avroom/dialog/SingleRoomTipDialog.kt b/app/src/main/java/com/chwl/app/avroom/dialog/SingleRoomTipDialog.kt similarity index 76% rename from app/src/main/java/com/yizhuan/habu/avroom/dialog/SingleRoomTipDialog.kt rename to app/src/main/java/com/chwl/app/avroom/dialog/SingleRoomTipDialog.kt index 50a9c8722..366f48333 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/dialog/SingleRoomTipDialog.kt +++ b/app/src/main/java/com/chwl/app/avroom/dialog/SingleRoomTipDialog.kt @@ -1,9 +1,9 @@ -package com.yizhuan.habu.avroom.dialog +package com.chwl.app.avroom.dialog import android.annotation.SuppressLint import android.view.WindowManager -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.databinding.DialogSingleRoomTipBinding +import com.chwl.app.base.BaseDialog +import com.chwl.app.databinding.DialogSingleRoomTipBinding class SingleRoomTipDialog : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/habu/avroom/firstcharge/FirstChargeDialog.kt b/app/src/main/java/com/chwl/app/avroom/firstcharge/FirstChargeDialog.kt similarity index 93% rename from app/src/main/java/com/yizhuan/habu/avroom/firstcharge/FirstChargeDialog.kt rename to app/src/main/java/com/chwl/app/avroom/firstcharge/FirstChargeDialog.kt index 9021a0dc3..2c8bfd2ab 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/firstcharge/FirstChargeDialog.kt +++ b/app/src/main/java/com/chwl/app/avroom/firstcharge/FirstChargeDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.firstcharge +package com.chwl.app.avroom.firstcharge import android.annotation.SuppressLint import android.content.Context @@ -25,27 +25,27 @@ import com.example.module_base.support.billing.IProductDetails import com.example.module_base.support.billing.IPurchase import com.example.module_base.support.google.IGoogleService import com.netease.nim.uikit.common.util.sys.ScreenUtil -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingActivity -import com.yizhuan.habu.databinding.DialogFirstChargeBinding -import com.yizhuan.habu.ui.setting.ModifyPwdActivity -import com.yizhuan.habu.ui.webview.CommonWebViewActivity -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil -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.pay.PayModel -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.PayRecordId -import com.yizhuan.xchat_android_core.pay.event.FirstChargeEvent -import com.yizhuan.xchat_android_core.room.model.AvRoomModel -import com.yizhuan.xchat_android_core.utils.net.IgnoreException -import com.yizhuan.xchat_android_core.utils.toast -import com.yizhuan.xchat_android_library.common.util.DeviceUtil -import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil -import com.yizhuan.xchat_android_library.utils.ResUtil -import com.yizhuan.xchat_android_library.utils.SingleToastUtil +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingActivity +import com.chwl.app.databinding.DialogFirstChargeBinding +import com.chwl.app.ui.setting.ModifyPwdActivity +import com.chwl.app.ui.webview.CommonWebViewActivity +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil +import com.chwl.core.Constants +import com.chwl.core.DemoCache +import com.chwl.core.UriProvider +import com.chwl.core.pay.PayModel +import com.chwl.core.pay.bean.FirstChargeGoods +import com.chwl.core.pay.bean.FirstChargeReward +import com.chwl.core.pay.bean.PayRecordId +import com.chwl.core.pay.event.FirstChargeEvent +import com.chwl.core.room.model.AvRoomModel +import com.chwl.core.utils.net.IgnoreException +import com.chwl.core.utils.toast +import com.chwl.library.common.util.DeviceUtil +import com.chwl.library.utils.AppMetaDataUtil +import com.chwl.library.utils.ResUtil +import com.chwl.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/habu/avroom/firstcharge/FirstChargePrizeDialog.kt b/app/src/main/java/com/chwl/app/avroom/firstcharge/FirstChargePrizeDialog.kt similarity index 75% rename from app/src/main/java/com/yizhuan/habu/avroom/firstcharge/FirstChargePrizeDialog.kt rename to app/src/main/java/com/chwl/app/avroom/firstcharge/FirstChargePrizeDialog.kt index 3aa6373ac..0f684f75c 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/firstcharge/FirstChargePrizeDialog.kt +++ b/app/src/main/java/com/chwl/app/avroom/firstcharge/FirstChargePrizeDialog.kt @@ -1,16 +1,16 @@ -package com.yizhuan.habu.avroom.firstcharge +package com.chwl.app.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.netease.nim.uikit.common.util.sys.ScreenUtil -import com.yizhuan.habu.R -import com.yizhuan.habu.databinding.DialogFirstChargePrizeBinding -import com.yizhuan.habu.treasure_box.widget.dialog.BaseBindingDialog -import com.yizhuan.habu.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.pay.bean.FirstChargeReward -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes +import com.chwl.app.R +import com.chwl.app.databinding.DialogFirstChargePrizeBinding +import com.chwl.app.treasure_box.widget.dialog.BaseBindingDialog +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.core.pay.bean.FirstChargeReward +import com.chwl.library.annatation.ActLayoutRes @ActLayoutRes(R.layout.dialog_first_charge_prize) class FirstChargePrizeDialog( diff --git a/app/src/main/java/com/yizhuan/habu/avroom/firstcharge/Reward2Adapter.kt b/app/src/main/java/com/chwl/app/avroom/firstcharge/Reward2Adapter.kt similarity index 84% rename from app/src/main/java/com/yizhuan/habu/avroom/firstcharge/Reward2Adapter.kt rename to app/src/main/java/com/chwl/app/avroom/firstcharge/Reward2Adapter.kt index d70292340..258cc76f3 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/firstcharge/Reward2Adapter.kt +++ b/app/src/main/java/com/chwl/app/avroom/firstcharge/Reward2Adapter.kt @@ -1,11 +1,11 @@ -package com.yizhuan.habu.avroom.firstcharge +package com.chwl.app.avroom.firstcharge import com.chad.library.adapter.base.BaseMultiItemQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.pay.bean.FirstChargeReward -import com.yizhuan.xchat_android_core.utils.TextUtils +import com.chwl.app.R +import com.chwl.app.ui.utils.ImageLoadUtils +import com.chwl.core.pay.bean.FirstChargeReward +import com.chwl.core.utils.TextUtils class Reward2Adapter : BaseMultiItemQuickAdapter(null) { diff --git a/app/src/main/java/com/yizhuan/habu/avroom/firstcharge/RewardAdapter.kt b/app/src/main/java/com/chwl/app/avroom/firstcharge/RewardAdapter.kt similarity index 80% rename from app/src/main/java/com/yizhuan/habu/avroom/firstcharge/RewardAdapter.kt rename to app/src/main/java/com/chwl/app/avroom/firstcharge/RewardAdapter.kt index 796485c46..8a108ba5e 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/firstcharge/RewardAdapter.kt +++ b/app/src/main/java/com/chwl/app/avroom/firstcharge/RewardAdapter.kt @@ -1,14 +1,14 @@ -package com.yizhuan.habu.avroom.firstcharge +package com.chwl.app.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.habu.R -import com.yizhuan.habu.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.pay.bean.FirstChargeReward -import com.yizhuan.xchat_android_core.utils.TextUtils +import com.chwl.app.R +import com.chwl.app.ui.utils.ImageLoadUtils +import com.chwl.core.pay.bean.FirstChargeReward +import com.chwl.core.utils.TextUtils class RewardAdapter(private val itemWidth: Int) : BaseQuickAdapter(R.layout.item_first_charge_reward) { diff --git a/app/src/main/java/com/yizhuan/habu/avroom/fragment/BaseRoomFragment.kt b/app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt similarity index 90% rename from app/src/main/java/com/yizhuan/habu/avroom/fragment/BaseRoomFragment.kt rename to app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt index d30d745cd..b572887b2 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/fragment/BaseRoomFragment.kt +++ b/app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.fragment +package com.chwl.app.avroom.fragment import android.Manifest import android.annotation.SuppressLint @@ -36,90 +36,90 @@ 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.habu.R -import com.yizhuan.habu.avroom.BottomViewListenerWrapper -import com.yizhuan.habu.avroom.SoftKeyBoardListener -import com.yizhuan.habu.avroom.SoftKeyBoardListener.OnSoftKeyBoardChangeListener -import com.yizhuan.habu.avroom.activity.RoomInviteActivity -import com.yizhuan.habu.avroom.activity.RoomTitleEditActivity -import com.yizhuan.habu.avroom.adapter.OnMicroItemClickListener -import com.yizhuan.habu.avroom.dialog.AttentionHintDialog -import com.yizhuan.habu.avroom.dialog.DatingVipRuleDialog -import com.yizhuan.habu.avroom.dialog.RoomFreeGiftDialog -import com.yizhuan.habu.avroom.dialog.RoomOperationDialog -import com.yizhuan.habu.avroom.firstcharge.FirstChargeDialog -import com.yizhuan.habu.avroom.presenter.BaseRoomPresenter -import com.yizhuan.habu.avroom.redpackage.send.RedPackageSendDialog -import com.yizhuan.habu.avroom.room_album.RoomAlbumModel -import com.yizhuan.habu.avroom.view.IBaseRoomView -import com.yizhuan.habu.avroom.widget.BottomView -import com.yizhuan.habu.avroom.widget.MessageView -import com.yizhuan.habu.avroom.widget.MicroView -import com.yizhuan.habu.base.BaseMvpActivity -import com.yizhuan.habu.base.BaseMvpFragment -import com.yizhuan.habu.event.OpenRoomIntroEvent -import com.yizhuan.habu.friend.view.SelectFriendActivity -import com.yizhuan.habu.home.adapter.RoomActAdapter -import com.yizhuan.habu.shipantics.PullRadishActivity -import com.yizhuan.habu.treasure_box.widget.GoldBoxHelper -import com.yizhuan.habu.ui.webview.DialogWebViewActivity -import com.yizhuan.habu.ui.widget.ButtonItem -import com.yizhuan.habu.ui.widget.GiftDialog -import com.yizhuan.habu.ui.widget.GiftDialog.OnGiftDialogBtnClickListener -import com.yizhuan.habu.ui.widget.GiftDialog.SenGiftCallback -import com.yizhuan.habu.ui.widget.UserInfoDialog -import com.yizhuan.habu.ui.widget.dynamicface.DynamicFaceDialog -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil -import com.yizhuan.habu.ui.widget.rollviewpager.RollPagerView -import com.yizhuan.habu.ui.widget.rollviewpager.Util -import com.yizhuan.habu.ui.widget.rollviewpager.hintview.ColorPointHintView -import com.yizhuan.habu.utils.KeyBoardUtils -import com.yizhuan.habu.music.widget.MusicPlayerView -import com.yizhuan.habu.room_chat.activity.RoomMsgActivity +import com.chwl.app.R +import com.chwl.app.avroom.BottomViewListenerWrapper +import com.chwl.app.avroom.SoftKeyBoardListener +import com.chwl.app.avroom.SoftKeyBoardListener.OnSoftKeyBoardChangeListener +import com.chwl.app.avroom.activity.RoomInviteActivity +import com.chwl.app.avroom.activity.RoomTitleEditActivity +import com.chwl.app.avroom.adapter.OnMicroItemClickListener +import com.chwl.app.avroom.dialog.AttentionHintDialog +import com.chwl.app.avroom.dialog.DatingVipRuleDialog +import com.chwl.app.avroom.dialog.RoomFreeGiftDialog +import com.chwl.app.avroom.dialog.RoomOperationDialog +import com.chwl.app.avroom.firstcharge.FirstChargeDialog +import com.chwl.app.avroom.presenter.BaseRoomPresenter +import com.chwl.app.avroom.redpackage.send.RedPackageSendDialog +import com.chwl.app.avroom.room_album.RoomAlbumModel +import com.chwl.app.avroom.view.IBaseRoomView +import com.chwl.app.avroom.widget.BottomView +import com.chwl.app.avroom.widget.MessageView +import com.chwl.app.avroom.widget.MicroView +import com.chwl.app.base.BaseMvpActivity +import com.chwl.app.base.BaseMvpFragment +import com.chwl.app.event.OpenRoomIntroEvent +import com.chwl.app.friend.view.SelectFriendActivity +import com.chwl.app.home.adapter.RoomActAdapter +import com.chwl.app.shipantics.PullRadishActivity +import com.chwl.app.treasure_box.widget.GoldBoxHelper +import com.chwl.app.ui.webview.DialogWebViewActivity +import com.chwl.app.ui.widget.ButtonItem +import com.chwl.app.ui.widget.GiftDialog +import com.chwl.app.ui.widget.GiftDialog.OnGiftDialogBtnClickListener +import com.chwl.app.ui.widget.GiftDialog.SenGiftCallback +import com.chwl.app.ui.widget.UserInfoDialog +import com.chwl.app.ui.widget.dynamicface.DynamicFaceDialog +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil +import com.chwl.app.ui.widget.rollviewpager.RollPagerView +import com.chwl.app.ui.widget.rollviewpager.Util +import com.chwl.app.ui.widget.rollviewpager.hintview.ColorPointHintView +import com.chwl.app.utils.KeyBoardUtils +import com.chwl.app.music.widget.MusicPlayerView +import com.chwl.app.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.gift.event.RoomFreeGiftEvent -import com.yizhuan.xchat_android_core.helper.AtProxy -import com.yizhuan.xchat_android_core.home.bean.BannerInfo -import com.yizhuan.xchat_android_core.home.event.OpenRoomMessageInputEvent -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.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.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.support.room.RoomView -import com.yizhuan.xchat_android_core.support.room.RoomWidget -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.common.util.LimitClickUtils -import com.yizhuan.xchat_android_library.common.util.SPUtils -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.chwl.core.Constants +import com.chwl.core.DemoCache +import com.chwl.core.UriProvider +import com.chwl.core.auth.AuthModel +import com.chwl.core.bean.RoomMicInfo +import com.chwl.core.gift.GiftModel +import com.chwl.core.gift.bean.GiftInfo +import com.chwl.core.gift.event.RoomFreeGiftEvent +import com.chwl.core.helper.AtProxy +import com.chwl.core.home.bean.BannerInfo +import com.chwl.core.home.event.OpenRoomMessageInputEvent +import com.chwl.core.im.custom.bean.RoomFollowOwnerAttachment +import com.chwl.core.im.custom.bean.RoomFollowOwnerAttachment2 +import com.chwl.core.manager.AudioEngineManager +import com.chwl.core.manager.AvRoomDataManager +import com.chwl.core.manager.IMNetEaseManager +import com.chwl.core.manager.RoomEvent +import com.chwl.core.mentoring_relationship.event.MentoringStopCountingEvent +import com.chwl.core.room.anotherroompk.ShowGiftDialogEvent +import com.chwl.core.room.anotherroompk.ShowUserInfoDialogEvent +import com.chwl.core.room.bean.RoomContributeUserInfo +import com.chwl.core.room.bean.RoomInfo +import com.chwl.core.room.event.RoomAtEvent +import com.chwl.core.room.event.RoomClearScreenEvent +import com.chwl.core.room.game.GameStatus +import com.chwl.core.room.giftvalue.helper.GiftValueMrg +import com.chwl.core.room.queue.bean.MicMemberInfo +import com.chwl.core.share.bean.SessionType +import com.chwl.core.super_admin.SaConstant +import com.chwl.core.super_admin.model.SuperAdminModel +import com.chwl.core.super_admin.util.SuperAdminUtil +import com.chwl.core.support.room.RoomView +import com.chwl.core.support.room.RoomWidget +import com.chwl.core.user.UserModel +import com.chwl.core.user.bean.BaseInfo +import com.chwl.core.user.bean.UserInfo +import com.chwl.core.utils.CurrentTimeUtils +import com.chwl.core.utils.net.VipLevelNotEnoughException +import com.chwl.library.common.util.LimitClickUtils +import com.chwl.library.common.util.SPUtils +import com.chwl.library.net.rxnet.utils.RxNetWorkUtils +import com.chwl.library.rxbus.RxBus +import com.chwl.library.utils.* import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/yizhuan/habu/avroom/fragment/FakeSingleRoomBackFragment.kt b/app/src/main/java/com/chwl/app/avroom/fragment/FakeSingleRoomBackFragment.kt similarity index 85% rename from app/src/main/java/com/yizhuan/habu/avroom/fragment/FakeSingleRoomBackFragment.kt rename to app/src/main/java/com/chwl/app/avroom/fragment/FakeSingleRoomBackFragment.kt index 86dd51d27..a3b89febc 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/fragment/FakeSingleRoomBackFragment.kt +++ b/app/src/main/java/com/chwl/app/avroom/fragment/FakeSingleRoomBackFragment.kt @@ -1,16 +1,16 @@ -package com.yizhuan.habu.avroom.fragment +package com.chwl.app.avroom.fragment import android.annotation.SuppressLint -import com.yizhuan.habu.R -import com.yizhuan.habu.avroom.activity.AVRoomActivity -import com.yizhuan.habu.base.BaseViewBindingFragment -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.avroom.activity.AVRoomActivity +import com.chwl.app.base.BaseViewBindingFragment +import com.chwl.app.databinding.FragmentFakeSingleRoomBinding +import com.chwl.core.room.bean.RoomInfo +import com.chwl.core.room.event.SwitchRoomEvent +import com.chwl.core.room.model.AvRoomModel +import com.chwl.core.utils.CurrentTimeUtils +import com.chwl.core.utils.StringUtils +import com.chwl.library.utils.ResUtil import io.reactivex.Single import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable diff --git a/app/src/main/java/com/yizhuan/habu/avroom/fragment/FakeSingleRoomFragment.kt b/app/src/main/java/com/chwl/app/avroom/fragment/FakeSingleRoomFragment.kt similarity index 85% rename from app/src/main/java/com/yizhuan/habu/avroom/fragment/FakeSingleRoomFragment.kt rename to app/src/main/java/com/chwl/app/avroom/fragment/FakeSingleRoomFragment.kt index a8c7fc39b..cf5ed0936 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/fragment/FakeSingleRoomFragment.kt +++ b/app/src/main/java/com/chwl/app/avroom/fragment/FakeSingleRoomFragment.kt @@ -1,20 +1,20 @@ -package com.yizhuan.habu.avroom.fragment +package com.chwl.app.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.habu.R -import com.yizhuan.habu.avroom.activity.AVRoomActivity -import com.yizhuan.habu.base.BaseViewBindingFragment -import com.yizhuan.habu.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.chwl.app.R +import com.chwl.app.avroom.activity.AVRoomActivity +import com.chwl.app.base.BaseViewBindingFragment +import com.chwl.app.databinding.FragmentFakeSingleRoomBinding +import com.chwl.core.manager.AvRoomDataManager +import com.chwl.core.room.bean.RoomInfo +import com.chwl.core.room.event.SwitchRoomEvent +import com.chwl.core.room.model.AvRoomModel +import com.chwl.core.utils.CurrentTimeUtils +import com.chwl.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/habu/avroom/fragment/GameRoomFragment.kt b/app/src/main/java/com/chwl/app/avroom/fragment/GameRoomFragment.kt similarity index 82% rename from app/src/main/java/com/yizhuan/habu/avroom/fragment/GameRoomFragment.kt rename to app/src/main/java/com/chwl/app/avroom/fragment/GameRoomFragment.kt index e56288b13..61687ff8b 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/fragment/GameRoomFragment.kt +++ b/app/src/main/java/com/chwl/app/avroom/fragment/GameRoomFragment.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.fragment +package com.chwl.app.avroom.fragment import android.annotation.SuppressLint import android.os.Bundle @@ -6,24 +6,24 @@ import android.view.View import androidx.core.view.isInvisible import androidx.core.view.isVisible import androidx.databinding.DataBindingUtil -import com.yizhuan.habu.R -import com.yizhuan.habu.avroom.adapter.GameMicroViewAdapter -import com.yizhuan.habu.avroom.adapter.GameMiniMicroViewAdapter -import com.yizhuan.habu.avroom.adapter.OnMicroItemClickListener -import com.yizhuan.habu.avroom.firstcharge.FirstChargePrizeDialog -import com.yizhuan.habu.avroom.game.GameDelegate -import com.yizhuan.habu.avroom.game.OnGameStatusChangeListener -import com.yizhuan.habu.avroom.presenter.GameRoomPresenter -import com.yizhuan.habu.avroom.redpackage.RedPackageWidget -import com.yizhuan.habu.avroom.view.IGameRoomView -import com.yizhuan.habu.databinding.FragmentGameRoomBinding -import com.yizhuan.habu.ui.widget.GiftDialog.OnGiftDialogBtnClickListener -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 com.chwl.app.R +import com.chwl.app.avroom.adapter.GameMicroViewAdapter +import com.chwl.app.avroom.adapter.GameMiniMicroViewAdapter +import com.chwl.app.avroom.adapter.OnMicroItemClickListener +import com.chwl.app.avroom.firstcharge.FirstChargePrizeDialog +import com.chwl.app.avroom.game.GameDelegate +import com.chwl.app.avroom.game.OnGameStatusChangeListener +import com.chwl.app.avroom.presenter.GameRoomPresenter +import com.chwl.app.avroom.redpackage.RedPackageWidget +import com.chwl.app.avroom.view.IGameRoomView +import com.chwl.app.databinding.FragmentGameRoomBinding +import com.chwl.app.ui.widget.GiftDialog.OnGiftDialogBtnClickListener +import com.chwl.core.home.bean.BannerInfo +import com.chwl.core.manager.AvRoomDataManager +import com.chwl.core.music.model.PlayerModel +import com.chwl.core.pay.event.FirstChargeEvent +import com.chwl.core.room.event.FinishAvRoomEvent +import com.chwl.library.base.factory.CreatePresenter import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/yizhuan/habu/avroom/fragment/HomePartyFragment.java b/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyFragment.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/avroom/fragment/HomePartyFragment.java rename to app/src/main/java/com/chwl/app/avroom/fragment/HomePartyFragment.java index 2ec2e814d..c9a90676d 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/fragment/HomePartyFragment.java +++ b/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.fragment; +package com.chwl.app.avroom.fragment; import android.annotation.SuppressLint; import android.content.ClipData; @@ -26,47 +26,47 @@ 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.habu.R; -import com.yizhuan.habu.avroom.activity.AVRoomActivity; -import com.yizhuan.habu.avroom.activity.RoomOnlineUserActivity; -import com.yizhuan.habu.avroom.adapter.SelectGameAdapter; -import com.yizhuan.habu.avroom.dialog.ExitRoomPopupWindow; -import com.yizhuan.habu.avroom.widget.GiftV2View; -import com.yizhuan.habu.avroom.widget.RoomEffectView; -import com.yizhuan.habu.base.BaseFragment; -import com.yizhuan.habu.databinding.FragmentChatroomGameMainBinding; -import com.yizhuan.habu.friend.view.SelectFriendActivity; -import com.yizhuan.habu.home.helper.OpenRoomHelper; -import com.yizhuan.habu.ui.widget.ShareDialog; -import com.yizhuan.habu.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.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.Logger; -import com.yizhuan.xchat_android_library.utils.JavaUtil; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.app.avroom.activity.AVRoomActivity; +import com.chwl.app.avroom.activity.RoomOnlineUserActivity; +import com.chwl.app.avroom.adapter.SelectGameAdapter; +import com.chwl.app.avroom.dialog.ExitRoomPopupWindow; +import com.chwl.app.avroom.widget.GiftV2View; +import com.chwl.app.avroom.widget.RoomEffectView; +import com.chwl.app.base.BaseFragment; +import com.chwl.app.databinding.FragmentChatroomGameMainBinding; +import com.chwl.app.friend.view.SelectFriendActivity; +import com.chwl.app.home.helper.OpenRoomHelper; +import com.chwl.app.ui.widget.ShareDialog; +import com.chwl.app.utils.RegexUtil; +import com.chwl.core.gift.bean.GiftMultiReceiverInfo; +import com.chwl.core.gift.bean.GiftReceiveInfo; +import com.chwl.core.gift.bean.LuckyBagGifts; +import com.chwl.core.gift.bean.MultiGiftReceiveInfo; +import com.chwl.core.home.event.FollowRoomEvent; +import com.chwl.core.home.event.ShareRoomEvent; +import com.chwl.core.home.model.CollectionRoomModel; +import com.chwl.core.im.custom.bean.CustomAttachment; +import com.chwl.core.im.custom.bean.RoomInfoAttachment; +import com.chwl.core.magic.bean.MagicReceivedInfo; +import com.chwl.core.magic.bean.MultiMagicReceivedInfo; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.manager.IMNetEaseManager; +import com.chwl.core.manager.RoomEvent; +import com.chwl.core.praise.PraiseModel; +import com.chwl.core.room.bean.RoomInfo; +import com.chwl.core.room.bean.RoomModeType; +import com.chwl.core.room.game.GameInfo; +import com.chwl.core.room.game.GameModel; +import com.chwl.core.room.queuing_mic.event.HasAnimationEffect; +import com.chwl.core.share.ShareModel; +import com.chwl.core.super_admin.util.SuperAdminUtil; +import com.chwl.core.user.UserModel; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.core.utils.Logger; +import com.chwl.library.utils.JavaUtil; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/fragment/HomePartyRoomFragment.java b/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyRoomFragment.java similarity index 92% rename from app/src/main/java/com/yizhuan/habu/avroom/fragment/HomePartyRoomFragment.java rename to app/src/main/java/com/chwl/app/avroom/fragment/HomePartyRoomFragment.java index 29aa086b4..fa322fbd9 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/fragment/HomePartyRoomFragment.java +++ b/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyRoomFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.fragment; +package com.chwl.app.avroom.fragment; import android.annotation.SuppressLint; import android.os.Bundle; @@ -10,64 +10,64 @@ 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.habu.R; -import com.yizhuan.habu.avroom.activity.AVRoomActivity; -import com.yizhuan.habu.avroom.adapter.BaseMicroViewAdapter; -import com.yizhuan.habu.avroom.adapter.CpMicroViewAdapter; -import com.yizhuan.habu.avroom.adapter.DatingMicroViewAdapter; -import com.yizhuan.habu.avroom.adapter.MicroViewAdapter; -import com.yizhuan.habu.avroom.anotherroompk.RoomPkFinishDialog; -import com.yizhuan.habu.avroom.anotherroompk.RoomPkForceFinishDialog; -import com.yizhuan.habu.avroom.anotherroompk.RoomPkReceivedDialog; -import com.yizhuan.habu.avroom.dialog.MicQueueDialog; -import com.yizhuan.habu.avroom.dialog.PKMicQueueDialog; -import com.yizhuan.habu.avroom.dialog.PKResultDialog; -import com.yizhuan.habu.avroom.dialog.PKScoreBoardDialog; -import com.yizhuan.habu.avroom.firstcharge.FirstChargePrizeDialog; -import com.yizhuan.habu.avroom.giftvalue.GiftValueDialogUiHelper; -import com.yizhuan.habu.avroom.presenter.HomePartyPresenter; -import com.yizhuan.habu.avroom.redpackage.RedPackageWidget; -import com.yizhuan.habu.avroom.view.IHomePartyView; -import com.yizhuan.habu.avroom.widget.PKBoardView; -import com.yizhuan.habu.base.BaseMvpActivity; -import com.yizhuan.habu.common.widget.dialog.DialogManager; -import com.yizhuan.habu.databinding.FragmentAvRoomGameBinding; -import com.yizhuan.habu.treasure_box.widget.GoldBoxHelper; -import com.yizhuan.habu.ui.webview.DatingRuleWebViewActivity; -import com.yizhuan.habu.ui.webview.DialogWebViewActivity; -import com.yizhuan.habu.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.utils.CurrentTimeUtils; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ResUtil; -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.chwl.app.R; +import com.chwl.app.avroom.activity.AVRoomActivity; +import com.chwl.app.avroom.adapter.BaseMicroViewAdapter; +import com.chwl.app.avroom.adapter.CpMicroViewAdapter; +import com.chwl.app.avroom.adapter.DatingMicroViewAdapter; +import com.chwl.app.avroom.adapter.MicroViewAdapter; +import com.chwl.app.avroom.anotherroompk.RoomPkFinishDialog; +import com.chwl.app.avroom.anotherroompk.RoomPkForceFinishDialog; +import com.chwl.app.avroom.anotherroompk.RoomPkReceivedDialog; +import com.chwl.app.avroom.dialog.MicQueueDialog; +import com.chwl.app.avroom.dialog.PKMicQueueDialog; +import com.chwl.app.avroom.dialog.PKResultDialog; +import com.chwl.app.avroom.dialog.PKScoreBoardDialog; +import com.chwl.app.avroom.firstcharge.FirstChargePrizeDialog; +import com.chwl.app.avroom.giftvalue.GiftValueDialogUiHelper; +import com.chwl.app.avroom.presenter.HomePartyPresenter; +import com.chwl.app.avroom.redpackage.RedPackageWidget; +import com.chwl.app.avroom.view.IHomePartyView; +import com.chwl.app.avroom.widget.PKBoardView; +import com.chwl.app.base.BaseMvpActivity; +import com.chwl.app.common.widget.dialog.DialogManager; +import com.chwl.app.databinding.FragmentAvRoomGameBinding; +import com.chwl.app.treasure_box.widget.GoldBoxHelper; +import com.chwl.app.ui.webview.DatingRuleWebViewActivity; +import com.chwl.app.ui.webview.DialogWebViewActivity; +import com.chwl.app.utils.UserUtils; +import com.chwl.core.Constants; +import com.chwl.core.UriProvider; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.home.bean.BannerInfo; +import com.chwl.core.home.event.ShareRoomEvent; +import com.chwl.core.im.custom.bean.RoomPKAttachment; +import com.chwl.core.im.custom.bean.RoomPkBean; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.manager.RoomEvent; +import com.chwl.core.market_verify.MarketVerifyModel; +import com.chwl.core.pay.event.FirstChargeEvent; +import com.chwl.core.room.bean.RoomInfo; +import com.chwl.core.room.event.DatingSelectUserEvent; +import com.chwl.core.room.face.DynamicFaceModel; +import com.chwl.core.room.face.FaceInfo; +import com.chwl.core.room.model.AvRoomModel; +import com.chwl.core.room.model.MicQueueModel; +import com.chwl.core.room.pk.bean.PKRespQueuingMicListInfo; +import com.chwl.core.room.pk.bean.RoomPkData; +import com.chwl.core.room.pk.event.PKStateEvent; +import com.chwl.core.room.pk.model.PkModel; +import com.chwl.core.room.queuing_mic.bean.RespQueuingMicListInfo; +import com.chwl.core.room.queuing_mic.event.QueuingMicEmptyEvent; +import com.chwl.core.room.queuing_mic.event.QueuingMicNotEmptyEvent; +import com.chwl.core.super_admin.util.SuperAdminUtil; +import com.chwl.core.utils.CurrentTimeUtils; +import com.chwl.library.base.factory.CreatePresenter; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; +import com.chwl.library.utils.TimeUtils; +import com.chwl.library.utils.UIUtils; +import com.chwl.library.utils.config.BasicConfig; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/fragment/IRoomRankDialogChangePageListener.java b/app/src/main/java/com/chwl/app/avroom/fragment/IRoomRankDialogChangePageListener.java similarity index 67% rename from app/src/main/java/com/yizhuan/habu/avroom/fragment/IRoomRankDialogChangePageListener.java rename to app/src/main/java/com/chwl/app/avroom/fragment/IRoomRankDialogChangePageListener.java index 99e38aa46..8b8d58785 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/fragment/IRoomRankDialogChangePageListener.java +++ b/app/src/main/java/com/chwl/app/avroom/fragment/IRoomRankDialogChangePageListener.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.fragment; +package com.chwl.app.avroom.fragment; public interface IRoomRankDialogChangePageListener { void onChangePage(int pos); diff --git a/app/src/main/java/com/yizhuan/habu/avroom/fragment/IRoomRankDialogDismissListener.java b/app/src/main/java/com/chwl/app/avroom/fragment/IRoomRankDialogDismissListener.java similarity index 64% rename from app/src/main/java/com/yizhuan/habu/avroom/fragment/IRoomRankDialogDismissListener.java rename to app/src/main/java/com/chwl/app/avroom/fragment/IRoomRankDialogDismissListener.java index adc1f0021..38668d80a 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/fragment/IRoomRankDialogDismissListener.java +++ b/app/src/main/java/com/chwl/app/avroom/fragment/IRoomRankDialogDismissListener.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.fragment; +package com.chwl.app.avroom.fragment; public interface IRoomRankDialogDismissListener { void onDismiss(); diff --git a/app/src/main/java/com/yizhuan/habu/avroom/fragment/IRoomRankHalfHourView.java b/app/src/main/java/com/chwl/app/avroom/fragment/IRoomRankHalfHourView.java similarity index 51% rename from app/src/main/java/com/yizhuan/habu/avroom/fragment/IRoomRankHalfHourView.java rename to app/src/main/java/com/chwl/app/avroom/fragment/IRoomRankHalfHourView.java index d8ad84e49..1f0976044 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/fragment/IRoomRankHalfHourView.java +++ b/app/src/main/java/com/chwl/app/avroom/fragment/IRoomRankHalfHourView.java @@ -1,9 +1,9 @@ -package com.yizhuan.habu.avroom.fragment; +package com.chwl.app.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.chwl.core.room.bean.RoomRankHalfHourMeInfo; +import com.chwl.core.room.bean.RoomRankHalfHourRankInfo; +import com.chwl.core.room.bean.RoomRankMultiItem; +import com.chwl.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/fragment/InputPwdDialogFragment.java b/app/src/main/java/com/chwl/app/avroom/fragment/InputPwdDialogFragment.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/avroom/fragment/InputPwdDialogFragment.java rename to app/src/main/java/com/chwl/app/avroom/fragment/InputPwdDialogFragment.java index 74b30a3f7..649e5117c 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/fragment/InputPwdDialogFragment.java +++ b/app/src/main/java/com/chwl/app/avroom/fragment/InputPwdDialogFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.fragment; +package com.chwl.app.avroom.fragment; import android.os.Bundle; import android.text.TextUtils; @@ -11,8 +11,8 @@ import android.widget.TextView; import androidx.annotation.Nullable; import androidx.fragment.app.DialogFragment; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_library.utils.codec.DESUtils; +import com.chwl.app.R; +import com.chwl.library.utils.codec.DESUtils; /** *

密码框输入

diff --git a/app/src/main/java/com/yizhuan/habu/avroom/fragment/InviteFriendListFragment.java b/app/src/main/java/com/chwl/app/avroom/fragment/InviteFriendListFragment.java similarity index 87% rename from app/src/main/java/com/yizhuan/habu/avroom/fragment/InviteFriendListFragment.java rename to app/src/main/java/com/chwl/app/avroom/fragment/InviteFriendListFragment.java index 5f4d697bf..970d70902 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/fragment/InviteFriendListFragment.java +++ b/app/src/main/java/com/chwl/app/avroom/fragment/InviteFriendListFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.fragment; +package com.chwl.app.avroom.fragment; import android.os.Bundle; @@ -7,16 +7,16 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import com.yizhuan.habu.R; -import com.yizhuan.habu.avroom.adapter.InviteFriendListAdapter; -import com.yizhuan.habu.base.BaseFragment; -import com.yizhuan.habu.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.chwl.app.R; +import com.chwl.app.avroom.adapter.InviteFriendListAdapter; +import com.chwl.app.base.BaseFragment; +import com.chwl.app.public_chat_hall.bean.PublicChatHallFriendInfo; +import com.chwl.core.im.friend.IMFriendModel; +import com.chwl.core.manager.IMNetEaseManager; +import com.chwl.core.manager.RelationShipEvent; +import com.chwl.core.user.UserModel; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/fragment/OnlineUserFragment.java b/app/src/main/java/com/chwl/app/avroom/fragment/OnlineUserFragment.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/avroom/fragment/OnlineUserFragment.java rename to app/src/main/java/com/chwl/app/avroom/fragment/OnlineUserFragment.java index 26d875edf..bf797cf93 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/fragment/OnlineUserFragment.java +++ b/app/src/main/java/com/chwl/app/avroom/fragment/OnlineUserFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.fragment; +package com.chwl.app.avroom.fragment; import android.view.View; @@ -12,21 +12,21 @@ 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.habu.R; -import com.yizhuan.habu.avroom.adapter.OnlineUserAdapter; -import com.yizhuan.habu.avroom.presenter.HomePartyUserListPresenter; -import com.yizhuan.habu.avroom.view.IHomePartyUserListView; -import com.yizhuan.habu.base.BaseMvpFragment; -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.avroom.adapter.OnlineUserAdapter; +import com.chwl.app.avroom.presenter.HomePartyUserListPresenter; +import com.chwl.app.avroom.view.IHomePartyUserListView; +import com.chwl.app.base.BaseMvpFragment; +import com.chwl.app.ui.widget.UserInfoDialog; +import com.chwl.core.Constants; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.room.bean.OnlineChatMember; +import com.chwl.core.room.bean.RoomInfo; +import com.chwl.core.super_admin.util.SuperAdminUtil; +import com.chwl.library.base.factory.CreatePresenter; +import com.chwl.library.utils.JavaUtil; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; import java.util.Iterator; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/fragment/RoomCharmListFragment.java b/app/src/main/java/com/chwl/app/avroom/fragment/RoomCharmListFragment.java similarity index 67% rename from app/src/main/java/com/yizhuan/habu/avroom/fragment/RoomCharmListFragment.java rename to app/src/main/java/com/chwl/app/avroom/fragment/RoomCharmListFragment.java index 8679f2cd7..52aaa20fd 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/fragment/RoomCharmListFragment.java +++ b/app/src/main/java/com/chwl/app/avroom/fragment/RoomCharmListFragment.java @@ -1,16 +1,16 @@ -package com.yizhuan.habu.avroom.fragment; +package com.chwl.app.avroom.fragment; import androidx.fragment.app.Fragment; -import com.yizhuan.habu.R; -import com.yizhuan.habu.avroom.adapter.RoomContributeListAdapter; -import com.yizhuan.habu.avroom.widget.RankNavigatorAdapter; -import com.yizhuan.habu.base.BaseBindingFragment; -import com.yizhuan.habu.databinding.FragmentRoomCharmListBinding; -import com.yizhuan.habu.ui.widget.magicindicator.ViewPagerHelper; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; -import com.yizhuan.xchat_android_core.room.bean.RoomContributeDataInfo; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; +import com.chwl.app.R; +import com.chwl.app.avroom.adapter.RoomContributeListAdapter; +import com.chwl.app.avroom.widget.RankNavigatorAdapter; +import com.chwl.app.base.BaseBindingFragment; +import com.chwl.app.databinding.FragmentRoomCharmListBinding; +import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.chwl.core.room.bean.RoomContributeDataInfo; +import com.chwl.library.annatation.ActLayoutRes; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/fragment/RoomCharmRankingListFragment.java b/app/src/main/java/com/chwl/app/avroom/fragment/RoomCharmRankingListFragment.java similarity index 85% rename from app/src/main/java/com/yizhuan/habu/avroom/fragment/RoomCharmRankingListFragment.java rename to app/src/main/java/com/chwl/app/avroom/fragment/RoomCharmRankingListFragment.java index 3d4c85d0c..c579154a1 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/fragment/RoomCharmRankingListFragment.java +++ b/app/src/main/java/com/chwl/app/avroom/fragment/RoomCharmRankingListFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.fragment; +package com.chwl.app.avroom.fragment; import android.os.Bundle; import android.text.TextUtils; @@ -14,21 +14,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.habu.R; -import com.yizhuan.habu.avroom.adapter.RoomConsumerListAdapterTemp; -import com.yizhuan.habu.avroom.presenter.RoomCharmRankingPresenter; -import com.yizhuan.habu.avroom.view.IRoomCharmRankingListView; -import com.yizhuan.habu.base.BaseMvpFragment; -import com.yizhuan.habu.ui.widget.GiftDialog; -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.avroom.adapter.RoomConsumerListAdapterTemp; +import com.chwl.app.avroom.presenter.RoomCharmRankingPresenter; +import com.chwl.app.avroom.view.IRoomCharmRankingListView; +import com.chwl.app.base.BaseMvpFragment; +import com.chwl.app.ui.widget.GiftDialog; +import com.chwl.app.ui.widget.UserInfoDialog; +import com.chwl.core.Constants; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.room.bean.RoomContributeUserInfo; +import com.chwl.core.room.bean.RoomInfo; +import com.chwl.core.room.bean.RoomRankMultiItem; +import com.chwl.library.base.factory.CreatePresenter; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/fragment/RoomContributeFragment.java b/app/src/main/java/com/chwl/app/avroom/fragment/RoomContributeFragment.java similarity index 89% rename from app/src/main/java/com/yizhuan/habu/avroom/fragment/RoomContributeFragment.java rename to app/src/main/java/com/chwl/app/avroom/fragment/RoomContributeFragment.java index 46e0c512c..d311793cc 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/fragment/RoomContributeFragment.java +++ b/app/src/main/java/com/chwl/app/avroom/fragment/RoomContributeFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.fragment; +package com.chwl.app.avroom.fragment; import android.os.Bundle; import android.view.LayoutInflater; @@ -12,18 +12,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.habu.R; -import com.yizhuan.habu.avroom.adapter.RoomConsumerListAdapterTemp; -import com.yizhuan.habu.avroom.presenter.RoomContributeListPresenter; -import com.yizhuan.habu.avroom.view.IRoomContributeListView; -import com.yizhuan.habu.base.BaseMvpFragment; -import com.yizhuan.habu.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.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.chwl.app.R; +import com.chwl.app.avroom.adapter.RoomConsumerListAdapterTemp; +import com.chwl.app.avroom.presenter.RoomContributeListPresenter; +import com.chwl.app.avroom.view.IRoomContributeListView; +import com.chwl.app.base.BaseMvpFragment; +import com.chwl.app.ui.widget.UserInfoDialog; +import com.chwl.core.Constants; +import com.chwl.core.room.bean.RoomContributeDataInfo; +import com.chwl.core.room.bean.RoomContributeUserInfo; +import com.chwl.core.room.bean.RoomRankMultiItem; +import com.chwl.library.base.factory.CreatePresenter; +import com.chwl.library.utils.ListUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/fragment/RoomContributeListFragment.java b/app/src/main/java/com/chwl/app/avroom/fragment/RoomContributeListFragment.java similarity index 72% rename from app/src/main/java/com/yizhuan/habu/avroom/fragment/RoomContributeListFragment.java rename to app/src/main/java/com/chwl/app/avroom/fragment/RoomContributeListFragment.java index 5653753e7..45a464bf6 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/fragment/RoomContributeListFragment.java +++ b/app/src/main/java/com/chwl/app/avroom/fragment/RoomContributeListFragment.java @@ -1,18 +1,18 @@ -package com.yizhuan.habu.avroom.fragment; +package com.chwl.app.avroom.fragment; import androidx.fragment.app.Fragment; import androidx.viewpager.widget.ViewPager; -import com.yizhuan.habu.R; -import com.yizhuan.habu.avroom.adapter.RoomContributeListAdapter; -import com.yizhuan.habu.avroom.widget.RankNavigatorAdapter; -import com.yizhuan.habu.base.BaseMvpFragment; -import com.yizhuan.habu.ui.widget.magicindicator.MagicIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.ViewPagerHelper; -import com.yizhuan.habu.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.chwl.app.R; +import com.chwl.app.avroom.adapter.RoomContributeListAdapter; +import com.chwl.app.avroom.widget.RankNavigatorAdapter; +import com.chwl.app.base.BaseMvpFragment; +import com.chwl.app.ui.widget.magicindicator.MagicIndicator; +import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.room.bean.RoomContributeDataInfo; +import com.chwl.library.base.IMvpBaseView; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/fragment/RoomRankDialogFragment.java b/app/src/main/java/com/chwl/app/avroom/fragment/RoomRankDialogFragment.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/avroom/fragment/RoomRankDialogFragment.java rename to app/src/main/java/com/chwl/app/avroom/fragment/RoomRankDialogFragment.java index 1fbe6bf74..209c04fed 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/fragment/RoomRankDialogFragment.java +++ b/app/src/main/java/com/chwl/app/avroom/fragment/RoomRankDialogFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.fragment; +package com.chwl.app.avroom.fragment; import android.app.Dialog; import android.os.Bundle; @@ -15,8 +15,8 @@ import androidx.appcompat.app.AppCompatDialogFragment; import androidx.fragment.app.Fragment; import androidx.viewpager.widget.ViewPager; -import com.yizhuan.habu.R; -import com.yizhuan.habu.avroom.adapter.RoomRankFragmentPageAdapter; +import com.chwl.app.R; +import com.chwl.app.avroom.adapter.RoomRankFragmentPageAdapter; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/fragment/RoomRankDialogUtils.java b/app/src/main/java/com/chwl/app/avroom/fragment/RoomRankDialogUtils.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/avroom/fragment/RoomRankDialogUtils.java rename to app/src/main/java/com/chwl/app/avroom/fragment/RoomRankDialogUtils.java index 6564d6611..85694a4d0 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/fragment/RoomRankDialogUtils.java +++ b/app/src/main/java/com/chwl/app/avroom/fragment/RoomRankDialogUtils.java @@ -1,7 +1,7 @@ -package com.yizhuan.habu.avroom.fragment; +package com.chwl.app.avroom.fragment; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.library.utils.ResUtil; import java.math.BigDecimal; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/fragment/RoomRankListFragment.java b/app/src/main/java/com/chwl/app/avroom/fragment/RoomRankListFragment.java similarity index 81% rename from app/src/main/java/com/yizhuan/habu/avroom/fragment/RoomRankListFragment.java rename to app/src/main/java/com/chwl/app/avroom/fragment/RoomRankListFragment.java index 8be76951c..9c5fe6f17 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/fragment/RoomRankListFragment.java +++ b/app/src/main/java/com/chwl/app/avroom/fragment/RoomRankListFragment.java @@ -1,17 +1,17 @@ -package com.yizhuan.habu.avroom.fragment; +package com.chwl.app.avroom.fragment; import android.view.View; import androidx.fragment.app.Fragment; -import com.yizhuan.habu.R; -import com.yizhuan.habu.avroom.adapter.RoomContributeListAdapter; -import com.yizhuan.habu.avroom.widget.RoomRankNavigatorAdapter; -import com.yizhuan.habu.base.BaseBindingFragment; -import com.yizhuan.habu.databinding.FragmentRoomRankListBinding; -import com.yizhuan.habu.ui.widget.magicindicator.ViewPagerHelper; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; +import com.chwl.app.R; +import com.chwl.app.avroom.adapter.RoomContributeListAdapter; +import com.chwl.app.avroom.widget.RoomRankNavigatorAdapter; +import com.chwl.app.base.BaseBindingFragment; +import com.chwl.app.databinding.FragmentRoomRankListBinding; +import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.chwl.library.annatation.ActLayoutRes; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/fragment/RoomTitleDialogFragment.java b/app/src/main/java/com/chwl/app/avroom/fragment/RoomTitleDialogFragment.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/avroom/fragment/RoomTitleDialogFragment.java rename to app/src/main/java/com/chwl/app/avroom/fragment/RoomTitleDialogFragment.java index 31ffe67d5..ca2e01415 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/fragment/RoomTitleDialogFragment.java +++ b/app/src/main/java/com/chwl/app/avroom/fragment/RoomTitleDialogFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.fragment; +package com.chwl.app.avroom.fragment; import android.os.Bundle; import android.text.TextUtils; @@ -14,8 +14,8 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.DialogFragment; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.library.utils.ResUtil; public class RoomTitleDialogFragment extends DialogFragment { diff --git a/app/src/main/java/com/yizhuan/habu/avroom/fragment/SingleRoomFragment.kt b/app/src/main/java/com/chwl/app/avroom/fragment/SingleRoomFragment.kt similarity index 82% rename from app/src/main/java/com/yizhuan/habu/avroom/fragment/SingleRoomFragment.kt rename to app/src/main/java/com/chwl/app/avroom/fragment/SingleRoomFragment.kt index 57b2e9049..590a03d86 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/fragment/SingleRoomFragment.kt +++ b/app/src/main/java/com/chwl/app/avroom/fragment/SingleRoomFragment.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.fragment +package com.chwl.app.avroom.fragment import android.annotation.SuppressLint import android.os.Bundle @@ -9,38 +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.habu.R -import com.yizhuan.habu.avroom.adapter.OnMicroItemClickListener -import com.yizhuan.habu.avroom.adapter.SingleAnchorMicroViewAdapter -import com.yizhuan.habu.avroom.adapter.SingleRoomPKMicroViewAdapter -import com.yizhuan.habu.avroom.dialog.RequestUpMicDialog -import com.yizhuan.habu.avroom.firstcharge.FirstChargePrizeDialog -import com.yizhuan.habu.avroom.presenter.SingleRoomPresenter -import com.yizhuan.habu.avroom.redpackage.RedPackageWidget -import com.yizhuan.habu.avroom.singleroompk.SingleRoomPkFinishDialog -import com.yizhuan.habu.avroom.singleroompk.SingleRoomPkForceFinishDialog -import com.yizhuan.habu.avroom.singleroompk.SingleRoomPkReceivedDialog -import com.yizhuan.habu.avroom.view.ISingleRoomView -import com.yizhuan.habu.databinding.FragmentSingleRoomBinding -import com.yizhuan.habu.fansteam.FansTeamJoinActivity -import com.yizhuan.habu.fansteam.FansTeamJoinedActivity -import com.yizhuan.habu.fansteam.FansTeamViewModel -import com.yizhuan.habu.treasure_box.widget.GoldBoxHelper -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.habu.ui.webview.CommonWebViewActivity -import com.yizhuan.habu.ui.webview.DialogWebViewActivity -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.user.bean.UserInfo -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter +import com.chwl.app.R +import com.chwl.app.avroom.adapter.OnMicroItemClickListener +import com.chwl.app.avroom.adapter.SingleAnchorMicroViewAdapter +import com.chwl.app.avroom.adapter.SingleRoomPKMicroViewAdapter +import com.chwl.app.avroom.dialog.RequestUpMicDialog +import com.chwl.app.avroom.firstcharge.FirstChargePrizeDialog +import com.chwl.app.avroom.presenter.SingleRoomPresenter +import com.chwl.app.avroom.redpackage.RedPackageWidget +import com.chwl.app.avroom.singleroompk.SingleRoomPkFinishDialog +import com.chwl.app.avroom.singleroompk.SingleRoomPkForceFinishDialog +import com.chwl.app.avroom.singleroompk.SingleRoomPkReceivedDialog +import com.chwl.app.avroom.view.ISingleRoomView +import com.chwl.app.databinding.FragmentSingleRoomBinding +import com.chwl.app.fansteam.FansTeamJoinActivity +import com.chwl.app.fansteam.FansTeamJoinedActivity +import com.chwl.app.fansteam.FansTeamViewModel +import com.chwl.app.treasure_box.widget.GoldBoxHelper +import com.chwl.app.ui.utils.load +import com.chwl.app.ui.webview.CommonWebViewActivity +import com.chwl.app.ui.webview.DialogWebViewActivity +import com.chwl.core.UriProvider +import com.chwl.core.auth.AuthModel +import com.chwl.core.fansteam.FansTeamInitInfo +import com.chwl.core.home.bean.BannerInfo +import com.chwl.core.im.custom.bean.FansTeamMsgAttachment +import com.chwl.core.im.custom.bean.RequestUpmicAttachment +import com.chwl.core.im.custom.bean.RoomPKAttachment +import com.chwl.core.manager.AvRoomDataManager +import com.chwl.core.manager.RoomEvent +import com.chwl.core.pay.event.FirstChargeEvent +import com.chwl.core.user.bean.UserInfo +import com.chwl.library.base.factory.CreatePresenter import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/yizhuan/habu/avroom/game/AppConfig.java b/app/src/main/java/com/chwl/app/avroom/game/AppConfig.java similarity index 75% rename from app/src/main/java/com/yizhuan/habu/avroom/game/AppConfig.java rename to app/src/main/java/com/chwl/app/avroom/game/AppConfig.java index 7fae77fe1..cdcfb7102 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/game/AppConfig.java +++ b/app/src/main/java/com/chwl/app/avroom/game/AppConfig.java @@ -2,9 +2,9 @@ Copyright © Sud.Tech https://sud.tech */ -package com.yizhuan.habu.avroom.game; +package com.chwl.app.avroom.game; -import com.yizhuan.xchat_android_library.BuildConfig; +import com.chwl.library.BuildConfig; public class AppConfig { diff --git a/app/src/main/java/com/yizhuan/habu/avroom/game/GameDelegate.kt b/app/src/main/java/com/chwl/app/avroom/game/GameDelegate.kt similarity index 96% rename from app/src/main/java/com/yizhuan/habu/avroom/game/GameDelegate.kt rename to app/src/main/java/com/chwl/app/avroom/game/GameDelegate.kt index efb1127ad..7b332d379 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/game/GameDelegate.kt +++ b/app/src/main/java/com/chwl/app/avroom/game/GameDelegate.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.game +package com.chwl.app.avroom.game import android.annotation.SuppressLint import android.app.Activity @@ -11,18 +11,18 @@ import android.view.View import android.view.ViewTreeObserver.OnGlobalLayoutListener import android.widget.FrameLayout import com.google.gson.Gson -import com.yizhuan.habu.R -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.chwl.app.R +import com.chwl.core.auth.AuthModel +import com.chwl.core.manager.AvRoomDataManager +import com.chwl.core.room.game.GameCfg +import com.chwl.core.room.game.GameModel +import com.chwl.core.room.game.GameStatus +import com.chwl.core.room.model.HomePartyModel +import com.chwl.core.user.UserModel +import com.chwl.core.utils.LogUtils +import com.chwl.core.utils.net.RxHelper +import com.chwl.library.net.rxnet.callback.CallBack +import com.chwl.library.utils.SingleToastUtil import okhttp3.* import org.json.JSONException import org.json.JSONObject diff --git a/app/src/main/java/com/yizhuan/habu/avroom/game/OnGameStatusChangeListener.kt b/app/src/main/java/com/chwl/app/avroom/game/OnGameStatusChangeListener.kt similarity index 80% rename from app/src/main/java/com/yizhuan/habu/avroom/game/OnGameStatusChangeListener.kt rename to app/src/main/java/com/chwl/app/avroom/game/OnGameStatusChangeListener.kt index 93caa4076..0b5fc1e14 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/game/OnGameStatusChangeListener.kt +++ b/app/src/main/java/com/chwl/app/avroom/game/OnGameStatusChangeListener.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.game +package com.chwl.app.avroom.game interface OnGameStatusChangeListener { /** diff --git a/app/src/main/java/com/yizhuan/habu/avroom/game/SudMGPAPPState.java b/app/src/main/java/com/chwl/app/avroom/game/SudMGPAPPState.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/avroom/game/SudMGPAPPState.java rename to app/src/main/java/com/chwl/app/avroom/game/SudMGPAPPState.java index 80f7ab286..667b34c45 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/game/SudMGPAPPState.java +++ b/app/src/main/java/com/chwl/app/avroom/game/SudMGPAPPState.java @@ -2,7 +2,7 @@ Copyright © Sud.Tech https://sud.tech */ -package com.yizhuan.habu.avroom.game; +package com.chwl.app.avroom.game; /** * Time:2021/10/19 diff --git a/app/src/main/java/com/yizhuan/habu/avroom/game/SudMGPMGState.java b/app/src/main/java/com/chwl/app/avroom/game/SudMGPMGState.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/avroom/game/SudMGPMGState.java rename to app/src/main/java/com/chwl/app/avroom/game/SudMGPMGState.java index fb33b5b14..b4309738e 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/game/SudMGPMGState.java +++ b/app/src/main/java/com/chwl/app/avroom/game/SudMGPMGState.java @@ -2,7 +2,7 @@ Copyright © Sud.Tech https://sud.tech */ -package com.yizhuan.habu.avroom.game; +package com.chwl.app.avroom.game; /** * Time:2021/10/19 diff --git a/app/src/main/java/com/yizhuan/habu/avroom/giftvalue/GiftValueDialogUiHelper.java b/app/src/main/java/com/chwl/app/avroom/giftvalue/GiftValueDialogUiHelper.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/avroom/giftvalue/GiftValueDialogUiHelper.java rename to app/src/main/java/com/chwl/app/avroom/giftvalue/GiftValueDialogUiHelper.java index 27a4422b4..802a16a44 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/giftvalue/GiftValueDialogUiHelper.java +++ b/app/src/main/java/com/chwl/app/avroom/giftvalue/GiftValueDialogUiHelper.java @@ -1,14 +1,14 @@ -package com.yizhuan.habu.avroom.giftvalue; +package com.chwl.app.avroom.giftvalue; import android.content.Context; import androidx.annotation.Nullable; -import com.yizhuan.habu.R; -import com.yizhuan.habu.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.chwl.app.R; +import com.chwl.app.common.widget.dialog.DialogManager; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.utils.ActivityUtil; +import com.chwl.core.utils.SharedPreferenceUtils; /** * 礼物值的弹框处理 diff --git a/app/src/main/java/com/yizhuan/habu/avroom/helper/AnimHelper.java b/app/src/main/java/com/chwl/app/avroom/helper/AnimHelper.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/avroom/helper/AnimHelper.java rename to app/src/main/java/com/chwl/app/avroom/helper/AnimHelper.java index e64f0dcbc..448a59ac1 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/helper/AnimHelper.java +++ b/app/src/main/java/com/chwl/app/avroom/helper/AnimHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.helper; +package com.chwl.app.avroom.helper; import static com.yizhuan.xchat_android_constants.XChatConstants.SELECT_ANIM_DURATION; @@ -27,8 +27,8 @@ 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.habu.R; -import com.yizhuan.habu.application.XChatApplication; +import com.chwl.app.R; +import com.chwl.app.application.XChatApplication; public class AnimHelper { diff --git a/app/src/main/java/com/yizhuan/habu/avroom/helper/RoomViewModel.java b/app/src/main/java/com/chwl/app/avroom/helper/RoomViewModel.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/avroom/helper/RoomViewModel.java rename to app/src/main/java/com/chwl/app/avroom/helper/RoomViewModel.java index 846e25b93..391f07e2a 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/helper/RoomViewModel.java +++ b/app/src/main/java/com/chwl/app/avroom/helper/RoomViewModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.helper; +package com.chwl.app.avroom.helper; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/newuserchargegift/NewUserChargePrizeDialog.kt b/app/src/main/java/com/chwl/app/avroom/newuserchargegift/NewUserChargePrizeDialog.kt similarity index 70% rename from app/src/main/java/com/yizhuan/habu/avroom/newuserchargegift/NewUserChargePrizeDialog.kt rename to app/src/main/java/com/chwl/app/avroom/newuserchargegift/NewUserChargePrizeDialog.kt index 18b6ee3e0..6fb98d60e 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/newuserchargegift/NewUserChargePrizeDialog.kt +++ b/app/src/main/java/com/chwl/app/avroom/newuserchargegift/NewUserChargePrizeDialog.kt @@ -1,14 +1,14 @@ -package com.yizhuan.habu.avroom.newuserchargegift +package com.chwl.app.avroom.newuserchargegift import android.content.Context import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.yizhuan.habu.R -import com.yizhuan.habu.databinding.DialogNewUserChargePrizeBinding -import com.yizhuan.habu.treasure_box.widget.dialog.BaseBindingDialog -import com.yizhuan.habu.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.pay.bean.FirstChargeReward -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes +import com.chwl.app.R +import com.chwl.app.databinding.DialogNewUserChargePrizeBinding +import com.chwl.app.treasure_box.widget.dialog.BaseBindingDialog +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.core.pay.bean.FirstChargeReward +import com.chwl.library.annatation.ActLayoutRes @ActLayoutRes(R.layout.dialog_new_user_charge_prize) class NewUserChargePrizeDialog( diff --git a/app/src/main/java/com/yizhuan/habu/avroom/newuserchargegift/RewardAdapter.kt b/app/src/main/java/com/chwl/app/avroom/newuserchargegift/RewardAdapter.kt similarity index 71% rename from app/src/main/java/com/yizhuan/habu/avroom/newuserchargegift/RewardAdapter.kt rename to app/src/main/java/com/chwl/app/avroom/newuserchargegift/RewardAdapter.kt index 512cf531a..96863e097 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/newuserchargegift/RewardAdapter.kt +++ b/app/src/main/java/com/chwl/app/avroom/newuserchargegift/RewardAdapter.kt @@ -1,12 +1,12 @@ -package com.yizhuan.habu.avroom.newuserchargegift +package com.chwl.app.avroom.newuserchargegift import android.widget.ImageView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.xchat_android_core.pay.bean.FirstChargeReward -import com.yizhuan.xchat_android_core.utils.TextUtils +import com.chwl.app.R +import com.chwl.app.ui.utils.load +import com.chwl.core.pay.bean.FirstChargeReward +import com.chwl.core.utils.TextUtils class RewardAdapter : BaseQuickAdapter(R.layout.item_new_user_charge_reward) { diff --git a/app/src/main/java/com/yizhuan/habu/avroom/presenter/AvRoomPresenter.java b/app/src/main/java/com/chwl/app/avroom/presenter/AvRoomPresenter.java similarity index 89% rename from app/src/main/java/com/yizhuan/habu/avroom/presenter/AvRoomPresenter.java rename to app/src/main/java/com/chwl/app/avroom/presenter/AvRoomPresenter.java index 9ac89f6f0..c6aaaf05a 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/presenter/AvRoomPresenter.java +++ b/app/src/main/java/com/chwl/app/avroom/presenter/AvRoomPresenter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.presenter; +package com.chwl.app.avroom.presenter; import android.annotation.SuppressLint; import android.os.Bundle; @@ -18,48 +18,48 @@ 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.habu.R; -import com.yizhuan.habu.avroom.activity.AVRoomActivity; -import com.yizhuan.habu.avroom.core.AudioRoomContext; -import com.yizhuan.xchat_android_core.support.room.RoomContext; -import com.yizhuan.habu.avroom.view.IAvRoomView; -import com.yizhuan.habu.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.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.avroom.activity.AVRoomActivity; +import com.chwl.app.avroom.core.AudioRoomContext; +import com.chwl.core.support.room.RoomContext; +import com.chwl.app.avroom.view.IAvRoomView; +import com.chwl.app.base.BaseMvpPresenter; +import com.chwl.core.Constants; +import com.chwl.core.DemoCache; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.bean.RoomMicInfo; +import com.chwl.core.bean.RoomQueueInfo; +import com.chwl.core.bean.response.ServiceResult; +import com.chwl.core.channel_page.model.ChannelPageModel; +import com.chwl.core.manager.AudioEngineManager; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.manager.IMNetEaseManager; +import com.chwl.core.manager.RoomEvent; +import com.chwl.core.miniworld.event.AudioPartyOpenEvent; +import com.chwl.core.module_hall.hall.HallModel; +import com.chwl.core.monsterhunting.bean.MonsterInfo; +import com.chwl.core.monsterhunting.model.MonsterHuntingModel; +import com.chwl.core.patriarch.exception.PmRoomLimitException; +import com.chwl.core.public_chat_hall.manager.PublicChatHallDataManager; +import com.chwl.core.room.anotherroompk.RoomPKModel; +import com.chwl.core.room.bean.RoomInfo; +import com.chwl.core.room.giftvalue.helper.GiftValueMrg; +import com.chwl.core.room.model.AvRoomModel; +import com.chwl.core.room.model.MicQueueModel; +import com.chwl.core.room.queue.bean.MicMemberInfo; +import com.chwl.core.room.queuing_mic.bean.QueuingMicMemeberInfo; +import com.chwl.core.room.queuing_mic.event.QueuingMicNotEmptyEvent; +import com.chwl.core.super_admin.SuperAdminDataMrg; +import com.chwl.core.user.UserModel; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.core.utils.LogUtils; +import com.chwl.core.utils.net.RxHelper; +import com.chwl.library.base.PresenterEvent; +import com.chwl.library.net.rxnet.callback.CallBack; +import com.chwl.library.threadmgr.ThreadPoolManager; +import com.chwl.library.utils.JavaUtil; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/presenter/BaseRoomPresenter.java b/app/src/main/java/com/chwl/app/avroom/presenter/BaseRoomPresenter.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/avroom/presenter/BaseRoomPresenter.java rename to app/src/main/java/com/chwl/app/avroom/presenter/BaseRoomPresenter.java index ac2aa72cc..0f5ebcd06 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/presenter/BaseRoomPresenter.java +++ b/app/src/main/java/com/chwl/app/avroom/presenter/BaseRoomPresenter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.presenter; +package com.chwl.app.avroom.presenter; import android.annotation.SuppressLint; import android.text.TextUtils; @@ -13,41 +13,41 @@ import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.netease.nimlib.sdk.util.Entry; import com.orhanobut.logger.Logger; -import com.yizhuan.habu.R; -import com.yizhuan.habu.avroom.view.IBaseRoomView; -import com.yizhuan.habu.base.BaseMvpPresenter; -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.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.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.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.app.avroom.view.IBaseRoomView; +import com.chwl.app.base.BaseMvpPresenter; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.bean.RoomQueueInfo; +import com.chwl.core.gift.GiftModel; +import com.chwl.core.helper.AtProxy; +import com.chwl.core.im.custom.bean.CustomAttachment; +import com.chwl.core.im.custom.bean.RequestUpmicAttachment; +import com.chwl.core.im.custom.bean.RoomInfoAttachment; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.manager.IMNetEaseManager; +import com.chwl.core.praise.PraiseModel; +import com.chwl.core.room.bean.RoomContributeDataInfo; +import com.chwl.core.room.bean.RoomInfo; +import com.chwl.core.room.exception.AntiSpamHitException; +import com.chwl.core.room.game.GameStatus; +import com.chwl.core.room.giftvalue.helper.GiftValueMrg; +import com.chwl.core.room.model.AvRoomModel; +import com.chwl.core.room.model.HomePartyModel; +import com.chwl.core.room.model.RoomBaseModel; +import com.chwl.core.room.model.RoomContributeListModel; +import com.chwl.core.room.queue.bean.MicMemberInfo; +import com.chwl.core.super_admin.model.SuperAdminModel; +import com.chwl.core.super_admin.util.SuperAdminUtil; +import com.chwl.core.user.UserModel; +import com.chwl.core.user.bean.BaseInfo; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.core.utils.net.DontWarnObserver; +import com.chwl.core.utils.net.RxHelper; +import com.chwl.library.base.PresenterEvent; +import com.chwl.library.net.rxnet.callback.CallBack; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; import java.util.Objects; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/presenter/BaseRoomRankPresenter.java b/app/src/main/java/com/chwl/app/avroom/presenter/BaseRoomRankPresenter.java similarity index 87% rename from app/src/main/java/com/yizhuan/habu/avroom/presenter/BaseRoomRankPresenter.java rename to app/src/main/java/com/chwl/app/avroom/presenter/BaseRoomRankPresenter.java index 9bdab5647..c73647016 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/presenter/BaseRoomRankPresenter.java +++ b/app/src/main/java/com/chwl/app/avroom/presenter/BaseRoomRankPresenter.java @@ -1,14 +1,14 @@ -package com.yizhuan.habu.avroom.presenter; +package com.chwl.app.avroom.presenter; import android.os.Bundle; import androidx.annotation.Nullable; -import com.yizhuan.habu.avroom.adapter.RoomConsumerListAdapterTemp; -import com.yizhuan.habu.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.chwl.app.avroom.adapter.RoomConsumerListAdapterTemp; +import com.chwl.app.base.BaseMvpPresenter; +import com.chwl.core.room.bean.RoomContributeUserInfo; +import com.chwl.core.room.bean.RoomRankMultiItem; +import com.chwl.library.base.IMvpBaseView; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/presenter/CreatePKPresenter.java b/app/src/main/java/com/chwl/app/avroom/presenter/CreatePKPresenter.java similarity index 87% rename from app/src/main/java/com/yizhuan/habu/avroom/presenter/CreatePKPresenter.java rename to app/src/main/java/com/chwl/app/avroom/presenter/CreatePKPresenter.java index b346bfce6..c123835f7 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/presenter/CreatePKPresenter.java +++ b/app/src/main/java/com/chwl/app/avroom/presenter/CreatePKPresenter.java @@ -1,11 +1,11 @@ -package com.yizhuan.habu.avroom.presenter; +package com.chwl.app.avroom.presenter; -import com.yizhuan.habu.R; -import com.yizhuan.habu.avroom.view.ICreatePKView; -import com.yizhuan.habu.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.room.pk.model.PkModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.avroom.view.ICreatePKView; +import com.chwl.app.base.BaseMvpPresenter; +import com.chwl.core.room.pk.model.PkModel; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/presenter/GameRoomPresenter.java b/app/src/main/java/com/chwl/app/avroom/presenter/GameRoomPresenter.java similarity index 86% rename from app/src/main/java/com/yizhuan/habu/avroom/presenter/GameRoomPresenter.java rename to app/src/main/java/com/chwl/app/avroom/presenter/GameRoomPresenter.java index 4d58a171b..5b23191f4 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/presenter/GameRoomPresenter.java +++ b/app/src/main/java/com/chwl/app/avroom/presenter/GameRoomPresenter.java @@ -1,12 +1,12 @@ -package com.yizhuan.habu.avroom.presenter; +package com.chwl.app.avroom.presenter; import android.annotation.SuppressLint; -import com.yizhuan.habu.avroom.view.IGameRoomView; -import com.yizhuan.habu.treasure_box.widget.GoldBoxHelper; -import com.yizhuan.habu.utils.UserUtils; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; +import com.chwl.app.avroom.view.IGameRoomView; +import com.chwl.app.treasure_box.widget.GoldBoxHelper; +import com.chwl.app.utils.UserUtils; +import com.chwl.core.home.bean.BannerInfo; +import com.chwl.core.room.model.AvRoomModel; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/presenter/HomePartyPresenter.java b/app/src/main/java/com/chwl/app/avroom/presenter/HomePartyPresenter.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/avroom/presenter/HomePartyPresenter.java rename to app/src/main/java/com/chwl/app/avroom/presenter/HomePartyPresenter.java index 8f3f2c973..363b77436 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/presenter/HomePartyPresenter.java +++ b/app/src/main/java/com/chwl/app/avroom/presenter/HomePartyPresenter.java @@ -1,7 +1,7 @@ -package com.yizhuan.habu.avroom.presenter; +package com.chwl.app.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.chwl.core.manager.RoomEvent.DRAGON_BAR_CANCEL; +import static com.chwl.core.manager.RoomEvent.DRAGON_BAR_END; import android.annotation.SuppressLint; @@ -10,33 +10,33 @@ 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.habu.R; -import com.yizhuan.habu.avroom.view.IHomePartyView; -import com.yizhuan.habu.treasure_box.widget.GoldBoxHelper; -import com.yizhuan.habu.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.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.chwl.app.R; +import com.chwl.app.avroom.view.IHomePartyView; +import com.chwl.app.treasure_box.widget.GoldBoxHelper; +import com.chwl.app.utils.UserUtils; +import com.chwl.core.Constants; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.bean.RoomQueueInfo; +import com.chwl.core.home.bean.BannerInfo; +import com.chwl.core.im.custom.bean.CustomAttachment; +import com.chwl.core.im.custom.bean.FaceAttachment; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.manager.IMNetEaseManager; +import com.chwl.core.manager.RoomEvent; +import com.chwl.core.room.bean.DragonBarInfo; +import com.chwl.core.room.bean.RoomInfo; +import com.chwl.core.room.dragonball.DragonBallModel; +import com.chwl.core.room.face.FaceInfo; +import com.chwl.core.room.face.FaceReceiveInfo; +import com.chwl.core.room.giftvalue.helper.GiftValueMrg; +import com.chwl.core.room.model.RoomSettingModel; +import com.chwl.core.room.queue.bean.MicMemberInfo; +import com.chwl.core.user.UserModel; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.core.utils.net.BeanObserver; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; +import com.chwl.library.utils.config.BasicConfig; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/presenter/HomePartyUserListPresenter.java b/app/src/main/java/com/chwl/app/avroom/presenter/HomePartyUserListPresenter.java similarity index 87% rename from app/src/main/java/com/yizhuan/habu/avroom/presenter/HomePartyUserListPresenter.java rename to app/src/main/java/com/chwl/app/avroom/presenter/HomePartyUserListPresenter.java index 1579bf7dc..3b559cf0c 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/presenter/HomePartyUserListPresenter.java +++ b/app/src/main/java/com/chwl/app/avroom/presenter/HomePartyUserListPresenter.java @@ -1,14 +1,14 @@ -package com.yizhuan.habu.avroom.presenter; +package com.chwl.app.avroom.presenter; import android.annotation.SuppressLint; import com.orhanobut.logger.Logger; -import com.yizhuan.habu.R; -import com.yizhuan.habu.avroom.view.IHomePartyUserListView; -import com.yizhuan.habu.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.room.bean.OnlineChatMember; -import com.yizhuan.xchat_android_core.room.model.HomePartyUserListModel; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.avroom.view.IHomePartyUserListView; +import com.chwl.app.base.BaseMvpPresenter; +import com.chwl.core.room.bean.OnlineChatMember; +import com.chwl.core.room.model.HomePartyUserListModel; +import com.chwl.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/presenter/RecordForPKPresenter.java b/app/src/main/java/com/chwl/app/avroom/presenter/RecordForPKPresenter.java similarity index 71% rename from app/src/main/java/com/yizhuan/habu/avroom/presenter/RecordForPKPresenter.java rename to app/src/main/java/com/chwl/app/avroom/presenter/RecordForPKPresenter.java index a4c91a15d..5a6c6ad41 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/presenter/RecordForPKPresenter.java +++ b/app/src/main/java/com/chwl/app/avroom/presenter/RecordForPKPresenter.java @@ -1,16 +1,16 @@ -package com.yizhuan.habu.avroom.presenter; +package com.chwl.app.avroom.presenter; -import com.yizhuan.habu.R; -import com.yizhuan.habu.avroom.view.IRecordForPKView; -import com.yizhuan.habu.base.BaseMvpPresenter; -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.avroom.view.IRecordForPKView; +import com.chwl.app.base.BaseMvpPresenter; +import com.chwl.app.home.helper.LoadPageDataHelper; +import com.chwl.core.Constants; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.room.bean.RoomInfo; +import com.chwl.core.room.pk.bean.PKRecordInfo; +import com.chwl.core.room.pk.bean.PKRecordListInfo; +import com.chwl.core.room.pk.model.PkModel; +import com.chwl.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/presenter/RoomBlackPresenter.java b/app/src/main/java/com/chwl/app/avroom/presenter/RoomBlackPresenter.java similarity index 79% rename from app/src/main/java/com/yizhuan/habu/avroom/presenter/RoomBlackPresenter.java rename to app/src/main/java/com/chwl/app/avroom/presenter/RoomBlackPresenter.java index c2983ada6..5a9fed8f2 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/presenter/RoomBlackPresenter.java +++ b/app/src/main/java/com/chwl/app/avroom/presenter/RoomBlackPresenter.java @@ -1,10 +1,10 @@ -package com.yizhuan.habu.avroom.presenter; +package com.chwl.app.avroom.presenter; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; -import com.yizhuan.habu.avroom.view.IRoomBlackView; -import com.yizhuan.habu.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.room.model.RoomBaseModel; -import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack; +import com.chwl.app.avroom.view.IRoomBlackView; +import com.chwl.app.base.BaseMvpPresenter; +import com.chwl.core.room.model.RoomBaseModel; +import com.chwl.library.net.rxnet.callback.CallBack; /** *

diff --git a/app/src/main/java/com/yizhuan/habu/avroom/presenter/RoomCharmRankingPresenter.java b/app/src/main/java/com/chwl/app/avroom/presenter/RoomCharmRankingPresenter.java similarity index 79% rename from app/src/main/java/com/yizhuan/habu/avroom/presenter/RoomCharmRankingPresenter.java rename to app/src/main/java/com/chwl/app/avroom/presenter/RoomCharmRankingPresenter.java index 4df5574d3..e953d73a9 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/presenter/RoomCharmRankingPresenter.java +++ b/app/src/main/java/com/chwl/app/avroom/presenter/RoomCharmRankingPresenter.java @@ -1,13 +1,13 @@ -package com.yizhuan.habu.avroom.presenter; +package com.chwl.app.avroom.presenter; -import com.yizhuan.habu.avroom.view.IRoomCharmRankingListView; -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.chwl.app.avroom.view.IRoomCharmRankingListView; +import com.chwl.core.bean.response.ServiceResult; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.room.bean.RoomContributeDataInfo; +import com.chwl.core.room.bean.RoomContributeUserInfo; +import com.chwl.core.room.bean.RoomRankMultiItem; +import com.chwl.core.room.model.RoomCharmModel; +import com.chwl.core.room.model.inteface.IRoomCharmModel; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/presenter/RoomContributeListPresenter.java b/app/src/main/java/com/chwl/app/avroom/presenter/RoomContributeListPresenter.java similarity index 85% rename from app/src/main/java/com/yizhuan/habu/avroom/presenter/RoomContributeListPresenter.java rename to app/src/main/java/com/chwl/app/avroom/presenter/RoomContributeListPresenter.java index 97129979f..d6c15f7f5 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/presenter/RoomContributeListPresenter.java +++ b/app/src/main/java/com/chwl/app/avroom/presenter/RoomContributeListPresenter.java @@ -1,11 +1,11 @@ -package com.yizhuan.habu.avroom.presenter; +package com.chwl.app.avroom.presenter; import android.annotation.SuppressLint; -import com.yizhuan.habu.R; -import com.yizhuan.habu.avroom.view.IRoomContributeListView; -import com.yizhuan.xchat_android_core.room.model.RoomContributeListModel; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.avroom.view.IRoomContributeListView; +import com.chwl.core.room.model.RoomContributeListModel; +import com.chwl.library.utils.ResUtil; /** * Created by MadisonRong on 25/04/2018. diff --git a/app/src/main/java/com/yizhuan/habu/avroom/presenter/RoomInvitePresenter.java b/app/src/main/java/com/chwl/app/avroom/presenter/RoomInvitePresenter.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/avroom/presenter/RoomInvitePresenter.java rename to app/src/main/java/com/chwl/app/avroom/presenter/RoomInvitePresenter.java index 535007a70..c95dc2e18 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/presenter/RoomInvitePresenter.java +++ b/app/src/main/java/com/chwl/app/avroom/presenter/RoomInvitePresenter.java @@ -1,16 +1,16 @@ -package com.yizhuan.habu.avroom.presenter; +package com.chwl.app.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.habu.avroom.view.IRoomInviteView; -import com.yizhuan.habu.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.chwl.app.avroom.view.IRoomInviteView; +import com.chwl.app.base.BaseMvpPresenter; +import com.chwl.core.bean.RoomQueueInfo; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.room.model.RoomInviteModel; +import com.chwl.core.super_admin.util.SuperAdminUtil; import java.util.List; import java.util.ListIterator; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/presenter/RoomManagerPresenter.java b/app/src/main/java/com/chwl/app/avroom/presenter/RoomManagerPresenter.java similarity index 89% rename from app/src/main/java/com/yizhuan/habu/avroom/presenter/RoomManagerPresenter.java rename to app/src/main/java/com/chwl/app/avroom/presenter/RoomManagerPresenter.java index 68c9c4caa..4879774e2 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/presenter/RoomManagerPresenter.java +++ b/app/src/main/java/com/chwl/app/avroom/presenter/RoomManagerPresenter.java @@ -1,18 +1,18 @@ -package com.yizhuan.habu.avroom.presenter; +package com.chwl.app.avroom.presenter; import android.annotation.SuppressLint; import android.text.TextUtils; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; -import com.yizhuan.habu.avroom.view.IRoomManagerView; -import com.yizhuan.habu.base.BaseMvpPresenter; -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.chwl.app.avroom.view.IRoomManagerView; +import com.chwl.app.base.BaseMvpPresenter; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.room.model.AvRoomModel; +import com.chwl.core.room.model.RoomBaseModel; +import com.chwl.core.user.UserModel; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.library.base.PresenterEvent; +import com.chwl.library.net.rxnet.callback.CallBack; import java.util.ArrayList; import java.util.HashMap; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/presenter/RoomNewbieHellowWordPresenter.java b/app/src/main/java/com/chwl/app/avroom/presenter/RoomNewbieHellowWordPresenter.java similarity index 80% rename from app/src/main/java/com/yizhuan/habu/avroom/presenter/RoomNewbieHellowWordPresenter.java rename to app/src/main/java/com/chwl/app/avroom/presenter/RoomNewbieHellowWordPresenter.java index 4f8edba73..4b15429bf 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/presenter/RoomNewbieHellowWordPresenter.java +++ b/app/src/main/java/com/chwl/app/avroom/presenter/RoomNewbieHellowWordPresenter.java @@ -1,11 +1,11 @@ -package com.yizhuan.habu.avroom.presenter; +package com.chwl.app.avroom.presenter; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseMvpPresenter; -import com.yizhuan.habu.module.IRoomNewbieMessageView; -import com.yizhuan.habu.module.RoomNewbieModel; -import com.yizhuan.xchat_android_core.bean.RoomNewbieMessageInfo; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseMvpPresenter; +import com.chwl.app.module.IRoomNewbieMessageView; +import com.chwl.app.module.RoomNewbieModel; +import com.chwl.core.bean.RoomNewbieMessageInfo; +import com.chwl.library.utils.ResUtil; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/presenter/RoomNewbiePresenter.java b/app/src/main/java/com/chwl/app/avroom/presenter/RoomNewbiePresenter.java similarity index 83% rename from app/src/main/java/com/yizhuan/habu/avroom/presenter/RoomNewbiePresenter.java rename to app/src/main/java/com/chwl/app/avroom/presenter/RoomNewbiePresenter.java index 11273e50b..c94968c24 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/presenter/RoomNewbiePresenter.java +++ b/app/src/main/java/com/chwl/app/avroom/presenter/RoomNewbiePresenter.java @@ -1,12 +1,12 @@ -package com.yizhuan.habu.avroom.presenter; +package com.chwl.app.avroom.presenter; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseMvpPresenter; -import com.yizhuan.habu.module.IRoomNewbieView; -import com.yizhuan.habu.module.RoomNewbieModel; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bean.RoomNewbieInfo; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseMvpPresenter; +import com.chwl.app.module.IRoomNewbieView; +import com.chwl.app.module.RoomNewbieModel; +import com.chwl.core.Constants; +import com.chwl.core.bean.RoomNewbieInfo; +import com.chwl.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/presenter/RoomRankHalfHourPresenter.java b/app/src/main/java/com/chwl/app/avroom/presenter/RoomRankHalfHourPresenter.java similarity index 84% rename from app/src/main/java/com/yizhuan/habu/avroom/presenter/RoomRankHalfHourPresenter.java rename to app/src/main/java/com/chwl/app/avroom/presenter/RoomRankHalfHourPresenter.java index a6ac5327c..f4e0c8ba6 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/presenter/RoomRankHalfHourPresenter.java +++ b/app/src/main/java/com/chwl/app/avroom/presenter/RoomRankHalfHourPresenter.java @@ -1,14 +1,14 @@ -package com.yizhuan.habu.avroom.presenter; +package com.chwl.app.avroom.presenter; -import com.yizhuan.habu.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.chwl.app.avroom.fragment.IRoomRankHalfHourView; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.room.bean.RoomInfo; +import com.chwl.core.room.bean.RoomRankHalfHourDataInfo; +import com.chwl.core.room.bean.RoomRankHalfHourRankInfo; +import com.chwl.core.room.bean.RoomRankMultiItem; +import com.chwl.core.room.model.RoomRankModel; +import com.chwl.library.base.factory.AbstractMvpPresenter; +import com.chwl.library.utils.SingleToastUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/presenter/RoomSettingPresenter.java b/app/src/main/java/com/chwl/app/avroom/presenter/RoomSettingPresenter.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/avroom/presenter/RoomSettingPresenter.java rename to app/src/main/java/com/chwl/app/avroom/presenter/RoomSettingPresenter.java index 252f263c6..b6d65d510 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/presenter/RoomSettingPresenter.java +++ b/app/src/main/java/com/chwl/app/avroom/presenter/RoomSettingPresenter.java @@ -1,25 +1,25 @@ -package com.yizhuan.habu.avroom.presenter; +package com.chwl.app.avroom.presenter; import android.annotation.SuppressLint; import android.os.Handler; -import com.yizhuan.habu.avroom.view.IRoomSettingView; -import com.yizhuan.habu.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.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.chwl.app.avroom.view.IRoomSettingView; +import com.chwl.app.base.BaseMvpPresenter; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.manager.IMNetEaseManager; +import com.chwl.core.manager.RoomEvent; +import com.chwl.core.room.bean.RoomInfo; +import com.chwl.core.room.bean.RoomSettingTabInfo; +import com.chwl.core.room.giftvalue.GiftValueModel; +import com.chwl.core.room.giftvalue.bean.RoomGiftValue; +import com.chwl.core.room.giftvalue.helper.GiftValueMrg; +import com.chwl.core.room.model.MicQueueModel; +import com.chwl.core.room.model.RoomSettingModel; +import com.chwl.core.user.UserModel; +import com.chwl.core.utils.net.BeanObserver; +import com.chwl.core.utils.net.DontWarnObserver; +import com.chwl.library.net.rxnet.callback.CallBack; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/presenter/SingleRoomPresenter.java b/app/src/main/java/com/chwl/app/avroom/presenter/SingleRoomPresenter.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/avroom/presenter/SingleRoomPresenter.java rename to app/src/main/java/com/chwl/app/avroom/presenter/SingleRoomPresenter.java index 5c54845ef..71615551e 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/presenter/SingleRoomPresenter.java +++ b/app/src/main/java/com/chwl/app/avroom/presenter/SingleRoomPresenter.java @@ -1,11 +1,11 @@ -package com.yizhuan.habu.avroom.presenter; +package com.chwl.app.avroom.presenter; import android.annotation.SuppressLint; -import com.yizhuan.habu.avroom.view.ISingleRoomView; -import com.yizhuan.habu.treasure_box.widget.GoldBoxHelper; -import com.yizhuan.habu.utils.UserUtils; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; +import com.chwl.app.avroom.view.ISingleRoomView; +import com.chwl.app.treasure_box.widget.GoldBoxHelper; +import com.chwl.app.utils.UserUtils; +import com.chwl.core.home.bean.BannerInfo; /** *

diff --git a/app/src/main/java/com/yizhuan/habu/avroom/recommendcard/MyRecommendCardActivity.java b/app/src/main/java/com/chwl/app/avroom/recommendcard/MyRecommendCardActivity.java similarity index 81% rename from app/src/main/java/com/yizhuan/habu/avroom/recommendcard/MyRecommendCardActivity.java rename to app/src/main/java/com/chwl/app/avroom/recommendcard/MyRecommendCardActivity.java index b0e5f8e22..4bab95954 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/recommendcard/MyRecommendCardActivity.java +++ b/app/src/main/java/com/chwl/app/avroom/recommendcard/MyRecommendCardActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.recommendcard; +package com.chwl.app.avroom.recommendcard; import android.content.Context; import android.content.Intent; @@ -8,17 +8,17 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentStatePagerAdapter; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseViewBindingActivity; -import com.yizhuan.habu.base.TitleBar; -import com.yizhuan.habu.databinding.ActivityMyRecommendCardBinding; -import com.yizhuan.habu.module_hall.hall.view.indicator.StatisticsIndicatorAdapter; -import com.yizhuan.habu.ui.webview.CommonWebViewActivity; -import com.yizhuan.habu.ui.widget.magicindicator.ViewPagerHelper; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.room.recommendpos.bean.RcmdCardType; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseViewBindingActivity; +import com.chwl.app.base.TitleBar; +import com.chwl.app.databinding.ActivityMyRecommendCardBinding; +import com.chwl.app.module_hall.hall.view.indicator.StatisticsIndicatorAdapter; +import com.chwl.app.ui.webview.CommonWebViewActivity; +import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.chwl.core.UriProvider; +import com.chwl.core.room.recommendpos.bean.RcmdCardType; +import com.chwl.library.utils.ResUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/recommendcard/RecommendCardFragment.java b/app/src/main/java/com/chwl/app/avroom/recommendcard/RecommendCardFragment.java similarity index 83% rename from app/src/main/java/com/yizhuan/habu/avroom/recommendcard/RecommendCardFragment.java rename to app/src/main/java/com/chwl/app/avroom/recommendcard/RecommendCardFragment.java index ca4307e44..0c1c1766c 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/recommendcard/RecommendCardFragment.java +++ b/app/src/main/java/com/chwl/app/avroom/recommendcard/RecommendCardFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.recommendcard; +package com.chwl.app.avroom.recommendcard; import android.content.Context; import android.os.Bundle; @@ -12,18 +12,18 @@ import androidx.recyclerview.widget.RecyclerView; import com.netease.nim.uikit.common.util.sys.ScreenUtil; import com.trello.rxlifecycle3.android.FragmentEvent; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseFragment; -import com.yizhuan.habu.base.list.BaseViewHolder; -import com.yizhuan.habu.base.list.CommonAdapter; -import com.yizhuan.habu.base.list.IRecyclerListener; -import com.yizhuan.habu.base.list.RefreshRecyclerView; -import com.yizhuan.habu.ui.webview.event.H5NotifyClientEvent; -import com.yizhuan.habu.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.yizhuan.xchat_android_core.web.bean.H5NotifyData; +import com.chwl.app.R; +import com.chwl.app.base.BaseFragment; +import com.chwl.app.base.list.BaseViewHolder; +import com.chwl.app.base.list.CommonAdapter; +import com.chwl.app.base.list.IRecyclerListener; +import com.chwl.app.base.list.RefreshRecyclerView; +import com.chwl.app.ui.webview.event.H5NotifyClientEvent; +import com.chwl.app.ui.widget.recyclerview.decoration.HorizontalDecoration; +import com.chwl.core.room.recommendpos.RecommendCardModel; +import com.chwl.core.room.recommendpos.bean.RcmdCardType; +import com.chwl.core.room.recommendpos.bean.RecommendCard; +import com.chwl.core.web.bean.H5NotifyData; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/recommendcard/RecommendCardListAdapter.java b/app/src/main/java/com/chwl/app/avroom/recommendcard/RecommendCardListAdapter.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/avroom/recommendcard/RecommendCardListAdapter.java rename to app/src/main/java/com/chwl/app/avroom/recommendcard/RecommendCardListAdapter.java index f20dc2c0c..ec71cc989 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/recommendcard/RecommendCardListAdapter.java +++ b/app/src/main/java/com/chwl/app/avroom/recommendcard/RecommendCardListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.recommendcard; +package com.chwl.app.avroom.recommendcard; import android.content.Context; import android.text.style.AbsoluteSizeSpan; @@ -6,15 +6,15 @@ import android.view.View; import com.coorchice.library.SuperTextView; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.yizhuan.habu.R; -import com.yizhuan.habu.UIHelper; -import com.yizhuan.habu.avroom.widget.MessageView; -import com.yizhuan.habu.base.list.BaseViewHolder; -import com.yizhuan.habu.base.list.CommonAdapter; -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_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.chwl.app.R; +import com.chwl.app.UIHelper; +import com.chwl.app.avroom.widget.MessageView; +import com.chwl.app.base.list.BaseViewHolder; +import com.chwl.app.base.list.CommonAdapter; +import com.chwl.core.room.recommendpos.bean.RcmdCardType; +import com.chwl.core.room.recommendpos.bean.RecommendCard; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.TimeUtils; /** * 推荐卡列表 diff --git a/app/src/main/java/com/chwl/app/avroom/redpackage/RedPackageEvent.java b/app/src/main/java/com/chwl/app/avroom/redpackage/RedPackageEvent.java new file mode 100644 index 000000000..4616156df --- /dev/null +++ b/app/src/main/java/com/chwl/app/avroom/redpackage/RedPackageEvent.java @@ -0,0 +1,4 @@ +package com.chwl.app.avroom.redpackage; + +public class RedPackageEvent { +} diff --git a/app/src/main/java/com/yizhuan/habu/avroom/redpackage/RedPackageGoRoomDialog.kt b/app/src/main/java/com/chwl/app/avroom/redpackage/RedPackageGoRoomDialog.kt similarity index 83% rename from app/src/main/java/com/yizhuan/habu/avroom/redpackage/RedPackageGoRoomDialog.kt rename to app/src/main/java/com/chwl/app/avroom/redpackage/RedPackageGoRoomDialog.kt index 0c17b9d73..396c65a80 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/redpackage/RedPackageGoRoomDialog.kt +++ b/app/src/main/java/com/chwl/app/avroom/redpackage/RedPackageGoRoomDialog.kt @@ -1,18 +1,18 @@ -package com.yizhuan.habu.avroom.redpackage +package com.chwl.app.avroom.redpackage import android.os.Bundle import android.view.WindowManager import android.view.animation.AnimationUtils -import com.yizhuan.habu.R -import com.yizhuan.habu.avroom.activity.AVRoomActivity -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.common.widget.dialog.DialogManager -import com.yizhuan.habu.databinding.DialogRedPackageGoRoomBinding -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.avroom.activity.AVRoomActivity +import com.chwl.app.base.BaseDialog +import com.chwl.app.common.widget.dialog.DialogManager +import com.chwl.app.databinding.DialogRedPackageGoRoomBinding +import com.chwl.app.ui.utils.ImageLoadUtils +import com.chwl.core.manager.AvRoomDataManager +import com.chwl.core.redpackage.RedPackageNotifyInfo +import com.chwl.core.utils.subAndReplaceDot +import com.chwl.library.utils.ResUtil import org.greenrobot.eventbus.EventBus class RedPackageGoRoomDialog : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/habu/avroom/redpackage/RedPackageHandler.kt b/app/src/main/java/com/chwl/app/avroom/redpackage/RedPackageHandler.kt similarity index 89% rename from app/src/main/java/com/yizhuan/habu/avroom/redpackage/RedPackageHandler.kt rename to app/src/main/java/com/chwl/app/avroom/redpackage/RedPackageHandler.kt index 8a3532b9a..291e840db 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/redpackage/RedPackageHandler.kt +++ b/app/src/main/java/com/chwl/app/avroom/redpackage/RedPackageHandler.kt @@ -1,18 +1,18 @@ -package com.yizhuan.habu.avroom.redpackage +package com.chwl.app.avroom.redpackage import android.content.Context import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.MutableLiveData -import com.yizhuan.habu.avroom.activity.AVRoomActivity -import com.yizhuan.habu.avroom.redpackage.open.RedPackageOpenDialog -import com.yizhuan.xchat_android_core.im.custom.bean.RedPackageAttachment -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager -import com.yizhuan.xchat_android_core.manager.RoomEvent -import com.yizhuan.xchat_android_core.redpackage.RedPackageModel -import com.yizhuan.xchat_android_core.redpackage.RedPackageNotifyInfo -import com.yizhuan.xchat_android_core.support.room.RoomContext -import com.yizhuan.xchat_android_core.support.room.RoomHandler +import com.chwl.app.avroom.activity.AVRoomActivity +import com.chwl.app.avroom.redpackage.open.RedPackageOpenDialog +import com.chwl.core.im.custom.bean.RedPackageAttachment +import com.chwl.core.manager.IMNetEaseManager +import com.chwl.core.manager.RoomEvent +import com.chwl.core.redpackage.RedPackageModel +import com.chwl.core.redpackage.RedPackageNotifyInfo +import com.chwl.core.support.room.RoomContext +import com.chwl.core.support.room.RoomHandler /** * Created by Max on 2023/10/26 11:26 diff --git a/app/src/main/java/com/yizhuan/habu/avroom/redpackage/RedPackageWidget.kt b/app/src/main/java/com/chwl/app/avroom/redpackage/RedPackageWidget.kt similarity index 91% rename from app/src/main/java/com/yizhuan/habu/avroom/redpackage/RedPackageWidget.kt rename to app/src/main/java/com/chwl/app/avroom/redpackage/RedPackageWidget.kt index e1be8766d..af4cfeb0a 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/redpackage/RedPackageWidget.kt +++ b/app/src/main/java/com/chwl/app/avroom/redpackage/RedPackageWidget.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.redpackage +package com.chwl.app.avroom.redpackage import android.content.Context import android.util.AttributeSet @@ -8,17 +8,17 @@ import androidx.core.view.isVisible import androidx.databinding.DataBindingUtil import com.example.lib_utils.ServiceTime import com.example.lib_utils.ktx.singleClick -import com.yizhuan.habu.R -import com.yizhuan.habu.avroom.redpackage.open.RedPackageOpenDialog -import com.yizhuan.habu.common.widget.dialog.DialogManager -import com.yizhuan.habu.databinding.RedPackageWidgetBinding -import com.yizhuan.xchat_android_core.redpackage.RedPackageModel -import com.yizhuan.xchat_android_core.redpackage.RedPackageNotifyInfo -import com.yizhuan.xchat_android_core.support.room.FrameLayoutRoomWidget -import com.yizhuan.xchat_android_core.support.room.RoomContext -import com.yizhuan.xchat_android_core.support.room.RoomView -import com.yizhuan.xchat_android_core.support.room.RoomWidget -import com.yizhuan.xchat_android_library.utils.SingleToastUtil +import com.chwl.app.R +import com.chwl.app.avroom.redpackage.open.RedPackageOpenDialog +import com.chwl.app.common.widget.dialog.DialogManager +import com.chwl.app.databinding.RedPackageWidgetBinding +import com.chwl.core.redpackage.RedPackageModel +import com.chwl.core.redpackage.RedPackageNotifyInfo +import com.chwl.core.support.room.FrameLayoutRoomWidget +import com.chwl.core.support.room.RoomContext +import com.chwl.core.support.room.RoomView +import com.chwl.core.support.room.RoomWidget +import com.chwl.library.utils.SingleToastUtil import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable diff --git a/app/src/main/java/com/yizhuan/habu/avroom/redpackage/open/RedPackageOpenDialog.kt b/app/src/main/java/com/chwl/app/avroom/redpackage/open/RedPackageOpenDialog.kt similarity index 94% rename from app/src/main/java/com/yizhuan/habu/avroom/redpackage/open/RedPackageOpenDialog.kt rename to app/src/main/java/com/chwl/app/avroom/redpackage/open/RedPackageOpenDialog.kt index 88b2c46c2..cb5c9576d 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/redpackage/open/RedPackageOpenDialog.kt +++ b/app/src/main/java/com/chwl/app/avroom/redpackage/open/RedPackageOpenDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.redpackage.open +package com.chwl.app.avroom.redpackage.open import android.animation.Animator @@ -18,24 +18,24 @@ import com.example.lib_utils.ktx.toStringRes import com.example.lib_utils.log.ILog import com.example.lib_utils.spannable.spannableBuilder import com.trello.rxlifecycle3.android.FragmentEvent -import com.yizhuan.habu.R -import com.yizhuan.habu.avroom.redpackage.RedPackageHandler -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.databinding.RedPackageOpenDialogBinding -import com.yizhuan.habu.ui.utils.loadAvatar -import com.yizhuan.habu.ui.widget.UserInfoDialog -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.home.event.FollowRoomEvent -import com.yizhuan.xchat_android_core.home.event.OpenRoomMessageInputEvent -import com.yizhuan.xchat_android_core.home.event.ShareRoomEvent -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.* -import com.yizhuan.xchat_android_core.support.config.Constants -import com.yizhuan.xchat_android_core.support.room.RoomContext -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes -import com.yizhuan.xchat_android_library.utils.SingleToastUtil +import com.chwl.app.R +import com.chwl.app.avroom.redpackage.RedPackageHandler +import com.chwl.app.base.BaseDialog +import com.chwl.app.databinding.RedPackageOpenDialogBinding +import com.chwl.app.ui.utils.loadAvatar +import com.chwl.app.ui.widget.UserInfoDialog +import com.chwl.core.auth.AuthModel +import com.chwl.core.home.event.FollowRoomEvent +import com.chwl.core.home.event.OpenRoomMessageInputEvent +import com.chwl.core.home.event.ShareRoomEvent +import com.chwl.core.home.model.CollectionRoomModel +import com.chwl.core.manager.AvRoomDataManager +import com.chwl.core.pay.PayModel +import com.chwl.core.redpackage.* +import com.chwl.core.support.config.Constants +import com.chwl.core.support.room.RoomContext +import com.chwl.library.annatation.ActLayoutRes +import com.chwl.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/habu/avroom/redpackage/open/RedPackageResultAdapter.kt b/app/src/main/java/com/chwl/app/avroom/redpackage/open/RedPackageResultAdapter.kt similarity index 80% rename from app/src/main/java/com/yizhuan/habu/avroom/redpackage/open/RedPackageResultAdapter.kt rename to app/src/main/java/com/chwl/app/avroom/redpackage/open/RedPackageResultAdapter.kt index 039978979..bb7ffc39c 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/redpackage/open/RedPackageResultAdapter.kt +++ b/app/src/main/java/com/chwl/app/avroom/redpackage/open/RedPackageResultAdapter.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.redpackage.open +package com.chwl.app.avroom.redpackage.open import android.view.View import android.view.ViewGroup @@ -6,12 +6,12 @@ import android.widget.ImageView import androidx.core.view.isVisible import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.utils.loadAvatar -import com.yizhuan.habu.utils.UserUtils -import com.yizhuan.xchat_android_core.redpackage.RedEnvelopeItemVO -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.ui.utils.loadAvatar +import com.chwl.app.utils.UserUtils +import com.chwl.core.redpackage.RedEnvelopeItemVO +import com.chwl.core.utils.subAndReplaceDot +import com.chwl.library.utils.ResUtil import java.text.SimpleDateFormat import java.util.Locale diff --git a/app/src/main/java/com/yizhuan/habu/avroom/redpackage/send/PrivateRedPackageEditorFragment.kt b/app/src/main/java/com/chwl/app/avroom/redpackage/send/PrivateRedPackageEditorFragment.kt similarity index 89% rename from app/src/main/java/com/yizhuan/habu/avroom/redpackage/send/PrivateRedPackageEditorFragment.kt rename to app/src/main/java/com/chwl/app/avroom/redpackage/send/PrivateRedPackageEditorFragment.kt index d3517753a..7caa6299c 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/redpackage/send/PrivateRedPackageEditorFragment.kt +++ b/app/src/main/java/com/chwl/app/avroom/redpackage/send/PrivateRedPackageEditorFragment.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.redpackage.send +package com.chwl.app.avroom.redpackage.send import android.graphics.Color import androidx.core.view.isVisible @@ -7,25 +7,25 @@ import com.example.lib_utils.ktx.getColorById import com.example.lib_utils.ktx.singleClick import com.example.lib_utils.ktx.toStringRes import com.example.lib_utils.log.ILog -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseBindingFragment -import com.yizhuan.habu.databinding.RedPackagePrivateFragmentBinding -import com.yizhuan.habu.pay.password.GiveGoldPassWordFragment -import com.yizhuan.habu.pay.widget.GridPasswordNoFocusView -import com.yizhuan.habu.ui.setting.ModifyPwdActivity -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil -import com.yizhuan.habu.ui.widget.recyclerview.decoration.ColorDecoration -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.initial.InitialModel -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.pay.PayModel -import com.yizhuan.xchat_android_core.redpackage.RedPackageModel -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.ResUtil -import com.yizhuan.xchat_android_library.utils.SingleToastUtil -import com.yizhuan.xchat_android_library.utils.codec.DESUtils +import com.chwl.app.R +import com.chwl.app.base.BaseBindingFragment +import com.chwl.app.databinding.RedPackagePrivateFragmentBinding +import com.chwl.app.pay.password.GiveGoldPassWordFragment +import com.chwl.app.pay.widget.GridPasswordNoFocusView +import com.chwl.app.ui.setting.ModifyPwdActivity +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil +import com.chwl.app.ui.widget.recyclerview.decoration.ColorDecoration +import com.chwl.core.auth.AuthModel +import com.chwl.core.initial.InitialModel +import com.chwl.core.manager.AvRoomDataManager +import com.chwl.core.pay.PayModel +import com.chwl.core.redpackage.RedPackageModel +import com.chwl.core.user.UserModel +import com.chwl.core.utils.toIntOrDef +import com.chwl.library.annatation.ActLayoutRes +import com.chwl.library.utils.ResUtil +import com.chwl.library.utils.SingleToastUtil +import com.chwl.library.utils.codec.DESUtils import okhttp3.internal.toLongOrDefault import java.math.RoundingMode import java.text.NumberFormat diff --git a/app/src/main/java/com/yizhuan/habu/avroom/redpackage/send/PublicRedPackageEditorFragment.kt b/app/src/main/java/com/chwl/app/avroom/redpackage/send/PublicRedPackageEditorFragment.kt similarity index 83% rename from app/src/main/java/com/yizhuan/habu/avroom/redpackage/send/PublicRedPackageEditorFragment.kt rename to app/src/main/java/com/chwl/app/avroom/redpackage/send/PublicRedPackageEditorFragment.kt index 1049061a4..12cadc4fb 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/redpackage/send/PublicRedPackageEditorFragment.kt +++ b/app/src/main/java/com/chwl/app/avroom/redpackage/send/PublicRedPackageEditorFragment.kt @@ -1,26 +1,26 @@ -package com.yizhuan.habu.avroom.redpackage.send +package com.chwl.app.avroom.redpackage.send import com.example.lib_utils.ktx.addDisableFilter import com.example.lib_utils.ktx.setOnInputChangedListener import com.example.lib_utils.ktx.singleClick import com.example.lib_utils.ktx.toStringRes -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseBindingFragment -import com.yizhuan.habu.databinding.RedPackagePublicFragmentBinding -import com.yizhuan.habu.pay.password.GiveGoldPassWordFragment -import com.yizhuan.habu.pay.widget.GridPasswordNoFocusView -import com.yizhuan.habu.ui.setting.ModifyPwdActivity -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.redpackage.RedPackageModel -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.SingleToastUtil -import com.yizhuan.xchat_android_library.utils.codec.DESUtils +import com.chwl.app.R +import com.chwl.app.base.BaseBindingFragment +import com.chwl.app.databinding.RedPackagePublicFragmentBinding +import com.chwl.app.pay.password.GiveGoldPassWordFragment +import com.chwl.app.pay.widget.GridPasswordNoFocusView +import com.chwl.app.ui.setting.ModifyPwdActivity +import com.chwl.core.auth.AuthModel +import com.chwl.core.initial.InitialModel +import com.chwl.core.initial.bean.InitInfo +import com.chwl.core.manager.AvRoomDataManager +import com.chwl.core.pay.PayModel +import com.chwl.core.redpackage.RedPackageModel +import com.chwl.core.user.UserModel +import com.chwl.core.utils.toIntOrDef +import com.chwl.library.annatation.ActLayoutRes +import com.chwl.library.utils.SingleToastUtil +import com.chwl.library.utils.codec.DESUtils import okhttp3.internal.toLongOrDefault import java.math.RoundingMode import java.text.NumberFormat diff --git a/app/src/main/java/com/yizhuan/habu/avroom/redpackage/send/RedPackageSendDialog.kt b/app/src/main/java/com/chwl/app/avroom/redpackage/send/RedPackageSendDialog.kt similarity index 76% rename from app/src/main/java/com/yizhuan/habu/avroom/redpackage/send/RedPackageSendDialog.kt rename to app/src/main/java/com/chwl/app/avroom/redpackage/send/RedPackageSendDialog.kt index dd4316e66..a8e1adb2e 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/redpackage/send/RedPackageSendDialog.kt +++ b/app/src/main/java/com/chwl/app/avroom/redpackage/send/RedPackageSendDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.redpackage.send +package com.chwl.app.avroom.redpackage.send import android.annotation.SuppressLint @@ -8,27 +8,27 @@ import android.view.WindowManager import androidx.fragment.app.Fragment import com.example.lib_utils.ktx.singleClick import com.example.lib_utils.ktx.toStringRes -import com.yizhuan.habu.R -import com.yizhuan.habu.avroom.redpackage.RedPackageEvent -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.common.ViewPagerAdapter -import com.yizhuan.habu.databinding.RedPackageSendDialogBinding -import com.yizhuan.habu.ui.pay.ChargeActivity -import com.yizhuan.habu.ui.webview.CommonWebViewActivity -import com.yizhuan.habu.ui.webview.DialogWebViewActivity -import com.yizhuan.habu.ui.widget.magicindicator.ViewPagerHelper -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator -import com.yizhuan.xchat_android_core.Constants -import com.yizhuan.xchat_android_core.UriProvider -import com.yizhuan.xchat_android_core.initial.InitialModel -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_library.annatation.ActLayoutRes -import com.yizhuan.xchat_android_library.common.util.DeviceUtil -import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil -import com.yizhuan.xchat_android_library.utils.ResUtil -import com.yizhuan.xchat_android_library.utils.SingleToastUtil +import com.chwl.app.R +import com.chwl.app.avroom.redpackage.RedPackageEvent +import com.chwl.app.base.BaseDialog +import com.chwl.app.common.ViewPagerAdapter +import com.chwl.app.databinding.RedPackageSendDialogBinding +import com.chwl.app.ui.pay.ChargeActivity +import com.chwl.app.ui.webview.CommonWebViewActivity +import com.chwl.app.ui.webview.DialogWebViewActivity +import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator +import com.chwl.core.Constants +import com.chwl.core.UriProvider +import com.chwl.core.initial.InitialModel +import com.chwl.core.pay.PayModel +import com.chwl.core.pay.event.UpdateWalletInfoEvent +import com.chwl.core.redpackage.* +import com.chwl.library.annatation.ActLayoutRes +import com.chwl.library.common.util.DeviceUtil +import com.chwl.library.utils.AppMetaDataUtil +import com.chwl.library.utils.ResUtil +import com.chwl.library.utils.SingleToastUtil import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode @@ -41,7 +41,7 @@ import org.greenrobot.eventbus.ThreadMode class RedPackageSendDialog : BaseDialog() { private val permissionType: Int - get() = arguments?.getInt(com.yizhuan.xchat_android_core.support.config.Constants.KEY_INTENT) + get() = arguments?.getInt(com.chwl.core.support.config.Constants.KEY_INTENT) ?: 0 /** @@ -62,7 +62,7 @@ class RedPackageSendDialog : BaseDialog() { return RedPackageSendDialog().apply { this.arguments = Bundle().apply { putInt( - com.yizhuan.xchat_android_core.support.config.Constants.KEY_INTENT, + com.chwl.core.support.config.Constants.KEY_INTENT, permissionType ) } diff --git a/app/src/main/java/com/yizhuan/habu/avroom/redpackage/send/RedPackageTypeItemAdapter.kt b/app/src/main/java/com/chwl/app/avroom/redpackage/send/RedPackageTypeItemAdapter.kt similarity index 96% rename from app/src/main/java/com/yizhuan/habu/avroom/redpackage/send/RedPackageTypeItemAdapter.kt rename to app/src/main/java/com/chwl/app/avroom/redpackage/send/RedPackageTypeItemAdapter.kt index 0e8e55ffb..daec058f3 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/redpackage/send/RedPackageTypeItemAdapter.kt +++ b/app/src/main/java/com/chwl/app/avroom/redpackage/send/RedPackageTypeItemAdapter.kt @@ -1,9 +1,9 @@ -package com.yizhuan.habu.avroom.redpackage.send +package com.chwl.app.avroom.redpackage.send import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.example.lib_utils.ktx.getColorById -import com.yizhuan.habu.R +import com.chwl.app.R import io.realm.internal.Keep /** diff --git a/app/src/main/java/com/yizhuan/habu/avroom/redpackage/send/TabIndicatorAdapter.java b/app/src/main/java/com/chwl/app/avroom/redpackage/send/TabIndicatorAdapter.java similarity index 85% rename from app/src/main/java/com/yizhuan/habu/avroom/redpackage/send/TabIndicatorAdapter.java rename to app/src/main/java/com/chwl/app/avroom/redpackage/send/TabIndicatorAdapter.java index 944557fce..0cd281567 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/redpackage/send/TabIndicatorAdapter.java +++ b/app/src/main/java/com/chwl/app/avroom/redpackage/send/TabIndicatorAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.redpackage.send; +package com.chwl.app.avroom.redpackage.send; import android.content.Context; import android.view.Gravity; @@ -8,13 +8,13 @@ import android.widget.FrameLayout; import androidx.appcompat.widget.AppCompatTextView; -import com.yizhuan.habu.R; -import com.yizhuan.habu.common.util.Utils; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; +import com.chwl.app.R; +import com.chwl.app.common.util.Utils; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/room_album/ChooseGiftRoomAlbumDialogFragment.kt b/app/src/main/java/com/chwl/app/avroom/room_album/ChooseGiftRoomAlbumDialogFragment.kt similarity index 85% rename from app/src/main/java/com/yizhuan/habu/avroom/room_album/ChooseGiftRoomAlbumDialogFragment.kt rename to app/src/main/java/com/chwl/app/avroom/room_album/ChooseGiftRoomAlbumDialogFragment.kt index 3d01a8608..9905e0b7d 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/room_album/ChooseGiftRoomAlbumDialogFragment.kt +++ b/app/src/main/java/com/chwl/app/avroom/room_album/ChooseGiftRoomAlbumDialogFragment.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.room_album +package com.chwl.app.avroom.room_album import android.app.Dialog import android.os.Bundle @@ -10,13 +10,13 @@ import androidx.recyclerview.widget.GridLayoutManager import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.google.android.material.bottomsheet.BottomSheetDialogFragment -import com.yizhuan.habu.R -import com.yizhuan.habu.databinding.DialogChooseGiftRoomAlbumBinding -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.habu.ui.widget.recyclerview.decoration.GridSpacingItemNewDecoration -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.GiftType +import com.chwl.app.R +import com.chwl.app.databinding.DialogChooseGiftRoomAlbumBinding +import com.chwl.app.ui.utils.ImageLoadUtilsV2 +import com.chwl.app.ui.widget.recyclerview.decoration.GridSpacingItemNewDecoration +import com.chwl.core.gift.GiftModel +import com.chwl.core.gift.bean.GiftInfo +import com.chwl.core.gift.bean.GiftType class ChooseGiftRoomAlbumDialogFragment : BottomSheetDialogFragment() { diff --git a/app/src/main/java/com/yizhuan/habu/avroom/room_album/PhotoItem.kt b/app/src/main/java/com/chwl/app/avroom/room_album/PhotoItem.kt similarity index 87% rename from app/src/main/java/com/yizhuan/habu/avroom/room_album/PhotoItem.kt rename to app/src/main/java/com/chwl/app/avroom/room_album/PhotoItem.kt index 9681caa1a..8cffee578 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/room_album/PhotoItem.kt +++ b/app/src/main/java/com/chwl/app/avroom/room_album/PhotoItem.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.room_album +package com.chwl.app.avroom.room_album import com.chad.library.adapter.base.entity.MultiItemEntity diff --git a/app/src/main/java/com/yizhuan/habu/avroom/room_album/RoomAlbumActivity.kt b/app/src/main/java/com/chwl/app/avroom/room_album/RoomAlbumActivity.kt similarity index 81% rename from app/src/main/java/com/yizhuan/habu/avroom/room_album/RoomAlbumActivity.kt rename to app/src/main/java/com/chwl/app/avroom/room_album/RoomAlbumActivity.kt index 2485ba954..2f646e7c6 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/room_album/RoomAlbumActivity.kt +++ b/app/src/main/java/com/chwl/app/avroom/room_album/RoomAlbumActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.room_album +package com.chwl.app.avroom.room_album import android.annotation.SuppressLint import android.content.Context @@ -10,17 +10,17 @@ import androidx.activity.viewModels import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import androidx.viewpager2.adapter.FragmentStateAdapter -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingActivity -import com.yizhuan.habu.databinding.ActivityRoomAlbumBinding -import com.yizhuan.habu.ui.widget.magicindicator.ViewPagerHelper -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.indicators.GradientLinePagerIndicator -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.titles.ColorTransitionPagerTitleView +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingActivity +import com.chwl.app.databinding.ActivityRoomAlbumBinding +import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.GradientLinePagerIndicator +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.titles.ColorTransitionPagerTitleView class RoomAlbumActivity : BaseViewBindingActivity() { diff --git a/app/src/main/java/com/yizhuan/habu/avroom/room_album/RoomAlbumFragment.kt b/app/src/main/java/com/chwl/app/avroom/room_album/RoomAlbumFragment.kt similarity index 90% rename from app/src/main/java/com/yizhuan/habu/avroom/room_album/RoomAlbumFragment.kt rename to app/src/main/java/com/chwl/app/avroom/room_album/RoomAlbumFragment.kt index 5e60f088a..e51a00929 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/room_album/RoomAlbumFragment.kt +++ b/app/src/main/java/com/chwl/app/avroom/room_album/RoomAlbumFragment.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.room_album +package com.chwl.app.avroom.room_album import android.os.Bundle import android.view.View @@ -10,18 +10,18 @@ import androidx.recyclerview.widget.GridLayoutManager import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.chad.library.adapter.base.diff.BaseQuickDiffCallback -import com.yizhuan.habu.R -import com.yizhuan.habu.avroom.bean.RoomAlbumPhotoInfo -import com.yizhuan.habu.base.BaseViewBindingFragment -import com.yizhuan.habu.community.photo.BigPhotoActivity -import com.yizhuan.habu.community.photo.PagerOption -import com.yizhuan.habu.community.utils.ObjectTypeHelper -import com.yizhuan.habu.databinding.FragmentRoomAlbumBinding -import com.yizhuan.habu.ui.utils.ImageLoadUtils -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.habu.ui.widget.ButtonItem -import com.yizhuan.habu.ui.widget.recyclerview.decoration.GridSpacingItemNewDecoration -import com.yizhuan.xchat_android_core.Constants +import com.chwl.app.R +import com.chwl.app.avroom.bean.RoomAlbumPhotoInfo +import com.chwl.app.base.BaseViewBindingFragment +import com.chwl.app.community.photo.BigPhotoActivity +import com.chwl.app.community.photo.PagerOption +import com.chwl.app.community.utils.ObjectTypeHelper +import com.chwl.app.databinding.FragmentRoomAlbumBinding +import com.chwl.app.ui.utils.ImageLoadUtils +import com.chwl.app.ui.utils.ImageLoadUtilsV2 +import com.chwl.app.ui.widget.ButtonItem +import com.chwl.app.ui.widget.recyclerview.decoration.GridSpacingItemNewDecoration +import com.chwl.core.Constants class RoomAlbumFragment : BaseViewBindingFragment() { diff --git a/app/src/main/java/com/yizhuan/habu/avroom/room_album/RoomAlbumFragmentViewModel.kt b/app/src/main/java/com/chwl/app/avroom/room_album/RoomAlbumFragmentViewModel.kt similarity index 86% rename from app/src/main/java/com/yizhuan/habu/avroom/room_album/RoomAlbumFragmentViewModel.kt rename to app/src/main/java/com/chwl/app/avroom/room_album/RoomAlbumFragmentViewModel.kt index 4dc1c7141..18431b7f7 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/room_album/RoomAlbumFragmentViewModel.kt +++ b/app/src/main/java/com/chwl/app/avroom/room_album/RoomAlbumFragmentViewModel.kt @@ -1,13 +1,13 @@ -package com.yizhuan.habu.avroom.room_album +package com.chwl.app.avroom.room_album import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import com.hjq.toast.ToastUtils -import com.yizhuan.habu.avroom.bean.RoomAlbumPhotoInfo -import com.yizhuan.habu.base.BaseViewModel -import com.yizhuan.xchat_android_core.Constants -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.utils.toast +import com.chwl.app.avroom.bean.RoomAlbumPhotoInfo +import com.chwl.app.base.BaseViewModel +import com.chwl.core.Constants +import com.chwl.core.manager.AvRoomDataManager +import com.chwl.core.utils.toast class RoomAlbumFragmentViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/yizhuan/habu/avroom/room_album/RoomAlbumModel.kt b/app/src/main/java/com/chwl/app/avroom/room_album/RoomAlbumModel.kt similarity index 86% rename from app/src/main/java/com/yizhuan/habu/avroom/room_album/RoomAlbumModel.kt rename to app/src/main/java/com/chwl/app/avroom/room_album/RoomAlbumModel.kt index 49a84bd0a..1735dfb8e 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/room_album/RoomAlbumModel.kt +++ b/app/src/main/java/com/chwl/app/avroom/room_album/RoomAlbumModel.kt @@ -1,12 +1,12 @@ -package com.yizhuan.habu.avroom.room_album +package com.chwl.app.avroom.room_album -import com.yizhuan.habu.avroom.bean.RoomAlbumPhotoInfo -import com.yizhuan.xchat_android_core.Constants -import com.yizhuan.xchat_android_core.bean.response.ServiceResult -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo -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.chwl.app.avroom.bean.RoomAlbumPhotoInfo +import com.chwl.core.Constants +import com.chwl.core.bean.response.ServiceResult +import com.chwl.core.gift.bean.GiftReceiveInfo +import com.chwl.core.utils.net.RxHelper +import com.chwl.core.utils.net.launchRequest +import com.chwl.library.net.rxnet.RxNet import io.reactivex.Single import retrofit2.http.Field import retrofit2.http.FormUrlEncoded diff --git a/app/src/main/java/com/yizhuan/habu/avroom/room_album/RoomAlbumViewModel.kt b/app/src/main/java/com/chwl/app/avroom/room_album/RoomAlbumViewModel.kt similarity index 80% rename from app/src/main/java/com/yizhuan/habu/avroom/room_album/RoomAlbumViewModel.kt rename to app/src/main/java/com/chwl/app/avroom/room_album/RoomAlbumViewModel.kt index 28f210b47..821635709 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/room_album/RoomAlbumViewModel.kt +++ b/app/src/main/java/com/chwl/app/avroom/room_album/RoomAlbumViewModel.kt @@ -1,14 +1,14 @@ -package com.yizhuan.habu.avroom.room_album +package com.chwl.app.avroom.room_album import android.annotation.SuppressLint import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import com.yizhuan.habu.base.BaseViewModel -import com.yizhuan.habu.base.Event -import com.yizhuan.xchat_android_core.file.FileModel -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.utils.toast +import com.chwl.app.base.BaseViewModel +import com.chwl.app.base.Event +import com.chwl.core.file.FileModel +import com.chwl.core.gift.bean.GiftInfo +import com.chwl.core.manager.AvRoomDataManager +import com.chwl.core.utils.toast import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/com/yizhuan/habu/avroom/room_album/UnlockRoomAlbumPhotoDialog.kt b/app/src/main/java/com/chwl/app/avroom/room_album/UnlockRoomAlbumPhotoDialog.kt similarity index 84% rename from app/src/main/java/com/yizhuan/habu/avroom/room_album/UnlockRoomAlbumPhotoDialog.kt rename to app/src/main/java/com/chwl/app/avroom/room_album/UnlockRoomAlbumPhotoDialog.kt index c42693777..3324d496b 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/room_album/UnlockRoomAlbumPhotoDialog.kt +++ b/app/src/main/java/com/chwl/app/avroom/room_album/UnlockRoomAlbumPhotoDialog.kt @@ -1,13 +1,13 @@ -package com.yizhuan.habu.avroom.room_album +package com.chwl.app.avroom.room_album import android.annotation.SuppressLint import android.os.Bundle import com.hjq.toast.ToastUtils -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.databinding.DialogLockRoomAlbumPhotoBinding -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager +import com.chwl.app.base.BaseDialog +import com.chwl.app.databinding.DialogLockRoomAlbumPhotoBinding +import com.chwl.app.ui.utils.ImageLoadUtilsV2 +import com.chwl.core.gift.bean.GiftReceiveInfo +import com.chwl.core.manager.AvRoomDataManager class UnlockRoomAlbumPhotoDialog : BaseDialog(){ diff --git a/app/src/main/java/com/yizhuan/habu/avroom/room_album/UploadRoomAlbumDialogFragment.kt b/app/src/main/java/com/chwl/app/avroom/room_album/UploadRoomAlbumDialogFragment.kt similarity index 91% rename from app/src/main/java/com/yizhuan/habu/avroom/room_album/UploadRoomAlbumDialogFragment.kt rename to app/src/main/java/com/chwl/app/avroom/room_album/UploadRoomAlbumDialogFragment.kt index 946a51d42..ac134ea28 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/room_album/UploadRoomAlbumDialogFragment.kt +++ b/app/src/main/java/com/chwl/app/avroom/room_album/UploadRoomAlbumDialogFragment.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.room_album +package com.chwl.app.avroom.room_album import android.Manifest import android.annotation.SuppressLint @@ -18,19 +18,19 @@ import com.chad.library.adapter.base.BaseMultiItemQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.google.android.material.bottomsheet.BottomSheetDialogFragment import com.hjq.toast.ToastUtils -import com.yizhuan.habu.R -import com.yizhuan.habu.common.widget.dialog.DialogManager -import com.yizhuan.habu.databinding.DialogRoomAlbumUploadBinding -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.habu.ui.widget.recyclerview.decoration.GridSpacingItemNewDecoration -import com.yizhuan.xchat_android_core.Constants -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo -import com.yizhuan.xchat_android_library.common.photo.PhotoProvider -import com.yizhuan.xchat_android_library.common.photo.PhotoProvider.photoProvider -import com.yizhuan.xchat_android_library.common.util.PhotoCompressUtil.compress -import com.yizhuan.xchat_android_library.common.util.PhotoCompressUtil.getCompressCachePath -import com.yizhuan.xchat_android_library.common.util.PhotosCompressCallback -import com.yizhuan.xchat_android_library.easypermisssion.EasyPermissions +import com.chwl.app.R +import com.chwl.app.common.widget.dialog.DialogManager +import com.chwl.app.databinding.DialogRoomAlbumUploadBinding +import com.chwl.app.ui.utils.ImageLoadUtilsV2 +import com.chwl.app.ui.widget.recyclerview.decoration.GridSpacingItemNewDecoration +import com.chwl.core.Constants +import com.chwl.core.gift.bean.GiftInfo +import com.chwl.library.common.photo.PhotoProvider +import com.chwl.library.common.photo.PhotoProvider.photoProvider +import com.chwl.library.common.util.PhotoCompressUtil.compress +import com.chwl.library.common.util.PhotoCompressUtil.getCompressCachePath +import com.chwl.library.common.util.PhotosCompressCallback +import com.chwl.library.easypermisssion.EasyPermissions import kotlinx.coroutines.Job class UploadRoomAlbumDialogFragment : BottomSheetDialogFragment() { diff --git a/app/src/main/java/com/yizhuan/habu/avroom/singleroompk/SingleRoomPKBoardView.kt b/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPKBoardView.kt similarity index 89% rename from app/src/main/java/com/yizhuan/habu/avroom/singleroompk/SingleRoomPKBoardView.kt rename to app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPKBoardView.kt index 301cc4825..fdbee5873 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/singleroompk/SingleRoomPKBoardView.kt +++ b/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPKBoardView.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.singleroompk +package com.chwl.app.avroom.singleroompk import android.annotation.SuppressLint import android.content.Context @@ -10,16 +10,16 @@ import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.view.isVisible import androidx.lifecycle.Observer import com.netease.nim.uikit.common.util.sys.TimeUtil -import com.yizhuan.habu.R -import com.yizhuan.habu.avroom.activity.AVRoomActivity -import com.yizhuan.habu.databinding.LayoutSingleRoomPkBoardViewBinding -import com.yizhuan.habu.ui.user.activity.UserInfoActivity -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.avroom.activity.AVRoomActivity +import com.chwl.app.databinding.LayoutSingleRoomPkBoardViewBinding +import com.chwl.app.ui.user.activity.UserInfoActivity +import com.chwl.app.ui.utils.load +import com.chwl.core.im.custom.bean.RoomPkBean +import com.chwl.core.manager.AvRoomDataManager +import com.chwl.core.utils.CurrentTimeUtils +import com.chwl.core.utils.subAndReplaceDot +import com.chwl.library.utils.ResUtil import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable diff --git a/app/src/main/java/com/yizhuan/habu/avroom/singleroompk/SingleRoomPKCreateActivity.kt b/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPKCreateActivity.kt similarity index 84% rename from app/src/main/java/com/yizhuan/habu/avroom/singleroompk/SingleRoomPKCreateActivity.kt rename to app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPKCreateActivity.kt index c7f2c4c77..b0919dd42 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/singleroompk/SingleRoomPKCreateActivity.kt +++ b/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPKCreateActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.singleroompk +package com.chwl.app.avroom.singleroompk import android.annotation.SuppressLint import android.content.Context @@ -7,20 +7,20 @@ import android.text.Editable import android.view.Gravity import android.view.WindowManager import androidx.core.view.isVisible -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingActivity -import com.yizhuan.habu.databinding.ActivitySingleRoomPkCreateBinding -import com.yizhuan.habu.ui.utils.ImageLoadUtils -import com.yizhuan.habu.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.SimpleRoomInfo -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.toIntOrDef -import com.yizhuan.xchat_android_core.utils.toast -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingActivity +import com.chwl.app.databinding.ActivitySingleRoomPkCreateBinding +import com.chwl.app.ui.utils.ImageLoadUtils +import com.chwl.app.ui.widget.TextWatcherSimple +import com.chwl.core.auth.AuthModel +import com.chwl.core.manager.AvRoomDataManager +import com.chwl.core.room.anotherroompk.SimpleRoomInfo +import com.chwl.core.room.anotherroompk.SingleRoomPKModel +import com.chwl.core.utils.ifNotNullOrEmpty +import com.chwl.core.utils.subAndReplaceDot +import com.chwl.core.utils.toIntOrDef +import com.chwl.core.utils.toast +import com.chwl.library.utils.ResUtil class SingleRoomPKCreateActivity : BaseViewBindingActivity() { diff --git a/app/src/main/java/com/yizhuan/habu/avroom/singleroompk/SingleRoomPKRankListView.kt b/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPKRankListView.kt similarity index 84% rename from app/src/main/java/com/yizhuan/habu/avroom/singleroompk/SingleRoomPKRankListView.kt rename to app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPKRankListView.kt index 268db638b..d5e5daaaf 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/singleroompk/SingleRoomPKRankListView.kt +++ b/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPKRankListView.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.singleroompk +package com.chwl.app.avroom.singleroompk import android.content.Context import android.util.AttributeSet @@ -6,12 +6,12 @@ import android.view.LayoutInflater import android.widget.FrameLayout import androidx.core.view.isInvisible import androidx.core.view.isVisible -import com.yizhuan.habu.R -import com.yizhuan.habu.databinding.LayoutSingleRoomPkRankListViewBinding -import com.yizhuan.habu.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.chwl.app.R +import com.chwl.app.databinding.LayoutSingleRoomPkRankListViewBinding +import com.chwl.app.ui.utils.ImageLoadUtils +import com.chwl.core.im.custom.bean.RoomPkBean +import com.chwl.core.room.anotherroompk.ShowUserInfoDialogEvent +import com.chwl.library.rxbus.RxBus class SingleRoomPKRankListView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 diff --git a/app/src/main/java/com/yizhuan/habu/avroom/singleroompk/SingleRoomPKSearchActivity.kt b/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPKSearchActivity.kt similarity index 82% rename from app/src/main/java/com/yizhuan/habu/avroom/singleroompk/SingleRoomPKSearchActivity.kt rename to app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPKSearchActivity.kt index 5bad5bf6d..cffdd5c4b 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/singleroompk/SingleRoomPKSearchActivity.kt +++ b/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPKSearchActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.singleroompk +package com.chwl.app.avroom.singleroompk import android.annotation.SuppressLint import android.app.Activity @@ -6,16 +6,16 @@ import android.content.Intent import android.view.Gravity import android.view.WindowManager import androidx.recyclerview.widget.LinearLayoutManager -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingActivity -import com.yizhuan.habu.common.EmptyViewHelper -import com.yizhuan.habu.databinding.ActivitySingleRoomPkSearchBinding -import com.yizhuan.habu.ui.user.activity.UserInfoActivity -import com.yizhuan.habu.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.room.anotherroompk.SimpleRoomInfo -import com.yizhuan.xchat_android_core.room.anotherroompk.SingleRoomPKModel -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingActivity +import com.chwl.app.common.EmptyViewHelper +import com.chwl.app.databinding.ActivitySingleRoomPkSearchBinding +import com.chwl.app.ui.user.activity.UserInfoActivity +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.core.manager.AvRoomDataManager +import com.chwl.core.room.anotherroompk.SimpleRoomInfo +import com.chwl.core.room.anotherroompk.SingleRoomPKModel +import com.chwl.library.utils.ResUtil class SingleRoomPKSearchActivity : BaseViewBindingActivity() { diff --git a/app/src/main/java/com/yizhuan/habu/avroom/singleroompk/SingleRoomPKSearchAdapter.kt b/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPKSearchAdapter.kt similarity index 82% rename from app/src/main/java/com/yizhuan/habu/avroom/singleroompk/SingleRoomPKSearchAdapter.kt rename to app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPKSearchAdapter.kt index 8f2ad6dd2..7f580d2cf 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/singleroompk/SingleRoomPKSearchAdapter.kt +++ b/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPKSearchAdapter.kt @@ -1,14 +1,14 @@ -package com.yizhuan.habu.avroom.singleroompk +package com.chwl.app.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.habu.R -import com.yizhuan.habu.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.room.anotherroompk.SimpleRoomInfo -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot +import com.chwl.app.R +import com.chwl.app.ui.utils.ImageLoadUtils +import com.chwl.core.room.anotherroompk.SimpleRoomInfo +import com.chwl.core.utils.subAndReplaceDot class SingleRoomPKSearchAdapter : BaseQuickAdapter(R.layout.item_single_room_pk_search) { diff --git a/app/src/main/java/com/yizhuan/habu/avroom/singleroompk/SingleRoomPkFinishDialog.kt b/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPkFinishDialog.kt similarity index 92% rename from app/src/main/java/com/yizhuan/habu/avroom/singleroompk/SingleRoomPkFinishDialog.kt rename to app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPkFinishDialog.kt index c3df8e2de..652b41051 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/singleroompk/SingleRoomPkFinishDialog.kt +++ b/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPkFinishDialog.kt @@ -1,15 +1,15 @@ -package com.yizhuan.habu.avroom.singleroompk +package com.chwl.app.avroom.singleroompk import android.annotation.SuppressLint import android.os.Bundle import android.view.WindowManager import androidx.core.view.isVisible -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.databinding.DialogSingleRoomPkFinishBinding -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot +import com.chwl.app.R +import com.chwl.app.base.BaseDialog +import com.chwl.app.databinding.DialogSingleRoomPkFinishBinding +import com.chwl.app.ui.utils.load +import com.chwl.core.im.custom.bean.RoomPkBean +import com.chwl.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/habu/avroom/singleroompk/SingleRoomPkForceFinishDialog.kt b/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPkForceFinishDialog.kt similarity index 80% rename from app/src/main/java/com/yizhuan/habu/avroom/singleroompk/SingleRoomPkForceFinishDialog.kt rename to app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPkForceFinishDialog.kt index a16368987..a21a46cfe 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/singleroompk/SingleRoomPkForceFinishDialog.kt +++ b/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPkForceFinishDialog.kt @@ -1,14 +1,14 @@ -package com.yizhuan.habu.avroom.singleroompk +package com.chwl.app.avroom.singleroompk import android.annotation.SuppressLint import android.os.Bundle import android.view.WindowManager -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.databinding.DialogSingleRoomPkForceFinishBinding -import com.yizhuan.habu.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot +import com.chwl.app.R +import com.chwl.app.base.BaseDialog +import com.chwl.app.databinding.DialogSingleRoomPkForceFinishBinding +import com.chwl.app.ui.utils.ImageLoadUtils +import com.chwl.core.im.custom.bean.RoomPkBean +import com.chwl.core.utils.subAndReplaceDot class SingleRoomPkForceFinishDialog : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/habu/avroom/singleroompk/SingleRoomPkReceivedDialog.kt b/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPkReceivedDialog.kt similarity index 80% rename from app/src/main/java/com/yizhuan/habu/avroom/singleroompk/SingleRoomPkReceivedDialog.kt rename to app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPkReceivedDialog.kt index c1b9d8e56..234a05e66 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/singleroompk/SingleRoomPkReceivedDialog.kt +++ b/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPkReceivedDialog.kt @@ -1,16 +1,16 @@ -package com.yizhuan.habu.avroom.singleroompk +package com.chwl.app.avroom.singleroompk import android.annotation.SuppressLint import android.os.Bundle import androidx.core.view.isVisible -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.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.chwl.app.base.BaseDialog +import com.chwl.app.databinding.DialogSingleRoomPkReceivedBinding +import com.chwl.core.im.custom.bean.RoomPkBean +import com.chwl.core.manager.AvRoomDataManager +import com.chwl.core.room.anotherroompk.SingleRoomPKModel +import com.chwl.core.utils.ifNotNullOrEmpty +import com.chwl.core.utils.subAndReplaceDot +import com.chwl.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/habu/avroom/singleroompk/SingleRoomPkRuleDialog.kt b/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPkRuleDialog.kt similarity index 73% rename from app/src/main/java/com/yizhuan/habu/avroom/singleroompk/SingleRoomPkRuleDialog.kt rename to app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPkRuleDialog.kt index 46478347c..8d92a8a74 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/singleroompk/SingleRoomPkRuleDialog.kt +++ b/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPkRuleDialog.kt @@ -1,10 +1,10 @@ -package com.yizhuan.habu.avroom.singleroompk +package com.chwl.app.avroom.singleroompk import android.text.method.ScrollingMovementMethod -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.databinding.DialogSingleRoomPkRuleBinding -import com.yizhuan.xchat_android_core.room.anotherroompk.SingleRoomPKModel -import com.yizhuan.xchat_android_core.utils.toast +import com.chwl.app.base.BaseDialog +import com.chwl.app.databinding.DialogSingleRoomPkRuleBinding +import com.chwl.core.room.anotherroompk.SingleRoomPKModel +import com.chwl.core.utils.toast class SingleRoomPkRuleDialog : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/habu/avroom/view/IAvRoomView.java b/app/src/main/java/com/chwl/app/avroom/view/IAvRoomView.java similarity index 78% rename from app/src/main/java/com/yizhuan/habu/avroom/view/IAvRoomView.java rename to app/src/main/java/com/chwl/app/avroom/view/IAvRoomView.java index 948997b5d..e9d3e57de 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/view/IAvRoomView.java +++ b/app/src/main/java/com/chwl/app/avroom/view/IAvRoomView.java @@ -1,12 +1,12 @@ -package com.yizhuan.habu.avroom.view; +package com.chwl.app.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.monsterhunting.bean.MonsterInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.user.bean.FirstChargeInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.chwl.core.channel_page.bean.HelloMessageInfo; +import com.chwl.core.gift.bean.GiftInfo; +import com.chwl.core.monsterhunting.bean.MonsterInfo; +import com.chwl.core.room.bean.RoomInfo; +import com.chwl.core.user.bean.FirstChargeInfo; +import com.chwl.library.base.IMvpBaseView; /** *

diff --git a/app/src/main/java/com/yizhuan/habu/avroom/view/IBaseRoomView.kt b/app/src/main/java/com/chwl/app/avroom/view/IBaseRoomView.kt similarity index 85% rename from app/src/main/java/com/yizhuan/habu/avroom/view/IBaseRoomView.kt rename to app/src/main/java/com/chwl/app/avroom/view/IBaseRoomView.kt index f12a4ea94..829ae8c1f 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/view/IBaseRoomView.kt +++ b/app/src/main/java/com/chwl/app/avroom/view/IBaseRoomView.kt @@ -1,8 +1,8 @@ -package com.yizhuan.habu.avroom.view +package com.chwl.app.avroom.view -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 com.chwl.core.bean.RoomMicInfo +import com.chwl.core.room.bean.RoomContributeUserInfo +import com.chwl.library.base.IMvpBaseView /** * diff --git a/app/src/main/java/com/yizhuan/habu/avroom/view/ICreatePKView.java b/app/src/main/java/com/chwl/app/avroom/view/ICreatePKView.java similarity index 54% rename from app/src/main/java/com/yizhuan/habu/avroom/view/ICreatePKView.java rename to app/src/main/java/com/chwl/app/avroom/view/ICreatePKView.java index 7525d4734..ff3167c5b 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/view/ICreatePKView.java +++ b/app/src/main/java/com/chwl/app/avroom/view/ICreatePKView.java @@ -1,6 +1,6 @@ -package com.yizhuan.habu.avroom.view; +package com.chwl.app.avroom.view; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.chwl.library.base.IMvpBaseView; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/habu/avroom/view/IGameRoomView.java b/app/src/main/java/com/chwl/app/avroom/view/IGameRoomView.java similarity index 68% rename from app/src/main/java/com/yizhuan/habu/avroom/view/IGameRoomView.java rename to app/src/main/java/com/chwl/app/avroom/view/IGameRoomView.java index 79affa8e8..15a8936e4 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/view/IGameRoomView.java +++ b/app/src/main/java/com/chwl/app/avroom/view/IGameRoomView.java @@ -1,6 +1,6 @@ -package com.yizhuan.habu.avroom.view; +package com.chwl.app.avroom.view; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; +import com.chwl.core.home.bean.BannerInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/view/IHomePartyUserListView.java b/app/src/main/java/com/chwl/app/avroom/view/IHomePartyUserListView.java similarity index 67% rename from app/src/main/java/com/yizhuan/habu/avroom/view/IHomePartyUserListView.java rename to app/src/main/java/com/chwl/app/avroom/view/IHomePartyUserListView.java index dc850b6c7..f992ec894 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/view/IHomePartyUserListView.java +++ b/app/src/main/java/com/chwl/app/avroom/view/IHomePartyUserListView.java @@ -1,9 +1,9 @@ -package com.yizhuan.habu.avroom.view; +package com.chwl.app.avroom.view; -import com.yizhuan.xchat_android_core.room.bean.OnlineChatMember; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.chwl.core.room.bean.OnlineChatMember; +import com.chwl.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/view/IHomePartyView.java b/app/src/main/java/com/chwl/app/avroom/view/IHomePartyView.java similarity index 76% rename from app/src/main/java/com/yizhuan/habu/avroom/view/IHomePartyView.java rename to app/src/main/java/com/chwl/app/avroom/view/IHomePartyView.java index fe10ddf36..6d92197c5 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/view/IHomePartyView.java +++ b/app/src/main/java/com/chwl/app/avroom/view/IHomePartyView.java @@ -1,7 +1,7 @@ -package com.yizhuan.habu.avroom.view; +package com.chwl.app.avroom.view; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; +import com.chwl.core.home.bean.BannerInfo; +import com.chwl.core.room.bean.RoomInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/view/ILightChatConsumeView.java b/app/src/main/java/com/chwl/app/avroom/view/ILightChatConsumeView.java similarity index 62% rename from app/src/main/java/com/yizhuan/habu/avroom/view/ILightChatConsumeView.java rename to app/src/main/java/com/chwl/app/avroom/view/ILightChatConsumeView.java index 320502c77..f74fd60d1 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/view/ILightChatConsumeView.java +++ b/app/src/main/java/com/chwl/app/avroom/view/ILightChatConsumeView.java @@ -1,9 +1,9 @@ -package com.yizhuan.habu.avroom.view; +package com.chwl.app.avroom.view; -import com.yizhuan.xchat_android_core.room.queue.bean.RoomConsumeInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.chwl.core.room.queue.bean.RoomConsumeInfo; +import com.chwl.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/view/ILightChatOnlineView.java b/app/src/main/java/com/chwl/app/avroom/view/ILightChatOnlineView.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/avroom/view/ILightChatOnlineView.java rename to app/src/main/java/com/chwl/app/avroom/view/ILightChatOnlineView.java index c825d6331..86b5a689b 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/view/ILightChatOnlineView.java +++ b/app/src/main/java/com/chwl/app/avroom/view/ILightChatOnlineView.java @@ -1,9 +1,9 @@ -package com.yizhuan.habu.avroom.view; +package com.chwl.app.avroom.view; import android.util.SparseArray; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; -import com.yizhuan.habu.ui.widget.ButtonItem; +import com.chwl.app.ui.widget.ButtonItem; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/view/ILightChatRoomView.java b/app/src/main/java/com/chwl/app/avroom/view/ILightChatRoomView.java similarity index 87% rename from app/src/main/java/com/yizhuan/habu/avroom/view/ILightChatRoomView.java rename to app/src/main/java/com/chwl/app/avroom/view/ILightChatRoomView.java index 88d74c4ba..806431221 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/view/ILightChatRoomView.java +++ b/app/src/main/java/com/chwl/app/avroom/view/ILightChatRoomView.java @@ -1,7 +1,7 @@ -package com.yizhuan.habu.avroom.view; +package com.chwl.app.avroom.view; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.chwl.library.base.IMvpBaseView; /** *

轻聊房

diff --git a/app/src/main/java/com/yizhuan/habu/avroom/view/IRecordForPKView.java b/app/src/main/java/com/chwl/app/avroom/view/IRecordForPKView.java similarity index 55% rename from app/src/main/java/com/yizhuan/habu/avroom/view/IRecordForPKView.java rename to app/src/main/java/com/chwl/app/avroom/view/IRecordForPKView.java index 638453253..d5a5ef8a4 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/view/IRecordForPKView.java +++ b/app/src/main/java/com/chwl/app/avroom/view/IRecordForPKView.java @@ -1,6 +1,6 @@ -package com.yizhuan.habu.avroom.view; +package com.chwl.app.avroom.view; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.chwl.library.base.IMvpBaseView; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/habu/avroom/view/IRoomBlackView.java b/app/src/main/java/com/chwl/app/avroom/view/IRoomBlackView.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/avroom/view/IRoomBlackView.java rename to app/src/main/java/com/chwl/app/avroom/view/IRoomBlackView.java index bafdaf2c2..e8212330f 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/view/IRoomBlackView.java +++ b/app/src/main/java/com/chwl/app/avroom/view/IRoomBlackView.java @@ -1,7 +1,7 @@ -package com.yizhuan.habu.avroom.view; +package com.chwl.app.avroom.view; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.chwl.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/view/IRoomCharmRankingListView.java b/app/src/main/java/com/chwl/app/avroom/view/IRoomCharmRankingListView.java similarity index 54% rename from app/src/main/java/com/yizhuan/habu/avroom/view/IRoomCharmRankingListView.java rename to app/src/main/java/com/chwl/app/avroom/view/IRoomCharmRankingListView.java index e9aee3e78..69d262e5d 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/view/IRoomCharmRankingListView.java +++ b/app/src/main/java/com/chwl/app/avroom/view/IRoomCharmRankingListView.java @@ -1,7 +1,7 @@ -package com.yizhuan.habu.avroom.view; +package com.chwl.app.avroom.view; -import com.yizhuan.xchat_android_core.room.bean.RoomRankMultiItem; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.chwl.core.room.bean.RoomRankMultiItem; +import com.chwl.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/view/IRoomContributeListView.java b/app/src/main/java/com/chwl/app/avroom/view/IRoomContributeListView.java similarity index 60% rename from app/src/main/java/com/yizhuan/habu/avroom/view/IRoomContributeListView.java rename to app/src/main/java/com/chwl/app/avroom/view/IRoomContributeListView.java index f03d4642e..1e0cab4e9 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/view/IRoomContributeListView.java +++ b/app/src/main/java/com/chwl/app/avroom/view/IRoomContributeListView.java @@ -1,8 +1,8 @@ -package com.yizhuan.habu.avroom.view; +package com.chwl.app.avroom.view; -import com.yizhuan.xchat_android_core.room.bean.RoomContributeDataInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.chwl.core.room.bean.RoomContributeDataInfo; +import com.chwl.library.base.IMvpBaseView; /** * Created by MadisonRong on 25/04/2018. diff --git a/app/src/main/java/com/yizhuan/habu/avroom/view/IRoomInviteView.java b/app/src/main/java/com/chwl/app/avroom/view/IRoomInviteView.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/avroom/view/IRoomInviteView.java rename to app/src/main/java/com/chwl/app/avroom/view/IRoomInviteView.java index fab6a8dc9..f53cb5dd3 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/view/IRoomInviteView.java +++ b/app/src/main/java/com/chwl/app/avroom/view/IRoomInviteView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.view; +package com.chwl.app.avroom.view; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/view/IRoomManagerView.java b/app/src/main/java/com/chwl/app/avroom/view/IRoomManagerView.java similarity index 89% rename from app/src/main/java/com/yizhuan/habu/avroom/view/IRoomManagerView.java rename to app/src/main/java/com/chwl/app/avroom/view/IRoomManagerView.java index 57f2161af..0d053a3ab 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/view/IRoomManagerView.java +++ b/app/src/main/java/com/chwl/app/avroom/view/IRoomManagerView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.view; +package com.chwl.app.avroom.view; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/view/IRoomMemberView.java b/app/src/main/java/com/chwl/app/avroom/view/IRoomMemberView.java similarity index 82% rename from app/src/main/java/com/yizhuan/habu/avroom/view/IRoomMemberView.java rename to app/src/main/java/com/chwl/app/avroom/view/IRoomMemberView.java index 594218e87..6eb0c4313 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/view/IRoomMemberView.java +++ b/app/src/main/java/com/chwl/app/avroom/view/IRoomMemberView.java @@ -1,7 +1,7 @@ -package com.yizhuan.habu.avroom.view; +package com.chwl.app.avroom.view; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.chwl.library.base.IMvpBaseView; /** diff --git a/app/src/main/java/com/yizhuan/habu/avroom/view/IRoomSettingView.java b/app/src/main/java/com/chwl/app/avroom/view/IRoomSettingView.java similarity index 73% rename from app/src/main/java/com/yizhuan/habu/avroom/view/IRoomSettingView.java rename to app/src/main/java/com/chwl/app/avroom/view/IRoomSettingView.java index 9df0afdde..350310a6d 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/view/IRoomSettingView.java +++ b/app/src/main/java/com/chwl/app/avroom/view/IRoomSettingView.java @@ -1,9 +1,9 @@ -package com.yizhuan.habu.avroom.view; +package com.chwl.app.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.chwl.core.room.bean.RoomInfo; +import com.chwl.core.room.bean.RoomSettingTabInfo; +import com.chwl.core.room.bean.SingleRoomSortInfo; +import com.chwl.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/view/ISingleRoomView.java b/app/src/main/java/com/chwl/app/avroom/view/ISingleRoomView.java similarity index 69% rename from app/src/main/java/com/yizhuan/habu/avroom/view/ISingleRoomView.java rename to app/src/main/java/com/chwl/app/avroom/view/ISingleRoomView.java index d62ee0d1d..f898dff23 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/view/ISingleRoomView.java +++ b/app/src/main/java/com/chwl/app/avroom/view/ISingleRoomView.java @@ -1,6 +1,6 @@ -package com.yizhuan.habu.avroom.view; +package com.chwl.app.avroom.view; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; +import com.chwl.core.home.bean.BannerInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/widget/ActivityTimerView.java b/app/src/main/java/com/chwl/app/avroom/widget/ActivityTimerView.java similarity index 92% rename from app/src/main/java/com/yizhuan/habu/avroom/widget/ActivityTimerView.java rename to app/src/main/java/com/chwl/app/avroom/widget/ActivityTimerView.java index 983b02046..2003499a3 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/widget/ActivityTimerView.java +++ b/app/src/main/java/com/chwl/app/avroom/widget/ActivityTimerView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.widget; +package com.chwl.app.avroom.widget; import android.content.Context; import android.util.AttributeSet; @@ -7,9 +7,9 @@ import android.widget.TextView; import androidx.annotation.Nullable; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_core.room.activitytimer.TimerBean; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.core.room.activitytimer.TimerBean; +import com.chwl.library.utils.ResUtil; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/widget/BottomView.java b/app/src/main/java/com/chwl/app/avroom/widget/BottomView.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/avroom/widget/BottomView.java rename to app/src/main/java/com/chwl/app/avroom/widget/BottomView.java index e5f88b57c..9b6f941c3 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/widget/BottomView.java +++ b/app/src/main/java/com/chwl/app/avroom/widget/BottomView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.widget; +package com.chwl.app.avroom.widget; import android.animation.Keyframe; import android.animation.ObjectAnimator; @@ -25,23 +25,23 @@ import com.netease.nim.uikit.api.NimUIKit; import com.netease.nim.uikit.common.util.sys.ScreenUtil; import com.netease.nimlib.sdk.msg.model.RecentContact; import com.netease.nimlib.sdk.uinfo.model.UserInfo; -import com.yizhuan.habu.R; -import com.yizhuan.habu.avroom.BottomViewListenerWrapper; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.habu.vip.VipMainActivity; -import com.yizhuan.habu.room_chat.activity.RoomMsgActivity; -import com.yizhuan.xchat_android_core.helper.ImHelperUtils; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMMessageManager; -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.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.chwl.app.R; +import com.chwl.app.avroom.BottomViewListenerWrapper; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.app.vip.VipMainActivity; +import com.chwl.app.room_chat.activity.RoomMsgActivity; +import com.chwl.core.helper.ImHelperUtils; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.manager.IMMessageManager; +import com.chwl.core.pay.event.FirstChargeEvent; +import com.chwl.core.room.bean.RoomInfo; +import com.chwl.core.room.bean.RoomModeType; +import com.chwl.core.super_admin.util.SuperAdminUtil; +import com.chwl.core.user.UserModel; +import com.chwl.core.utils.SharedPreferenceUtils; +import com.chwl.core.utils.StringExtensionKt; +import com.chwl.core.utils.net.RxHelper; +import com.chwl.library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/widget/EditRoomTitleDialog.java b/app/src/main/java/com/chwl/app/avroom/widget/EditRoomTitleDialog.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/avroom/widget/EditRoomTitleDialog.java rename to app/src/main/java/com/chwl/app/avroom/widget/EditRoomTitleDialog.java index 0ebb38980..6aeebbdf4 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/widget/EditRoomTitleDialog.java +++ b/app/src/main/java/com/chwl/app/avroom/widget/EditRoomTitleDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.widget; +package com.chwl.app.avroom.widget; import android.content.Context; import android.content.DialogInterface; @@ -16,10 +16,10 @@ import androidx.appcompat.app.AppCompatDialog; import com.trello.rxlifecycle3.android.ActivityEvent; import com.trello.rxlifecycle3.components.support.RxAppCompatActivity; -import com.yizhuan.habu.R; -import com.yizhuan.habu.utils.KeyBoardUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.app.utils.KeyBoardUtils; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/widget/FixRoomTitleTextView.java b/app/src/main/java/com/chwl/app/avroom/widget/FixRoomTitleTextView.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/avroom/widget/FixRoomTitleTextView.java rename to app/src/main/java/com/chwl/app/avroom/widget/FixRoomTitleTextView.java index 6dc56f728..cb3d64316 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/widget/FixRoomTitleTextView.java +++ b/app/src/main/java/com/chwl/app/avroom/widget/FixRoomTitleTextView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.widget; +package com.chwl.app.avroom.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/widget/GalleryLayoutManager.java b/app/src/main/java/com/chwl/app/avroom/widget/GalleryLayoutManager.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/avroom/widget/GalleryLayoutManager.java rename to app/src/main/java/com/chwl/app/avroom/widget/GalleryLayoutManager.java index d473371b4..9c9016d6f 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/widget/GalleryLayoutManager.java +++ b/app/src/main/java/com/chwl/app/avroom/widget/GalleryLayoutManager.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.widget; +package com.chwl.app.avroom.widget; import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE; @@ -17,7 +17,7 @@ import androidx.recyclerview.widget.OrientationHelper; import androidx.recyclerview.widget.RecyclerView; import androidx.viewpager.widget.ViewPager; -import com.yizhuan.habu.application.XChatApplication; +import com.chwl.app.application.XChatApplication; /** * A custom LayoutManager to build a {@link android.widget.Gallery} or a {@link ViewPager}like {@link RecyclerView} and diff --git a/app/src/main/java/com/yizhuan/habu/avroom/widget/GiftEffectView.java b/app/src/main/java/com/chwl/app/avroom/widget/GiftEffectView.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/avroom/widget/GiftEffectView.java rename to app/src/main/java/com/chwl/app/avroom/widget/GiftEffectView.java index 88face2cd..9b5e39fd0 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/widget/GiftEffectView.java +++ b/app/src/main/java/com/chwl/app/avroom/widget/GiftEffectView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.widget; +package com.chwl.app.avroom.widget; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -22,18 +22,18 @@ import com.opensource.svgaplayer.SVGAImageView; import com.opensource.svgaplayer.SVGAParser; import com.opensource.svgaplayer.SVGAVideoEntity; import com.tencent.qgame.animplayer.AnimView; -import com.yizhuan.habu.R; -import com.yizhuan.habu.common.widget.CircleImageView; -import com.yizhuan.habu.ui.utils.ImageLoadKt; -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.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.chwl.app.R; +import com.chwl.app.common.widget.CircleImageView; +import com.chwl.app.ui.utils.ImageLoadKt; +import com.chwl.core.gift.GiftModel; +import com.chwl.core.gift.bean.GiftEffectInfo; +import com.chwl.core.gift.bean.GiftInfo; +import com.chwl.core.initial.InitialModel; +import com.chwl.core.initial.bean.InitInfo; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.manager.IMNetEaseManager; +import com.chwl.core.manager.RoomEvent; +import com.chwl.library.utils.ResolutionUtils; import java.lang.ref.WeakReference; import java.net.MalformedURLException; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/widget/GiftV2View.java b/app/src/main/java/com/chwl/app/avroom/widget/GiftV2View.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/avroom/widget/GiftV2View.java rename to app/src/main/java/com/chwl/app/avroom/widget/GiftV2View.java index f5de635a1..b5fa96d5f 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/widget/GiftV2View.java +++ b/app/src/main/java/com/chwl/app/avroom/widget/GiftV2View.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.widget; +package com.chwl.app.avroom.widget; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -30,29 +30,29 @@ import com.opensource.svgaplayer.SVGADrawable; import com.opensource.svgaplayer.SVGAImageView; import com.opensource.svgaplayer.SVGAParser; import com.opensource.svgaplayer.SVGAVideoEntity; -import com.yizhuan.habu.R; -import com.yizhuan.habu.common.svga.SimpleSvgaParseCompletion; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -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.room.bean.RoomInfo; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.ResolutionUtils; +import com.chwl.app.R; +import com.chwl.app.common.svga.SimpleSvgaParseCompletion; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.core.fansteam.FansTeamMsgInfo; +import com.chwl.core.gift.GiftModel; +import com.chwl.core.gift.bean.GiftEffectInfo; +import com.chwl.core.gift.bean.GiftInfo; +import com.chwl.core.gift.bean.GiftMultiReceiverInfo; +import com.chwl.core.gift.bean.GiftReceiveInfo; +import com.chwl.core.gift.bean.GiftReceiver; +import com.chwl.core.gift.bean.LuckyBagGifts; +import com.chwl.core.gift.bean.MultiGiftReceiveInfo; +import com.chwl.core.im.custom.bean.FansTeamMsgAttachment; +import com.chwl.core.magic.MagicModel; +import com.chwl.core.magic.ObjectPool; +import com.chwl.core.magic.bean.MagicInfo; +import com.chwl.core.magic.bean.MagicReceivedInfo; +import com.chwl.core.magic.bean.MultiMagicReceivedInfo; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.room.bean.RoomInfo; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.ResolutionUtils; import java.lang.ref.WeakReference; import java.net.MalformedURLException; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/widget/LollipopFixedWebView.java b/app/src/main/java/com/chwl/app/avroom/widget/LollipopFixedWebView.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/avroom/widget/LollipopFixedWebView.java rename to app/src/main/java/com/chwl/app/avroom/widget/LollipopFixedWebView.java index 0426ebd0b..9eaa3c486 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/widget/LollipopFixedWebView.java +++ b/app/src/main/java/com/chwl/app/avroom/widget/LollipopFixedWebView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.widget; +package com.chwl.app.avroom.widget; import android.annotation.TargetApi; import android.content.Context; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/widget/MagicTextView.java b/app/src/main/java/com/chwl/app/avroom/widget/MagicTextView.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/avroom/widget/MagicTextView.java rename to app/src/main/java/com/chwl/app/avroom/widget/MagicTextView.java index 1f9e0ebb9..9d5043c49 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/widget/MagicTextView.java +++ b/app/src/main/java/com/chwl/app/avroom/widget/MagicTextView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.widget; +package com.chwl.app.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.habu.R; +import com.chwl.app.R; import java.util.ArrayList; import java.util.WeakHashMap; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/widget/MessageView.java b/app/src/main/java/com/chwl/app/avroom/widget/MessageView.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/avroom/widget/MessageView.java rename to app/src/main/java/com/chwl/app/avroom/widget/MessageView.java index 8c32d606d..f8b730797 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/widget/MessageView.java +++ b/app/src/main/java/com/chwl/app/avroom/widget/MessageView.java @@ -1,27 +1,27 @@ -package com.yizhuan.habu.avroom.widget; +package com.chwl.app.avroom.widget; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_FAIRY; -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_ROOM_ALBUM; -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_CONVERT_L1; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_CONVERT_L2; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_CONVERT_L3; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_BALL_L1; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_BALL_L2; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_BALL_L3; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L1; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L2; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L3; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L4; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L5; -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.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_FAIRY; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GIFT_COMPOUND; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RED_PACKAGE; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ROOM_ALBUM; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ME; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_CONVERT_L1; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_CONVERT_L2; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_CONVERT_L3; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_BALL_L1; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_BALL_L2; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_BALL_L3; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L1; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L2; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L3; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L4; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L5; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_FANS_TEAM_JOIN; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_GIFT_COMPOUND; +import static com.chwl.core.redpackage.RedPackageTypeKt.ALL_DIAMOND; +import static com.chwl.core.redpackage.RedPackageTypeKt.ALL_GIFT; +import static com.chwl.core.redpackage.RedPackageTypeKt.ROOM_DIAMOND; +import static com.chwl.core.redpackage.RedPackageTypeKt.ROOM_GIFT; import android.annotation.SuppressLint; import android.app.Activity; @@ -67,131 +67,131 @@ import com.netease.nimlib.sdk.msg.attachment.MsgAttachment; 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.yizhuan.habu.sadmin.utils.SaAttachmentToMsgUtil; -import com.yizhuan.habu.R; -import com.yizhuan.habu.UIHelper; -import com.yizhuan.habu.avroom.activity.AVRoomActivity; -import com.yizhuan.habu.avroom.dialog.PKResultDialog; -import com.yizhuan.habu.avroom.room_album.UnlockRoomAlbumPhotoDialog; -import com.yizhuan.habu.common.util.Utils; -import com.yizhuan.habu.common.widget.CustomAutoWidthImageSpan; -import com.yizhuan.habu.common.widget.CustomImageSpan; -import com.yizhuan.habu.common.widget.OriginalDrawStatusClickSpan; -import com.yizhuan.habu.community.photo.BigPhotoActivity; -import com.yizhuan.habu.community.photo.PagerOption; -import com.yizhuan.habu.community.utils.ObjectTypeHelper; -import com.yizhuan.habu.treasure_box.widget.GoldBoxHelper; -import com.yizhuan.habu.treasurefairy.HomeFairyActivity; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2; -import com.yizhuan.habu.ui.widget.DividerItemDecoration; -import com.yizhuan.habu.ui.widget.MyItemAnimator; -import com.yizhuan.habu.ui.widget.RecyclerViewNoViewpagerScroll; -import com.yizhuan.habu.ui.widget.UserInfoDialog; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.habu.utils.RegexUtil; +import com.chwl.app.sadmin.utils.SaAttachmentToMsgUtil; +import com.chwl.app.R; +import com.chwl.app.UIHelper; +import com.chwl.app.avroom.activity.AVRoomActivity; +import com.chwl.app.avroom.dialog.PKResultDialog; +import com.chwl.app.avroom.room_album.UnlockRoomAlbumPhotoDialog; +import com.chwl.app.common.util.Utils; +import com.chwl.app.common.widget.CustomAutoWidthImageSpan; +import com.chwl.app.common.widget.CustomImageSpan; +import com.chwl.app.common.widget.OriginalDrawStatusClickSpan; +import com.chwl.app.community.photo.BigPhotoActivity; +import com.chwl.app.community.photo.PagerOption; +import com.chwl.app.community.utils.ObjectTypeHelper; +import com.chwl.app.treasure_box.widget.GoldBoxHelper; +import com.chwl.app.treasurefairy.HomeFairyActivity; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.app.ui.utils.ImageLoadUtilsV2; +import com.chwl.app.ui.widget.DividerItemDecoration; +import com.chwl.app.ui.widget.MyItemAnimator; +import com.chwl.app.ui.widget.RecyclerViewNoViewpagerScroll; +import com.chwl.app.ui.widget.UserInfoDialog; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.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.gift.toolbox.GiftToolbox; -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.FairyMsgAttachment; -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.NobleAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RedPackageRoomMsgAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomAlbumAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomAlbumMsgInfo; -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.RoomLuckySeaAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomLuckySeaMsgBean; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomNoticeAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPhoto; -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.User; -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.anotherroompk.ShowUserInfoDialogEvent; -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.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.treasurefairy.FairyMsgInfoBean; -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.StringExtensionKt; -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.rxbus.RxBus; -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.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.SizeUtils; +import com.chwl.core.DemoCache; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.bean.attachmsg.RoomQueueMsgAttachment; +import com.chwl.core.decoration.car.bean.CarInfo; +import com.chwl.core.fansteam.FansTeamMsgInfo; +import com.chwl.core.gift.GiftModel; +import com.chwl.core.gift.bean.GiftInfo; +import com.chwl.core.gift.bean.GiftList; +import com.chwl.core.gift.bean.GiftReceiveInfo; +import com.chwl.core.gift.bean.GiftReceiver; +import com.chwl.core.gift.bean.LuckyBagGifts; +import com.chwl.core.gift.bean.LuckyBagNoticeInfo; +import com.chwl.core.gift.toolbox.GiftToolbox; +import com.chwl.core.helper.ImHelperUtils; +import com.chwl.core.home.event.FollowRoomEvent; +import com.chwl.core.home.model.CollectionRoomModel; +import com.chwl.core.im.custom.bean.AuctionAttachment; +import com.chwl.core.im.custom.bean.CarveUpGoldAttachment; +import com.chwl.core.im.custom.bean.CleanScreenAttachment; +import com.chwl.core.im.custom.bean.CustomAttachment; +import com.chwl.core.im.custom.bean.DatingAttachment; +import com.chwl.core.im.custom.bean.FaceAttachment; +import com.chwl.core.im.custom.bean.FairyMsgAttachment; +import com.chwl.core.im.custom.bean.FansTeamMsgAttachment; +import com.chwl.core.im.custom.bean.GiftAttachment; +import com.chwl.core.im.custom.bean.GiftBatchAttachment; +import com.chwl.core.im.custom.bean.GiftCompoundAttachment; +import com.chwl.core.im.custom.bean.GiftCompoundMsgBean; +import com.chwl.core.im.custom.bean.JoinMiniWorldAttachment; +import com.chwl.core.im.custom.bean.JoinMiniWorldNoticeAttachment; +import com.chwl.core.im.custom.bean.MagicAllMicAttachment; +import com.chwl.core.im.custom.bean.MagicAttachment; +import com.chwl.core.im.custom.bean.MagicBatchAttachment; +import com.chwl.core.im.custom.bean.MonsterHuntingResultAttachment; +import com.chwl.core.im.custom.bean.MonsterStatusAttachment; +import com.chwl.core.im.custom.bean.MultiGiftAttachment; +import com.chwl.core.im.custom.bean.MultiLuckyGiftAttachment; +import com.chwl.core.im.custom.bean.NobleAttachment; +import com.chwl.core.im.custom.bean.RedPackageRoomMsgAttachment; +import com.chwl.core.im.custom.bean.RoomAlbumAttachment; +import com.chwl.core.im.custom.bean.RoomAlbumMsgInfo; +import com.chwl.core.im.custom.bean.RoomBoxPrizeAttachment; +import com.chwl.core.im.custom.bean.RoomFollowOwnerAttachment; +import com.chwl.core.im.custom.bean.RoomFollowOwnerAttachment2; +import com.chwl.core.im.custom.bean.RoomLuckySeaAttachment; +import com.chwl.core.im.custom.bean.RoomLuckySeaMsgBean; +import com.chwl.core.im.custom.bean.RoomNoticeAttachment; +import com.chwl.core.im.custom.bean.RoomPhoto; +import com.chwl.core.im.custom.bean.RoomReceivedLuckyGiftAttachment; +import com.chwl.core.im.custom.bean.RoomTipAttachment; +import com.chwl.core.im.custom.bean.TarotAttachment; +import com.chwl.core.im.custom.bean.TarotMsgBean; +import com.chwl.core.im.custom.bean.User; +import com.chwl.core.im.custom.bean.VipMessageAttachment; +import com.chwl.core.im.custom.bean.WelcomeAttachment; +import com.chwl.core.level.UserLevelResourceType; +import com.chwl.core.magic.MagicModel; +import com.chwl.core.magic.bean.MagicInfo; +import com.chwl.core.magic.bean.MagicMultiReceiverInfo; +import com.chwl.core.magic.bean.MagicReceivedInfo; +import com.chwl.core.magic.bean.MagicReceiver; +import com.chwl.core.magic.bean.MultiMagicReceivedInfo; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.manager.IMNetEaseManager; +import com.chwl.core.miniworld.bean.MiniWorldInWorldInfo; +import com.chwl.core.monsterhunting.bean.MonsterHuntingResult; +import com.chwl.core.monsterhunting.bean.MonsterProtocol; +import com.chwl.core.noble.NobleInfo; +import com.chwl.core.noble.NobleUtil; +import com.chwl.core.praise.PraiseModel; +import com.chwl.core.redpackage.RedEnvelopeRoomMsg; +import com.chwl.core.room.anotherroompk.ShowUserInfoDialogEvent; +import com.chwl.core.room.bean.DatingNotifyInfo; +import com.chwl.core.room.bean.RoomInfo; +import com.chwl.core.room.bean.RoomMessageViewNoticeInfo; +import com.chwl.core.room.bean.WelcomeInfo; +import com.chwl.core.room.face.DynamicFaceModel; +import com.chwl.core.room.face.FaceInfo; +import com.chwl.core.room.face.FaceReceiveInfo; +import com.chwl.core.room.model.AvRoomModel; +import com.chwl.core.room.pk.attachment.RoomPkAttachment; +import com.chwl.core.room.pk.bean.PKTeamInfo; +import com.chwl.core.room.pk.bean.RoomPKInvitedUpMicMember; +import com.chwl.core.room.pk.bean.RoomPkData; +import com.chwl.core.room.queuing_mic.attachment.QueuingMicAttachment; +import com.chwl.core.room.queuing_mic.bean.QueuingMicInfo; +import com.chwl.core.treasurefairy.FairyMsgInfoBean; +import com.chwl.core.user.UserModel; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.core.utils.ExtensionUtil; +import com.chwl.core.utils.StringExtensionKt; +import com.chwl.core.utils.net.DontWarnObserver; +import com.chwl.core.utils.net.RxHelper; +import com.chwl.core.vip.VipMessageInfo; +import com.chwl.library.rxbus.RxBus; +import com.chwl.library.utils.FormatUtils; +import com.chwl.library.utils.JavaUtil; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; +import com.chwl.library.utils.SizeUtils; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/widget/MicroView.java b/app/src/main/java/com/chwl/app/avroom/widget/MicroView.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/avroom/widget/MicroView.java rename to app/src/main/java/com/chwl/app/avroom/widget/MicroView.java index cf2007804..d92914a92 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/widget/MicroView.java +++ b/app/src/main/java/com/chwl/app/avroom/widget/MicroView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.widget; +package com.chwl.app.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.habu.R; -import com.yizhuan.habu.avroom.adapter.BaseMicroViewAdapter; -import com.yizhuan.habu.avroom.adapter.DatingMicroViewAdapter; -import com.yizhuan.habu.avroom.adapter.OnMicroItemClickListener; -import com.yizhuan.habu.ui.anim.AnimFactory; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.habu.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.chwl.app.R; +import com.chwl.app.avroom.adapter.BaseMicroViewAdapter; +import com.chwl.app.avroom.adapter.DatingMicroViewAdapter; +import com.chwl.app.avroom.adapter.OnMicroItemClickListener; +import com.chwl.app.ui.anim.AnimFactory; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.ui.widget.recyclerview.decoration.DatingItemDecoration; +import com.chwl.core.bean.RoomQueueInfo; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.manager.IMNetEaseManager; +import com.chwl.core.manager.RoomEvent; +import com.chwl.core.noble.NobleResourceType; +import com.chwl.core.noble.NobleUtil; +import com.chwl.core.room.event.ReceiveFaceEvent; +import com.chwl.core.room.face.FaceReceiveInfo; +import com.chwl.core.utils.LogUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/widget/OnMsgLongClickListener.java b/app/src/main/java/com/chwl/app/avroom/widget/OnMsgLongClickListener.java similarity index 76% rename from app/src/main/java/com/yizhuan/habu/avroom/widget/OnMsgLongClickListener.java rename to app/src/main/java/com/chwl/app/avroom/widget/OnMsgLongClickListener.java index b18f3e544..8ac3ed7da 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/widget/OnMsgLongClickListener.java +++ b/app/src/main/java/com/chwl/app/avroom/widget/OnMsgLongClickListener.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.widget; +package com.chwl.app.avroom.widget; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/widget/PKBoardView.java b/app/src/main/java/com/chwl/app/avroom/widget/PKBoardView.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/avroom/widget/PKBoardView.java rename to app/src/main/java/com/chwl/app/avroom/widget/PKBoardView.java index 73273b2a2..7c3242d98 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/widget/PKBoardView.java +++ b/app/src/main/java/com/chwl/app/avroom/widget/PKBoardView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.widget; +package com.chwl.app.avroom.widget; import android.content.Context; import android.text.TextUtils; @@ -11,23 +11,23 @@ import android.widget.RelativeLayout; import android.widget.TextView; import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.habu.R; -import com.yizhuan.habu.avroom.dialog.PKScoreBoardDialog; -import com.yizhuan.habu.avroom.dialog.PKSelectPeopleDialog; -import com.yizhuan.habu.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.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.app.avroom.dialog.PKScoreBoardDialog; +import com.chwl.app.avroom.dialog.PKSelectPeopleDialog; +import com.chwl.app.common.widget.CircleImageView; +import com.chwl.core.bean.RoomQueueInfo; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.room.pk.bean.PKMemberInfo; +import com.chwl.core.room.pk.bean.PKTeamInfo; +import com.chwl.core.room.pk.bean.RoomPKInvitedUpMicMember; +import com.chwl.core.room.pk.bean.RoomPkData; +import com.chwl.core.room.pk.event.PKDataUpdateEvent; +import com.chwl.core.room.pk.event.PKTimeFinishEvent; +import com.chwl.core.room.pk.event.PKTimeTickEvent; +import com.chwl.core.room.pk.model.PkModel; +import com.chwl.library.utils.FormatUtils; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/widget/PKProgressBar.kt b/app/src/main/java/com/chwl/app/avroom/widget/PKProgressBar.kt similarity index 94% rename from app/src/main/java/com/yizhuan/habu/avroom/widget/PKProgressBar.kt rename to app/src/main/java/com/chwl/app/avroom/widget/PKProgressBar.kt index 86950bf33..31db97b6d 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/widget/PKProgressBar.kt +++ b/app/src/main/java/com/chwl/app/avroom/widget/PKProgressBar.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.widget +package com.chwl.app.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.habu.R +import com.chwl.app.R class PKProgressBar(context: Context, attrs: AttributeSet?) : ProgressBar(context, attrs) { diff --git a/app/src/main/java/com/yizhuan/habu/avroom/widget/RankNavigatorAdapter.java b/app/src/main/java/com/chwl/app/avroom/widget/RankNavigatorAdapter.java similarity index 80% rename from app/src/main/java/com/yizhuan/habu/avroom/widget/RankNavigatorAdapter.java rename to app/src/main/java/com/chwl/app/avroom/widget/RankNavigatorAdapter.java index 2764c8684..f325e77b0 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/widget/RankNavigatorAdapter.java +++ b/app/src/main/java/com/chwl/app/avroom/widget/RankNavigatorAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.widget; +package com.chwl.app.avroom.widget; import android.content.Context; import android.graphics.Color; @@ -7,14 +7,14 @@ import android.widget.FrameLayout; import androidx.core.content.ContextCompat; -import com.yizhuan.habu.R; -import com.yizhuan.habu.decoration.view.widgets.BadgeScaleTransitionPagerTitleView; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.decoration.view.widgets.BadgeScaleTransitionPagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; +import com.chwl.library.utils.ResUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/widget/RoomEffectBoxView.kt b/app/src/main/java/com/chwl/app/avroom/widget/RoomEffectBoxView.kt similarity index 96% rename from app/src/main/java/com/yizhuan/habu/avroom/widget/RoomEffectBoxView.kt rename to app/src/main/java/com/chwl/app/avroom/widget/RoomEffectBoxView.kt index 064327211..e5cf9229d 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/widget/RoomEffectBoxView.kt +++ b/app/src/main/java/com/chwl/app/avroom/widget/RoomEffectBoxView.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.widget +package com.chwl.app.avroom.widget import android.annotation.SuppressLint import android.app.Activity @@ -25,36 +25,36 @@ 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.habu.R -import com.yizhuan.habu.avroom.activity.AVRoomActivity -import com.yizhuan.habu.avroom.helper.AnimHelper -import com.yizhuan.habu.common.svga.SimpleSvgaCallback -import com.yizhuan.habu.databinding.LayoutRoomEffectBinding -import com.yizhuan.habu.ui.utils.ImageLoadUtils -import com.yizhuan.habu.ui.utils.isDestroyed -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.habu.ui.utils.loadAnim -import com.yizhuan.habu.ui.widget.SimpleAnimListener -import com.yizhuan.habu.ui.widget.drawgift.DrawGiftPlayHelper -import com.yizhuan.habu.utils.SpannableBuilder +import com.chwl.app.R +import com.chwl.app.avroom.activity.AVRoomActivity +import com.chwl.app.avroom.helper.AnimHelper +import com.chwl.app.common.svga.SimpleSvgaCallback +import com.chwl.app.databinding.LayoutRoomEffectBinding +import com.chwl.app.ui.utils.ImageLoadUtils +import com.chwl.app.ui.utils.isDestroyed +import com.chwl.app.ui.utils.load +import com.chwl.app.ui.utils.loadAnim +import com.chwl.app.ui.widget.SimpleAnimListener +import com.chwl.app.ui.widget.drawgift.DrawGiftPlayHelper +import com.chwl.app.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.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ALL_ROOM_NOTIFY -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ALL_ROOM_NOTIFY_BY_SVGA -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.SimpleAnimationListener -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.yizhuan.xchat_android_library.utils.ResUtil -import com.yizhuan.xchat_android_library.utils.StringUtils +import com.chwl.core.auth.AuthModel +import com.chwl.core.decoration.car.bean.CarInfo +import com.chwl.core.im.custom.bean.* +import com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ALL_ROOM_NOTIFY +import com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ALL_ROOM_NOTIFY_BY_SVGA +import com.chwl.core.manager.AvRoomDataManager +import com.chwl.core.manager.IMNetEaseManager +import com.chwl.core.manager.RoomEvent +import com.chwl.core.monsterhunting.SimpleAnimationListener +import com.chwl.core.room.bean.DatingNotifyInfo +import com.chwl.core.super_admin.util.SuperAdminUtil +import com.chwl.core.user.UserModel +import com.chwl.core.user.bean.UserInfo +import com.chwl.core.utils.subAndReplaceDot +import com.chwl.library.utils.ListUtils +import com.chwl.library.utils.ResUtil +import com.chwl.library.utils.StringUtils import io.reactivex.Observable import io.reactivex.ObservableEmitter import io.reactivex.ObservableOnSubscribe diff --git a/app/src/main/java/com/yizhuan/habu/avroom/widget/RoomEffectView.kt b/app/src/main/java/com/chwl/app/avroom/widget/RoomEffectView.kt similarity index 97% rename from app/src/main/java/com/yizhuan/habu/avroom/widget/RoomEffectView.kt rename to app/src/main/java/com/chwl/app/avroom/widget/RoomEffectView.kt index 864afe2d5..086661268 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/widget/RoomEffectView.kt +++ b/app/src/main/java/com/chwl/app/avroom/widget/RoomEffectView.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.widget +package com.chwl.app.avroom.widget import android.annotation.SuppressLint import android.app.Activity @@ -27,39 +27,39 @@ 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.habu.R -import com.yizhuan.habu.avroom.activity.AVRoomActivity -import com.yizhuan.habu.avroom.bean.RoomPlayBean -import com.yizhuan.habu.avroom.helper.AnimHelper -import com.yizhuan.habu.common.svga.SimpleSvgaCallback -import com.yizhuan.habu.databinding.LayoutRoomEffectBinding -import com.yizhuan.habu.ui.utils.ImageLoadUtils -import com.yizhuan.habu.ui.utils.isDestroyed -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.habu.ui.utils.loadAnim -import com.yizhuan.habu.ui.webview.CommonWebViewActivity -import com.yizhuan.habu.ui.widget.SimpleAnimListener -import com.yizhuan.habu.ui.widget.drawgift.DrawGiftPlayHelper -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil -import com.yizhuan.habu.utils.MsgBuilder -import com.yizhuan.habu.utils.RegexUtil -import com.yizhuan.habu.utils.SpannableBuilder +import com.chwl.app.R +import com.chwl.app.avroom.activity.AVRoomActivity +import com.chwl.app.avroom.bean.RoomPlayBean +import com.chwl.app.avroom.helper.AnimHelper +import com.chwl.app.common.svga.SimpleSvgaCallback +import com.chwl.app.databinding.LayoutRoomEffectBinding +import com.chwl.app.ui.utils.ImageLoadUtils +import com.chwl.app.ui.utils.isDestroyed +import com.chwl.app.ui.utils.load +import com.chwl.app.ui.utils.loadAnim +import com.chwl.app.ui.webview.CommonWebViewActivity +import com.chwl.app.ui.widget.SimpleAnimListener +import com.chwl.app.ui.widget.drawgift.DrawGiftPlayHelper +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil +import com.chwl.app.utils.MsgBuilder +import com.chwl.app.utils.RegexUtil +import com.chwl.app.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.monsterhunting.SimpleAnimationListener -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.yizhuan.xchat_android_library.utils.ResUtil -import com.yizhuan.xchat_android_library.utils.StringUtils +import com.chwl.core.auth.AuthModel +import com.chwl.core.decoration.car.bean.CarInfo +import com.chwl.core.im.custom.bean.* +import com.chwl.core.manager.AvRoomDataManager +import com.chwl.core.manager.IMNetEaseManager +import com.chwl.core.manager.RoomEvent +import com.chwl.core.monsterhunting.SimpleAnimationListener +import com.chwl.core.room.bean.DatingNotifyInfo +import com.chwl.core.super_admin.util.SuperAdminUtil +import com.chwl.core.user.UserModel +import com.chwl.core.user.bean.UserInfo +import com.chwl.core.utils.subAndReplaceDot +import com.chwl.library.utils.ListUtils +import com.chwl.library.utils.ResUtil +import com.chwl.library.utils.StringUtils import io.reactivex.Observable import io.reactivex.ObservableEmitter import io.reactivex.ObservableOnSubscribe diff --git a/app/src/main/java/com/yizhuan/habu/avroom/widget/RoomRankNavigatorAdapter.java b/app/src/main/java/com/chwl/app/avroom/widget/RoomRankNavigatorAdapter.java similarity index 80% rename from app/src/main/java/com/yizhuan/habu/avroom/widget/RoomRankNavigatorAdapter.java rename to app/src/main/java/com/chwl/app/avroom/widget/RoomRankNavigatorAdapter.java index 65732344f..84ff83953 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/widget/RoomRankNavigatorAdapter.java +++ b/app/src/main/java/com/chwl/app/avroom/widget/RoomRankNavigatorAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.widget; +package com.chwl.app.avroom.widget; import android.content.Context; import android.graphics.Color; @@ -7,14 +7,14 @@ import android.widget.FrameLayout; import androidx.core.content.ContextCompat; -import com.yizhuan.habu.R; -import com.yizhuan.habu.decoration.view.widgets.BadgeScaleTransitionPagerTitleView; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.decoration.view.widgets.BadgeScaleTransitionPagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; +import com.chwl.library.utils.ResUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/widget/RoomRankWrapViewPager.java b/app/src/main/java/com/chwl/app/avroom/widget/RoomRankWrapViewPager.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/avroom/widget/RoomRankWrapViewPager.java rename to app/src/main/java/com/chwl/app/avroom/widget/RoomRankWrapViewPager.java index a57f7b2da..366f77732 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/widget/RoomRankWrapViewPager.java +++ b/app/src/main/java/com/chwl/app/avroom/widget/RoomRankWrapViewPager.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.widget; +package com.chwl.app.avroom.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/widget/ScaleTransformer.java b/app/src/main/java/com/chwl/app/avroom/widget/ScaleTransformer.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/avroom/widget/ScaleTransformer.java rename to app/src/main/java/com/chwl/app/avroom/widget/ScaleTransformer.java index aaef83608..22621edbb 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/widget/ScaleTransformer.java +++ b/app/src/main/java/com/chwl/app/avroom/widget/ScaleTransformer.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.widget; +package com.chwl.app.avroom.widget; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/widget/ScrollSpeedLinearLayoutManger.java b/app/src/main/java/com/chwl/app/avroom/widget/ScrollSpeedLinearLayoutManger.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/avroom/widget/ScrollSpeedLinearLayoutManger.java rename to app/src/main/java/com/chwl/app/avroom/widget/ScrollSpeedLinearLayoutManger.java index ad3fddd9d..fd3f31621 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/widget/ScrollSpeedLinearLayoutManger.java +++ b/app/src/main/java/com/chwl/app/avroom/widget/ScrollSpeedLinearLayoutManger.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.widget; +package com.chwl.app.avroom.widget; import android.content.Context; import android.graphics.PointF; diff --git a/app/src/main/java/com/yizhuan/habu/avroom/widget/SliddingView.java b/app/src/main/java/com/chwl/app/avroom/widget/SliddingView.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/avroom/widget/SliddingView.java rename to app/src/main/java/com/chwl/app/avroom/widget/SliddingView.java index a95333e5e..cbdc783da 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/widget/SliddingView.java +++ b/app/src/main/java/com/chwl/app/avroom/widget/SliddingView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.widget; +package com.chwl.app.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.habu.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; /** diff --git a/app/src/main/java/com/yizhuan/habu/avroom/widget/VerticalViewPagerAdapter.java b/app/src/main/java/com/chwl/app/avroom/widget/VerticalViewPagerAdapter.java similarity index 84% rename from app/src/main/java/com/yizhuan/habu/avroom/widget/VerticalViewPagerAdapter.java rename to app/src/main/java/com/chwl/app/avroom/widget/VerticalViewPagerAdapter.java index 8364d5ff0..48ff1260a 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/widget/VerticalViewPagerAdapter.java +++ b/app/src/main/java/com/chwl/app/avroom/widget/VerticalViewPagerAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.widget; +package com.chwl.app.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.habu.avroom.fragment.FakeSingleRoomBackFragment; -import com.yizhuan.habu.avroom.fragment.FakeSingleRoomFragment; -import com.yizhuan.habu.avroom.fragment.HomePartyFragment; +import com.chwl.app.avroom.fragment.FakeSingleRoomBackFragment; +import com.chwl.app.avroom.fragment.FakeSingleRoomFragment; +import com.chwl.app.avroom.fragment.HomePartyFragment; /** diff --git a/app/src/main/java/com/yizhuan/habu/avroom/widget/ViewItem.java b/app/src/main/java/com/chwl/app/avroom/widget/ViewItem.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/avroom/widget/ViewItem.java rename to app/src/main/java/com/chwl/app/avroom/widget/ViewItem.java index e9decb68d..f48ecedcc 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/widget/ViewItem.java +++ b/app/src/main/java/com/chwl/app/avroom/widget/ViewItem.java @@ -1,6 +1,6 @@ -package com.yizhuan.habu.avroom.widget; +package com.chwl.app.avroom.widget; -import com.yizhuan.habu.R; +import com.chwl.app.R; /** * 从library拿到client diff --git a/app/src/main/java/com/yizhuan/habu/avroom/widget/VipProgressBar.kt b/app/src/main/java/com/chwl/app/avroom/widget/VipProgressBar.kt similarity index 94% rename from app/src/main/java/com/yizhuan/habu/avroom/widget/VipProgressBar.kt rename to app/src/main/java/com/chwl/app/avroom/widget/VipProgressBar.kt index bf1fb18b1..1a30df8cf 100644 --- a/app/src/main/java/com/yizhuan/habu/avroom/widget/VipProgressBar.kt +++ b/app/src/main/java/com/chwl/app/avroom/widget/VipProgressBar.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.avroom.widget +package com.chwl.app.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.habu.R +import com.chwl.app.R class VipProgressBar(context: Context, attrs: AttributeSet?) : ProgressBar(context, attrs) { diff --git a/app/src/main/java/com/yizhuan/habu/base/AbstractMvpActivity.java b/app/src/main/java/com/chwl/app/base/AbstractMvpActivity.java similarity index 87% rename from app/src/main/java/com/yizhuan/habu/base/AbstractMvpActivity.java rename to app/src/main/java/com/chwl/app/base/AbstractMvpActivity.java index c0172195b..ef88b16aa 100644 --- a/app/src/main/java/com/yizhuan/habu/base/AbstractMvpActivity.java +++ b/app/src/main/java/com/chwl/app/base/AbstractMvpActivity.java @@ -1,16 +1,16 @@ -package com.yizhuan.habu.base; +package com.chwl.app.base; import android.os.Bundle; import android.util.Log; import androidx.annotation.Nullable; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; -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.factory.PresenterMvpFactory; -import com.yizhuan.xchat_android_library.base.factory.PresenterMvpFactoryImpl; -import com.yizhuan.xchat_android_library.base.factory.PresenterProxyInterface; +import com.chwl.library.base.IMvpBaseView; +import com.chwl.library.base.factory.AbstractMvpPresenter; +import com.chwl.library.base.factory.BaseMvpProxy; +import com.chwl.library.base.factory.PresenterMvpFactory; +import com.chwl.library.base.factory.PresenterMvpFactoryImpl; +import com.chwl.library.base.factory.PresenterProxyInterface; /** *

1. 子类的Presenter必须继承自AbstractMvpPresenter； diff --git a/app/src/main/java/com/yizhuan/habu/base/AbstractMvpFragment.java b/app/src/main/java/com/chwl/app/base/AbstractMvpFragment.java similarity index 86% rename from app/src/main/java/com/yizhuan/habu/base/AbstractMvpFragment.java rename to app/src/main/java/com/chwl/app/base/AbstractMvpFragment.java index a58aa684a..5f9a94f4c 100644 --- a/app/src/main/java/com/yizhuan/habu/base/AbstractMvpFragment.java +++ b/app/src/main/java/com/chwl/app/base/AbstractMvpFragment.java @@ -1,16 +1,16 @@ -package com.yizhuan.habu.base; +package com.chwl.app.base; import android.os.Bundle; import android.util.Log; import androidx.annotation.Nullable; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; -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.factory.PresenterMvpFactory; -import com.yizhuan.xchat_android_library.base.factory.PresenterMvpFactoryImpl; -import com.yizhuan.xchat_android_library.base.factory.PresenterProxyInterface; +import com.chwl.library.base.IMvpBaseView; +import com.chwl.library.base.factory.AbstractMvpPresenter; +import com.chwl.library.base.factory.BaseMvpProxy; +import com.chwl.library.base.factory.PresenterMvpFactory; +import com.chwl.library.base.factory.PresenterMvpFactoryImpl; +import com.chwl.library.base.factory.PresenterProxyInterface; /** *

1. 子类的Presenter必须继承自AbstractMvpPresenter； diff --git a/app/src/main/java/com/yizhuan/habu/base/BaseActivity.java b/app/src/main/java/com/chwl/app/base/BaseActivity.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/base/BaseActivity.java rename to app/src/main/java/com/chwl/app/base/BaseActivity.java index bcb472bba..61f8e56b8 100644 --- a/app/src/main/java/com/yizhuan/habu/base/BaseActivity.java +++ b/app/src/main/java/com/chwl/app/base/BaseActivity.java @@ -1,25 +1,25 @@ -package com.yizhuan.habu.base; +package com.chwl.app.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_ALL_SERVICE_GIFT; -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_FAIRY; -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_LUCKY_GIFT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_ALL; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_SERVER_ALL; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_NOTIFY_H5_SUB_WHOLE_SERVICE; -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_ALL_ROOM_NOTIFY_BY_SVGA; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L5; -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.chwl.core.Constants.DEBUG_MAX_UID; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_NOBLE; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MESS_SUB_OPENNOBLE; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MESS_SUB_RENEWNOBLE; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ALL_SERVICE_GIFT; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_BOX; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_FAIRY; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_GIFT; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_ALL; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_SERVER_ALL; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_NOTIFY_H5_SUB_WHOLE_SERVICE; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RED_PACKAGE; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ALL_ROOM_NOTIFY_BY_SVGA; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L5; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_RED_PACKAGE_RECEIVE_ALL_DIAMOND; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP_USER_ALL_UPGRADE; +import static com.chwl.library.utils.UIUtils.getActivityByContext; import android.annotation.SuppressLint; import android.app.ActivityManager; @@ -61,80 +61,80 @@ 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.habu.NimMiddleActivity; -import com.yizhuan.habu.R; -import com.yizhuan.habu.application.IReportConstants; -import com.yizhuan.habu.application.ReportManager; -import com.yizhuan.habu.application.XChatApplication; -import com.yizhuan.habu.avroom.activity.AVRoomActivity; -import com.yizhuan.habu.avroom.firstcharge.FirstChargeDialog; -import com.yizhuan.habu.avroom.redpackage.RedPackageGoRoomDialog; -import com.yizhuan.habu.avroom.redpackage.RedPackageHandler; -import com.yizhuan.habu.avroom.redpackage.open.RedPackageOpenDialog; -import com.yizhuan.habu.common.LoadingFragment; -import com.yizhuan.habu.common.NetworkErrorFragment; -import com.yizhuan.habu.common.NoDataFragment; -import com.yizhuan.habu.common.ReloadFragment; -import com.yizhuan.habu.common.permission.PermissionActivity; -import com.yizhuan.habu.common.widget.StatusLayout; -import com.yizhuan.habu.common.widget.dialog.DialogManager; -import com.yizhuan.habu.common.widget.dialog.DialogUiHelper; -import com.yizhuan.habu.treasure_box.activity.TreasureBoxActivity; -import com.yizhuan.habu.treasurefairy.HomeFairyActivity; -import com.yizhuan.habu.ui.im.avtivity.NimP2PMessageActivity; -import com.yizhuan.habu.ui.login.AddUserInfoActivity; -import com.yizhuan.habu.ui.login.LoginCodeActivity; -import com.yizhuan.habu.ui.login.LoginPhoneActivity; -import com.yizhuan.habu.ui.pay.ChargeActivity; -import com.yizhuan.habu.ui.setting.ResetPasswordActivity; -import com.yizhuan.habu.ui.webview.CommonWebViewActivity; -import com.yizhuan.habu.ui.widget.DefaultToolBar; -import com.yizhuan.habu.ui.widget.dialog.AllPlayEffectDialog; -import com.yizhuan.habu.ui.widget.dialog.AllServiceGiftLevelDialog; -import com.yizhuan.habu.ui.widget.dialog.AllServiceVipLevelUPDialog; -import com.yizhuan.habu.ui.widget.dialog.OpenNobleGlobalNoticeDialog; -import com.yizhuan.habu.utils.UserUtils; -import com.yizhuan.habu.mentoring_relationship.dialog.GrabApprenticesNoticeDialog; +import com.chwl.app.NimMiddleActivity; +import com.chwl.app.R; +import com.chwl.app.application.IReportConstants; +import com.chwl.app.application.ReportManager; +import com.chwl.app.application.XChatApplication; +import com.chwl.app.avroom.activity.AVRoomActivity; +import com.chwl.app.avroom.firstcharge.FirstChargeDialog; +import com.chwl.app.avroom.redpackage.RedPackageGoRoomDialog; +import com.chwl.app.avroom.redpackage.RedPackageHandler; +import com.chwl.app.avroom.redpackage.open.RedPackageOpenDialog; +import com.chwl.app.common.LoadingFragment; +import com.chwl.app.common.NetworkErrorFragment; +import com.chwl.app.common.NoDataFragment; +import com.chwl.app.common.ReloadFragment; +import com.chwl.app.common.permission.PermissionActivity; +import com.chwl.app.common.widget.StatusLayout; +import com.chwl.app.common.widget.dialog.DialogManager; +import com.chwl.app.common.widget.dialog.DialogUiHelper; +import com.chwl.app.treasure_box.activity.TreasureBoxActivity; +import com.chwl.app.treasurefairy.HomeFairyActivity; +import com.chwl.app.ui.im.avtivity.NimP2PMessageActivity; +import com.chwl.app.ui.login.AddUserInfoActivity; +import com.chwl.app.ui.login.LoginCodeActivity; +import com.chwl.app.ui.login.LoginPhoneActivity; +import com.chwl.app.ui.pay.ChargeActivity; +import com.chwl.app.ui.setting.ResetPasswordActivity; +import com.chwl.app.ui.webview.CommonWebViewActivity; +import com.chwl.app.ui.widget.DefaultToolBar; +import com.chwl.app.ui.widget.dialog.AllPlayEffectDialog; +import com.chwl.app.ui.widget.dialog.AllServiceGiftLevelDialog; +import com.chwl.app.ui.widget.dialog.AllServiceVipLevelUPDialog; +import com.chwl.app.ui.widget.dialog.OpenNobleGlobalNoticeDialog; +import com.chwl.app.utils.UserUtils; +import com.chwl.app.mentoring_relationship.dialog.GrabApprenticesNoticeDialog; import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.bean.BaseProtocol; -import com.yizhuan.xchat_android_core.gift.bean.LuckyBagNoticeInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.NotifyH5Info; -import com.yizhuan.xchat_android_core.im.custom.bean.PlayEffectInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomBoxPrizeInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomLuckySeaMsgBean; -import com.yizhuan.xchat_android_core.im.custom.bean.TarotMsgBean; -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.AllServiceGiftProtocol; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.noble.NobleProtocol; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; -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.support.room.RoomContext; -import com.yizhuan.xchat_android_core.treasurefairy.FairyMsgInfoBean; -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.common.util.DeviceUtil; -import com.yizhuan.xchat_android_library.rxbus.RxBus; -import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil; -import com.yizhuan.xchat_android_library.utils.NetworkUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; -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.chwl.core.Constants; +import com.chwl.core.UriProvider; +import com.chwl.core.bean.BaseProtocol; +import com.chwl.core.gift.bean.LuckyBagNoticeInfo; +import com.chwl.core.im.custom.bean.CustomAttachment; +import com.chwl.core.im.custom.bean.NotifyH5Info; +import com.chwl.core.im.custom.bean.PlayEffectInfo; +import com.chwl.core.im.custom.bean.RoomBoxPrizeInfo; +import com.chwl.core.im.custom.bean.RoomLuckySeaMsgBean; +import com.chwl.core.im.custom.bean.TarotMsgBean; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.manager.IMNetEaseManager; +import com.chwl.core.manager.RoomEvent; +import com.chwl.core.mentoring_relationship.event.GrabApprenticesEvent; +import com.chwl.core.newbie.NewbieHelloInfo; +import com.chwl.core.newbie.event.NewbieHelloDialogEvent; +import com.chwl.core.noble.AllServiceGiftProtocol; +import com.chwl.core.noble.NobleInfo; +import com.chwl.core.noble.NobleProtocol; +import com.chwl.core.pay.PayModel; +import com.chwl.core.pay.bean.WalletInfo; +import com.chwl.core.redpackage.RedPackageNotifyInfo; +import com.chwl.core.room.bean.RoomInfo; +import com.chwl.core.room.model.AvRoomModel; +import com.chwl.core.support.room.RoomContext; +import com.chwl.core.treasurefairy.FairyMsgInfoBean; +import com.chwl.core.user.UserModel; +import com.chwl.core.utils.net.RxHelper; +import com.chwl.core.vip.VipMessageInfo; +import com.chwl.library.common.util.DeviceUtil; +import com.chwl.library.rxbus.RxBus; +import com.chwl.library.utils.AppMetaDataUtil; +import com.chwl.library.utils.NetworkUtils; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; +import com.chwl.library.utils.UIUtils; +import com.chwl.library.utils.codec.DESUtils; +import com.chwl.library.utils.config.BasicConfig; +import com.chwl.library.utils.log.MLog; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; diff --git a/app/src/main/java/com/yizhuan/habu/base/BaseBindingActivity.java b/app/src/main/java/com/chwl/app/base/BaseBindingActivity.java similarity index 89% rename from app/src/main/java/com/yizhuan/habu/base/BaseBindingActivity.java rename to app/src/main/java/com/chwl/app/base/BaseBindingActivity.java index bfa443e63..845b68771 100644 --- a/app/src/main/java/com/yizhuan/habu/base/BaseBindingActivity.java +++ b/app/src/main/java/com/chwl/app/base/BaseBindingActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.base; +package com.chwl.app.base; import android.content.Intent; import android.os.Bundle; @@ -7,8 +7,8 @@ import android.view.View; import androidx.databinding.DataBindingUtil; import androidx.databinding.ViewDataBinding; -import com.yizhuan.habu.BR; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; +import com.chwl.app.BR; +import com.chwl.library.annatation.ActLayoutRes; /** * Created by huangmeng1 on 2018/5/7. diff --git a/app/src/main/java/com/yizhuan/habu/base/BaseBindingFragment.java b/app/src/main/java/com/chwl/app/base/BaseBindingFragment.java similarity index 89% rename from app/src/main/java/com/yizhuan/habu/base/BaseBindingFragment.java rename to app/src/main/java/com/chwl/app/base/BaseBindingFragment.java index d8fdd8be7..e3184868d 100644 --- a/app/src/main/java/com/yizhuan/habu/base/BaseBindingFragment.java +++ b/app/src/main/java/com/chwl/app/base/BaseBindingFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.base; +package com.chwl.app.base; import android.os.Bundle; import android.view.LayoutInflater; @@ -9,7 +9,7 @@ import androidx.annotation.Nullable; import androidx.databinding.DataBindingUtil; import androidx.databinding.ViewDataBinding; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; +import com.chwl.library.annatation.ActLayoutRes; /** * Created by huangmeng1 on 2018/5/7. diff --git a/app/src/main/java/com/yizhuan/habu/base/BaseBindingTakePhotoActivity.java b/app/src/main/java/com/chwl/app/base/BaseBindingTakePhotoActivity.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/base/BaseBindingTakePhotoActivity.java rename to app/src/main/java/com/chwl/app/base/BaseBindingTakePhotoActivity.java index 4b07fb78f..c8137caca 100644 --- a/app/src/main/java/com/yizhuan/habu/base/BaseBindingTakePhotoActivity.java +++ b/app/src/main/java/com/chwl/app/base/BaseBindingTakePhotoActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.base; +package com.chwl.app.base; import android.annotation.SuppressLint; import android.net.Uri; @@ -12,12 +12,12 @@ 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.habu.R; -import com.yizhuan.habu.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.ResUtil; -import com.yizhuan.xchat_android_library.utils.file.JXFileUtils; +import com.chwl.app.R; +import com.chwl.app.ui.widget.ButtonItem; +import com.chwl.core.file.FileModel; +import com.chwl.library.annatation.ActLayoutRes; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.file.JXFileUtils; import java.io.File; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/habu/base/BaseBsDialog.java b/app/src/main/java/com/chwl/app/base/BaseBsDialog.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/base/BaseBsDialog.java rename to app/src/main/java/com/chwl/app/base/BaseBsDialog.java index bf7c076ed..c53e48801 100644 --- a/app/src/main/java/com/yizhuan/habu/base/BaseBsDialog.java +++ b/app/src/main/java/com/chwl/app/base/BaseBsDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.base; +package com.chwl.app.base; import android.content.Context; import android.os.Bundle; @@ -9,7 +9,7 @@ import androidx.annotation.NonNull; import com.google.android.material.bottomsheet.BottomSheetBehavior; import com.google.android.material.bottomsheet.BottomSheetDialog; -import com.yizhuan.habu.R; +import com.chwl.app.R; /** * 定义一些通用的属性 diff --git a/app/src/main/java/com/yizhuan/habu/base/BaseDialog.kt b/app/src/main/java/com/chwl/app/base/BaseDialog.kt similarity index 98% rename from app/src/main/java/com/yizhuan/habu/base/BaseDialog.kt rename to app/src/main/java/com/chwl/app/base/BaseDialog.kt index 66b7e6618..f882b29f2 100644 --- a/app/src/main/java/com/yizhuan/habu/base/BaseDialog.kt +++ b/app/src/main/java/com/chwl/app/base/BaseDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.base +package com.chwl.app.base import android.content.Context import android.content.DialogInterface diff --git a/app/src/main/java/com/yizhuan/habu/base/BaseFragment.java b/app/src/main/java/com/chwl/app/base/BaseFragment.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/base/BaseFragment.java rename to app/src/main/java/com/chwl/app/base/BaseFragment.java index 9a7f83afa..ca8ead7cb 100644 --- a/app/src/main/java/com/yizhuan/habu/base/BaseFragment.java +++ b/app/src/main/java/com/chwl/app/base/BaseFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.base; +package com.chwl.app.base; import android.annotation.SuppressLint; import android.app.Activity; @@ -19,20 +19,20 @@ import androidx.fragment.app.FragmentManager; import com.tbruyelle.rxpermissions2.RxPermissions; import com.trello.rxlifecycle3.components.support.RxFragment; -import com.yizhuan.habu.R; -import com.yizhuan.habu.common.AbsStatusFragment; -import com.yizhuan.habu.common.LoadingFragment; -import com.yizhuan.habu.common.NetworkErrorFragment; -import com.yizhuan.habu.common.NoDataFragment; -import com.yizhuan.habu.common.ReloadFragment; -import com.yizhuan.habu.common.widget.StatusLayout; -import com.yizhuan.habu.common.widget.dialog.DialogManager; -import com.yizhuan.xchat_android_library.utils.NetworkUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; -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.chwl.app.R; +import com.chwl.app.common.AbsStatusFragment; +import com.chwl.app.common.LoadingFragment; +import com.chwl.app.common.NetworkErrorFragment; +import com.chwl.app.common.NoDataFragment; +import com.chwl.app.common.ReloadFragment; +import com.chwl.app.common.widget.StatusLayout; +import com.chwl.app.common.widget.dialog.DialogManager; +import com.chwl.library.utils.NetworkUtils; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; +import com.chwl.library.utils.UIUtils; +import com.chwl.library.utils.config.BasicConfig; +import com.chwl.library.utils.log.MLog; import java.util.List; import java.util.Stack; diff --git a/app/src/main/java/com/yizhuan/habu/base/BaseLazyFragment.java b/app/src/main/java/com/chwl/app/base/BaseLazyFragment.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/base/BaseLazyFragment.java rename to app/src/main/java/com/chwl/app/base/BaseLazyFragment.java index 8b2b40056..a7ed39822 100644 --- a/app/src/main/java/com/yizhuan/habu/base/BaseLazyFragment.java +++ b/app/src/main/java/com/chwl/app/base/BaseLazyFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.base; +package com.chwl.app.base; import android.os.Bundle; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/habu/base/BaseListViewModel.java b/app/src/main/java/com/chwl/app/base/BaseListViewModel.java similarity index 86% rename from app/src/main/java/com/yizhuan/habu/base/BaseListViewModel.java rename to app/src/main/java/com/chwl/app/base/BaseListViewModel.java index 51001aa2c..2f571463d 100644 --- a/app/src/main/java/com/yizhuan/habu/base/BaseListViewModel.java +++ b/app/src/main/java/com/chwl/app/base/BaseListViewModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.base; +package com.chwl.app.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.chwl.core.Constants; +import com.chwl.core.bean.response.ServiceResult; +import com.chwl.core.utils.net.RxHelper; +import com.chwl.library.utils.SingleToastUtil; +import com.chwl.library.utils.config.BasicConfig; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/base/BaseMsListViewModel.java b/app/src/main/java/com/chwl/app/base/BaseMsListViewModel.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/base/BaseMsListViewModel.java rename to app/src/main/java/com/chwl/app/base/BaseMsListViewModel.java index 13b04c928..169f9ae44 100644 --- a/app/src/main/java/com/yizhuan/habu/base/BaseMsListViewModel.java +++ b/app/src/main/java/com/chwl/app/base/BaseMsListViewModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.base; +package com.chwl.app.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.chwl.core.Constants; +import com.chwl.core.bean.response.ServiceResult; +import com.chwl.core.utils.net.RxHelper; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/base/BaseMvpActivity.java b/app/src/main/java/com/chwl/app/base/BaseMvpActivity.java similarity index 57% rename from app/src/main/java/com/yizhuan/habu/base/BaseMvpActivity.java rename to app/src/main/java/com/chwl/app/base/BaseMvpActivity.java index 877cbaa09..7c4b4ccb3 100644 --- a/app/src/main/java/com/yizhuan/habu/base/BaseMvpActivity.java +++ b/app/src/main/java/com/chwl/app/base/BaseMvpActivity.java @@ -1,7 +1,7 @@ -package com.yizhuan.habu.base; +package com.chwl.app.base; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; -import com.yizhuan.xchat_android_library.base.factory.AbstractMvpPresenter; +import com.chwl.library.base.IMvpBaseView; +import com.chwl.library.base.factory.AbstractMvpPresenter; /** * @author alvin hwang diff --git a/app/src/main/java/com/yizhuan/habu/base/BaseMvpFragment.java b/app/src/main/java/com/chwl/app/base/BaseMvpFragment.java similarity index 68% rename from app/src/main/java/com/yizhuan/habu/base/BaseMvpFragment.java rename to app/src/main/java/com/chwl/app/base/BaseMvpFragment.java index 013c6e70c..2d6bb4a1d 100644 --- a/app/src/main/java/com/yizhuan/habu/base/BaseMvpFragment.java +++ b/app/src/main/java/com/chwl/app/base/BaseMvpFragment.java @@ -1,11 +1,11 @@ -package com.yizhuan.habu.base; +package com.chwl.app.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.chwl.library.base.IMvpBaseView; +import com.chwl.library.base.factory.AbstractMvpPresenter; /** * @author alvin hwang diff --git a/app/src/main/java/com/yizhuan/habu/base/BaseMvpPresenter.java b/app/src/main/java/com/chwl/app/base/BaseMvpPresenter.java similarity index 72% rename from app/src/main/java/com/yizhuan/habu/base/BaseMvpPresenter.java rename to app/src/main/java/com/chwl/app/base/BaseMvpPresenter.java index 74232fcdb..15bc59f7b 100644 --- a/app/src/main/java/com/yizhuan/habu/base/BaseMvpPresenter.java +++ b/app/src/main/java/com/chwl/app/base/BaseMvpPresenter.java @@ -1,11 +1,11 @@ -package com.yizhuan.habu.base; +package com.chwl.app.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.chwl.library.base.IMvpBaseView; +import com.chwl.library.base.factory.AbstractMvpPresenter; /** diff --git a/app/src/main/java/com/yizhuan/habu/base/BaseMvpTakePhotoActivity.java b/app/src/main/java/com/chwl/app/base/BaseMvpTakePhotoActivity.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/base/BaseMvpTakePhotoActivity.java rename to app/src/main/java/com/chwl/app/base/BaseMvpTakePhotoActivity.java index 82102a0a0..61eba8553 100644 --- a/app/src/main/java/com/yizhuan/habu/base/BaseMvpTakePhotoActivity.java +++ b/app/src/main/java/com/chwl/app/base/BaseMvpTakePhotoActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.base; +package com.chwl.app.base; import android.annotation.SuppressLint; import android.content.Intent; @@ -19,14 +19,14 @@ 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.habu.R; -import com.yizhuan.habu.common.permission.PermissionActivity; -import com.yizhuan.habu.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.ResUtil; -import com.yizhuan.xchat_android_library.utils.file.JXFileUtils; +import com.chwl.app.R; +import com.chwl.app.common.permission.PermissionActivity; +import com.chwl.app.ui.widget.ButtonItem; +import com.chwl.core.file.FileModel; +import com.chwl.library.base.IMvpBaseView; +import com.chwl.library.base.factory.AbstractMvpPresenter; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.file.JXFileUtils; import java.io.File; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/habu/base/BaseSdDialog.java b/app/src/main/java/com/chwl/app/base/BaseSdDialog.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/base/BaseSdDialog.java rename to app/src/main/java/com/chwl/app/base/BaseSdDialog.java index 5b9ee4d13..c2ff5d434 100644 --- a/app/src/main/java/com/yizhuan/habu/base/BaseSdDialog.java +++ b/app/src/main/java/com/chwl/app/base/BaseSdDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.base; +package com.chwl.app.base; import android.content.Context; diff --git a/app/src/main/java/com/yizhuan/habu/base/BaseVM.java b/app/src/main/java/com/chwl/app/base/BaseVM.java similarity index 70% rename from app/src/main/java/com/yizhuan/habu/base/BaseVM.java rename to app/src/main/java/com/chwl/app/base/BaseVM.java index 17c220fd3..85a969389 100644 --- a/app/src/main/java/com/yizhuan/habu/base/BaseVM.java +++ b/app/src/main/java/com/chwl/app/base/BaseVM.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.base; +package com.chwl.app.base; /** * Created by huangmeng1 on 2018/5/7. diff --git a/app/src/main/java/com/yizhuan/habu/base/BaseViewBindingActivity.kt b/app/src/main/java/com/chwl/app/base/BaseViewBindingActivity.kt similarity index 97% rename from app/src/main/java/com/yizhuan/habu/base/BaseViewBindingActivity.kt rename to app/src/main/java/com/chwl/app/base/BaseViewBindingActivity.kt index dc39f6e26..3c301a5cc 100644 --- a/app/src/main/java/com/yizhuan/habu/base/BaseViewBindingActivity.kt +++ b/app/src/main/java/com/chwl/app/base/BaseViewBindingActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.base +package com.chwl.app.base import android.os.Bundle import android.view.LayoutInflater diff --git a/app/src/main/java/com/yizhuan/habu/base/BaseViewBindingFragment.kt b/app/src/main/java/com/chwl/app/base/BaseViewBindingFragment.kt similarity index 97% rename from app/src/main/java/com/yizhuan/habu/base/BaseViewBindingFragment.kt rename to app/src/main/java/com/chwl/app/base/BaseViewBindingFragment.kt index a90700fb6..26aadc6b2 100644 --- a/app/src/main/java/com/yizhuan/habu/base/BaseViewBindingFragment.kt +++ b/app/src/main/java/com/chwl/app/base/BaseViewBindingFragment.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.base +package com.chwl.app.base import android.os.Bundle import android.view.LayoutInflater diff --git a/app/src/main/java/com/yizhuan/habu/base/BaseViewModel.kt b/app/src/main/java/com/chwl/app/base/BaseViewModel.kt similarity index 88% rename from app/src/main/java/com/yizhuan/habu/base/BaseViewModel.kt rename to app/src/main/java/com/chwl/app/base/BaseViewModel.kt index c2457c8a4..0fc8b97e0 100644 --- a/app/src/main/java/com/yizhuan/habu/base/BaseViewModel.kt +++ b/app/src/main/java/com/chwl/app/base/BaseViewModel.kt @@ -1,11 +1,11 @@ -package com.yizhuan.habu.base +package com.chwl.app.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.yizhuan.xchat_android_library.net.rxnet.exception.ExceptionHandle +import com.chwl.core.utils.toast +import com.chwl.library.net.rxnet.exception.ExceptionHandle import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/yizhuan/habu/base/DialogManagerInterface.java b/app/src/main/java/com/chwl/app/base/DialogManagerInterface.java similarity index 57% rename from app/src/main/java/com/yizhuan/habu/base/DialogManagerInterface.java rename to app/src/main/java/com/chwl/app/base/DialogManagerInterface.java index 7167214a4..131f376a6 100644 --- a/app/src/main/java/com/yizhuan/habu/base/DialogManagerInterface.java +++ b/app/src/main/java/com/chwl/app/base/DialogManagerInterface.java @@ -1,6 +1,6 @@ -package com.yizhuan.habu.base; +package com.chwl.app.base; -import com.yizhuan.habu.common.widget.dialog.DialogManager; +import com.chwl.app.common.widget.dialog.DialogManager; /** * 返回通用的dialogmanager diff --git a/app/src/main/java/com/yizhuan/habu/base/Event.kt b/app/src/main/java/com/chwl/app/base/Event.kt similarity index 95% rename from app/src/main/java/com/yizhuan/habu/base/Event.kt rename to app/src/main/java/com/chwl/app/base/Event.kt index 7236ed46b..3a66752e9 100644 --- a/app/src/main/java/com/yizhuan/habu/base/Event.kt +++ b/app/src/main/java/com/chwl/app/base/Event.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.base +package com.chwl.app.base /** * Used as a wrapper for data that is exposed via a LiveData that represents an event. diff --git a/app/src/main/java/com/yizhuan/habu/base/IAcitivityBase.java b/app/src/main/java/com/chwl/app/base/IAcitivityBase.java similarity index 84% rename from app/src/main/java/com/yizhuan/habu/base/IAcitivityBase.java rename to app/src/main/java/com/chwl/app/base/IAcitivityBase.java index 2e6019a37..659d7693e 100644 --- a/app/src/main/java/com/yizhuan/habu/base/IAcitivityBase.java +++ b/app/src/main/java/com/chwl/app/base/IAcitivityBase.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.base; +package com.chwl.app.base; /** * Created by zhouxiangfeng on 17/3/5. diff --git a/app/src/main/java/com/yizhuan/habu/base/IBase.java b/app/src/main/java/com/chwl/app/base/IBase.java similarity index 70% rename from app/src/main/java/com/yizhuan/habu/base/IBase.java rename to app/src/main/java/com/chwl/app/base/IBase.java index e0d9204fe..59e465291 100644 --- a/app/src/main/java/com/yizhuan/habu/base/IBase.java +++ b/app/src/main/java/com/chwl/app/base/IBase.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.base; +package com.chwl.app.base; /** * Created by zhouxiangfeng on 17/3/5. diff --git a/app/src/main/java/com/yizhuan/habu/base/IDataStatus.java b/app/src/main/java/com/chwl/app/base/IDataStatus.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/base/IDataStatus.java rename to app/src/main/java/com/chwl/app/base/IDataStatus.java index 772191d70..df9148e3a 100644 --- a/app/src/main/java/com/yizhuan/habu/base/IDataStatus.java +++ b/app/src/main/java/com/chwl/app/base/IDataStatus.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.base; +package com.chwl.app.base; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/habu/base/TitleBar.java b/app/src/main/java/com/chwl/app/base/TitleBar.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/base/TitleBar.java rename to app/src/main/java/com/chwl/app/base/TitleBar.java index 9834c8fb3..bc01b202b 100644 --- a/app/src/main/java/com/yizhuan/habu/base/TitleBar.java +++ b/app/src/main/java/com/chwl/app/base/TitleBar.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.base; +package com.chwl.app.base; /** * Created by zhouxiangfeng on 2017/4/9. @@ -20,7 +20,7 @@ import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; -import com.yizhuan.habu.R; +import com.chwl.app.R; import java.util.LinkedList; diff --git a/app/src/main/java/com/yizhuan/habu/base/list/BaseRecyclerView.java b/app/src/main/java/com/chwl/app/base/list/BaseRecyclerView.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/base/list/BaseRecyclerView.java rename to app/src/main/java/com/chwl/app/base/list/BaseRecyclerView.java index 118f34437..fbe32357f 100644 --- a/app/src/main/java/com/yizhuan/habu/base/list/BaseRecyclerView.java +++ b/app/src/main/java/com/chwl/app/base/list/BaseRecyclerView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.base.list; +package com.chwl.app.base.list; import android.annotation.SuppressLint; import android.content.Context; @@ -17,7 +17,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.chwl.library.utils.ListUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/base/list/BaseViewHolder.java b/app/src/main/java/com/chwl/app/base/list/BaseViewHolder.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/base/list/BaseViewHolder.java rename to app/src/main/java/com/chwl/app/base/list/BaseViewHolder.java index 890303c82..b6e669480 100644 --- a/app/src/main/java/com/yizhuan/habu/base/list/BaseViewHolder.java +++ b/app/src/main/java/com/chwl/app/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.habu.base.list; +package com.chwl.app.base.list; import android.graphics.Bitmap; import android.graphics.Paint; diff --git a/app/src/main/java/com/yizhuan/habu/base/list/CommonAdapter.java b/app/src/main/java/com/chwl/app/base/list/CommonAdapter.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/base/list/CommonAdapter.java rename to app/src/main/java/com/chwl/app/base/list/CommonAdapter.java index a9f8214b0..e7103b269 100644 --- a/app/src/main/java/com/yizhuan/habu/base/list/CommonAdapter.java +++ b/app/src/main/java/com/chwl/app/base/list/CommonAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.base.list; +package com.chwl.app.base.list; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/habu/base/list/DefalutStatus.java b/app/src/main/java/com/chwl/app/base/list/DefalutStatus.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/base/list/DefalutStatus.java rename to app/src/main/java/com/chwl/app/base/list/DefalutStatus.java index 7788c42b9..20f262b55 100644 --- a/app/src/main/java/com/yizhuan/habu/base/list/DefalutStatus.java +++ b/app/src/main/java/com/chwl/app/base/list/DefalutStatus.java @@ -1,6 +1,6 @@ -package com.yizhuan.habu.base.list; +package com.chwl.app.base.list; -import com.yizhuan.habu.R; +import com.chwl.app.R; /** * 默认列表状态view diff --git a/app/src/main/java/com/yizhuan/habu/base/list/Header.java b/app/src/main/java/com/chwl/app/base/list/Header.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/base/list/Header.java rename to app/src/main/java/com/chwl/app/base/list/Header.java index d6e6eb520..120220e84 100644 --- a/app/src/main/java/com/yizhuan/habu/base/list/Header.java +++ b/app/src/main/java/com/chwl/app/base/list/Header.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.base.list; +package com.chwl.app.base.list; /** * Created by lvzebiao on 2018/12/18. diff --git a/app/src/main/java/com/yizhuan/habu/base/list/IHeaderHolderListener.java b/app/src/main/java/com/chwl/app/base/list/IHeaderHolderListener.java similarity index 79% rename from app/src/main/java/com/yizhuan/habu/base/list/IHeaderHolderListener.java rename to app/src/main/java/com/chwl/app/base/list/IHeaderHolderListener.java index ed4951d4f..348a82035 100644 --- a/app/src/main/java/com/yizhuan/habu/base/list/IHeaderHolderListener.java +++ b/app/src/main/java/com/chwl/app/base/list/IHeaderHolderListener.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.base.list; +package com.chwl.app.base.list; /** * Created by lvzebiao on 2018/12/18. diff --git a/app/src/main/java/com/yizhuan/habu/base/list/IRecyclerListener.java b/app/src/main/java/com/chwl/app/base/list/IRecyclerListener.java similarity index 84% rename from app/src/main/java/com/yizhuan/habu/base/list/IRecyclerListener.java rename to app/src/main/java/com/chwl/app/base/list/IRecyclerListener.java index d82fc8b19..003ae4890 100644 --- a/app/src/main/java/com/yizhuan/habu/base/list/IRecyclerListener.java +++ b/app/src/main/java/com/chwl/app/base/list/IRecyclerListener.java @@ -1,11 +1,11 @@ -package com.yizhuan.habu.base.list; +package com.chwl.app.base.list; import android.content.Context; import androidx.recyclerview.widget.RecyclerView; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/base/list/IStatusView.java b/app/src/main/java/com/chwl/app/base/list/IStatusView.java similarity index 84% rename from app/src/main/java/com/yizhuan/habu/base/list/IStatusView.java rename to app/src/main/java/com/chwl/app/base/list/IStatusView.java index 1ac7b1936..e133f838e 100644 --- a/app/src/main/java/com/yizhuan/habu/base/list/IStatusView.java +++ b/app/src/main/java/com/chwl/app/base/list/IStatusView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.base.list; +package com.chwl.app.base.list; /** * Created by lvzebiao on 2018/12/14. diff --git a/app/src/main/java/com/yizhuan/habu/base/list/LineColorDecoration.java b/app/src/main/java/com/chwl/app/base/list/LineColorDecoration.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/base/list/LineColorDecoration.java rename to app/src/main/java/com/chwl/app/base/list/LineColorDecoration.java index 61caae943..2f95db303 100644 --- a/app/src/main/java/com/yizhuan/habu/base/list/LineColorDecoration.java +++ b/app/src/main/java/com/chwl/app/base/list/LineColorDecoration.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.base.list; +package com.chwl.app.base.list; import android.content.Context; import android.graphics.Canvas; @@ -9,7 +9,7 @@ import android.view.View; import androidx.recyclerview.widget.RecyclerView; -import com.yizhuan.xchat_android_library.utils.SizeUtils; +import com.chwl.library.utils.SizeUtils; /** diff --git a/app/src/main/java/com/yizhuan/habu/base/list/LoadingViewHolder.java b/app/src/main/java/com/chwl/app/base/list/LoadingViewHolder.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/base/list/LoadingViewHolder.java rename to app/src/main/java/com/chwl/app/base/list/LoadingViewHolder.java index 6812f6b5e..db9462ff0 100644 --- a/app/src/main/java/com/yizhuan/habu/base/list/LoadingViewHolder.java +++ b/app/src/main/java/com/chwl/app/base/list/LoadingViewHolder.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.base.list; +package com.chwl.app.base.list; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/habu/base/list/MultiCommonAdapter.java b/app/src/main/java/com/chwl/app/base/list/MultiCommonAdapter.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/base/list/MultiCommonAdapter.java rename to app/src/main/java/com/chwl/app/base/list/MultiCommonAdapter.java index 9c8a8b317..e81929f8c 100644 --- a/app/src/main/java/com/yizhuan/habu/base/list/MultiCommonAdapter.java +++ b/app/src/main/java/com/chwl/app/base/list/MultiCommonAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.base.list; +package com.chwl.app.base.list; import android.util.SparseIntArray; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/yizhuan/habu/base/list/MultiItemEntity.java b/app/src/main/java/com/chwl/app/base/list/MultiItemEntity.java similarity index 75% rename from app/src/main/java/com/yizhuan/habu/base/list/MultiItemEntity.java rename to app/src/main/java/com/chwl/app/base/list/MultiItemEntity.java index 0f8e6a346..d8d5def4e 100644 --- a/app/src/main/java/com/yizhuan/habu/base/list/MultiItemEntity.java +++ b/app/src/main/java/com/chwl/app/base/list/MultiItemEntity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.base.list; +package com.chwl.app.base.list; /** * Created by lvzebiao on 2018/12/18. diff --git a/app/src/main/java/com/yizhuan/habu/base/list/OnItemChildClickListener.java b/app/src/main/java/com/chwl/app/base/list/OnItemChildClickListener.java similarity index 84% rename from app/src/main/java/com/yizhuan/habu/base/list/OnItemChildClickListener.java rename to app/src/main/java/com/chwl/app/base/list/OnItemChildClickListener.java index 5202282ac..aa87b449f 100644 --- a/app/src/main/java/com/yizhuan/habu/base/list/OnItemChildClickListener.java +++ b/app/src/main/java/com/chwl/app/base/list/OnItemChildClickListener.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.base.list; +package com.chwl.app.base.list; /** * Created by lvzebiao on 2018/12/18. diff --git a/app/src/main/java/com/yizhuan/habu/base/list/OnItemClickListener.java b/app/src/main/java/com/chwl/app/base/list/OnItemClickListener.java similarity index 82% rename from app/src/main/java/com/yizhuan/habu/base/list/OnItemClickListener.java rename to app/src/main/java/com/chwl/app/base/list/OnItemClickListener.java index fc8236f77..367d1fb7f 100644 --- a/app/src/main/java/com/yizhuan/habu/base/list/OnItemClickListener.java +++ b/app/src/main/java/com/chwl/app/base/list/OnItemClickListener.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.base.list; +package com.chwl.app.base.list; /** * Created by lvzebiao on 2018/12/18. diff --git a/app/src/main/java/com/yizhuan/habu/base/list/RefreshRecyclerView.java b/app/src/main/java/com/chwl/app/base/list/RefreshRecyclerView.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/base/list/RefreshRecyclerView.java rename to app/src/main/java/com/chwl/app/base/list/RefreshRecyclerView.java index 5b1cc7fb4..fad0f96a9 100644 --- a/app/src/main/java/com/yizhuan/habu/base/list/RefreshRecyclerView.java +++ b/app/src/main/java/com/chwl/app/base/list/RefreshRecyclerView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.base.list; +package com.chwl.app.base.list; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yizhuan/habu/base/list/WrapperAdapter.java b/app/src/main/java/com/chwl/app/base/list/WrapperAdapter.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/base/list/WrapperAdapter.java rename to app/src/main/java/com/chwl/app/base/list/WrapperAdapter.java index 204e37a15..5d7ef268e 100644 --- a/app/src/main/java/com/yizhuan/habu/base/list/WrapperAdapter.java +++ b/app/src/main/java/com/chwl/app/base/list/WrapperAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.base.list; +package com.chwl.app.base.list; import android.content.Context; import android.view.LayoutInflater; @@ -10,7 +10,7 @@ import android.widget.TextView; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.yizhuan.habu.R; +import com.chwl.app.R; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/bills/activities/BillBaseActivity.java b/app/src/main/java/com/chwl/app/bills/activities/BillBaseActivity.java similarity index 92% rename from app/src/main/java/com/yizhuan/habu/bills/activities/BillBaseActivity.java rename to app/src/main/java/com/chwl/app/bills/activities/BillBaseActivity.java index c1485b816..46f7d88e3 100644 --- a/app/src/main/java/com/yizhuan/habu/bills/activities/BillBaseActivity.java +++ b/app/src/main/java/com/chwl/app/bills/activities/BillBaseActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.bills.activities; +package com.chwl.app.bills.activities; import android.annotation.SuppressLint; import android.view.View; @@ -12,14 +12,14 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.jzxiang.pickerview.listener.OnDateSetListener; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseBindingActivity; -import com.yizhuan.habu.bills.adapter.BillBaseAdapter; -import com.yizhuan.habu.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.ResUtil; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.chwl.app.R; +import com.chwl.app.base.BaseBindingActivity; +import com.chwl.app.bills.adapter.BillBaseAdapter; +import com.chwl.app.common.NoDataFragment; +import com.chwl.core.Constants; +import com.chwl.core.bills.bean.BillItemEntity; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.TimeUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/bills/activities/BillGiftExpendActivity.java b/app/src/main/java/com/chwl/app/bills/activities/BillGiftExpendActivity.java similarity index 85% rename from app/src/main/java/com/yizhuan/habu/bills/activities/BillGiftExpendActivity.java rename to app/src/main/java/com/chwl/app/bills/activities/BillGiftExpendActivity.java index edf8e37a7..ae6a03d51 100644 --- a/app/src/main/java/com/yizhuan/habu/bills/activities/BillGiftExpendActivity.java +++ b/app/src/main/java/com/chwl/app/bills/activities/BillGiftExpendActivity.java @@ -1,30 +1,30 @@ -package com.yizhuan.habu.bills.activities; +package com.chwl.app.bills.activities; import android.annotation.SuppressLint; import android.text.TextUtils; import android.view.View; import android.widget.TextView; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.TitleBar; -import com.yizhuan.habu.bills.adapter.GiftExpendAdapter; -import com.yizhuan.habu.databinding.ActivityBillsGiftBinding; -import com.yizhuan.habu.ui.pay.ChargeActivity; -import com.yizhuan.habu.ui.webview.CommonWebViewActivity; -import com.yizhuan.habu.ui.widget.RecyclerViewNoBugLinearLayoutManager; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.UriProvider; -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.common.util.DeviceUtil; -import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.TitleBar; +import com.chwl.app.bills.adapter.GiftExpendAdapter; +import com.chwl.app.databinding.ActivityBillsGiftBinding; +import com.chwl.app.ui.pay.ChargeActivity; +import com.chwl.app.ui.webview.CommonWebViewActivity; +import com.chwl.app.ui.widget.RecyclerViewNoBugLinearLayoutManager; +import com.chwl.core.Constants; +import com.chwl.core.UriProvider; +import com.chwl.core.bills.BillModel; +import com.chwl.core.bills.bean.BillItemEntity; +import com.chwl.core.bills.bean.ExpendInfo; +import com.chwl.core.bills.bean.ExpendListInfo; +import com.chwl.core.pay.PayModel; +import com.chwl.core.pay.bean.WalletInfo; +import com.chwl.library.annatation.ActLayoutRes; +import com.chwl.library.common.util.DeviceUtil; +import com.chwl.library.utils.AppMetaDataUtil; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/bills/activities/BillGiftInComeActivity.java b/app/src/main/java/com/chwl/app/bills/activities/BillGiftInComeActivity.java similarity index 86% rename from app/src/main/java/com/yizhuan/habu/bills/activities/BillGiftInComeActivity.java rename to app/src/main/java/com/chwl/app/bills/activities/BillGiftInComeActivity.java index 3cda58e9f..1ce3f5c77 100644 --- a/app/src/main/java/com/yizhuan/habu/bills/activities/BillGiftInComeActivity.java +++ b/app/src/main/java/com/chwl/app/bills/activities/BillGiftInComeActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.bills.activities; +package com.chwl.app.bills.activities; import android.annotation.SuppressLint; import android.content.Intent; @@ -8,26 +8,26 @@ import android.widget.ImageView; import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.TitleBar; -import com.yizhuan.habu.bills.adapter.GiftIncomeAdapter; -import com.yizhuan.habu.databinding.ActivityBillsGiftBinding; -import com.yizhuan.habu.ui.pay.ChargeActivity; -import com.yizhuan.habu.ui.webview.CommonWebViewActivity; -import com.yizhuan.habu.ui.widget.RecyclerViewNoBugLinearLayoutManager; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.UriProvider; -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.common.util.DeviceUtil; -import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.TitleBar; +import com.chwl.app.bills.adapter.GiftIncomeAdapter; +import com.chwl.app.databinding.ActivityBillsGiftBinding; +import com.chwl.app.ui.pay.ChargeActivity; +import com.chwl.app.ui.webview.CommonWebViewActivity; +import com.chwl.app.ui.widget.RecyclerViewNoBugLinearLayoutManager; +import com.chwl.core.Constants; +import com.chwl.core.UriProvider; +import com.chwl.core.bills.BillModel; +import com.chwl.core.bills.bean.BillItemEntity; +import com.chwl.core.bills.bean.IncomeInfo; +import com.chwl.core.bills.bean.IncomeListInfo; +import com.chwl.core.pay.PayModel; +import com.chwl.core.pay.bean.WalletInfo; +import com.chwl.library.annatation.ActLayoutRes; +import com.chwl.library.common.util.DeviceUtil; +import com.chwl.library.utils.AppMetaDataUtil; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/bills/activities/BillGiftIncomeGroupActivity.java b/app/src/main/java/com/chwl/app/bills/activities/BillGiftIncomeGroupActivity.java similarity index 75% rename from app/src/main/java/com/yizhuan/habu/bills/activities/BillGiftIncomeGroupActivity.java rename to app/src/main/java/com/chwl/app/bills/activities/BillGiftIncomeGroupActivity.java index 395842f7e..f584fd820 100644 --- a/app/src/main/java/com/yizhuan/habu/bills/activities/BillGiftIncomeGroupActivity.java +++ b/app/src/main/java/com/chwl/app/bills/activities/BillGiftIncomeGroupActivity.java @@ -1,7 +1,7 @@ -package com.yizhuan.habu.bills.activities; +package com.chwl.app.bills.activities; -import static com.yizhuan.habu.bills.fragmemt.RadishGiftFragment.TYPE_RADISH_EXPAND; -import static com.yizhuan.habu.bills.fragmemt.RadishGiftFragment.TYPE_RADISH_INCOME; +import static com.chwl.app.bills.fragmemt.RadishGiftFragment.TYPE_RADISH_EXPAND; +import static com.chwl.app.bills.fragmemt.RadishGiftFragment.TYPE_RADISH_INCOME; import android.content.Context; import android.content.Intent; @@ -13,28 +13,28 @@ import android.widget.TextView; import androidx.fragment.app.Fragment; import androidx.viewpager.widget.ViewPager; -import com.yizhuan.habu.R; -import com.yizhuan.habu.avroom.adapter.RoomContributeListAdapter; -import com.yizhuan.habu.base.BaseMvpActivity; -import com.yizhuan.habu.base.TitleBar; -import com.yizhuan.habu.bills.fragmemt.GiftIncomeFragment; -import com.yizhuan.habu.bills.fragmemt.GiftOutputFragment; -import com.yizhuan.habu.bills.fragmemt.RadishGiftFragment; -import com.yizhuan.habu.bills.presenter.BillGiftIncomeGroupPresenter; -import com.yizhuan.habu.bills.view.IBillGiftIncomeGroupView; -import com.yizhuan.habu.bills.view.ISmoothToTopView; -import com.yizhuan.habu.bills.widget.BillGiftIncomeGroupNavigatorAdapter; -import com.yizhuan.habu.ui.pay.ChargeActivity; -import com.yizhuan.habu.ui.webview.CommonWebViewActivity; -import com.yizhuan.habu.ui.widget.magicindicator.MagicIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.ViewPagerHelper; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.common.util.DeviceUtil; -import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.avroom.adapter.RoomContributeListAdapter; +import com.chwl.app.base.BaseMvpActivity; +import com.chwl.app.base.TitleBar; +import com.chwl.app.bills.fragmemt.GiftIncomeFragment; +import com.chwl.app.bills.fragmemt.GiftOutputFragment; +import com.chwl.app.bills.fragmemt.RadishGiftFragment; +import com.chwl.app.bills.presenter.BillGiftIncomeGroupPresenter; +import com.chwl.app.bills.view.IBillGiftIncomeGroupView; +import com.chwl.app.bills.view.ISmoothToTopView; +import com.chwl.app.bills.widget.BillGiftIncomeGroupNavigatorAdapter; +import com.chwl.app.ui.pay.ChargeActivity; +import com.chwl.app.ui.webview.CommonWebViewActivity; +import com.chwl.app.ui.widget.magicindicator.MagicIndicator; +import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.chwl.core.Constants; +import com.chwl.core.UriProvider; +import com.chwl.library.base.factory.CreatePresenter; +import com.chwl.library.common.util.DeviceUtil; +import com.chwl.library.utils.AppMetaDataUtil; +import com.chwl.library.utils.ResUtil; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/habu/bills/activities/BillNobleActivity.java b/app/src/main/java/com/chwl/app/bills/activities/BillNobleActivity.java similarity index 89% rename from app/src/main/java/com/yizhuan/habu/bills/activities/BillNobleActivity.java rename to app/src/main/java/com/chwl/app/bills/activities/BillNobleActivity.java index fc714caae..fff849437 100644 --- a/app/src/main/java/com/yizhuan/habu/bills/activities/BillNobleActivity.java +++ b/app/src/main/java/com/chwl/app/bills/activities/BillNobleActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.bills.activities; +package com.chwl.app.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.habu.R; -import com.yizhuan.habu.bills.adapter.NobleBillAdapter; -import com.yizhuan.habu.databinding.ActivityBillsBinding; -import com.yizhuan.habu.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.chwl.app.R; +import com.chwl.app.bills.adapter.NobleBillAdapter; +import com.chwl.app.databinding.ActivityBillsBinding; +import com.chwl.app.ui.widget.RecyclerViewNoBugLinearLayoutManager; +import com.chwl.core.Constants; +import com.chwl.core.bills.BillModel; +import com.chwl.core.bills.bean.BillItemEntity; +import com.chwl.core.bills.bean.NobleBillListInfo; +import com.chwl.library.annatation.ActLayoutRes; +import com.chwl.library.utils.ListUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/bills/activities/ChargeBillsActivity.java b/app/src/main/java/com/chwl/app/bills/activities/ChargeBillsActivity.java similarity index 87% rename from app/src/main/java/com/yizhuan/habu/bills/activities/ChargeBillsActivity.java rename to app/src/main/java/com/chwl/app/bills/activities/ChargeBillsActivity.java index 01a56f636..bf109149a 100644 --- a/app/src/main/java/com/yizhuan/habu/bills/activities/ChargeBillsActivity.java +++ b/app/src/main/java/com/chwl/app/bills/activities/ChargeBillsActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.bills.activities; +package com.chwl.app.bills.activities; import android.annotation.SuppressLint; import android.content.Intent; @@ -8,25 +8,25 @@ import android.view.View; import android.widget.ImageView; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.TitleBar; -import com.yizhuan.habu.bills.adapter.ChargeBillsAdapter; -import com.yizhuan.habu.databinding.ActivityBillsBinding; -import com.yizhuan.habu.ui.pay.ChargeActivity; -import com.yizhuan.habu.ui.webview.CommonWebViewActivity; -import com.yizhuan.habu.ui.widget.RecyclerViewNoBugLinearLayoutManager; +import com.chwl.app.R; +import com.chwl.app.base.TitleBar; +import com.chwl.app.bills.adapter.ChargeBillsAdapter; +import com.chwl.app.databinding.ActivityBillsBinding; +import com.chwl.app.ui.pay.ChargeActivity; +import com.chwl.app.ui.webview.CommonWebViewActivity; +import com.chwl.app.ui.widget.RecyclerViewNoBugLinearLayoutManager; import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.UriProvider; -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.common.util.DeviceUtil; -import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.core.Constants; +import com.chwl.core.UriProvider; +import com.chwl.core.bills.BillModel; +import com.chwl.core.bills.bean.BillItemEntity; +import com.chwl.core.bills.bean.ExpendInfo; +import com.chwl.core.bills.bean.ExpendListInfo; +import com.chwl.library.annatation.ActLayoutRes; +import com.chwl.library.common.util.DeviceUtil; +import com.chwl.library.utils.AppMetaDataUtil; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/bills/activities/ChatBillsActivity.java b/app/src/main/java/com/chwl/app/bills/activities/ChatBillsActivity.java similarity index 89% rename from app/src/main/java/com/yizhuan/habu/bills/activities/ChatBillsActivity.java rename to app/src/main/java/com/chwl/app/bills/activities/ChatBillsActivity.java index 4d5199548..2293b02a6 100644 --- a/app/src/main/java/com/yizhuan/habu/bills/activities/ChatBillsActivity.java +++ b/app/src/main/java/com/chwl/app/bills/activities/ChatBillsActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.bills.activities; +package com.chwl.app.bills.activities; import android.annotation.SuppressLint; import android.os.Bundle; @@ -7,17 +7,17 @@ import android.view.View; import android.widget.ImageView; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.habu.R; -import com.yizhuan.habu.bills.adapter.ChatBillsAdapter; -import com.yizhuan.habu.databinding.ActivityBillsBinding; -import com.yizhuan.habu.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.chwl.app.R; +import com.chwl.app.bills.adapter.ChatBillsAdapter; +import com.chwl.app.databinding.ActivityBillsBinding; +import com.chwl.app.ui.widget.RecyclerViewNoBugLinearLayoutManager; +import com.chwl.core.Constants; +import com.chwl.core.bills.BillModel; +import com.chwl.core.bills.bean.BillItemEntity; +import com.chwl.core.bills.bean.IncomeInfo; +import com.chwl.core.bills.bean.IncomeListInfo; +import com.chwl.library.annatation.ActLayoutRes; +import com.chwl.library.utils.ListUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/bills/activities/RedBagBillsActivity.java b/app/src/main/java/com/chwl/app/bills/activities/RedBagBillsActivity.java similarity index 86% rename from app/src/main/java/com/yizhuan/habu/bills/activities/RedBagBillsActivity.java rename to app/src/main/java/com/chwl/app/bills/activities/RedBagBillsActivity.java index 3716cc09e..e0a45c2ec 100644 --- a/app/src/main/java/com/yizhuan/habu/bills/activities/RedBagBillsActivity.java +++ b/app/src/main/java/com/chwl/app/bills/activities/RedBagBillsActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.bills.activities; +package com.chwl.app.bills.activities; import android.annotation.SuppressLint; import android.content.Intent; @@ -7,24 +7,24 @@ import android.text.TextUtils; import android.view.View; import android.widget.ImageView; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.TitleBar; -import com.yizhuan.habu.bills.adapter.RedBagBillsAdapter; -import com.yizhuan.habu.databinding.ActivityBillsBinding; -import com.yizhuan.habu.ui.pay.ChargeActivity; -import com.yizhuan.habu.ui.webview.CommonWebViewActivity; -import com.yizhuan.habu.ui.widget.RecyclerViewNoBugLinearLayoutManager; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.UriProvider; -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.common.util.DeviceUtil; -import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.TitleBar; +import com.chwl.app.bills.adapter.RedBagBillsAdapter; +import com.chwl.app.databinding.ActivityBillsBinding; +import com.chwl.app.ui.pay.ChargeActivity; +import com.chwl.app.ui.webview.CommonWebViewActivity; +import com.chwl.app.ui.widget.RecyclerViewNoBugLinearLayoutManager; +import com.chwl.core.Constants; +import com.chwl.core.UriProvider; +import com.chwl.core.bills.BillModel; +import com.chwl.core.bills.bean.BillItemEntity; +import com.chwl.core.bills.bean.RedBagInfo; +import com.chwl.core.bills.bean.RedBagListInfo; +import com.chwl.library.annatation.ActLayoutRes; +import com.chwl.library.common.util.DeviceUtil; +import com.chwl.library.utils.AppMetaDataUtil; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/bills/activities/TotalBillsActivity.java b/app/src/main/java/com/chwl/app/bills/activities/TotalBillsActivity.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/bills/activities/TotalBillsActivity.java rename to app/src/main/java/com/chwl/app/bills/activities/TotalBillsActivity.java index b311f4f48..480138ec6 100644 --- a/app/src/main/java/com/yizhuan/habu/bills/activities/TotalBillsActivity.java +++ b/app/src/main/java/com/chwl/app/bills/activities/TotalBillsActivity.java @@ -1,12 +1,12 @@ -package com.yizhuan.habu.bills.activities; +package com.chwl.app.bills.activities; import android.content.Intent; import android.os.Bundle; import android.view.View; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseActivity; -import com.yizhuan.habu.bills.widget.BillItemView; +import com.chwl.app.R; +import com.chwl.app.base.BaseActivity; +import com.chwl.app.bills.widget.BillItemView; /** * @author Administrator diff --git a/app/src/main/java/com/yizhuan/habu/bills/activities/WithdrawBillsActivity.java b/app/src/main/java/com/chwl/app/bills/activities/WithdrawBillsActivity.java similarity index 85% rename from app/src/main/java/com/yizhuan/habu/bills/activities/WithdrawBillsActivity.java rename to app/src/main/java/com/chwl/app/bills/activities/WithdrawBillsActivity.java index dec74521f..aa83f6118 100644 --- a/app/src/main/java/com/yizhuan/habu/bills/activities/WithdrawBillsActivity.java +++ b/app/src/main/java/com/chwl/app/bills/activities/WithdrawBillsActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.bills.activities; +package com.chwl.app.bills.activities; import android.content.Intent; import android.util.SparseLongArray; @@ -10,22 +10,22 @@ import android.widget.TextView; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.jzxiang.pickerview.listener.OnDateSetListener; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseBindingActivity; -import com.yizhuan.habu.base.TitleBar; -import com.yizhuan.habu.bills.event.DateInfoEvent; -import com.yizhuan.habu.bills.event.TopEvent; -import com.yizhuan.habu.bills.fragmemt.WithdrawBillsFragment; -import com.yizhuan.habu.databinding.ActivityWithdrawBillsBinding; -import com.yizhuan.habu.ui.pay.ChargeActivity; -import com.yizhuan.habu.ui.webview.CommonWebViewActivity; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.common.util.DeviceUtil; -import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.chwl.app.R; +import com.chwl.app.base.BaseBindingActivity; +import com.chwl.app.base.TitleBar; +import com.chwl.app.bills.event.DateInfoEvent; +import com.chwl.app.bills.event.TopEvent; +import com.chwl.app.bills.fragmemt.WithdrawBillsFragment; +import com.chwl.app.databinding.ActivityWithdrawBillsBinding; +import com.chwl.app.ui.pay.ChargeActivity; +import com.chwl.app.ui.webview.CommonWebViewActivity; +import com.chwl.core.Constants; +import com.chwl.core.UriProvider; +import com.chwl.library.annatation.ActLayoutRes; +import com.chwl.library.common.util.DeviceUtil; +import com.chwl.library.utils.AppMetaDataUtil; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.TimeUtils; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/yizhuan/habu/bills/adapter/BillBaseAdapter.java b/app/src/main/java/com/chwl/app/bills/adapter/BillBaseAdapter.java similarity index 86% rename from app/src/main/java/com/yizhuan/habu/bills/adapter/BillBaseAdapter.java rename to app/src/main/java/com/chwl/app/bills/adapter/BillBaseAdapter.java index 485402b98..1b4e735a5 100644 --- a/app/src/main/java/com/yizhuan/habu/bills/adapter/BillBaseAdapter.java +++ b/app/src/main/java/com/chwl/app/bills/adapter/BillBaseAdapter.java @@ -1,10 +1,10 @@ -package com.yizhuan.habu.bills.adapter; +package com.chwl.app.bills.adapter; import com.chad.library.adapter.base.BaseMultiItemQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.chwl.app.R; +import com.chwl.core.bills.bean.BillItemEntity; +import com.chwl.library.utils.TimeUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/bills/adapter/ChargeBillsAdapter.java b/app/src/main/java/com/chwl/app/bills/adapter/ChargeBillsAdapter.java similarity index 77% rename from app/src/main/java/com/yizhuan/habu/bills/adapter/ChargeBillsAdapter.java rename to app/src/main/java/com/chwl/app/bills/adapter/ChargeBillsAdapter.java index af8499fbe..2febaad38 100644 --- a/app/src/main/java/com/yizhuan/habu/bills/adapter/ChargeBillsAdapter.java +++ b/app/src/main/java/com/chwl/app/bills/adapter/ChargeBillsAdapter.java @@ -1,11 +1,11 @@ -package com.yizhuan.habu.bills.adapter; +package com.chwl.app.bills.adapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.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.ResUtil; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.chwl.app.R; +import com.chwl.core.bills.bean.BillItemEntity; +import com.chwl.core.bills.bean.ExpendInfo; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.TimeUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/bills/adapter/ChatBillsAdapter.java b/app/src/main/java/com/chwl/app/bills/adapter/ChatBillsAdapter.java similarity index 81% rename from app/src/main/java/com/yizhuan/habu/bills/adapter/ChatBillsAdapter.java rename to app/src/main/java/com/chwl/app/bills/adapter/ChatBillsAdapter.java index cac8f7c15..05241d039 100644 --- a/app/src/main/java/com/yizhuan/habu/bills/adapter/ChatBillsAdapter.java +++ b/app/src/main/java/com/chwl/app/bills/adapter/ChatBillsAdapter.java @@ -1,12 +1,12 @@ -package com.yizhuan.habu.bills.adapter; +package com.chwl.app.bills.adapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.R; -import com.yizhuan.habu.common.widget.CircleImageView; -import com.yizhuan.habu.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.chwl.app.R; +import com.chwl.app.common.widget.CircleImageView; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.core.bills.bean.BillItemEntity; +import com.chwl.core.bills.bean.IncomeInfo; +import com.chwl.library.utils.TimeUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/bills/adapter/GiftExpendAdapter.java b/app/src/main/java/com/chwl/app/bills/adapter/GiftExpendAdapter.java similarity index 78% rename from app/src/main/java/com/yizhuan/habu/bills/adapter/GiftExpendAdapter.java rename to app/src/main/java/com/chwl/app/bills/adapter/GiftExpendAdapter.java index 68e778438..2f23451fb 100644 --- a/app/src/main/java/com/yizhuan/habu/bills/adapter/GiftExpendAdapter.java +++ b/app/src/main/java/com/chwl/app/bills/adapter/GiftExpendAdapter.java @@ -1,14 +1,14 @@ -package com.yizhuan.habu.bills.adapter; +package com.chwl.app.bills.adapter; import android.widget.ImageView; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.R; -import com.yizhuan.habu.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.ResUtil; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.chwl.app.R; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.core.bills.bean.BillItemEntity; +import com.chwl.core.bills.bean.ExpendInfo; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.TimeUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/bills/adapter/GiftIncomeAdapter.java b/app/src/main/java/com/chwl/app/bills/adapter/GiftIncomeAdapter.java similarity index 78% rename from app/src/main/java/com/yizhuan/habu/bills/adapter/GiftIncomeAdapter.java rename to app/src/main/java/com/chwl/app/bills/adapter/GiftIncomeAdapter.java index b45d84dcd..a298095c2 100644 --- a/app/src/main/java/com/yizhuan/habu/bills/adapter/GiftIncomeAdapter.java +++ b/app/src/main/java/com/chwl/app/bills/adapter/GiftIncomeAdapter.java @@ -1,14 +1,14 @@ -package com.yizhuan.habu.bills.adapter; +package com.chwl.app.bills.adapter; import android.widget.ImageView; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.R; -import com.yizhuan.habu.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.ResUtil; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.chwl.app.R; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.core.bills.bean.BillItemEntity; +import com.chwl.core.bills.bean.IncomeInfo; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.TimeUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/bills/adapter/NobleBillAdapter.java b/app/src/main/java/com/chwl/app/bills/adapter/NobleBillAdapter.java similarity index 77% rename from app/src/main/java/com/yizhuan/habu/bills/adapter/NobleBillAdapter.java rename to app/src/main/java/com/chwl/app/bills/adapter/NobleBillAdapter.java index 10c8f37fb..f5bd071b5 100644 --- a/app/src/main/java/com/yizhuan/habu/bills/adapter/NobleBillAdapter.java +++ b/app/src/main/java/com/chwl/app/bills/adapter/NobleBillAdapter.java @@ -1,10 +1,10 @@ -package com.yizhuan.habu.bills.adapter; +package com.chwl.app.bills.adapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.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.chwl.app.R; +import com.chwl.core.bills.bean.BillItemEntity; +import com.chwl.core.bills.bean.NobleBillListInfo; +import com.chwl.library.utils.TimeUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/bills/adapter/RadishGiftAdapter.java b/app/src/main/java/com/chwl/app/bills/adapter/RadishGiftAdapter.java similarity index 82% rename from app/src/main/java/com/yizhuan/habu/bills/adapter/RadishGiftAdapter.java rename to app/src/main/java/com/chwl/app/bills/adapter/RadishGiftAdapter.java index 9834351c2..51456a07e 100644 --- a/app/src/main/java/com/yizhuan/habu/bills/adapter/RadishGiftAdapter.java +++ b/app/src/main/java/com/chwl/app/bills/adapter/RadishGiftAdapter.java @@ -1,16 +1,16 @@ -package com.yizhuan.habu.bills.adapter; +package com.chwl.app.bills.adapter; import android.widget.ImageView; import androidx.core.content.ContextCompat; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.R; -import com.yizhuan.habu.bills.fragmemt.RadishGiftFragment; -import com.yizhuan.habu.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.chwl.app.R; +import com.chwl.app.bills.fragmemt.RadishGiftFragment; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.core.bills.bean.BillItemEntity; +import com.chwl.core.bills.bean.RadishGiftInfo; +import com.chwl.library.utils.TimeUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/bills/adapter/RedBagBillsAdapter.java b/app/src/main/java/com/chwl/app/bills/adapter/RedBagBillsAdapter.java similarity index 75% rename from app/src/main/java/com/yizhuan/habu/bills/adapter/RedBagBillsAdapter.java rename to app/src/main/java/com/chwl/app/bills/adapter/RedBagBillsAdapter.java index 5d9b3a93b..8073132ac 100644 --- a/app/src/main/java/com/yizhuan/habu/bills/adapter/RedBagBillsAdapter.java +++ b/app/src/main/java/com/chwl/app/bills/adapter/RedBagBillsAdapter.java @@ -1,11 +1,11 @@ -package com.yizhuan.habu.bills.adapter; +package com.chwl.app.bills.adapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.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.ResUtil; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.chwl.app.R; +import com.chwl.core.bills.bean.BillItemEntity; +import com.chwl.core.bills.bean.RedBagInfo; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.TimeUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/bills/adapter/WithdrawBillsAdapter.java b/app/src/main/java/com/chwl/app/bills/adapter/WithdrawBillsAdapter.java similarity index 77% rename from app/src/main/java/com/yizhuan/habu/bills/adapter/WithdrawBillsAdapter.java rename to app/src/main/java/com/chwl/app/bills/adapter/WithdrawBillsAdapter.java index f3a352135..2b35d105e 100644 --- a/app/src/main/java/com/yizhuan/habu/bills/adapter/WithdrawBillsAdapter.java +++ b/app/src/main/java/com/chwl/app/bills/adapter/WithdrawBillsAdapter.java @@ -1,11 +1,11 @@ -package com.yizhuan.habu.bills.adapter; +package com.chwl.app.bills.adapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.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.ResUtil; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.chwl.app.R; +import com.chwl.core.bills.bean.BillItemEntity; +import com.chwl.core.bills.bean.IncomeInfo; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.TimeUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/bills/adapter/WithdrawBillsIndicatorAdapter.java b/app/src/main/java/com/chwl/app/bills/adapter/WithdrawBillsIndicatorAdapter.java similarity index 87% rename from app/src/main/java/com/yizhuan/habu/bills/adapter/WithdrawBillsIndicatorAdapter.java rename to app/src/main/java/com/chwl/app/bills/adapter/WithdrawBillsIndicatorAdapter.java index dbad40f90..490eff943 100644 --- a/app/src/main/java/com/yizhuan/habu/bills/adapter/WithdrawBillsIndicatorAdapter.java +++ b/app/src/main/java/com/chwl/app/bills/adapter/WithdrawBillsIndicatorAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.bills.adapter; +package com.chwl.app.bills.adapter; import android.content.Context; import android.view.Gravity; @@ -6,11 +6,11 @@ import android.view.View; import androidx.appcompat.widget.AppCompatTextView; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; -import com.yizhuan.habu.common.util.Utils; +import com.chwl.app.R; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.chwl.app.common.util.Utils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/bills/adapter/WithdrawRedBillsAdapter.java b/app/src/main/java/com/chwl/app/bills/adapter/WithdrawRedBillsAdapter.java similarity index 78% rename from app/src/main/java/com/yizhuan/habu/bills/adapter/WithdrawRedBillsAdapter.java rename to app/src/main/java/com/chwl/app/bills/adapter/WithdrawRedBillsAdapter.java index 8a45eaf40..065a2f424 100644 --- a/app/src/main/java/com/yizhuan/habu/bills/adapter/WithdrawRedBillsAdapter.java +++ b/app/src/main/java/com/chwl/app/bills/adapter/WithdrawRedBillsAdapter.java @@ -1,11 +1,11 @@ -package com.yizhuan.habu.bills.adapter; +package com.chwl.app.bills.adapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.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.ResUtil; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.chwl.app.R; +import com.chwl.core.bills.bean.BillItemEntity; +import com.chwl.core.bills.bean.RedBagInfo; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.TimeUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/bills/event/DateInfoEvent.java b/app/src/main/java/com/chwl/app/bills/event/DateInfoEvent.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/bills/event/DateInfoEvent.java rename to app/src/main/java/com/chwl/app/bills/event/DateInfoEvent.java index ff636d20a..bb666d817 100644 --- a/app/src/main/java/com/yizhuan/habu/bills/event/DateInfoEvent.java +++ b/app/src/main/java/com/chwl/app/bills/event/DateInfoEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.bills.event; +package com.chwl.app.bills.event; /** *

事件日期

diff --git a/app/src/main/java/com/yizhuan/habu/bills/event/TopEvent.java b/app/src/main/java/com/chwl/app/bills/event/TopEvent.java similarity index 77% rename from app/src/main/java/com/yizhuan/habu/bills/event/TopEvent.java rename to app/src/main/java/com/chwl/app/bills/event/TopEvent.java index 608f6cedf..fa604b454 100644 --- a/app/src/main/java/com/yizhuan/habu/bills/event/TopEvent.java +++ b/app/src/main/java/com/chwl/app/bills/event/TopEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.bills.event; +package com.chwl.app.bills.event; public class TopEvent { diff --git a/app/src/main/java/com/yizhuan/habu/bills/fragmemt/BaseBillsFragment.java b/app/src/main/java/com/chwl/app/bills/fragmemt/BaseBillsFragment.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/bills/fragmemt/BaseBillsFragment.java rename to app/src/main/java/com/chwl/app/bills/fragmemt/BaseBillsFragment.java index 14d4a26df..16dd10a11 100644 --- a/app/src/main/java/com/yizhuan/habu/bills/fragmemt/BaseBillsFragment.java +++ b/app/src/main/java/com/chwl/app/bills/fragmemt/BaseBillsFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.bills.fragmemt; +package com.chwl.app.bills.fragmemt; import android.view.View; import android.widget.ImageView; @@ -10,15 +10,15 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.jzxiang.pickerview.listener.OnDateSetListener; -import com.yizhuan.habu.R; -import com.yizhuan.habu.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.IMvpBaseView; -import com.yizhuan.xchat_android_library.base.factory.AbstractMvpPresenter; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.chwl.app.R; +import com.chwl.app.base.BaseMvpFragment; +import com.chwl.core.Constants; +import com.chwl.core.bills.bean.BillItemEntity; +import com.chwl.core.radish.RadishModel; +import com.chwl.library.base.IMvpBaseView; +import com.chwl.library.base.factory.AbstractMvpPresenter; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.TimeUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/bills/fragmemt/GiftIncomeFragment.java b/app/src/main/java/com/chwl/app/bills/fragmemt/GiftIncomeFragment.java similarity index 87% rename from app/src/main/java/com/yizhuan/habu/bills/fragmemt/GiftIncomeFragment.java rename to app/src/main/java/com/chwl/app/bills/fragmemt/GiftIncomeFragment.java index 1daf94fe8..9c3f80d61 100644 --- a/app/src/main/java/com/yizhuan/habu/bills/fragmemt/GiftIncomeFragment.java +++ b/app/src/main/java/com/chwl/app/bills/fragmemt/GiftIncomeFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.bills.fragmemt; +package com.chwl.app.bills.fragmemt; import android.annotation.SuppressLint; import android.text.TextUtils; @@ -7,19 +7,19 @@ import android.view.View; import androidx.fragment.app.Fragment; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.habu.R; -import com.yizhuan.habu.bills.adapter.BillBaseAdapter; -import com.yizhuan.habu.bills.adapter.GiftIncomeAdapter; -import com.yizhuan.habu.bills.presenter.GiftIncomePresenter; -import com.yizhuan.habu.bills.view.IGiftIncomeView; -import com.yizhuan.habu.ui.widget.RecyclerViewNoBugLinearLayoutManager; +import com.chwl.app.R; +import com.chwl.app.bills.adapter.BillBaseAdapter; +import com.chwl.app.bills.adapter.GiftIncomeAdapter; +import com.chwl.app.bills.presenter.GiftIncomePresenter; +import com.chwl.app.bills.view.IGiftIncomeView; +import com.chwl.app.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.chwl.core.Constants; +import com.chwl.core.bills.bean.BillItemEntity; +import com.chwl.core.bills.bean.IncomeInfo; +import com.chwl.core.bills.bean.IncomeListInfo; +import com.chwl.library.base.factory.CreatePresenter; +import com.chwl.library.utils.ListUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/bills/fragmemt/GiftOutputFragment.java b/app/src/main/java/com/chwl/app/bills/fragmemt/GiftOutputFragment.java similarity index 87% rename from app/src/main/java/com/yizhuan/habu/bills/fragmemt/GiftOutputFragment.java rename to app/src/main/java/com/chwl/app/bills/fragmemt/GiftOutputFragment.java index 13f9ce647..b9f9295c8 100644 --- a/app/src/main/java/com/yizhuan/habu/bills/fragmemt/GiftOutputFragment.java +++ b/app/src/main/java/com/chwl/app/bills/fragmemt/GiftOutputFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.bills.fragmemt; +package com.chwl.app.bills.fragmemt; import android.annotation.SuppressLint; import android.text.TextUtils; @@ -7,19 +7,19 @@ import android.view.View; import androidx.fragment.app.Fragment; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.habu.R; -import com.yizhuan.habu.bills.adapter.BillBaseAdapter; -import com.yizhuan.habu.bills.adapter.GiftExpendAdapter; -import com.yizhuan.habu.bills.presenter.GiftOutputPresenter; -import com.yizhuan.habu.bills.view.IGiftOutputView; -import com.yizhuan.habu.ui.widget.RecyclerViewNoBugLinearLayoutManager; +import com.chwl.app.R; +import com.chwl.app.bills.adapter.BillBaseAdapter; +import com.chwl.app.bills.adapter.GiftExpendAdapter; +import com.chwl.app.bills.presenter.GiftOutputPresenter; +import com.chwl.app.bills.view.IGiftOutputView; +import com.chwl.app.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.chwl.core.Constants; +import com.chwl.core.bills.bean.BillItemEntity; +import com.chwl.core.bills.bean.ExpendInfo; +import com.chwl.core.bills.bean.ExpendListInfo; +import com.chwl.library.base.factory.CreatePresenter; +import com.chwl.library.utils.ListUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/bills/fragmemt/RadishGiftFragment.java b/app/src/main/java/com/chwl/app/bills/fragmemt/RadishGiftFragment.java similarity index 86% rename from app/src/main/java/com/yizhuan/habu/bills/fragmemt/RadishGiftFragment.java rename to app/src/main/java/com/chwl/app/bills/fragmemt/RadishGiftFragment.java index d93ce8ce9..dbec84eac 100644 --- a/app/src/main/java/com/yizhuan/habu/bills/fragmemt/RadishGiftFragment.java +++ b/app/src/main/java/com/chwl/app/bills/fragmemt/RadishGiftFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.bills.fragmemt; +package com.chwl.app.bills.fragmemt; import android.os.Bundle; import android.text.TextUtils; @@ -6,19 +6,19 @@ import android.text.TextUtils; import androidx.fragment.app.Fragment; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.habu.R; -import com.yizhuan.habu.bills.adapter.BillBaseAdapter; -import com.yizhuan.habu.bills.adapter.RadishGiftAdapter; -import com.yizhuan.habu.bills.presenter.RadishGiftPresenter; -import com.yizhuan.habu.bills.view.IRadishGiftView; -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.bills.adapter.BillBaseAdapter; +import com.chwl.app.bills.adapter.RadishGiftAdapter; +import com.chwl.app.bills.presenter.RadishGiftPresenter; +import com.chwl.app.bills.view.IRadishGiftView; +import com.chwl.app.ui.widget.RecyclerViewNoBugLinearLayoutManager; +import com.chwl.core.Constants; +import com.chwl.core.bills.bean.BillItemEntity; +import com.chwl.core.bills.bean.RadishGiftInfo; +import com.chwl.core.bills.bean.RadishGiftListInfo; +import com.chwl.library.base.factory.CreatePresenter; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/bills/fragmemt/WithdrawBillsFragment.java b/app/src/main/java/com/chwl/app/bills/fragmemt/WithdrawBillsFragment.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/bills/fragmemt/WithdrawBillsFragment.java rename to app/src/main/java/com/chwl/app/bills/fragmemt/WithdrawBillsFragment.java index 410f502ad..5a51e5c94 100644 --- a/app/src/main/java/com/yizhuan/habu/bills/fragmemt/WithdrawBillsFragment.java +++ b/app/src/main/java/com/chwl/app/bills/fragmemt/WithdrawBillsFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.bills.fragmemt; +package com.chwl.app.bills.fragmemt; import android.annotation.SuppressLint; import android.content.Context; @@ -11,22 +11,22 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseBindingFragment; -import com.yizhuan.habu.bills.adapter.WithdrawBillsAdapter; -import com.yizhuan.habu.bills.event.DateInfoEvent; -import com.yizhuan.habu.bills.event.TopEvent; -import com.yizhuan.habu.common.NoDataFragment; -import com.yizhuan.habu.databinding.FragmentXrexylerviewBinding; -import com.yizhuan.habu.ui.widget.RecyclerViewNoBugLinearLayoutManager; +import com.chwl.app.R; +import com.chwl.app.base.BaseBindingFragment; +import com.chwl.app.bills.adapter.WithdrawBillsAdapter; +import com.chwl.app.bills.event.DateInfoEvent; +import com.chwl.app.bills.event.TopEvent; +import com.chwl.app.common.NoDataFragment; +import com.chwl.app.databinding.FragmentXrexylerviewBinding; +import com.chwl.app.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.chwl.core.Constants; +import com.chwl.core.bills.BillModel; +import com.chwl.core.bills.bean.BillItemEntity; +import com.chwl.core.bills.bean.IncomeInfo; +import com.chwl.core.bills.bean.IncomeListInfo; +import com.chwl.library.annatation.ActLayoutRes; +import com.chwl.library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/chwl/app/bills/presenter/BillGiftIncomeGroupPresenter.java b/app/src/main/java/com/chwl/app/bills/presenter/BillGiftIncomeGroupPresenter.java new file mode 100644 index 000000000..931834b31 --- /dev/null +++ b/app/src/main/java/com/chwl/app/bills/presenter/BillGiftIncomeGroupPresenter.java @@ -0,0 +1,7 @@ +package com.chwl.app.bills.presenter; + +import com.chwl.app.base.BaseMvpPresenter; +import com.chwl.app.bills.view.IBillGiftIncomeGroupView; + +public class BillGiftIncomeGroupPresenter extends BaseMvpPresenter { +} diff --git a/app/src/main/java/com/yizhuan/habu/bills/presenter/GiftIncomePresenter.java b/app/src/main/java/com/chwl/app/bills/presenter/GiftIncomePresenter.java similarity index 83% rename from app/src/main/java/com/yizhuan/habu/bills/presenter/GiftIncomePresenter.java rename to app/src/main/java/com/chwl/app/bills/presenter/GiftIncomePresenter.java index 389ce84d1..53716740b 100644 --- a/app/src/main/java/com/yizhuan/habu/bills/presenter/GiftIncomePresenter.java +++ b/app/src/main/java/com/chwl/app/bills/presenter/GiftIncomePresenter.java @@ -1,10 +1,10 @@ -package com.yizhuan.habu.bills.presenter; +package com.chwl.app.bills.presenter; import android.annotation.SuppressLint; -import com.yizhuan.habu.base.BaseMvpPresenter; -import com.yizhuan.habu.bills.view.IGiftIncomeView; -import com.yizhuan.xchat_android_core.bills.BillModel; +import com.chwl.app.base.BaseMvpPresenter; +import com.chwl.app.bills.view.IGiftIncomeView; +import com.chwl.core.bills.BillModel; public class GiftIncomePresenter extends BaseMvpPresenter { diff --git a/app/src/main/java/com/yizhuan/habu/bills/presenter/GiftOutputPresenter.java b/app/src/main/java/com/chwl/app/bills/presenter/GiftOutputPresenter.java similarity index 81% rename from app/src/main/java/com/yizhuan/habu/bills/presenter/GiftOutputPresenter.java rename to app/src/main/java/com/chwl/app/bills/presenter/GiftOutputPresenter.java index 55d629666..5f59d8fe4 100644 --- a/app/src/main/java/com/yizhuan/habu/bills/presenter/GiftOutputPresenter.java +++ b/app/src/main/java/com/chwl/app/bills/presenter/GiftOutputPresenter.java @@ -1,10 +1,10 @@ -package com.yizhuan.habu.bills.presenter; +package com.chwl.app.bills.presenter; import android.annotation.SuppressLint; -import com.yizhuan.habu.base.BaseMvpPresenter; -import com.yizhuan.habu.bills.view.IGiftOutputView; -import com.yizhuan.xchat_android_core.bills.BillModel; +import com.chwl.app.base.BaseMvpPresenter; +import com.chwl.app.bills.view.IGiftOutputView; +import com.chwl.core.bills.BillModel; public class GiftOutputPresenter extends BaseMvpPresenter { diff --git a/app/src/main/java/com/yizhuan/habu/bills/presenter/RadishGiftPresenter.java b/app/src/main/java/com/chwl/app/bills/presenter/RadishGiftPresenter.java similarity index 83% rename from app/src/main/java/com/yizhuan/habu/bills/presenter/RadishGiftPresenter.java rename to app/src/main/java/com/chwl/app/bills/presenter/RadishGiftPresenter.java index 721b53874..fbff4682a 100644 --- a/app/src/main/java/com/yizhuan/habu/bills/presenter/RadishGiftPresenter.java +++ b/app/src/main/java/com/chwl/app/bills/presenter/RadishGiftPresenter.java @@ -1,9 +1,9 @@ -package com.yizhuan.habu.bills.presenter; +package com.chwl.app.bills.presenter; -import com.yizhuan.habu.base.BaseMvpPresenter; -import com.yizhuan.habu.bills.view.IRadishGiftView; -import com.yizhuan.xchat_android_core.bills.RadishGiftModel; -import com.yizhuan.xchat_android_core.bills.result.RadishGiftResult; +import com.chwl.app.base.BaseMvpPresenter; +import com.chwl.app.bills.view.IRadishGiftView; +import com.chwl.core.bills.RadishGiftModel; +import com.chwl.core.bills.result.RadishGiftResult; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; diff --git a/app/src/main/java/com/chwl/app/bills/view/IBillGiftIncomeGroupView.java b/app/src/main/java/com/chwl/app/bills/view/IBillGiftIncomeGroupView.java new file mode 100644 index 000000000..f22e91f52 --- /dev/null +++ b/app/src/main/java/com/chwl/app/bills/view/IBillGiftIncomeGroupView.java @@ -0,0 +1,6 @@ +package com.chwl.app.bills.view; + +import com.chwl.library.base.IMvpBaseView; + +public interface IBillGiftIncomeGroupView extends IMvpBaseView { +} diff --git a/app/src/main/java/com/yizhuan/habu/bills/view/IGiftIncomeView.java b/app/src/main/java/com/chwl/app/bills/view/IGiftIncomeView.java similarity index 60% rename from app/src/main/java/com/yizhuan/habu/bills/view/IGiftIncomeView.java rename to app/src/main/java/com/chwl/app/bills/view/IGiftIncomeView.java index c8098c1f4..d4da736a9 100644 --- a/app/src/main/java/com/yizhuan/habu/bills/view/IGiftIncomeView.java +++ b/app/src/main/java/com/chwl/app/bills/view/IGiftIncomeView.java @@ -1,6 +1,6 @@ -package com.yizhuan.habu.bills.view; +package com.chwl.app.bills.view; -import com.yizhuan.xchat_android_core.bills.bean.IncomeListInfo; +import com.chwl.core.bills.bean.IncomeListInfo; public interface IGiftIncomeView extends ISmoothToTopView { void onGetDataError(String message); diff --git a/app/src/main/java/com/yizhuan/habu/bills/view/IGiftOutputView.java b/app/src/main/java/com/chwl/app/bills/view/IGiftOutputView.java similarity index 52% rename from app/src/main/java/com/yizhuan/habu/bills/view/IGiftOutputView.java rename to app/src/main/java/com/chwl/app/bills/view/IGiftOutputView.java index 4d4002fe0..1d8b84526 100644 --- a/app/src/main/java/com/yizhuan/habu/bills/view/IGiftOutputView.java +++ b/app/src/main/java/com/chwl/app/bills/view/IGiftOutputView.java @@ -1,7 +1,7 @@ -package com.yizhuan.habu.bills.view; +package com.chwl.app.bills.view; -import com.yizhuan.xchat_android_core.bills.bean.ExpendListInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.chwl.core.bills.bean.ExpendListInfo; +import com.chwl.library.base.IMvpBaseView; public interface IGiftOutputView extends IMvpBaseView { void smoothScrollToTop(); diff --git a/app/src/main/java/com/yizhuan/habu/bills/view/IRadishGiftView.java b/app/src/main/java/com/chwl/app/bills/view/IRadishGiftView.java similarity index 61% rename from app/src/main/java/com/yizhuan/habu/bills/view/IRadishGiftView.java rename to app/src/main/java/com/chwl/app/bills/view/IRadishGiftView.java index a1765310b..4608b18ab 100644 --- a/app/src/main/java/com/yizhuan/habu/bills/view/IRadishGiftView.java +++ b/app/src/main/java/com/chwl/app/bills/view/IRadishGiftView.java @@ -1,6 +1,6 @@ -package com.yizhuan.habu.bills.view; +package com.chwl.app.bills.view; -import com.yizhuan.xchat_android_core.bills.bean.RadishGiftListInfo; +import com.chwl.core.bills.bean.RadishGiftListInfo; public interface IRadishGiftView extends ISmoothToTopView { void getRadishRecordSuccess(RadishGiftListInfo list); diff --git a/app/src/main/java/com/chwl/app/bills/view/ISmoothToTopView.java b/app/src/main/java/com/chwl/app/bills/view/ISmoothToTopView.java new file mode 100644 index 000000000..a8d64b7f8 --- /dev/null +++ b/app/src/main/java/com/chwl/app/bills/view/ISmoothToTopView.java @@ -0,0 +1,7 @@ +package com.chwl.app.bills.view; + +import com.chwl.library.base.IMvpBaseView; + +public interface ISmoothToTopView extends IMvpBaseView { + void smoothScrollToTop(); +} diff --git a/app/src/main/java/com/yizhuan/habu/bills/widget/BillGiftIncomeGroupNavigatorAdapter.java b/app/src/main/java/com/chwl/app/bills/widget/BillGiftIncomeGroupNavigatorAdapter.java similarity index 77% rename from app/src/main/java/com/yizhuan/habu/bills/widget/BillGiftIncomeGroupNavigatorAdapter.java rename to app/src/main/java/com/chwl/app/bills/widget/BillGiftIncomeGroupNavigatorAdapter.java index 4d1ebea1c..1423d5c4e 100644 --- a/app/src/main/java/com/yizhuan/habu/bills/widget/BillGiftIncomeGroupNavigatorAdapter.java +++ b/app/src/main/java/com/chwl/app/bills/widget/BillGiftIncomeGroupNavigatorAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.bills.widget; +package com.chwl.app.bills.widget; import android.content.Context; import android.view.ViewGroup; @@ -6,15 +6,15 @@ import android.widget.FrameLayout; import androidx.core.content.ContextCompat; -import com.yizhuan.habu.R; -import com.yizhuan.habu.avroom.widget.RankNavigatorAdapter; -import com.yizhuan.habu.decoration.view.widgets.BadgeScaleTransitionPagerTitleView; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.avroom.widget.RankNavigatorAdapter; +import com.chwl.app.decoration.view.widgets.BadgeScaleTransitionPagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; +import com.chwl.library.utils.ResUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/bills/widget/BillItemView.java b/app/src/main/java/com/chwl/app/bills/widget/BillItemView.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/bills/widget/BillItemView.java rename to app/src/main/java/com/chwl/app/bills/widget/BillItemView.java index f25f76371..aa87804dd 100644 --- a/app/src/main/java/com/yizhuan/habu/bills/widget/BillItemView.java +++ b/app/src/main/java/com/chwl/app/bills/widget/BillItemView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.bills.widget; +package com.chwl.app.bills.widget; import android.content.Context; import android.content.res.TypedArray; @@ -10,7 +10,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; -import com.yizhuan.habu.R; +import com.chwl.app.R; /** *

账单item

diff --git a/app/src/main/java/com/yizhuan/habu/bindadapter/BaseAdapter.java b/app/src/main/java/com/chwl/app/bindadapter/BaseAdapter.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/bindadapter/BaseAdapter.java rename to app/src/main/java/com/chwl/app/bindadapter/BaseAdapter.java index a9d9f9fec..9a12af885 100644 --- a/app/src/main/java/com/yizhuan/habu/bindadapter/BaseAdapter.java +++ b/app/src/main/java/com/chwl/app/bindadapter/BaseAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.bindadapter; +package com.chwl.app.bindadapter; import android.view.View; import android.view.ViewGroup; @@ -9,7 +9,7 @@ import androidx.databinding.DataBindingUtil; import androidx.databinding.ViewDataBinding; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.habu.R; +import com.chwl.app.R; /** diff --git a/app/src/main/java/com/yizhuan/habu/bindadapter/BindingViewHolder.java b/app/src/main/java/com/chwl/app/bindadapter/BindingViewHolder.java similarity index 87% rename from app/src/main/java/com/yizhuan/habu/bindadapter/BindingViewHolder.java rename to app/src/main/java/com/chwl/app/bindadapter/BindingViewHolder.java index a967a62bc..1b5ed148d 100644 --- a/app/src/main/java/com/yizhuan/habu/bindadapter/BindingViewHolder.java +++ b/app/src/main/java/com/chwl/app/bindadapter/BindingViewHolder.java @@ -1,11 +1,11 @@ -package com.yizhuan.habu.bindadapter; +package com.chwl.app.bindadapter; import android.view.View; import androidx.databinding.ViewDataBinding; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.R; +import com.chwl.app.R; /** * Created by fwhm on 2017/3/28. diff --git a/app/src/main/java/com/yizhuan/habu/bindadapter/RvAdapter.java b/app/src/main/java/com/chwl/app/bindadapter/RvAdapter.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/bindadapter/RvAdapter.java rename to app/src/main/java/com/chwl/app/bindadapter/RvAdapter.java index 8c65ad324..4ad068f93 100644 --- a/app/src/main/java/com/yizhuan/habu/bindadapter/RvAdapter.java +++ b/app/src/main/java/com/chwl/app/bindadapter/RvAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.bindadapter; +package com.chwl.app.bindadapter; import androidx.databinding.BindingAdapter; import androidx.recyclerview.widget.RecyclerView; diff --git a/app/src/main/java/com/yizhuan/habu/bindadapter/ViewAdapter.java b/app/src/main/java/com/chwl/app/bindadapter/ViewAdapter.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/bindadapter/ViewAdapter.java rename to app/src/main/java/com/chwl/app/bindadapter/ViewAdapter.java index fdc3539ef..a4d8ee74f 100644 --- a/app/src/main/java/com/yizhuan/habu/bindadapter/ViewAdapter.java +++ b/app/src/main/java/com/chwl/app/bindadapter/ViewAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.bindadapter; +package com.chwl.app.bindadapter; import android.graphics.drawable.Drawable; import android.graphics.drawable.GradientDrawable; @@ -17,14 +17,14 @@ 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.habu.R; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.habu.view.GenderAgeTextView; -import com.yizhuan.xchat_android_core.utils.StarUtils; -import com.yizhuan.xchat_android_library.utils.TimeUtils; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; -import com.yizhuan.xchat_android_library.widget.IOSSwitchView; +import com.chwl.app.R; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.view.GenderAgeTextView; +import com.chwl.core.utils.StarUtils; +import com.chwl.library.utils.TimeUtils; +import com.chwl.library.utils.config.BasicConfig; +import com.chwl.library.widget.IOSSwitchView; import java.util.Date; diff --git a/app/src/main/java/com/yizhuan/habu/common/AbsStatusFragment.java b/app/src/main/java/com/chwl/app/common/AbsStatusFragment.java similarity index 86% rename from app/src/main/java/com/yizhuan/habu/common/AbsStatusFragment.java rename to app/src/main/java/com/chwl/app/common/AbsStatusFragment.java index 0d7a2ba63..12ce33863 100644 --- a/app/src/main/java/com/yizhuan/habu/common/AbsStatusFragment.java +++ b/app/src/main/java/com/chwl/app/common/AbsStatusFragment.java @@ -1,12 +1,12 @@ -package com.yizhuan.habu.common; +package com.chwl.app.common; import android.os.Bundle; import android.view.View; import androidx.fragment.app.Fragment; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.library.utils.SingleToastUtil; /** * Created by xujiexing on 14-7-21. diff --git a/app/src/main/java/com/yizhuan/habu/common/CommonPagerAdapter.kt b/app/src/main/java/com/chwl/app/common/CommonPagerAdapter.kt similarity index 93% rename from app/src/main/java/com/yizhuan/habu/common/CommonPagerAdapter.kt rename to app/src/main/java/com/chwl/app/common/CommonPagerAdapter.kt index 5029461e1..51273b02f 100644 --- a/app/src/main/java/com/yizhuan/habu/common/CommonPagerAdapter.kt +++ b/app/src/main/java/com/chwl/app/common/CommonPagerAdapter.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common +package com.chwl.app.common import android.annotation.SuppressLint import androidx.fragment.app.Fragment diff --git a/app/src/main/java/com/yizhuan/habu/common/EmptyViewHelper.java b/app/src/main/java/com/chwl/app/common/EmptyViewHelper.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/common/EmptyViewHelper.java rename to app/src/main/java/com/chwl/app/common/EmptyViewHelper.java index 65de8126e..e15ce9522 100644 --- a/app/src/main/java/com/yizhuan/habu/common/EmptyViewHelper.java +++ b/app/src/main/java/com/chwl/app/common/EmptyViewHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common; +package com.chwl.app.common; import android.content.Context; import android.view.LayoutInflater; @@ -7,9 +7,9 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_library.utils.NetworkUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.library.utils.NetworkUtils; +import com.chwl.library.utils.ResUtil; public class EmptyViewHelper { diff --git a/app/src/main/java/com/yizhuan/habu/common/IStatusFragment.java b/app/src/main/java/com/chwl/app/common/IStatusFragment.java similarity index 83% rename from app/src/main/java/com/yizhuan/habu/common/IStatusFragment.java rename to app/src/main/java/com/chwl/app/common/IStatusFragment.java index e576df2f5..a6aa65f90 100644 --- a/app/src/main/java/com/yizhuan/habu/common/IStatusFragment.java +++ b/app/src/main/java/com/chwl/app/common/IStatusFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common; +package com.chwl.app.common; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/habu/common/LoadingFragment.java b/app/src/main/java/com/chwl/app/common/LoadingFragment.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/common/LoadingFragment.java rename to app/src/main/java/com/chwl/app/common/LoadingFragment.java index 8f848d90e..2271aaeb7 100644 --- a/app/src/main/java/com/yizhuan/habu/common/LoadingFragment.java +++ b/app/src/main/java/com/chwl/app/common/LoadingFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common; +package com.chwl.app.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.habu.R; +import com.chwl.app.R; /** diff --git a/app/src/main/java/com/yizhuan/habu/common/NetworkErrorFragment.java b/app/src/main/java/com/chwl/app/common/NetworkErrorFragment.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/common/NetworkErrorFragment.java rename to app/src/main/java/com/chwl/app/common/NetworkErrorFragment.java index e98811e1f..d69bbe87b 100644 --- a/app/src/main/java/com/yizhuan/habu/common/NetworkErrorFragment.java +++ b/app/src/main/java/com/chwl/app/common/NetworkErrorFragment.java @@ -1,14 +1,14 @@ -package com.yizhuan.habu.common; +package com.chwl.app.common; -import static com.yizhuan.habu.common.NoDataFragment.LAYOUTID_PARAM; +import static com.chwl.app.common.NoDataFragment.LAYOUTID_PARAM; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_library.utils.NetworkUtils; +import com.chwl.app.R; +import com.chwl.library.utils.NetworkUtils; /** * Created by xujiexing on 14-4-9. diff --git a/app/src/main/java/com/yizhuan/habu/common/NoDataFragment.java b/app/src/main/java/com/chwl/app/common/NoDataFragment.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/common/NoDataFragment.java rename to app/src/main/java/com/chwl/app/common/NoDataFragment.java index 593721af5..b3de2aa0b 100644 --- a/app/src/main/java/com/yizhuan/habu/common/NoDataFragment.java +++ b/app/src/main/java/com/chwl/app/common/NoDataFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common; +package com.chwl.app.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.habu.R; +import com.chwl.app.R; /** diff --git a/app/src/main/java/com/yizhuan/habu/common/ReloadFragment.java b/app/src/main/java/com/chwl/app/common/ReloadFragment.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/common/ReloadFragment.java rename to app/src/main/java/com/chwl/app/common/ReloadFragment.java index f0e8c9500..e6652459f 100644 --- a/app/src/main/java/com/yizhuan/habu/common/ReloadFragment.java +++ b/app/src/main/java/com/chwl/app/common/ReloadFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common; +package com.chwl.app.common; import android.annotation.TargetApi; import android.os.Build; @@ -11,9 +11,9 @@ import android.widget.TextView; import androidx.annotation.ColorInt; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_library.utils.NetworkUtils; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.chwl.app.R; +import com.chwl.library.utils.NetworkUtils; +import com.chwl.library.utils.log.MLog; /** * Created by xujiexing on 14-4-9. diff --git a/app/src/main/java/com/yizhuan/habu/common/ViewPagerAdapter.java b/app/src/main/java/com/chwl/app/common/ViewPagerAdapter.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/common/ViewPagerAdapter.java rename to app/src/main/java/com/chwl/app/common/ViewPagerAdapter.java index dc47f9105..7716ec680 100644 --- a/app/src/main/java/com/yizhuan/habu/common/ViewPagerAdapter.java +++ b/app/src/main/java/com/chwl/app/common/ViewPagerAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common; +package com.chwl.app.common; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; diff --git a/app/src/main/java/com/yizhuan/habu/common/app/ActivityStack.java b/app/src/main/java/com/chwl/app/common/app/ActivityStack.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/common/app/ActivityStack.java rename to app/src/main/java/com/chwl/app/common/app/ActivityStack.java index 10494dfbb..cb768328b 100644 --- a/app/src/main/java/com/yizhuan/habu/common/app/ActivityStack.java +++ b/app/src/main/java/com/chwl/app/common/app/ActivityStack.java @@ -1,12 +1,12 @@ -package com.yizhuan.habu.common.app; +package com.chwl.app.common.app; import android.app.Activity; import android.content.Context; -import com.yizhuan.habu.application.XChatApplication; -import com.yizhuan.habu.avroom.activity.AVRoomActivity; -import com.yizhuan.habu.utils.ActWhiteListMrg; -import com.yizhuan.xchat_android_core.utils.Logger; +import com.chwl.app.application.XChatApplication; +import com.chwl.app.avroom.activity.AVRoomActivity; +import com.chwl.app.utils.ActWhiteListMrg; +import com.chwl.core.utils.Logger; import java.lang.ref.WeakReference; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/app/src/main/java/com/yizhuan/habu/common/dialog/PhotoDialog.kt b/app/src/main/java/com/chwl/app/common/dialog/PhotoDialog.kt similarity index 93% rename from app/src/main/java/com/yizhuan/habu/common/dialog/PhotoDialog.kt rename to app/src/main/java/com/chwl/app/common/dialog/PhotoDialog.kt index c5941ccc2..12f0cac66 100644 --- a/app/src/main/java/com/yizhuan/habu/common/dialog/PhotoDialog.kt +++ b/app/src/main/java/com/chwl/app/common/dialog/PhotoDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common.dialog +package com.chwl.app.common.dialog import android.Manifest import android.content.Intent @@ -11,17 +11,17 @@ import android.view.Gravity import android.view.Window import android.view.WindowManager import com.hjq.toast.ToastUtils -import com.yizhuan.habu.R -import com.yizhuan.habu.application.XChatApplication -import com.yizhuan.habu.databinding.PhotoDialogBinding -import com.yizhuan.habu.ui.widget.dialog.CommonTipDialog -import com.yizhuan.xchat_android_library.common.base.BaseDialogFragment -import com.yizhuan.xchat_android_library.common.photo.PhotoProvider -import com.yizhuan.xchat_android_library.common.photo.PhotoProviderNew -import com.yizhuan.xchat_android_library.common.util.PhotoCompressCallback -import com.yizhuan.xchat_android_library.common.util.PhotoCompressUtil -import com.yizhuan.xchat_android_library.common.util.PhotosCompressCallback -import com.yizhuan.xchat_android_library.easypermisssion.EasyPermissions +import com.chwl.app.R +import com.chwl.app.application.XChatApplication +import com.chwl.app.databinding.PhotoDialogBinding +import com.chwl.app.ui.widget.dialog.CommonTipDialog +import com.chwl.library.common.base.BaseDialogFragment +import com.chwl.library.common.photo.PhotoProvider +import com.chwl.library.common.photo.PhotoProviderNew +import com.chwl.library.common.util.PhotoCompressCallback +import com.chwl.library.common.util.PhotoCompressUtil +import com.chwl.library.common.util.PhotosCompressCallback +import com.chwl.library.easypermisssion.EasyPermissions import kotlinx.coroutines.Job /** diff --git a/app/src/main/java/com/yizhuan/habu/common/permission/EasyPermissions.java b/app/src/main/java/com/chwl/app/common/permission/EasyPermissions.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/common/permission/EasyPermissions.java rename to app/src/main/java/com/chwl/app/common/permission/EasyPermissions.java index 5eabf0a2a..882a3866d 100644 --- a/app/src/main/java/com/yizhuan/habu/common/permission/EasyPermissions.java +++ b/app/src/main/java/com/chwl/app/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.habu.common.permission; +package com.chwl.app.common.permission; import android.annotation.TargetApi; import android.app.Activity; @@ -33,7 +33,7 @@ import androidx.core.app.ActivityCompat; import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; -import com.yizhuan.habu.common.widget.dialog.BaseAlertDialogBuilder; +import com.chwl.app.common.widget.dialog.BaseAlertDialogBuilder; import java.util.ArrayList; import java.util.Arrays; diff --git a/app/src/main/java/com/yizhuan/habu/common/permission/PermissionActivity.java b/app/src/main/java/com/chwl/app/common/permission/PermissionActivity.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/common/permission/PermissionActivity.java rename to app/src/main/java/com/chwl/app/common/permission/PermissionActivity.java index 060718111..a81afe19d 100644 --- a/app/src/main/java/com/yizhuan/habu/common/permission/PermissionActivity.java +++ b/app/src/main/java/com/chwl/app/common/permission/PermissionActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common.permission; +package com.chwl.app.common.permission; import android.content.Intent; @@ -8,7 +8,7 @@ import android.os.Bundle; import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; -import com.yizhuan.habu.R; +import com.chwl.app.R; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/common/permission/StatusBarCompat.java b/app/src/main/java/com/chwl/app/common/permission/StatusBarCompat.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/common/permission/StatusBarCompat.java rename to app/src/main/java/com/chwl/app/common/permission/StatusBarCompat.java index 30571c07f..9c549db5f 100644 --- a/app/src/main/java/com/yizhuan/habu/common/permission/StatusBarCompat.java +++ b/app/src/main/java/com/chwl/app/common/permission/StatusBarCompat.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common.permission; +package com.chwl.app.common.permission; import android.app.Activity; import android.content.Context; diff --git a/app/src/main/java/com/yizhuan/habu/common/photo/PhotoProvider.kt b/app/src/main/java/com/chwl/app/common/photo/PhotoProvider.kt similarity index 92% rename from app/src/main/java/com/yizhuan/habu/common/photo/PhotoProvider.kt rename to app/src/main/java/com/chwl/app/common/photo/PhotoProvider.kt index 4c7b6767c..550cfb249 100644 --- a/app/src/main/java/com/yizhuan/habu/common/photo/PhotoProvider.kt +++ b/app/src/main/java/com/chwl/app/common/photo/PhotoProvider.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.common.photo +package com.chwl.library.common.photo import android.app.Activity import android.content.Intent @@ -7,16 +7,16 @@ import android.os.Build import android.os.Environment import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentActivity -import com.yizhuan.xchat_android_library.common.application.BaseApp -import com.yizhuan.xchat_android_library.common.delegate.SpDelegate -import com.yizhuan.xchat_android_library.common.file.FileHelper -import com.yizhuan.xchat_android_library.common.glide.GlideEngine -import com.yizhuan.xchat_android_library.common.util.Logger -import com.yizhuan.xchat_android_library.easyphoto.EasyPhotos -import com.yizhuan.xchat_android_library.easyphoto.constant.Type.* -import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo -import com.yizhuan.xchat_android_library.utils.TimeUtils -import com.yizhuan.xchat_android_library.utils.TimeUtils.TIME_FORMAT +import com.chwl.library.common.application.BaseApp +import com.chwl.library.common.delegate.SpDelegate +import com.chwl.library.common.file.FileHelper +import com.chwl.library.common.glide.GlideEngine +import com.chwl.library.common.util.Logger +import com.chwl.library.easyphoto.EasyPhotos +import com.chwl.library.easyphoto.constant.Type.* +import com.chwl.library.easyphoto.models.album.entity.Photo +import com.chwl.library.utils.TimeUtils +import com.chwl.library.utils.TimeUtils.TIME_FORMAT import kotlinx.coroutines.* import java.io.File diff --git a/app/src/main/java/com/yizhuan/habu/common/server/NetworkService.java b/app/src/main/java/com/chwl/app/common/server/NetworkService.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/common/server/NetworkService.java rename to app/src/main/java/com/chwl/app/common/server/NetworkService.java index 4d004db72..5d1eee86b 100644 --- a/app/src/main/java/com/yizhuan/habu/common/server/NetworkService.java +++ b/app/src/main/java/com/chwl/app/common/server/NetworkService.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common.server; +package com.chwl.app.common.server; import android.app.Service; import android.content.BroadcastReceiver; @@ -10,8 +10,8 @@ import android.net.NetworkInfo; import android.os.IBinder; import android.util.Log; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.library.utils.ResUtil; public class NetworkService extends Service { diff --git a/app/src/main/java/com/yizhuan/habu/common/svga/SimpleSvgaCallback.java b/app/src/main/java/com/chwl/app/common/svga/SimpleSvgaCallback.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/common/svga/SimpleSvgaCallback.java rename to app/src/main/java/com/chwl/app/common/svga/SimpleSvgaCallback.java index 322e9e9d3..86da85bd1 100644 --- a/app/src/main/java/com/yizhuan/habu/common/svga/SimpleSvgaCallback.java +++ b/app/src/main/java/com/chwl/app/common/svga/SimpleSvgaCallback.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common.svga; +package com.chwl.app.common.svga; import com.opensource.svgaplayer.SVGACallback; diff --git a/app/src/main/java/com/yizhuan/habu/common/svga/SimpleSvgaParseCompletion.java b/app/src/main/java/com/chwl/app/common/svga/SimpleSvgaParseCompletion.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/common/svga/SimpleSvgaParseCompletion.java rename to app/src/main/java/com/chwl/app/common/svga/SimpleSvgaParseCompletion.java index 43dd0361d..6d056fdb2 100644 --- a/app/src/main/java/com/yizhuan/habu/common/svga/SimpleSvgaParseCompletion.java +++ b/app/src/main/java/com/chwl/app/common/svga/SimpleSvgaParseCompletion.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common.svga; +package com.chwl.app.common.svga; import com.opensource.svgaplayer.SVGAParser; import com.opensource.svgaplayer.SVGAVideoEntity; diff --git a/app/src/main/java/com/yizhuan/habu/common/util/AppLifeCycleHelper.java b/app/src/main/java/com/chwl/app/common/util/AppLifeCycleHelper.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/common/util/AppLifeCycleHelper.java rename to app/src/main/java/com/chwl/app/common/util/AppLifeCycleHelper.java index 2408c2853..b05ccef77 100644 --- a/app/src/main/java/com/yizhuan/habu/common/util/AppLifeCycleHelper.java +++ b/app/src/main/java/com/chwl/app/common/util/AppLifeCycleHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common.util; +package com.chwl.app.common.util; import android.app.Activity; import android.app.Application; @@ -6,10 +6,10 @@ import android.os.Bundle; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.yizhuan.habu.application.XChatApplication; -import com.yizhuan.xchat_android_core.auth.AuthModel; +import com.chwl.app.application.XChatApplication; +import com.chwl.core.auth.AuthModel; -import com.yizhuan.xchat_android_library.common.util.CoreUtils; +import com.chwl.library.common.util.CoreUtils; /** * Activity生命周期工具类 diff --git a/app/src/main/java/com/yizhuan/habu/common/util/BitmapUtil.java b/app/src/main/java/com/chwl/app/common/util/BitmapUtil.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/common/util/BitmapUtil.java rename to app/src/main/java/com/chwl/app/common/util/BitmapUtil.java index 73177fca0..64931d1c7 100644 --- a/app/src/main/java/com/yizhuan/habu/common/util/BitmapUtil.java +++ b/app/src/main/java/com/chwl/app/common/util/BitmapUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common.util; +package com.chwl.app.common.util; import android.graphics.Bitmap; import android.graphics.BitmapFactory; @@ -6,7 +6,7 @@ import android.graphics.Matrix; import android.graphics.Point; import android.net.Uri; -import com.yizhuan.habu.application.XChatApplication; +import com.chwl.app.application.XChatApplication; import java.io.ByteArrayOutputStream; import java.io.FileDescriptor; @@ -14,7 +14,7 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; -import com.yizhuan.xchat_android_library.common.util.Logger; +import com.chwl.library.common.util.Logger; /** * Created by wushaocheng diff --git a/app/src/main/java/com/yizhuan/habu/common/util/DialogFragmentUtils.java b/app/src/main/java/com/chwl/app/common/util/DialogFragmentUtils.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/common/util/DialogFragmentUtils.java rename to app/src/main/java/com/chwl/app/common/util/DialogFragmentUtils.java index dfcc356ee..2c1b65e45 100644 --- a/app/src/main/java/com/yizhuan/habu/common/util/DialogFragmentUtils.java +++ b/app/src/main/java/com/chwl/app/common/util/DialogFragmentUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common.util; +package com.chwl.app.common.util; import android.app.Activity; import android.os.Bundle; @@ -8,14 +8,14 @@ import androidx.fragment.app.DialogFragment; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; -import com.yizhuan.habu.base.BaseActivity; -import com.yizhuan.xchat_android_core.utils.Logger; +import com.chwl.app.base.BaseActivity; +import com.chwl.core.utils.Logger; import java.util.List; -import com.yizhuan.xchat_android_library.common.base.BaseDialogFragment; -import com.yizhuan.xchat_android_library.common.util.ActivityHelper; -import com.yizhuan.xchat_android_library.common.util.ReflectionUtils; +import com.chwl.library.common.base.BaseDialogFragment; +import com.chwl.library.common.util.ActivityHelper; +import com.chwl.library.common.util.ReflectionUtils; /** diff --git a/app/src/main/java/com/yizhuan/habu/common/util/PauseWorkerHandler.java b/app/src/main/java/com/chwl/app/common/util/PauseWorkerHandler.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/common/util/PauseWorkerHandler.java rename to app/src/main/java/com/chwl/app/common/util/PauseWorkerHandler.java index 18f9120e3..cff53ece7 100644 --- a/app/src/main/java/com/yizhuan/habu/common/util/PauseWorkerHandler.java +++ b/app/src/main/java/com/chwl/app/common/util/PauseWorkerHandler.java @@ -1,8 +1,8 @@ -package com.yizhuan.habu.common.util; +package com.chwl.app.common.util; import android.os.Handler; import android.os.Looper; -import com.yizhuan.xchat_android_core.utils.Logger; +import com.chwl.core.utils.Logger; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; @@ -11,7 +11,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Vector; -import com.yizhuan.xchat_android_library.common.util.CoreUtils; +import com.chwl.library.common.util.CoreUtils; /** * Created by logwee on 2019/4/9. diff --git a/app/src/main/java/com/yizhuan/habu/common/util/StringUtils.java b/app/src/main/java/com/chwl/app/common/util/StringUtils.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/common/util/StringUtils.java rename to app/src/main/java/com/chwl/app/common/util/StringUtils.java index 65ab25e32..4feb35b54 100644 --- a/app/src/main/java/com/yizhuan/habu/common/util/StringUtils.java +++ b/app/src/main/java/com/chwl/app/common/util/StringUtils.java @@ -1,6 +1,6 @@ -package com.yizhuan.habu.common.util; +package com.chwl.app.common.util; -import com.yizhuan.xchat_android_library.utils.FP; +import com.chwl.library.utils.FP; public class StringUtils { diff --git a/app/src/main/java/com/yizhuan/habu/common/util/Utils.java b/app/src/main/java/com/chwl/app/common/util/Utils.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/common/util/Utils.java rename to app/src/main/java/com/chwl/app/common/util/Utils.java index b2e8ff82b..bc68b3546 100644 --- a/app/src/main/java/com/yizhuan/habu/common/util/Utils.java +++ b/app/src/main/java/com/chwl/app/common/util/Utils.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common.util; +package com.chwl.app.common.util; import android.annotation.TargetApi; import android.content.Context; @@ -9,7 +9,7 @@ import android.view.WindowManager; import androidx.fragment.app.FragmentManager; -import com.yizhuan.xchat_android_core.utils.Logger; +import com.chwl.core.utils.Logger; import java.lang.reflect.Field; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/common/widget/AgeSexView.java b/app/src/main/java/com/chwl/app/common/widget/AgeSexView.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/common/widget/AgeSexView.java rename to app/src/main/java/com/chwl/app/common/widget/AgeSexView.java index f996a65ed..afe8f00bc 100644 --- a/app/src/main/java/com/yizhuan/habu/common/widget/AgeSexView.java +++ b/app/src/main/java/com/chwl/app/common/widget/AgeSexView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common.widget; +package com.chwl.app.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.habu.R; +import com.chwl.app.R; /** * Created by zhouxiangfeng on 17/2/26. diff --git a/app/src/main/java/com/yizhuan/habu/common/widget/BadgeView.java b/app/src/main/java/com/chwl/app/common/widget/BadgeView.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/common/widget/BadgeView.java rename to app/src/main/java/com/chwl/app/common/widget/BadgeView.java index 88a7a3c72..f5f7c96a5 100644 --- a/app/src/main/java/com/yizhuan/habu/common/widget/BadgeView.java +++ b/app/src/main/java/com/chwl/app/common/widget/BadgeView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common.widget; +package com.chwl.app.common.widget; import android.content.Context; import android.content.res.Resources; diff --git a/app/src/main/java/com/yizhuan/habu/common/widget/ChangeColorIconWithText.java b/app/src/main/java/com/chwl/app/common/widget/ChangeColorIconWithText.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/common/widget/ChangeColorIconWithText.java rename to app/src/main/java/com/chwl/app/common/widget/ChangeColorIconWithText.java index 0e277e5de..17c933c98 100644 --- a/app/src/main/java/com/yizhuan/habu/common/widget/ChangeColorIconWithText.java +++ b/app/src/main/java/com/chwl/app/common/widget/ChangeColorIconWithText.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common.widget; +package com.chwl.app.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.habu.R; +import com.chwl.app.R; public class ChangeColorIconWithText extends View { diff --git a/app/src/main/java/com/yizhuan/habu/common/widget/CircleGradualImageView.java b/app/src/main/java/com/chwl/app/common/widget/CircleGradualImageView.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/common/widget/CircleGradualImageView.java rename to app/src/main/java/com/chwl/app/common/widget/CircleGradualImageView.java index 0faa062f7..6e96c5d91 100644 --- a/app/src/main/java/com/yizhuan/habu/common/widget/CircleGradualImageView.java +++ b/app/src/main/java/com/chwl/app/common/widget/CircleGradualImageView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common.widget; +package com.chwl.app.common.widget; import android.content.Context; import android.content.res.TypedArray; @@ -23,8 +23,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.habu.R; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.R; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; /** * Created by MadisonRong on 23/04/2018. diff --git a/app/src/main/java/com/yizhuan/habu/common/widget/CircleImageSpan.java b/app/src/main/java/com/chwl/app/common/widget/CircleImageSpan.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/common/widget/CircleImageSpan.java rename to app/src/main/java/com/chwl/app/common/widget/CircleImageSpan.java index 161605032..b3e19f17d 100644 --- a/app/src/main/java/com/yizhuan/habu/common/widget/CircleImageSpan.java +++ b/app/src/main/java/com/chwl/app/common/widget/CircleImageSpan.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common.widget; +package com.chwl.app.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.habu.common.util.Utils; -import com.yizhuan.habu.ui.gift.widget.GlideCircleTransform; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.chwl.app.common.util.Utils; +import com.chwl.app.ui.gift.widget.GlideCircleTransform; +import com.chwl.library.utils.config.BasicConfig; public class CircleImageSpan extends ImageSpan { diff --git a/app/src/main/java/com/yizhuan/habu/common/widget/CircleImageView.java b/app/src/main/java/com/chwl/app/common/widget/CircleImageView.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/common/widget/CircleImageView.java rename to app/src/main/java/com/chwl/app/common/widget/CircleImageView.java index 37098f513..d98529702 100644 --- a/app/src/main/java/com/yizhuan/habu/common/widget/CircleImageView.java +++ b/app/src/main/java/com/chwl/app/common/widget/CircleImageView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common.widget; +package com.chwl.app.common.widget; import android.content.Context; import android.content.res.TypedArray; @@ -18,7 +18,7 @@ import android.util.AttributeSet; import androidx.appcompat.widget.AppCompatImageView; -import com.yizhuan.habu.R; +import com.chwl.app.R; public class CircleImageView extends AppCompatImageView { diff --git a/app/src/main/java/com/yizhuan/habu/common/widget/CustomAutoWidthImageSpan.java b/app/src/main/java/com/chwl/app/common/widget/CustomAutoWidthImageSpan.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/common/widget/CustomAutoWidthImageSpan.java rename to app/src/main/java/com/chwl/app/common/widget/CustomAutoWidthImageSpan.java index fb568de2f..b4fc631ec 100644 --- a/app/src/main/java/com/yizhuan/habu/common/widget/CustomAutoWidthImageSpan.java +++ b/app/src/main/java/com/chwl/app/common/widget/CustomAutoWidthImageSpan.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common.widget; +package com.chwl.app.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.habu.common.util.Utils; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.chwl.app.common.util.Utils; +import com.chwl.library.utils.config.BasicConfig; import java.lang.ref.WeakReference; diff --git a/app/src/main/java/com/yizhuan/habu/common/widget/CustomImageSpan.java b/app/src/main/java/com/chwl/app/common/widget/CustomImageSpan.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/common/widget/CustomImageSpan.java rename to app/src/main/java/com/chwl/app/common/widget/CustomImageSpan.java index 74450a4b7..9adf20f58 100644 --- a/app/src/main/java/com/yizhuan/habu/common/widget/CustomImageSpan.java +++ b/app/src/main/java/com/chwl/app/common/widget/CustomImageSpan.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common.widget; +package com.chwl.app.common.widget; import android.app.Activity; import android.content.Context; @@ -19,10 +19,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.habu.common.util.Utils; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_library.utils.SizeUtils; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.chwl.app.common.util.Utils; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.library.utils.SizeUtils; +import com.chwl.library.utils.config.BasicConfig; import java.lang.ref.WeakReference; diff --git a/app/src/main/java/com/yizhuan/habu/common/widget/DragLayout.java b/app/src/main/java/com/chwl/app/common/widget/DragLayout.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/common/widget/DragLayout.java rename to app/src/main/java/com/chwl/app/common/widget/DragLayout.java index c4038e20e..f8d1edb0b 100644 --- a/app/src/main/java/com/yizhuan/habu/common/widget/DragLayout.java +++ b/app/src/main/java/com/chwl/app/common/widget/DragLayout.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common.widget; +package com.chwl.app.common.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yizhuan/habu/common/widget/FloatingLiveMiniView.java b/app/src/main/java/com/chwl/app/common/widget/FloatingLiveMiniView.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/common/widget/FloatingLiveMiniView.java rename to app/src/main/java/com/chwl/app/common/widget/FloatingLiveMiniView.java index aa73408fa..104f8f13d 100644 --- a/app/src/main/java/com/yizhuan/habu/common/widget/FloatingLiveMiniView.java +++ b/app/src/main/java/com/chwl/app/common/widget/FloatingLiveMiniView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common.widget; +package com.chwl.app.common.widget; import android.content.Context; import android.util.AttributeSet; @@ -7,8 +7,8 @@ import android.widget.RelativeLayout; import androidx.annotation.Nullable; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.R; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; /** * 全局悬浮的最小化控件 diff --git a/app/src/main/java/com/yizhuan/habu/common/widget/LimitEditText.java b/app/src/main/java/com/chwl/app/common/widget/LimitEditText.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/common/widget/LimitEditText.java rename to app/src/main/java/com/chwl/app/common/widget/LimitEditText.java index 2330bb57d..a37d6ae47 100644 --- a/app/src/main/java/com/yizhuan/habu/common/widget/LimitEditText.java +++ b/app/src/main/java/com/chwl/app/common/widget/LimitEditText.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common.widget; +package com.chwl.app.common.widget; import android.content.Context; import android.content.res.TypedArray; @@ -8,8 +8,8 @@ import android.widget.TextView; import androidx.appcompat.widget.AppCompatEditText; -import com.yizhuan.habu.R; -import com.yizhuan.habu.utils.LimitInputFliter; +import com.chwl.app.R; +import com.chwl.app.utils.LimitInputFliter; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/habu/common/widget/LoadingImageView.java b/app/src/main/java/com/chwl/app/common/widget/LoadingImageView.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/common/widget/LoadingImageView.java rename to app/src/main/java/com/chwl/app/common/widget/LoadingImageView.java index 27f6adfd2..0c3f0f4d4 100644 --- a/app/src/main/java/com/yizhuan/habu/common/widget/LoadingImageView.java +++ b/app/src/main/java/com/chwl/app/common/widget/LoadingImageView.java @@ -1,5 +1,5 @@ -package com.yizhuan.habu.common.widget; +package com.chwl.app.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.habu.R; +import com.chwl.app.R; /** diff --git a/app/src/main/java/com/yizhuan/habu/common/widget/MaskImageView.java b/app/src/main/java/com/chwl/app/common/widget/MaskImageView.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/common/widget/MaskImageView.java rename to app/src/main/java/com/chwl/app/common/widget/MaskImageView.java index b5c888e66..65f100823 100644 --- a/app/src/main/java/com/yizhuan/habu/common/widget/MaskImageView.java +++ b/app/src/main/java/com/chwl/app/common/widget/MaskImageView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common.widget; +package com.chwl.app.common.widget; import android.content.Context; import android.content.res.TypedArray; @@ -10,7 +10,7 @@ import android.graphics.ColorMatrixColorFilter; import android.util.AttributeSet; import android.widget.ImageView; -import com.yizhuan.habu.R; +import com.chwl.app.R; /** diff --git a/app/src/main/java/com/yizhuan/habu/common/widget/OriginalDrawStatusClickSpan.java b/app/src/main/java/com/chwl/app/common/widget/OriginalDrawStatusClickSpan.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/common/widget/OriginalDrawStatusClickSpan.java rename to app/src/main/java/com/chwl/app/common/widget/OriginalDrawStatusClickSpan.java index f684ca351..eb7fc524e 100644 --- a/app/src/main/java/com/yizhuan/habu/common/widget/OriginalDrawStatusClickSpan.java +++ b/app/src/main/java/com/chwl/app/common/widget/OriginalDrawStatusClickSpan.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common.widget; +package com.chwl.app.common.widget; import android.text.TextPaint; import android.text.style.ClickableSpan; diff --git a/app/src/main/java/com/yizhuan/habu/common/widget/OvalImageView.java b/app/src/main/java/com/chwl/app/common/widget/OvalImageView.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/common/widget/OvalImageView.java rename to app/src/main/java/com/chwl/app/common/widget/OvalImageView.java index e0094dcd3..9892f028b 100644 --- a/app/src/main/java/com/yizhuan/habu/common/widget/OvalImageView.java +++ b/app/src/main/java/com/chwl/app/common/widget/OvalImageView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common.widget; +package com.chwl.app.common.widget; import android.content.Context; import android.graphics.Canvas; diff --git a/app/src/main/java/com/yizhuan/habu/common/widget/PlayerView.java b/app/src/main/java/com/chwl/app/common/widget/PlayerView.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/common/widget/PlayerView.java rename to app/src/main/java/com/chwl/app/common/widget/PlayerView.java index 84f5634f3..f801bc430 100644 --- a/app/src/main/java/com/yizhuan/habu/common/widget/PlayerView.java +++ b/app/src/main/java/com/chwl/app/common/widget/PlayerView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common.widget; +package com.chwl.app.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.habu.R; +import com.chwl.app.R; /** * Created by zhouxiangfeng on 17/2/26. diff --git a/app/src/main/java/com/yizhuan/habu/common/widget/RectRoundImageView.java b/app/src/main/java/com/chwl/app/common/widget/RectRoundImageView.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/common/widget/RectRoundImageView.java rename to app/src/main/java/com/chwl/app/common/widget/RectRoundImageView.java index 8c36a2a56..b03e5364d 100644 --- a/app/src/main/java/com/yizhuan/habu/common/widget/RectRoundImageView.java +++ b/app/src/main/java/com/chwl/app/common/widget/RectRoundImageView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common.widget; +package com.chwl.app.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.habu.R; +import com.chwl.app.R; import java.io.InputStream; diff --git a/app/src/main/java/com/yizhuan/habu/common/widget/SlideListViewPager.java b/app/src/main/java/com/chwl/app/common/widget/SlideListViewPager.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/common/widget/SlideListViewPager.java rename to app/src/main/java/com/chwl/app/common/widget/SlideListViewPager.java index eed12e82f..da2dde24f 100644 --- a/app/src/main/java/com/yizhuan/habu/common/widget/SlideListViewPager.java +++ b/app/src/main/java/com/chwl/app/common/widget/SlideListViewPager.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common.widget; +package com.chwl.app.common.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yizhuan/habu/common/widget/StatusLayout.java b/app/src/main/java/com/chwl/app/common/widget/StatusLayout.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/common/widget/StatusLayout.java rename to app/src/main/java/com/chwl/app/common/widget/StatusLayout.java index 6e2925603..c09e01c43 100644 --- a/app/src/main/java/com/yizhuan/habu/common/widget/StatusLayout.java +++ b/app/src/main/java/com/chwl/app/common/widget/StatusLayout.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common.widget; +package com.chwl.app.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.habu.R; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.chwl.app.R; +import com.chwl.library.utils.log.MLog; /** diff --git a/app/src/main/java/com/yizhuan/habu/common/widget/TextDrawable.java b/app/src/main/java/com/chwl/app/common/widget/TextDrawable.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/common/widget/TextDrawable.java rename to app/src/main/java/com/chwl/app/common/widget/TextDrawable.java index 6f0ecdecc..97e1b874d 100644 --- a/app/src/main/java/com/yizhuan/habu/common/widget/TextDrawable.java +++ b/app/src/main/java/com/chwl/app/common/widget/TextDrawable.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common.widget; +package com.chwl.app.common.widget; import android.graphics.Canvas; import android.graphics.Color; diff --git a/app/src/main/java/com/yizhuan/habu/common/widget/TutuSwitchView.java b/app/src/main/java/com/chwl/app/common/widget/TutuSwitchView.java similarity index 68% rename from app/src/main/java/com/yizhuan/habu/common/widget/TutuSwitchView.java rename to app/src/main/java/com/chwl/app/common/widget/TutuSwitchView.java index cdb526bb6..5cd47d474 100644 --- a/app/src/main/java/com/yizhuan/habu/common/widget/TutuSwitchView.java +++ b/app/src/main/java/com/chwl/app/common/widget/TutuSwitchView.java @@ -1,15 +1,15 @@ -package com.yizhuan.habu.common.widget; +package com.chwl.app.common.widget; import android.content.Context; import android.util.AttributeSet; import androidx.core.content.ContextCompat; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_library.widget.IOSSwitchView; +import com.chwl.app.R; +import com.chwl.library.widget.IOSSwitchView; /** - * 开关控件，涉及ui，继承library的 {@link com.yizhuan.xchat_android_library.widget.IOSSwitchView} + * 开关控件，涉及ui，继承library的 {@link com.chwl.library.widget.IOSSwitchView} * 改写UI * Created by lvzebiao on 2019/1/25. */ diff --git a/app/src/main/java/com/yizhuan/habu/common/widget/dialog/BaseAlertDialogBuilder.java b/app/src/main/java/com/chwl/app/common/widget/dialog/BaseAlertDialogBuilder.java similarity index 89% rename from app/src/main/java/com/yizhuan/habu/common/widget/dialog/BaseAlertDialogBuilder.java rename to app/src/main/java/com/chwl/app/common/widget/dialog/BaseAlertDialogBuilder.java index 29c34eb5b..ddd38119b 100644 --- a/app/src/main/java/com/yizhuan/habu/common/widget/dialog/BaseAlertDialogBuilder.java +++ b/app/src/main/java/com/chwl/app/common/widget/dialog/BaseAlertDialogBuilder.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common.widget.dialog; +package com.chwl.app.common.widget.dialog; import android.content.Context; diff --git a/app/src/main/java/com/yizhuan/habu/common/widget/dialog/ChooseWorldsDialog.java b/app/src/main/java/com/chwl/app/common/widget/dialog/ChooseWorldsDialog.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/common/widget/dialog/ChooseWorldsDialog.java rename to app/src/main/java/com/chwl/app/common/widget/dialog/ChooseWorldsDialog.java index 2257d3fa2..c8f5b78a1 100644 --- a/app/src/main/java/com/yizhuan/habu/common/widget/dialog/ChooseWorldsDialog.java +++ b/app/src/main/java/com/chwl/app/common/widget/dialog/ChooseWorldsDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common.widget.dialog; +package com.chwl.app.common.widget.dialog; import android.app.Activity; import android.app.Dialog; @@ -19,16 +19,16 @@ import androidx.fragment.app.Fragment; import androidx.viewpager.widget.ViewPager; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.yizhuan.habu.R; -import com.yizhuan.habu.community.publish.view.WorldsChooseFrg; -import com.yizhuan.habu.home.adapter.FragmentViewPagerAdapter; -import com.yizhuan.habu.ui.widget.magicindicator.MagicIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.ViewPagerHelper; -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.community.publish.view.WorldsChooseFrg; +import com.chwl.app.home.adapter.FragmentViewPagerAdapter; +import com.chwl.app.ui.widget.magicindicator.MagicIndicator; +import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.chwl.core.Constants; +import com.chwl.core.community.bean.MiniWorldChooseInfo; +import com.chwl.core.home.bean.TabInfo; +import com.chwl.library.utils.ResUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/common/widget/dialog/ChooseWorldsIndicatorAdapter.java b/app/src/main/java/com/chwl/app/common/widget/dialog/ChooseWorldsIndicatorAdapter.java similarity index 79% rename from app/src/main/java/com/yizhuan/habu/common/widget/dialog/ChooseWorldsIndicatorAdapter.java rename to app/src/main/java/com/chwl/app/common/widget/dialog/ChooseWorldsIndicatorAdapter.java index 3fcc8e682..7e0303f06 100644 --- a/app/src/main/java/com/yizhuan/habu/common/widget/dialog/ChooseWorldsIndicatorAdapter.java +++ b/app/src/main/java/com/chwl/app/common/widget/dialog/ChooseWorldsIndicatorAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common.widget.dialog; +package com.chwl.app.common.widget.dialog; import android.content.Context; import android.view.ViewGroup; @@ -6,14 +6,14 @@ import android.widget.FrameLayout; import androidx.core.content.ContextCompat; -import com.yizhuan.habu.R; -import com.yizhuan.habu.decoration.view.widgets.BadgeScaleTransitionPagerTitleView; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; -import com.yizhuan.xchat_android_core.home.bean.TabInfo; +import com.chwl.app.R; +import com.chwl.app.decoration.view.widgets.BadgeScaleTransitionPagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; +import com.chwl.core.home.bean.TabInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/common/widget/dialog/CommonPopupDialog.java b/app/src/main/java/com/chwl/app/common/widget/dialog/CommonPopupDialog.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/common/widget/dialog/CommonPopupDialog.java rename to app/src/main/java/com/chwl/app/common/widget/dialog/CommonPopupDialog.java index 8c7dc8241..8fe4d797f 100644 --- a/app/src/main/java/com/yizhuan/habu/common/widget/dialog/CommonPopupDialog.java +++ b/app/src/main/java/com/chwl/app/common/widget/dialog/CommonPopupDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common.widget.dialog; +package com.chwl.app.common.widget.dialog; import android.content.Context; import android.os.Bundle; @@ -15,9 +15,9 @@ import android.widget.TextView; import com.example.lib_core.component.SuperBottomSheetDialog; import com.google.android.material.bottomsheet.BottomSheetBehavior; -import com.yizhuan.habu.R; -import com.yizhuan.habu.common.util.Utils; -import com.yizhuan.habu.ui.widget.ButtonItem; +import com.chwl.app.R; +import com.chwl.app.common.util.Utils; +import com.chwl.app.ui.widget.ButtonItem; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/common/widget/dialog/CustomPopupDialog.java b/app/src/main/java/com/chwl/app/common/widget/dialog/CustomPopupDialog.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/common/widget/dialog/CustomPopupDialog.java rename to app/src/main/java/com/chwl/app/common/widget/dialog/CustomPopupDialog.java index c48945060..2e455e52a 100644 --- a/app/src/main/java/com/yizhuan/habu/common/widget/dialog/CustomPopupDialog.java +++ b/app/src/main/java/com/chwl/app/common/widget/dialog/CustomPopupDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common.widget.dialog; +package com.chwl.app.common.widget.dialog; import android.app.AlertDialog; import android.content.Context; @@ -12,9 +12,9 @@ import android.view.Window; import android.view.WindowManager; import android.widget.TextView; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.widget.ButtonItem; -import com.yizhuan.xchat_android_library.utils.ResolutionUtils; +import com.chwl.app.R; +import com.chwl.app.ui.widget.ButtonItem; +import com.chwl.library.utils.ResolutionUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/common/widget/dialog/DialogManager.java b/app/src/main/java/com/chwl/app/common/widget/dialog/DialogManager.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/common/widget/dialog/DialogManager.java rename to app/src/main/java/com/chwl/app/common/widget/dialog/DialogManager.java index c9b5e6466..52bc967e7 100644 --- a/app/src/main/java/com/yizhuan/habu/common/widget/dialog/DialogManager.java +++ b/app/src/main/java/com/chwl/app/common/widget/dialog/DialogManager.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common.widget.dialog; +package com.chwl.app.common.widget.dialog; import android.annotation.TargetApi; import android.app.Activity; @@ -27,12 +27,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.habu.R; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.habu.ui.widget.ButtonItem; -import com.yizhuan.habu.utils.SpannableBuilder; -import com.yizhuan.xchat_android_core.utils.ActivityUtil; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.chwl.app.R; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.app.ui.widget.ButtonItem; +import com.chwl.app.utils.SpannableBuilder; +import com.chwl.core.utils.ActivityUtil; +import com.chwl.library.utils.log.MLog; import java.util.List; @@ -558,7 +558,7 @@ public class DialogManager { * 2、如果UI要求彈框是完全自定義的，再重新寫過 * * @param title 標題，空則隱藏 (ui說，有些彈框帶標題，有些不帶，兩種情況共存) - * @param message 內容，不能為空，配合{@link com.yizhuan.habu.utils.SpannableBuilder} 變色使用 + * @param message 內容，不能為空，配合{@link com.chwl.app.utils.SpannableBuilder} 變色使用 * @param okLabel ok按鈕，不能隱藏，默認為 text="確定" * @param cancelLabel 取消按鈕，空則隱藏，一般現在都用text="取消" * @param l 點擊監聽 diff --git a/app/src/main/java/com/yizhuan/habu/common/widget/dialog/DialogUiHelper.java b/app/src/main/java/com/chwl/app/common/widget/dialog/DialogUiHelper.java similarity index 76% rename from app/src/main/java/com/yizhuan/habu/common/widget/dialog/DialogUiHelper.java rename to app/src/main/java/com/chwl/app/common/widget/dialog/DialogUiHelper.java index 14415c039..7dc4d54fc 100644 --- a/app/src/main/java/com/yizhuan/habu/common/widget/dialog/DialogUiHelper.java +++ b/app/src/main/java/com/chwl/app/common/widget/dialog/DialogUiHelper.java @@ -1,21 +1,21 @@ -package com.yizhuan.habu.common.widget.dialog; +package com.chwl.app.common.widget.dialog; import android.content.Context; -import com.yizhuan.habu.R; -import com.yizhuan.habu.application.IReportConstants; -import com.yizhuan.habu.application.ReportManager; -import com.yizhuan.habu.radish.task.activity.TaskCenterActivity; -import com.yizhuan.habu.ui.pay.ChargeActivity; -import com.yizhuan.habu.ui.webview.CommonWebViewActivity; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; -import com.yizhuan.xchat_android_core.utils.ActivityUtil; -import com.yizhuan.xchat_android_library.common.util.DeviceUtil; -import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.application.IReportConstants; +import com.chwl.app.application.ReportManager; +import com.chwl.app.radish.task.activity.TaskCenterActivity; +import com.chwl.app.ui.pay.ChargeActivity; +import com.chwl.app.ui.webview.CommonWebViewActivity; +import com.chwl.core.Constants; +import com.chwl.core.UriProvider; +import com.chwl.core.pay.PayModel; +import com.chwl.core.pay.bean.WalletInfo; +import com.chwl.core.utils.ActivityUtil; +import com.chwl.library.common.util.DeviceUtil; +import com.chwl.library.utils.AppMetaDataUtil; +import com.chwl.library.utils.ResUtil; import java.util.HashMap; diff --git a/app/src/main/java/com/yizhuan/habu/common/widget/dialog/ListViewMenuItem.java b/app/src/main/java/com/chwl/app/common/widget/dialog/ListViewMenuItem.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/common/widget/dialog/ListViewMenuItem.java rename to app/src/main/java/com/chwl/app/common/widget/dialog/ListViewMenuItem.java index 8f8470d59..4587f63b8 100644 --- a/app/src/main/java/com/yizhuan/habu/common/widget/dialog/ListViewMenuItem.java +++ b/app/src/main/java/com/chwl/app/common/widget/dialog/ListViewMenuItem.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common.widget.dialog; +package com.chwl.app.common.widget.dialog; /** * Creator： Chanry diff --git a/app/src/main/java/com/yizhuan/habu/common/widget/dialog/LoadingImageView.java b/app/src/main/java/com/chwl/app/common/widget/dialog/LoadingImageView.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/common/widget/dialog/LoadingImageView.java rename to app/src/main/java/com/chwl/app/common/widget/dialog/LoadingImageView.java index 5afa7e051..4d81e926f 100644 --- a/app/src/main/java/com/yizhuan/habu/common/widget/dialog/LoadingImageView.java +++ b/app/src/main/java/com/chwl/app/common/widget/dialog/LoadingImageView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.common.widget.dialog; +package com.chwl.app.common.widget.dialog; import android.animation.ObjectAnimator; import android.content.Context; diff --git a/app/src/main/java/com/yizhuan/habu/common/widget/dialog/TimeOutProgressDialog.java b/app/src/main/java/com/chwl/app/common/widget/dialog/TimeOutProgressDialog.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/common/widget/dialog/TimeOutProgressDialog.java rename to app/src/main/java/com/chwl/app/common/widget/dialog/TimeOutProgressDialog.java index b8a05726d..603919173 100644 --- a/app/src/main/java/com/yizhuan/habu/common/widget/dialog/TimeOutProgressDialog.java +++ b/app/src/main/java/com/chwl/app/common/widget/dialog/TimeOutProgressDialog.java @@ -1,11 +1,11 @@ -package com.yizhuan.habu.common.widget.dialog; +package com.chwl.app.common.widget.dialog; import android.app.Activity; import android.os.Handler; import android.os.Looper; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.library.utils.SingleToastUtil; /** * Created by qinbo on 2014/7/2. diff --git a/app/src/main/java/com/yizhuan/habu/constants/BundleKeys.java b/app/src/main/java/com/chwl/app/constants/BundleKeys.java similarity index 92% rename from app/src/main/java/com/yizhuan/habu/constants/BundleKeys.java rename to app/src/main/java/com/chwl/app/constants/BundleKeys.java index 11b5cd8ea..12e4927b0 100644 --- a/app/src/main/java/com/yizhuan/habu/constants/BundleKeys.java +++ b/app/src/main/java/com/chwl/app/constants/BundleKeys.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.constants; +package com.chwl.app.constants; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/habu/decoration/adapter/CarShopAdapter.java b/app/src/main/java/com/chwl/app/decoration/adapter/CarShopAdapter.java similarity index 85% rename from app/src/main/java/com/yizhuan/habu/decoration/adapter/CarShopAdapter.java rename to app/src/main/java/com/chwl/app/decoration/adapter/CarShopAdapter.java index 5a27a6acb..73e8b06ff 100644 --- a/app/src/main/java/com/yizhuan/habu/decoration/adapter/CarShopAdapter.java +++ b/app/src/main/java/com/chwl/app/decoration/adapter/CarShopAdapter.java @@ -1,13 +1,13 @@ -package com.yizhuan.habu.decoration.adapter; +package com.chwl.app.decoration.adapter; import android.view.View; -import com.yizhuan.habu.R; -import com.yizhuan.habu.bindadapter.BaseAdapter; -import com.yizhuan.habu.bindadapter.BindingViewHolder; -import com.yizhuan.habu.databinding.ItemCarShopBinding; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.chwl.app.R; +import com.chwl.app.bindadapter.BaseAdapter; +import com.chwl.app.bindadapter.BindingViewHolder; +import com.chwl.app.databinding.ItemCarShopBinding; +import com.chwl.core.decoration.car.bean.CarInfo; +import com.chwl.library.utils.ListUtils; /** * Created by huangmeng1 on 2018/5/9. diff --git a/app/src/main/java/com/yizhuan/habu/decoration/adapter/DecorationCommonAdapter.kt b/app/src/main/java/com/chwl/app/decoration/adapter/DecorationCommonAdapter.kt similarity index 80% rename from app/src/main/java/com/yizhuan/habu/decoration/adapter/DecorationCommonAdapter.kt rename to app/src/main/java/com/chwl/app/decoration/adapter/DecorationCommonAdapter.kt index 52d7dbb86..ed011137d 100644 --- a/app/src/main/java/com/yizhuan/habu/decoration/adapter/DecorationCommonAdapter.kt +++ b/app/src/main/java/com/chwl/app/decoration/adapter/DecorationCommonAdapter.kt @@ -1,11 +1,11 @@ -package com.yizhuan.habu.decoration.adapter +package com.chwl.app.decoration.adapter import android.widget.ImageView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.xchat_android_core.decoration.DecorationInfo +import com.chwl.app.R +import com.chwl.app.ui.utils.load +import com.chwl.core.decoration.DecorationInfo open class DecorationCommonAdapter(layoutResId: Int = R.layout.item_decoration_common) : diff --git a/app/src/main/java/com/yizhuan/habu/decoration/adapter/HeadWearShopAdapter.java b/app/src/main/java/com/chwl/app/decoration/adapter/HeadWearShopAdapter.java similarity index 84% rename from app/src/main/java/com/yizhuan/habu/decoration/adapter/HeadWearShopAdapter.java rename to app/src/main/java/com/chwl/app/decoration/adapter/HeadWearShopAdapter.java index b246e0cda..5c52e3f81 100644 --- a/app/src/main/java/com/yizhuan/habu/decoration/adapter/HeadWearShopAdapter.java +++ b/app/src/main/java/com/chwl/app/decoration/adapter/HeadWearShopAdapter.java @@ -1,14 +1,14 @@ -package com.yizhuan.habu.decoration.adapter; +package com.chwl.app.decoration.adapter; import android.view.View; -import com.yizhuan.habu.R; -import com.yizhuan.habu.bindadapter.BaseAdapter; -import com.yizhuan.habu.bindadapter.BindingViewHolder; -import com.yizhuan.habu.databinding.ItemHeadWearBinding; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.chwl.app.R; +import com.chwl.app.bindadapter.BaseAdapter; +import com.chwl.app.bindadapter.BindingViewHolder; +import com.chwl.app.databinding.ItemHeadWearBinding; +import com.chwl.core.decoration.headwear.bean.HeadWearInfo; +import com.chwl.core.noble.NobleUtil; +import com.chwl.library.utils.ListUtils; /** * Created by huangmeng1 on 2018/5/10. diff --git a/app/src/main/java/com/yizhuan/habu/decoration/adapter/MyCarAdapter.java b/app/src/main/java/com/chwl/app/decoration/adapter/MyCarAdapter.java similarity index 92% rename from app/src/main/java/com/yizhuan/habu/decoration/adapter/MyCarAdapter.java rename to app/src/main/java/com/chwl/app/decoration/adapter/MyCarAdapter.java index 01a54ef2b..57223d9ab 100644 --- a/app/src/main/java/com/yizhuan/habu/decoration/adapter/MyCarAdapter.java +++ b/app/src/main/java/com/chwl/app/decoration/adapter/MyCarAdapter.java @@ -1,17 +1,17 @@ -package com.yizhuan.habu.decoration.adapter; +package com.chwl.app.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.habu.R; -import com.yizhuan.habu.bindadapter.BaseAdapter; -import com.yizhuan.habu.bindadapter.BindingViewHolder; -import com.yizhuan.habu.databinding.ItemCarGarageNormalBinding; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.bindadapter.BaseAdapter; +import com.chwl.app.bindadapter.BindingViewHolder; +import com.chwl.app.databinding.ItemCarGarageNormalBinding; +import com.chwl.core.decoration.car.bean.CarInfo; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; import org.jetbrains.annotations.NotNull; diff --git a/app/src/main/java/com/yizhuan/habu/decoration/adapter/MyChatBubbleAdapter.java b/app/src/main/java/com/chwl/app/decoration/adapter/MyChatBubbleAdapter.java similarity index 82% rename from app/src/main/java/com/yizhuan/habu/decoration/adapter/MyChatBubbleAdapter.java rename to app/src/main/java/com/chwl/app/decoration/adapter/MyChatBubbleAdapter.java index 26225c181..e5ff6564c 100644 --- a/app/src/main/java/com/yizhuan/habu/decoration/adapter/MyChatBubbleAdapter.java +++ b/app/src/main/java/com/chwl/app/decoration/adapter/MyChatBubbleAdapter.java @@ -1,18 +1,18 @@ -package com.yizhuan.habu.decoration.adapter; +package com.chwl.app.decoration.adapter; import android.view.View; import androidx.annotation.NonNull; -import com.yizhuan.habu.BR; -import com.yizhuan.habu.R; -import com.yizhuan.habu.bindadapter.BaseAdapter; -import com.yizhuan.habu.bindadapter.BindingViewHolder; -import com.yizhuan.habu.databinding.ItemMyChatBubbleBinding; -import com.yizhuan.habu.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_library.utils.ResUtil; +import com.chwl.app.BR; +import com.chwl.app.R; +import com.chwl.app.bindadapter.BaseAdapter; +import com.chwl.app.bindadapter.BindingViewHolder; +import com.chwl.app.databinding.ItemMyChatBubbleBinding; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.core.decoration.headwear.bean.ChatBubbleInfo; +import com.chwl.core.decoration.headwear.bean.HeadWearInfo; +import com.chwl.library.utils.ResUtil; /** * Created by huangmeng1 on 2018/5/11. diff --git a/app/src/main/java/com/yizhuan/habu/decoration/adapter/MyHeadWearAdapter.java b/app/src/main/java/com/chwl/app/decoration/adapter/MyHeadWearAdapter.java similarity index 85% rename from app/src/main/java/com/yizhuan/habu/decoration/adapter/MyHeadWearAdapter.java rename to app/src/main/java/com/chwl/app/decoration/adapter/MyHeadWearAdapter.java index 60a0507b2..8ecee750e 100644 --- a/app/src/main/java/com/yizhuan/habu/decoration/adapter/MyHeadWearAdapter.java +++ b/app/src/main/java/com/chwl/app/decoration/adapter/MyHeadWearAdapter.java @@ -1,14 +1,14 @@ -package com.yizhuan.habu.decoration.adapter; +package com.chwl.app.decoration.adapter; import android.view.View; -import com.yizhuan.habu.R; -import com.yizhuan.habu.bindadapter.BaseAdapter; -import com.yizhuan.habu.bindadapter.BindingViewHolder; -import com.yizhuan.habu.databinding.ItemMyHeadWearBinding; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.bindadapter.BaseAdapter; +import com.chwl.app.bindadapter.BindingViewHolder; +import com.chwl.app.databinding.ItemMyHeadWearBinding; +import com.chwl.core.decoration.headwear.bean.HeadWearInfo; +import com.chwl.core.noble.NobleUtil; +import com.chwl.library.utils.ResUtil; /** * Created by huangmeng1 on 2018/5/11. diff --git a/app/src/main/java/com/yizhuan/habu/decoration/adapter/MyNamePlateAdapter.java b/app/src/main/java/com/chwl/app/decoration/adapter/MyNamePlateAdapter.java similarity index 92% rename from app/src/main/java/com/yizhuan/habu/decoration/adapter/MyNamePlateAdapter.java rename to app/src/main/java/com/chwl/app/decoration/adapter/MyNamePlateAdapter.java index 2bda7e412..4a76cfa25 100644 --- a/app/src/main/java/com/yizhuan/habu/decoration/adapter/MyNamePlateAdapter.java +++ b/app/src/main/java/com/chwl/app/decoration/adapter/MyNamePlateAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.decoration.adapter; +package com.chwl.app.decoration.adapter; import android.view.View; import android.widget.ImageView; @@ -7,9 +7,9 @@ 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.habu.R; -import com.yizhuan.xchat_android_core.decoration.nameplate.bean.NamePlateInfo; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.core.decoration.nameplate.bean.NamePlateInfo; +import com.chwl.library.utils.ResUtil; /** * Created by yudi diff --git a/app/src/main/java/com/yizhuan/habu/decoration/adapter/MyUserCardWearAdapter.java b/app/src/main/java/com/chwl/app/decoration/adapter/MyUserCardWearAdapter.java similarity index 83% rename from app/src/main/java/com/yizhuan/habu/decoration/adapter/MyUserCardWearAdapter.java rename to app/src/main/java/com/chwl/app/decoration/adapter/MyUserCardWearAdapter.java index cd617a641..f560f4e27 100644 --- a/app/src/main/java/com/yizhuan/habu/decoration/adapter/MyUserCardWearAdapter.java +++ b/app/src/main/java/com/chwl/app/decoration/adapter/MyUserCardWearAdapter.java @@ -1,17 +1,17 @@ -package com.yizhuan.habu.decoration.adapter; +package com.chwl.app.decoration.adapter; import android.view.View; import androidx.annotation.NonNull; -import com.yizhuan.habu.R; -import com.yizhuan.habu.bindadapter.BaseAdapter; -import com.yizhuan.habu.bindadapter.BindingViewHolder; -import com.yizhuan.habu.databinding.ItemMyUserCardWearBinding; -import com.yizhuan.habu.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_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.bindadapter.BaseAdapter; +import com.chwl.app.bindadapter.BindingViewHolder; +import com.chwl.app.databinding.ItemMyUserCardWearBinding; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.core.decoration.headwear.bean.HeadWearInfo; +import com.chwl.core.decoration.headwear.bean.UserCardWearInfo; +import com.chwl.library.utils.ResUtil; /** * Created by huangmeng1 on 2018/5/11. diff --git a/app/src/main/java/com/yizhuan/habu/decoration/helper/DecorationDialogHelper.java b/app/src/main/java/com/chwl/app/decoration/helper/DecorationDialogHelper.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/decoration/helper/DecorationDialogHelper.java rename to app/src/main/java/com/chwl/app/decoration/helper/DecorationDialogHelper.java index e78d3c030..fbfedd66a 100644 --- a/app/src/main/java/com/yizhuan/habu/decoration/helper/DecorationDialogHelper.java +++ b/app/src/main/java/com/chwl/app/decoration/helper/DecorationDialogHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.decoration.helper; +package com.chwl.app.decoration.helper; import android.content.Context; import android.view.View; @@ -6,19 +6,19 @@ import android.widget.RadioButton; import android.widget.RadioGroup; import android.widget.TextView; -import com.yizhuan.habu.R; -import com.yizhuan.habu.common.widget.dialog.DialogManager; -import com.yizhuan.habu.common.widget.dialog.DialogUiHelper; -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.ActivityUtil; -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.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.app.common.widget.dialog.DialogManager; +import com.chwl.app.common.widget.dialog.DialogUiHelper; +import com.chwl.core.decoration.bean.BaseDecoration; +import com.chwl.core.decoration.bean.CurrencyType; +import com.chwl.core.decoration.car.CarModel; +import com.chwl.core.decoration.headwear.HeadwearModel; +import com.chwl.core.utils.ActivityUtil; +import com.chwl.core.utils.net.BalanceNotEnoughExeption; +import com.chwl.core.utils.net.RadishNotEnoughException; +import com.chwl.core.utils.net.RxHelper; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; import io.reactivex.functions.BiConsumer; import lombok.Data; diff --git a/app/src/main/java/com/yizhuan/habu/decoration/helper/DecorationHelper.java b/app/src/main/java/com/chwl/app/decoration/helper/DecorationHelper.java similarity index 82% rename from app/src/main/java/com/yizhuan/habu/decoration/helper/DecorationHelper.java rename to app/src/main/java/com/chwl/app/decoration/helper/DecorationHelper.java index 35cc163ff..b8d4fa83f 100644 --- a/app/src/main/java/com/yizhuan/habu/decoration/helper/DecorationHelper.java +++ b/app/src/main/java/com/chwl/app/decoration/helper/DecorationHelper.java @@ -1,17 +1,17 @@ -package com.yizhuan.habu.decoration.helper; +package com.chwl.app.decoration.helper; import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; -import com.yizhuan.habu.R; -import com.yizhuan.habu.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.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.app.common.widget.dialog.DialogManager; +import com.chwl.core.decoration.DecorationInfo; +import com.chwl.core.decoration.DecorationInfoEvent; +import com.chwl.core.decoration.DecorationModel; +import com.chwl.core.utils.net.RxHelper; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/yizhuan/habu/decoration/helper/DecorationSaleType.java b/app/src/main/java/com/chwl/app/decoration/helper/DecorationSaleType.java similarity index 86% rename from app/src/main/java/com/yizhuan/habu/decoration/helper/DecorationSaleType.java rename to app/src/main/java/com/chwl/app/decoration/helper/DecorationSaleType.java index ac88fe06e..92d65cdeb 100644 --- a/app/src/main/java/com/yizhuan/habu/decoration/helper/DecorationSaleType.java +++ b/app/src/main/java/com/chwl/app/decoration/helper/DecorationSaleType.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.decoration.helper; +package com.chwl.app.decoration.helper; /** * 购买 赠送 头饰 座驾的区分 diff --git a/app/src/main/java/com/yizhuan/habu/decoration/view/DecorationCommonFragment.kt b/app/src/main/java/com/chwl/app/decoration/view/DecorationCommonFragment.kt similarity index 84% rename from app/src/main/java/com/yizhuan/habu/decoration/view/DecorationCommonFragment.kt rename to app/src/main/java/com/chwl/app/decoration/view/DecorationCommonFragment.kt index d467654bf..71dd6dbd2 100644 --- a/app/src/main/java/com/yizhuan/habu/decoration/view/DecorationCommonFragment.kt +++ b/app/src/main/java/com/chwl/app/decoration/view/DecorationCommonFragment.kt @@ -1,21 +1,21 @@ -package com.yizhuan.habu.decoration.view +package com.chwl.app.decoration.view import android.os.Bundle import androidx.fragment.app.viewModels import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingFragment -import com.yizhuan.habu.common.EmptyViewHelper -import com.yizhuan.habu.databinding.FragmentDecorationCommonBinding -import com.yizhuan.habu.decoration.adapter.DecorationCommonAdapter -import com.yizhuan.habu.decoration.viewmodel.DecorationViewModel -import com.yizhuan.habu.ui.relation.FansListActivity -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingFragment +import com.chwl.app.common.EmptyViewHelper +import com.chwl.app.databinding.FragmentDecorationCommonBinding +import com.chwl.app.decoration.adapter.DecorationCommonAdapter +import com.chwl.app.decoration.viewmodel.DecorationViewModel +import com.chwl.app.ui.relation.FansListActivity +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.core.decoration.DecorationInfo +import com.chwl.core.decoration.DecorationInfoEvent +import com.chwl.library.annatation.ActLayoutRes +import com.chwl.library.utils.ResUtil import org.greenrobot.eventbus.EventBus /** diff --git a/app/src/main/java/com/yizhuan/habu/decoration/view/DecorationStoreActivity.kt b/app/src/main/java/com/chwl/app/decoration/view/DecorationStoreActivity.kt similarity index 78% rename from app/src/main/java/com/yizhuan/habu/decoration/view/DecorationStoreActivity.kt rename to app/src/main/java/com/chwl/app/decoration/view/DecorationStoreActivity.kt index 35e56b9be..44a92027e 100644 --- a/app/src/main/java/com/yizhuan/habu/decoration/view/DecorationStoreActivity.kt +++ b/app/src/main/java/com/chwl/app/decoration/view/DecorationStoreActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.decoration.view +package com.chwl.app.decoration.view import android.content.Context import android.content.Intent @@ -8,28 +8,28 @@ import androidx.activity.viewModels import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentPagerAdapter import com.netease.nim.uikit.StatusBarUtil -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingActivity -import com.yizhuan.habu.base.TitleBar -import com.yizhuan.habu.databinding.ActivityDecorationStoreBinding -import com.yizhuan.habu.decoration.view.widgets.CarMagicIndicator -import com.yizhuan.habu.decoration.view.widgets.MyDecorationMagicIndicator -import com.yizhuan.habu.decoration.viewmodel.DecorationViewModel -import com.yizhuan.habu.home.helper.BannerHelper -import com.yizhuan.habu.ui.pay.ChargeActivity -import com.yizhuan.habu.ui.webview.CommonWebViewActivity -import com.yizhuan.habu.ui.widget.magicindicator.ViewPagerHelper -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator -import com.yizhuan.xchat_android_core.Constants -import com.yizhuan.xchat_android_core.UriProvider -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.common.util.DeviceUtil -import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil -import com.yizhuan.xchat_android_library.utils.FormatUtils -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingActivity +import com.chwl.app.base.TitleBar +import com.chwl.app.databinding.ActivityDecorationStoreBinding +import com.chwl.app.decoration.view.widgets.CarMagicIndicator +import com.chwl.app.decoration.view.widgets.MyDecorationMagicIndicator +import com.chwl.app.decoration.viewmodel.DecorationViewModel +import com.chwl.app.home.helper.BannerHelper +import com.chwl.app.ui.pay.ChargeActivity +import com.chwl.app.ui.webview.CommonWebViewActivity +import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator +import com.chwl.core.Constants +import com.chwl.core.UriProvider +import com.chwl.core.home.bean.TabInfo +import com.chwl.core.pay.PayModel +import com.chwl.core.pay.event.UpdateWalletInfoEvent +import com.chwl.library.annatation.ActLayoutRes +import com.chwl.library.common.util.DeviceUtil +import com.chwl.library.utils.AppMetaDataUtil +import com.chwl.library.utils.FormatUtils +import com.chwl.library.utils.ResUtil import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/yizhuan/habu/decoration/view/ICarView.java b/app/src/main/java/com/chwl/app/decoration/view/ICarView.java similarity index 63% rename from app/src/main/java/com/yizhuan/habu/decoration/view/ICarView.java rename to app/src/main/java/com/chwl/app/decoration/view/ICarView.java index 8a3ac44c4..afd1d05e9 100644 --- a/app/src/main/java/com/yizhuan/habu/decoration/view/ICarView.java +++ b/app/src/main/java/com/chwl/app/decoration/view/ICarView.java @@ -1,7 +1,7 @@ -package com.yizhuan.habu.decoration.view; +package com.chwl.app.decoration.view; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.chwl.core.decoration.car.bean.CarInfo; +import com.chwl.library.base.IMvpBaseView; /** * Created by yudi diff --git a/app/src/main/java/com/yizhuan/habu/decoration/view/MyCarFragment.java b/app/src/main/java/com/chwl/app/decoration/view/MyCarFragment.java similarity index 86% rename from app/src/main/java/com/yizhuan/habu/decoration/view/MyCarFragment.java rename to app/src/main/java/com/chwl/app/decoration/view/MyCarFragment.java index da9c31d98..5fcce697c 100644 --- a/app/src/main/java/com/yizhuan/habu/decoration/view/MyCarFragment.java +++ b/app/src/main/java/com/chwl/app/decoration/view/MyCarFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.decoration.view; +package com.chwl.app.decoration.view; import android.annotation.SuppressLint; import android.os.Bundle; @@ -7,21 +7,21 @@ import android.view.View; import androidx.annotation.Nullable; import androidx.recyclerview.widget.LinearLayoutManager; -import com.yizhuan.habu.BR; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseBindingFragment; -import com.yizhuan.habu.common.NoDataFragment; -import com.yizhuan.habu.databinding.FrgMyDecorationCommonBinding; -import com.yizhuan.habu.decoration.adapter.MyCarAdapter; -import com.yizhuan.habu.decoration.viewmodel.MyCarVm; -import com.yizhuan.habu.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.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.BR; +import com.chwl.app.R; +import com.chwl.app.base.BaseBindingFragment; +import com.chwl.app.common.NoDataFragment; +import com.chwl.app.databinding.FrgMyDecorationCommonBinding; +import com.chwl.app.decoration.adapter.MyCarAdapter; +import com.chwl.app.decoration.viewmodel.MyCarVm; +import com.chwl.app.ui.widget.LoadingDialog; +import com.chwl.core.decoration.car.CarModel; +import com.chwl.core.decoration.car.bean.CarInfo; +import com.chwl.core.user.UserModel; +import com.chwl.library.annatation.ActLayoutRes; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/decoration/view/MyChatBubbleFragment.java b/app/src/main/java/com/chwl/app/decoration/view/MyChatBubbleFragment.java similarity index 83% rename from app/src/main/java/com/yizhuan/habu/decoration/view/MyChatBubbleFragment.java rename to app/src/main/java/com/chwl/app/decoration/view/MyChatBubbleFragment.java index 63500e042..a3d47b1a6 100644 --- a/app/src/main/java/com/yizhuan/habu/decoration/view/MyChatBubbleFragment.java +++ b/app/src/main/java/com/chwl/app/decoration/view/MyChatBubbleFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.decoration.view; +package com.chwl.app.decoration.view; import android.annotation.SuppressLint; import android.app.Activity; @@ -7,17 +7,17 @@ import android.view.View; import androidx.recyclerview.widget.GridLayoutManager; import com.trello.rxlifecycle3.android.FragmentEvent; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseBindingFragment; -import com.yizhuan.habu.common.NoDataFragment; -import com.yizhuan.habu.databinding.FragmentMyChatBubbleBinding; -import com.yizhuan.habu.decoration.adapter.MyChatBubbleAdapter; -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseBindingFragment; +import com.chwl.app.common.NoDataFragment; +import com.chwl.app.databinding.FragmentMyChatBubbleBinding; +import com.chwl.app.decoration.adapter.MyChatBubbleAdapter; +import com.chwl.app.decoration.viewmodel.UserChatBubbleVm; +import com.chwl.core.decoration.headwear.bean.ChatBubbleInfo; +import com.chwl.core.user.UserModel; +import com.chwl.library.annatation.ActLayoutRes; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; import java.util.Objects; diff --git a/app/src/main/java/com/yizhuan/habu/decoration/view/MyDecorationActivity.java b/app/src/main/java/com/chwl/app/decoration/view/MyDecorationActivity.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/decoration/view/MyDecorationActivity.java rename to app/src/main/java/com/chwl/app/decoration/view/MyDecorationActivity.java index 763009e40..ac1ae4d39 100644 --- a/app/src/main/java/com/yizhuan/habu/decoration/view/MyDecorationActivity.java +++ b/app/src/main/java/com/chwl/app/decoration/view/MyDecorationActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.decoration.view; +package com.chwl.app.decoration.view; import android.content.Context; import android.content.Intent; @@ -17,30 +17,30 @@ 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.habu.R; -import com.yizhuan.habu.base.BaseBindingActivity; -import com.yizhuan.habu.databinding.ActivityMyDecorationBinding; -import com.yizhuan.habu.decoration.helper.DecorationDialogHelper; -import com.yizhuan.habu.decoration.helper.DecorationSaleType; -import com.yizhuan.habu.decoration.view.widgets.MyDecorationMagicIndicator; -import com.yizhuan.habu.home.adapter.BannerAdapter; -import com.yizhuan.habu.ui.widget.magicindicator.MagicIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.ViewPagerHelper; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; -import com.yizhuan.habu.ui.widget.rollviewpager.Util; -import com.yizhuan.habu.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.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseBindingActivity; +import com.chwl.app.databinding.ActivityMyDecorationBinding; +import com.chwl.app.decoration.helper.DecorationDialogHelper; +import com.chwl.app.decoration.helper.DecorationSaleType; +import com.chwl.app.decoration.view.widgets.MyDecorationMagicIndicator; +import com.chwl.app.home.adapter.BannerAdapter; +import com.chwl.app.ui.widget.magicindicator.MagicIndicator; +import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.chwl.app.ui.widget.rollviewpager.Util; +import com.chwl.app.ui.widget.rollviewpager.hintview.ColorPointHintView; +import com.chwl.core.Constants; +import com.chwl.core.decoration.car.CarModel; +import com.chwl.core.decoration.car.bean.CarInfo; +import com.chwl.core.home.bean.BannerInfo; +import com.chwl.core.home.bean.TabInfo; +import com.chwl.core.home.model.GameHomeModel; +import com.chwl.core.market_verify.MarketVerifyModel; +import com.chwl.library.annatation.ActLayoutRes; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; import java.util.ArrayList; import java.util.Iterator; diff --git a/app/src/main/java/com/yizhuan/habu/decoration/view/MyHeadWearFragment.java b/app/src/main/java/com/chwl/app/decoration/view/MyHeadWearFragment.java similarity index 86% rename from app/src/main/java/com/yizhuan/habu/decoration/view/MyHeadWearFragment.java rename to app/src/main/java/com/chwl/app/decoration/view/MyHeadWearFragment.java index 9ee98683e..6fb04166e 100644 --- a/app/src/main/java/com/yizhuan/habu/decoration/view/MyHeadWearFragment.java +++ b/app/src/main/java/com/chwl/app/decoration/view/MyHeadWearFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.decoration.view; +package com.chwl.app.decoration.view; import android.annotation.SuppressLint; import android.app.Activity; @@ -8,20 +8,20 @@ import android.view.View; import androidx.recyclerview.widget.LinearLayoutManager; import com.trello.rxlifecycle3.android.FragmentEvent; -import com.yizhuan.habu.BR; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseBindingFragment; -import com.yizhuan.habu.common.NoDataFragment; -import com.yizhuan.habu.databinding.FrgMyDecorationCommonBinding; -import com.yizhuan.habu.decoration.adapter.MyHeadWearAdapter; -import com.yizhuan.habu.decoration.helper.DecorationDialogHelper; -import com.yizhuan.habu.decoration.helper.DecorationSaleType; -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.BR; +import com.chwl.app.R; +import com.chwl.app.base.BaseBindingFragment; +import com.chwl.app.common.NoDataFragment; +import com.chwl.app.databinding.FrgMyDecorationCommonBinding; +import com.chwl.app.decoration.adapter.MyHeadWearAdapter; +import com.chwl.app.decoration.helper.DecorationDialogHelper; +import com.chwl.app.decoration.helper.DecorationSaleType; +import com.chwl.app.decoration.viewmodel.HeadWearVm; +import com.chwl.core.decoration.headwear.bean.HeadWearInfo; +import com.chwl.core.user.UserModel; +import com.chwl.library.annatation.ActLayoutRes; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/decoration/view/MyNamePlateFragment.java b/app/src/main/java/com/chwl/app/decoration/view/MyNamePlateFragment.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/decoration/view/MyNamePlateFragment.java rename to app/src/main/java/com/chwl/app/decoration/view/MyNamePlateFragment.java index dc4465b00..c6ca5788f 100644 --- a/app/src/main/java/com/yizhuan/habu/decoration/view/MyNamePlateFragment.java +++ b/app/src/main/java/com/chwl/app/decoration/view/MyNamePlateFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.decoration.view; +package com.chwl.app.decoration.view; import android.annotation.SuppressLint; import android.os.Bundle; @@ -10,16 +10,16 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.trello.rxlifecycle3.android.FragmentEvent; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseFragment; -import com.yizhuan.habu.common.NoDataFragment; -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseFragment; +import com.chwl.app.common.NoDataFragment; +import com.chwl.app.decoration.adapter.MyNamePlateAdapter; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.decoration.nameplate.NamePlateModel; +import com.chwl.core.decoration.nameplate.bean.NamePlateInfo; +import com.chwl.core.user.UserModel; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/decoration/view/MyUserCardWearFragment.java b/app/src/main/java/com/chwl/app/decoration/view/MyUserCardWearFragment.java similarity index 83% rename from app/src/main/java/com/yizhuan/habu/decoration/view/MyUserCardWearFragment.java rename to app/src/main/java/com/chwl/app/decoration/view/MyUserCardWearFragment.java index ff5b5f8f8..be7103d57 100644 --- a/app/src/main/java/com/yizhuan/habu/decoration/view/MyUserCardWearFragment.java +++ b/app/src/main/java/com/chwl/app/decoration/view/MyUserCardWearFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.decoration.view; +package com.chwl.app.decoration.view; import android.annotation.SuppressLint; import android.app.Activity; @@ -7,18 +7,18 @@ import android.view.View; import androidx.recyclerview.widget.LinearLayoutManager; import com.trello.rxlifecycle3.android.FragmentEvent; -import com.yizhuan.habu.BR; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseBindingFragment; -import com.yizhuan.habu.common.NoDataFragment; -import com.yizhuan.habu.databinding.FrgMyDecorationCommonBinding; -import com.yizhuan.habu.decoration.adapter.MyUserCardWearAdapter; -import com.yizhuan.habu.decoration.viewmodel.UserCardWearVm; -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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.BR; +import com.chwl.app.R; +import com.chwl.app.base.BaseBindingFragment; +import com.chwl.app.common.NoDataFragment; +import com.chwl.app.databinding.FrgMyDecorationCommonBinding; +import com.chwl.app.decoration.adapter.MyUserCardWearAdapter; +import com.chwl.app.decoration.viewmodel.UserCardWearVm; +import com.chwl.core.decoration.headwear.bean.UserCardWearInfo; +import com.chwl.core.user.UserModel; +import com.chwl.library.annatation.ActLayoutRes; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; import java.util.Objects; diff --git a/app/src/main/java/com/yizhuan/habu/decoration/view/widgets/BadgeScaleTransitionPagerTitleView.java b/app/src/main/java/com/chwl/app/decoration/view/widgets/BadgeScaleTransitionPagerTitleView.java similarity index 92% rename from app/src/main/java/com/yizhuan/habu/decoration/view/widgets/BadgeScaleTransitionPagerTitleView.java rename to app/src/main/java/com/chwl/app/decoration/view/widgets/BadgeScaleTransitionPagerTitleView.java index cae3cb0ef..38942de6e 100644 --- a/app/src/main/java/com/yizhuan/habu/decoration/view/widgets/BadgeScaleTransitionPagerTitleView.java +++ b/app/src/main/java/com/chwl/app/decoration/view/widgets/BadgeScaleTransitionPagerTitleView.java @@ -1,13 +1,13 @@ -package com.yizhuan.habu.decoration.view.widgets; +package com.chwl.app.decoration.view.widgets; import android.content.Context; import android.util.AttributeSet; import android.view.View; import android.widget.RelativeLayout; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.chwl.app.R; +import com.chwl.app.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; /** diff --git a/app/src/main/java/com/yizhuan/habu/decoration/view/widgets/CarMagicIndicator.java b/app/src/main/java/com/chwl/app/decoration/view/widgets/CarMagicIndicator.java similarity index 81% rename from app/src/main/java/com/yizhuan/habu/decoration/view/widgets/CarMagicIndicator.java rename to app/src/main/java/com/chwl/app/decoration/view/widgets/CarMagicIndicator.java index eac98cf6c..81ec83dbb 100644 --- a/app/src/main/java/com/yizhuan/habu/decoration/view/widgets/CarMagicIndicator.java +++ b/app/src/main/java/com/chwl/app/decoration/view/widgets/CarMagicIndicator.java @@ -1,15 +1,15 @@ -package com.yizhuan.habu.decoration.view.widgets; +package com.chwl.app.decoration.view.widgets; import android.content.Context; import androidx.core.content.ContextCompat; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; -import com.yizhuan.xchat_android_core.home.bean.TabInfo; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.chwl.core.home.bean.TabInfo; +import com.chwl.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/decoration/view/widgets/MyDecorationMagicIndicator.java b/app/src/main/java/com/chwl/app/decoration/view/widgets/MyDecorationMagicIndicator.java similarity index 82% rename from app/src/main/java/com/yizhuan/habu/decoration/view/widgets/MyDecorationMagicIndicator.java rename to app/src/main/java/com/chwl/app/decoration/view/widgets/MyDecorationMagicIndicator.java index 9a7cc60ba..a8aa0088e 100644 --- a/app/src/main/java/com/yizhuan/habu/decoration/view/widgets/MyDecorationMagicIndicator.java +++ b/app/src/main/java/com/chwl/app/decoration/view/widgets/MyDecorationMagicIndicator.java @@ -1,15 +1,15 @@ -package com.yizhuan.habu.decoration.view.widgets; +package com.chwl.app.decoration.view.widgets; import android.content.Context; import androidx.core.content.ContextCompat; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; -import com.yizhuan.xchat_android_core.home.bean.TabInfo; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.chwl.core.home.bean.TabInfo; +import com.chwl.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/decoration/viewmodel/CarShopVm.java b/app/src/main/java/com/chwl/app/decoration/viewmodel/CarShopVm.java similarity index 61% rename from app/src/main/java/com/yizhuan/habu/decoration/viewmodel/CarShopVm.java rename to app/src/main/java/com/chwl/app/decoration/viewmodel/CarShopVm.java index 2c511b133..b12c5497c 100644 --- a/app/src/main/java/com/yizhuan/habu/decoration/viewmodel/CarShopVm.java +++ b/app/src/main/java/com/chwl/app/decoration/viewmodel/CarShopVm.java @@ -1,9 +1,9 @@ -package com.yizhuan.habu.decoration.viewmodel; +package com.chwl.app.decoration.viewmodel; -import com.yizhuan.habu.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.chwl.app.base.BaseListViewModel; +import com.chwl.core.bean.response.ServiceResult; +import com.chwl.core.decoration.car.CarModel; +import com.chwl.core.decoration.car.bean.CarInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/decoration/viewmodel/DecorationViewModel.kt b/app/src/main/java/com/chwl/app/decoration/viewmodel/DecorationViewModel.kt similarity index 71% rename from app/src/main/java/com/yizhuan/habu/decoration/viewmodel/DecorationViewModel.kt rename to app/src/main/java/com/chwl/app/decoration/viewmodel/DecorationViewModel.kt index c2c976bd5..9b7fafd1a 100644 --- a/app/src/main/java/com/yizhuan/habu/decoration/viewmodel/DecorationViewModel.kt +++ b/app/src/main/java/com/chwl/app/decoration/viewmodel/DecorationViewModel.kt @@ -1,16 +1,16 @@ -package com.yizhuan.habu.decoration.viewmodel +package com.chwl.app.decoration.viewmodel import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import com.yizhuan.habu.R -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.base.BaseViewModel +import com.chwl.core.bean.response.ListResult +import com.chwl.core.decoration.DecorationInfo +import com.chwl.core.decoration.DecorationModel +import com.chwl.core.home.bean.BannerInfo +import com.chwl.core.home.model.HomeModel +import com.chwl.core.utils.toast +import com.chwl.library.utils.ResUtil class DecorationViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/yizhuan/habu/decoration/viewmodel/HeadWearVm.java b/app/src/main/java/com/chwl/app/decoration/viewmodel/HeadWearVm.java similarity index 70% rename from app/src/main/java/com/yizhuan/habu/decoration/viewmodel/HeadWearVm.java rename to app/src/main/java/com/chwl/app/decoration/viewmodel/HeadWearVm.java index 7a573ba40..6e1291f5a 100644 --- a/app/src/main/java/com/yizhuan/habu/decoration/viewmodel/HeadWearVm.java +++ b/app/src/main/java/com/chwl/app/decoration/viewmodel/HeadWearVm.java @@ -1,10 +1,10 @@ -package com.yizhuan.habu.decoration.viewmodel; +package com.chwl.app.decoration.viewmodel; -import com.yizhuan.habu.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.HeadwearModel; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; +import com.chwl.app.base.BaseListViewModel; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.bean.response.ServiceResult; +import com.chwl.core.decoration.headwear.HeadwearModel; +import com.chwl.core.decoration.headwear.bean.HeadWearInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/decoration/viewmodel/MyCarVm.java b/app/src/main/java/com/chwl/app/decoration/viewmodel/MyCarVm.java similarity index 55% rename from app/src/main/java/com/yizhuan/habu/decoration/viewmodel/MyCarVm.java rename to app/src/main/java/com/chwl/app/decoration/viewmodel/MyCarVm.java index 8130d656d..6e4850ab0 100644 --- a/app/src/main/java/com/yizhuan/habu/decoration/viewmodel/MyCarVm.java +++ b/app/src/main/java/com/chwl/app/decoration/viewmodel/MyCarVm.java @@ -1,9 +1,9 @@ -package com.yizhuan.habu.decoration.viewmodel; +package com.chwl.app.decoration.viewmodel; -import com.yizhuan.habu.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.chwl.app.base.BaseListViewModel; +import com.chwl.core.bean.response.ServiceResult; +import com.chwl.core.decoration.car.CarModel; +import com.chwl.core.decoration.car.bean.CarInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/decoration/viewmodel/UserCardWearVm.java b/app/src/main/java/com/chwl/app/decoration/viewmodel/UserCardWearVm.java similarity index 59% rename from app/src/main/java/com/yizhuan/habu/decoration/viewmodel/UserCardWearVm.java rename to app/src/main/java/com/chwl/app/decoration/viewmodel/UserCardWearVm.java index a7c743093..c9b2e83f8 100644 --- a/app/src/main/java/com/yizhuan/habu/decoration/viewmodel/UserCardWearVm.java +++ b/app/src/main/java/com/chwl/app/decoration/viewmodel/UserCardWearVm.java @@ -1,9 +1,9 @@ -package com.yizhuan.habu.decoration.viewmodel; +package com.chwl.app.decoration.viewmodel; -import com.yizhuan.habu.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.chwl.app.base.BaseListViewModel; +import com.chwl.core.bean.response.ServiceResult; +import com.chwl.core.decoration.headwear.HeadwearModel; +import com.chwl.core.decoration.headwear.bean.UserCardWearInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/decoration/viewmodel/UserChatBubbleVm.java b/app/src/main/java/com/chwl/app/decoration/viewmodel/UserChatBubbleVm.java similarity index 59% rename from app/src/main/java/com/yizhuan/habu/decoration/viewmodel/UserChatBubbleVm.java rename to app/src/main/java/com/chwl/app/decoration/viewmodel/UserChatBubbleVm.java index 8fd1ddef9..5c84d31cf 100644 --- a/app/src/main/java/com/yizhuan/habu/decoration/viewmodel/UserChatBubbleVm.java +++ b/app/src/main/java/com/chwl/app/decoration/viewmodel/UserChatBubbleVm.java @@ -1,9 +1,9 @@ -package com.yizhuan.habu.decoration.viewmodel; +package com.chwl.app.decoration.viewmodel; -import com.yizhuan.habu.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.chwl.app.base.BaseListViewModel; +import com.chwl.core.bean.response.ServiceResult; +import com.chwl.core.decoration.headwear.HeadwearModel; +import com.chwl.core.decoration.headwear.bean.ChatBubbleInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/earn/EarnRecordViewModel.kt b/app/src/main/java/com/chwl/app/earn/EarnRecordViewModel.kt similarity index 96% rename from app/src/main/java/com/yizhuan/habu/earn/EarnRecordViewModel.kt rename to app/src/main/java/com/chwl/app/earn/EarnRecordViewModel.kt index 7f824ea37..7327833bd 100644 --- a/app/src/main/java/com/yizhuan/habu/earn/EarnRecordViewModel.kt +++ b/app/src/main/java/com/chwl/app/earn/EarnRecordViewModel.kt @@ -1,10 +1,10 @@ -package com.yizhuan.habu.earn +package com.chwl.app.earn import androidx.lifecycle.MutableLiveData -import com.yizhuan.habu.base.BaseViewModel -import com.yizhuan.xchat_android_core.earn.bean.* -import com.yizhuan.xchat_android_core.earn.model.EarnModel -import com.yizhuan.xchat_android_library.utils.TimeUtils +import com.chwl.app.base.BaseViewModel +import com.chwl.core.earn.bean.* +import com.chwl.core.earn.model.EarnModel +import com.chwl.library.utils.TimeUtils import java.util.* class EarnRecordViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/yizhuan/habu/earn/activity/BindWithdrawMsgActivity.kt b/app/src/main/java/com/chwl/app/earn/activity/BindWithdrawMsgActivity.kt similarity index 92% rename from app/src/main/java/com/yizhuan/habu/earn/activity/BindWithdrawMsgActivity.kt rename to app/src/main/java/com/chwl/app/earn/activity/BindWithdrawMsgActivity.kt index 7310ad0d7..66f14bca4 100644 --- a/app/src/main/java/com/yizhuan/habu/earn/activity/BindWithdrawMsgActivity.kt +++ b/app/src/main/java/com/chwl/app/earn/activity/BindWithdrawMsgActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.earn.activity +package com.chwl.app.earn.activity import android.content.Context import android.content.Intent @@ -6,12 +6,12 @@ import android.text.Editable import android.text.TextWatcher import androidx.activity.viewModels import com.netease.nim.uikit.StatusBarUtil -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingActivity -import com.yizhuan.habu.databinding.ActivityBindWithdrawMsgBinding -import com.yizhuan.habu.earn.EarnRecordViewModel -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.earn.bean.WithdrawAccount +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingActivity +import com.chwl.app.databinding.ActivityBindWithdrawMsgBinding +import com.chwl.app.earn.EarnRecordViewModel +import com.chwl.core.auth.AuthModel +import com.chwl.core.earn.bean.WithdrawAccount /** * 绑定提现信息 diff --git a/app/src/main/java/com/yizhuan/habu/earn/activity/ConvertDiamondActivity.kt b/app/src/main/java/com/chwl/app/earn/activity/ConvertDiamondActivity.kt similarity index 94% rename from app/src/main/java/com/yizhuan/habu/earn/activity/ConvertDiamondActivity.kt rename to app/src/main/java/com/chwl/app/earn/activity/ConvertDiamondActivity.kt index d2c9249c1..f5683cbf8 100644 --- a/app/src/main/java/com/yizhuan/habu/earn/activity/ConvertDiamondActivity.kt +++ b/app/src/main/java/com/chwl/app/earn/activity/ConvertDiamondActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.earn.activity +package com.chwl.app.earn.activity import android.content.Context import android.content.Intent @@ -6,13 +6,13 @@ import android.text.Editable import android.text.TextWatcher import androidx.activity.viewModels import com.netease.nim.uikit.StatusBarUtil -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingActivity -import com.yizhuan.habu.databinding.ActivityConvertDiamondBinding -import com.yizhuan.habu.earn.EarnRecordViewModel -import com.yizhuan.habu.ui.widget.dialog.ExchangeDiamondTipDialog -import com.yizhuan.xchat_android_core.earn.bean.GoldToDiamondInfo -import com.yizhuan.xchat_android_library.common.util.DoubleUtils +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingActivity +import com.chwl.app.databinding.ActivityConvertDiamondBinding +import com.chwl.app.earn.EarnRecordViewModel +import com.chwl.app.ui.widget.dialog.ExchangeDiamondTipDialog +import com.chwl.core.earn.bean.GoldToDiamondInfo +import com.chwl.library.common.util.DoubleUtils import kotlin.math.ceil import kotlin.math.floor diff --git a/app/src/main/java/com/yizhuan/habu/earn/activity/EarnRecordActivity.kt b/app/src/main/java/com/chwl/app/earn/activity/EarnRecordActivity.kt similarity index 85% rename from app/src/main/java/com/yizhuan/habu/earn/activity/EarnRecordActivity.kt rename to app/src/main/java/com/chwl/app/earn/activity/EarnRecordActivity.kt index dfbcbf728..08e60d91a 100644 --- a/app/src/main/java/com/yizhuan/habu/earn/activity/EarnRecordActivity.kt +++ b/app/src/main/java/com/chwl/app/earn/activity/EarnRecordActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.earn.activity +package com.chwl.app.earn.activity import android.content.Context import android.content.Intent @@ -6,17 +6,17 @@ import android.view.View import androidx.activity.viewModels import androidx.core.content.ContextCompat import com.netease.nim.uikit.StatusBarUtil -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingActivity -import com.yizhuan.habu.databinding.ActivityEarnRecordBinding -import com.yizhuan.habu.earn.EarnRecordViewModel -import com.yizhuan.habu.ui.pay.ChargeActivity -import com.yizhuan.habu.ui.webview.CommonWebViewActivity -import com.yizhuan.xchat_android_core.Constants -import com.yizhuan.xchat_android_core.UriProvider -import com.yizhuan.xchat_android_core.earn.bean.RoomTypeInfo -import com.yizhuan.xchat_android_library.common.util.DeviceUtil -import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingActivity +import com.chwl.app.databinding.ActivityEarnRecordBinding +import com.chwl.app.earn.EarnRecordViewModel +import com.chwl.app.ui.pay.ChargeActivity +import com.chwl.app.ui.webview.CommonWebViewActivity +import com.chwl.core.Constants +import com.chwl.core.UriProvider +import com.chwl.core.earn.bean.RoomTypeInfo +import com.chwl.library.common.util.DeviceUtil +import com.chwl.library.utils.AppMetaDataUtil /** * author: wushaocheng diff --git a/app/src/main/java/com/yizhuan/habu/earn/activity/EarnWithdrawActivity.kt b/app/src/main/java/com/chwl/app/earn/activity/EarnWithdrawActivity.kt similarity index 89% rename from app/src/main/java/com/yizhuan/habu/earn/activity/EarnWithdrawActivity.kt rename to app/src/main/java/com/chwl/app/earn/activity/EarnWithdrawActivity.kt index be555bef8..ade41732c 100644 --- a/app/src/main/java/com/yizhuan/habu/earn/activity/EarnWithdrawActivity.kt +++ b/app/src/main/java/com/chwl/app/earn/activity/EarnWithdrawActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.earn.activity +package com.chwl.app.earn.activity import android.content.Context import android.content.Intent @@ -8,19 +8,19 @@ import android.view.View import androidx.activity.viewModels import com.jungly.gridpasswordview.GridPasswordView import com.netease.nim.uikit.StatusBarUtil -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingActivity -import com.yizhuan.habu.databinding.ActivityEarnWithdrawBinding -import com.yizhuan.habu.earn.EarnRecordViewModel -import com.yizhuan.habu.pay.password.GiveGoldPassWordFragment -import com.yizhuan.habu.pay.widget.GridPasswordNoFocusView -import com.yizhuan.habu.ui.setting.ModifyPwdActivity -import com.yizhuan.habu.ui.webview.CommonWebViewActivity -import com.yizhuan.habu.ui.widget.dialog.CommonTipDialog -import com.yizhuan.xchat_android_core.UriProvider -import com.yizhuan.xchat_android_core.earn.bean.ConfigWithdrawInfo -import com.yizhuan.xchat_android_core.user.UserModel -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingActivity +import com.chwl.app.databinding.ActivityEarnWithdrawBinding +import com.chwl.app.earn.EarnRecordViewModel +import com.chwl.app.pay.password.GiveGoldPassWordFragment +import com.chwl.app.pay.widget.GridPasswordNoFocusView +import com.chwl.app.ui.setting.ModifyPwdActivity +import com.chwl.app.ui.webview.CommonWebViewActivity +import com.chwl.app.ui.widget.dialog.CommonTipDialog +import com.chwl.core.UriProvider +import com.chwl.core.earn.bean.ConfigWithdrawInfo +import com.chwl.core.user.UserModel +import com.chwl.library.utils.ResUtil /** * author: wushaocheng diff --git a/app/src/main/java/com/yizhuan/habu/earn/activity/GoldDetailActivity.kt b/app/src/main/java/com/chwl/app/earn/activity/GoldDetailActivity.kt similarity index 93% rename from app/src/main/java/com/yizhuan/habu/earn/activity/GoldDetailActivity.kt rename to app/src/main/java/com/chwl/app/earn/activity/GoldDetailActivity.kt index 7abec01a2..29ee6bed6 100644 --- a/app/src/main/java/com/yizhuan/habu/earn/activity/GoldDetailActivity.kt +++ b/app/src/main/java/com/chwl/app/earn/activity/GoldDetailActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.earn.activity +package com.chwl.app.earn.activity import android.content.Context import android.content.Intent @@ -9,20 +9,20 @@ import androidx.core.content.ContextCompat import androidx.recyclerview.widget.LinearLayoutManager import com.jzxiang.pickerview.data.Type import com.netease.nim.uikit.StatusBarUtil -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingActivity -import com.yizhuan.habu.common.EmptyViewHelper -import com.yizhuan.habu.databinding.ActivityGoldDetailBinding -import com.yizhuan.habu.earn.EarnRecordViewModel -import com.yizhuan.habu.earn.adapter.GoldDetailAdapter -import com.yizhuan.habu.earn.adapter.GoldRoomAdapter -import com.yizhuan.habu.module_hall.hall.view.dialog.TimePickerGoldDialog -import com.yizhuan.habu.ui.utils.RVDelegate -import com.yizhuan.habu.ui.widget.recyclerview.decoration.ColorDecoration -import com.yizhuan.habu.utils.SpannableBuilder -import com.yizhuan.xchat_android_core.earn.bean.HallMemberGoldFlowInfo -import com.yizhuan.xchat_android_core.earn.bean.HallMemberGoldFlowTotalInfo -import com.yizhuan.xchat_android_library.utils.FormatUtils +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingActivity +import com.chwl.app.common.EmptyViewHelper +import com.chwl.app.databinding.ActivityGoldDetailBinding +import com.chwl.app.earn.EarnRecordViewModel +import com.chwl.app.earn.adapter.GoldDetailAdapter +import com.chwl.app.earn.adapter.GoldRoomAdapter +import com.chwl.app.module_hall.hall.view.dialog.TimePickerGoldDialog +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.app.ui.widget.recyclerview.decoration.ColorDecoration +import com.chwl.app.utils.SpannableBuilder +import com.chwl.core.earn.bean.HallMemberGoldFlowInfo +import com.chwl.core.earn.bean.HallMemberGoldFlowTotalInfo +import com.chwl.library.utils.FormatUtils /** * 金币明细 diff --git a/app/src/main/java/com/yizhuan/habu/earn/adapter/GoldDetailAdapter.kt b/app/src/main/java/com/chwl/app/earn/adapter/GoldDetailAdapter.kt similarity index 79% rename from app/src/main/java/com/yizhuan/habu/earn/adapter/GoldDetailAdapter.kt rename to app/src/main/java/com/chwl/app/earn/adapter/GoldDetailAdapter.kt index cd54484be..30488a5e7 100644 --- a/app/src/main/java/com/yizhuan/habu/earn/adapter/GoldDetailAdapter.kt +++ b/app/src/main/java/com/chwl/app/earn/adapter/GoldDetailAdapter.kt @@ -1,11 +1,11 @@ -package com.yizhuan.habu.earn.adapter +package com.chwl.app.earn.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.xchat_android_core.earn.bean.HallMemberGoldFlowInfo -import com.yizhuan.xchat_android_library.utils.FormatUtils +import com.chwl.app.R +import com.chwl.app.ui.utils.ImageLoadUtilsV2 +import com.chwl.core.earn.bean.HallMemberGoldFlowInfo +import com.chwl.library.utils.FormatUtils class GoldDetailAdapter : BaseQuickAdapter(R.layout.item_gold_detail) { diff --git a/app/src/main/java/com/yizhuan/habu/earn/adapter/GoldRecordAdapter.kt b/app/src/main/java/com/chwl/app/earn/adapter/GoldRecordAdapter.kt similarity index 80% rename from app/src/main/java/com/yizhuan/habu/earn/adapter/GoldRecordAdapter.kt rename to app/src/main/java/com/chwl/app/earn/adapter/GoldRecordAdapter.kt index ef8970b2a..2cb27e2de 100644 --- a/app/src/main/java/com/yizhuan/habu/earn/adapter/GoldRecordAdapter.kt +++ b/app/src/main/java/com/chwl/app/earn/adapter/GoldRecordAdapter.kt @@ -1,11 +1,11 @@ -package com.yizhuan.habu.earn.adapter +package com.chwl.app.earn.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.xchat_android_core.earn.bean.HallMemberGoldFlowInfo -import com.yizhuan.xchat_android_library.utils.FormatUtils +import com.chwl.app.R +import com.chwl.app.ui.utils.ImageLoadUtilsV2 +import com.chwl.core.earn.bean.HallMemberGoldFlowInfo +import com.chwl.library.utils.FormatUtils class GoldRecordAdapter : BaseQuickAdapter(R.layout.item_gold_record) { diff --git a/app/src/main/java/com/yizhuan/habu/earn/adapter/GoldRoomAdapter.kt b/app/src/main/java/com/chwl/app/earn/adapter/GoldRoomAdapter.kt similarity index 88% rename from app/src/main/java/com/yizhuan/habu/earn/adapter/GoldRoomAdapter.kt rename to app/src/main/java/com/chwl/app/earn/adapter/GoldRoomAdapter.kt index 37e64d465..fadd6770e 100644 --- a/app/src/main/java/com/yizhuan/habu/earn/adapter/GoldRoomAdapter.kt +++ b/app/src/main/java/com/chwl/app/earn/adapter/GoldRoomAdapter.kt @@ -1,10 +1,10 @@ -package com.yizhuan.habu.earn.adapter +package com.chwl.app.earn.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.xchat_android_core.earn.bean.HallVo +import com.chwl.app.R +import com.chwl.app.ui.utils.ImageLoadUtilsV2 +import com.chwl.core.earn.bean.HallVo class GoldRoomAdapter : BaseQuickAdapter(R.layout.item_gold_room) { diff --git a/app/src/main/java/com/yizhuan/habu/event/ChargeEvent.java b/app/src/main/java/com/chwl/app/event/ChargeEvent.java similarity index 86% rename from app/src/main/java/com/yizhuan/habu/event/ChargeEvent.java rename to app/src/main/java/com/chwl/app/event/ChargeEvent.java index 0e337e432..10c7713ab 100644 --- a/app/src/main/java/com/yizhuan/habu/event/ChargeEvent.java +++ b/app/src/main/java/com/chwl/app/event/ChargeEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.event; +package com.chwl.app.event; public class ChargeEvent { private String message; diff --git a/app/src/main/java/com/yizhuan/habu/event/OpenRoomIntroEvent.java b/app/src/main/java/com/chwl/app/event/OpenRoomIntroEvent.java similarity index 53% rename from app/src/main/java/com/yizhuan/habu/event/OpenRoomIntroEvent.java rename to app/src/main/java/com/chwl/app/event/OpenRoomIntroEvent.java index 93339c245..cff0e932b 100644 --- a/app/src/main/java/com/yizhuan/habu/event/OpenRoomIntroEvent.java +++ b/app/src/main/java/com/chwl/app/event/OpenRoomIntroEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.event; +package com.chwl.app.event; public class OpenRoomIntroEvent { } diff --git a/app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilyAttentionFragmentView.java b/app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilyAttentionFragmentView.java similarity index 67% rename from app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilyAttentionFragmentView.java rename to app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilyAttentionFragmentView.java index 328515415..26504ddc9 100644 --- a/app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilyAttentionFragmentView.java +++ b/app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilyAttentionFragmentView.java @@ -1,7 +1,7 @@ -package com.yizhuan.habu.family.contract.viewinterface; +package com.chwl.app.family.contract.viewinterface; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.chwl.core.user.bean.AttentionInfo; +import com.chwl.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilyCurrencySearchView.java b/app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilyCurrencySearchView.java similarity index 53% rename from app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilyCurrencySearchView.java rename to app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilyCurrencySearchView.java index 2352103d1..8559fe7f1 100644 --- a/app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilyCurrencySearchView.java +++ b/app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilyCurrencySearchView.java @@ -1,6 +1,6 @@ -package com.yizhuan.habu.family.contract.viewinterface; +package com.chwl.app.family.contract.viewinterface; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.chwl.library.base.IMvpBaseView; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilyCurrencyView.java b/app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilyCurrencyView.java similarity index 61% rename from app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilyCurrencyView.java rename to app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilyCurrencyView.java index 6ee1c6e17..1a8441e34 100644 --- a/app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilyCurrencyView.java +++ b/app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilyCurrencyView.java @@ -1,7 +1,7 @@ -package com.yizhuan.habu.family.contract.viewinterface; +package com.chwl.app.family.contract.viewinterface; -import com.yizhuan.xchat_android_core.family.bean.VMBillItemInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.chwl.core.family.bean.VMBillItemInfo; +import com.chwl.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilyFansListFragmentView.java b/app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilyFansListFragmentView.java similarity index 64% rename from app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilyFansListFragmentView.java rename to app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilyFansListFragmentView.java index bb9edd662..89e5302b3 100644 --- a/app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilyFansListFragmentView.java +++ b/app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilyFansListFragmentView.java @@ -1,7 +1,7 @@ -package com.yizhuan.habu.family.contract.viewinterface; +package com.chwl.app.family.contract.viewinterface; -import com.yizhuan.xchat_android_core.user.bean.FansListInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.chwl.core.user.bean.FansListInfo; +import com.chwl.library.base.IMvpBaseView; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilyFriendListFragmentView.java b/app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilyFriendListFragmentView.java similarity index 66% rename from app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilyFriendListFragmentView.java rename to app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilyFriendListFragmentView.java index c6f631d05..ab71e9c31 100644 --- a/app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilyFriendListFragmentView.java +++ b/app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilyFriendListFragmentView.java @@ -1,7 +1,7 @@ -package com.yizhuan.habu.family.contract.viewinterface; +package com.chwl.app.family.contract.viewinterface; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilyGameListActivityView.java b/app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilyGameListActivityView.java similarity index 59% rename from app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilyGameListActivityView.java rename to app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilyGameListActivityView.java index 2d74ca449..9989ac71d 100644 --- a/app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilyGameListActivityView.java +++ b/app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilyGameListActivityView.java @@ -1,7 +1,7 @@ -package com.yizhuan.habu.family.contract.viewinterface; +package com.chwl.app.family.contract.viewinterface; -import com.yizhuan.xchat_android_core.family.bean.FamilyGameInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.chwl.core.family.bean.FamilyGameInfo; +import com.chwl.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilyInfoView.java b/app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilyInfoView.java similarity index 51% rename from app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilyInfoView.java rename to app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilyInfoView.java index 4d5023784..ae03c7cec 100644 --- a/app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilyInfoView.java +++ b/app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilyInfoView.java @@ -1,6 +1,6 @@ -package com.yizhuan.habu.family.contract.viewinterface; +package com.chwl.app.family.contract.viewinterface; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.chwl.library.base.IMvpBaseView; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilyManageActivityView.java b/app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilyManageActivityView.java similarity index 53% rename from app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilyManageActivityView.java rename to app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilyManageActivityView.java index d8f6bd6b4..0a6750e36 100644 --- a/app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilyManageActivityView.java +++ b/app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilyManageActivityView.java @@ -1,6 +1,6 @@ -package com.yizhuan.habu.family.contract.viewinterface; +package com.chwl.app.family.contract.viewinterface; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.chwl.library.base.IMvpBaseView; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilyMemberListView.java b/app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilyMemberListView.java similarity index 56% rename from app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilyMemberListView.java rename to app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilyMemberListView.java index f21967f62..51d32ef53 100644 --- a/app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilyMemberListView.java +++ b/app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilyMemberListView.java @@ -1,7 +1,7 @@ -package com.yizhuan.habu.family.contract.viewinterface; +package com.chwl.app.family.contract.viewinterface; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.chwl.core.family.bean.FamilyMemberInfo; +import com.chwl.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilyMemberSearchView.java b/app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilyMemberSearchView.java similarity index 52% rename from app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilyMemberSearchView.java rename to app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilyMemberSearchView.java index 09f2f7710..272c4d8e6 100644 --- a/app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilyMemberSearchView.java +++ b/app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilyMemberSearchView.java @@ -1,7 +1,7 @@ -package com.yizhuan.habu.family.contract.viewinterface; +package com.chwl.app.family.contract.viewinterface; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.chwl.core.family.bean.FamilyMemberInfo; +import com.chwl.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilyPlazaActivityView.java b/app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilyPlazaActivityView.java similarity index 52% rename from app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilyPlazaActivityView.java rename to app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilyPlazaActivityView.java index afe78dea6..6814c7fb1 100644 --- a/app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilyPlazaActivityView.java +++ b/app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilyPlazaActivityView.java @@ -1,6 +1,6 @@ -package com.yizhuan.habu.family.contract.viewinterface; +package com.chwl.app.family.contract.viewinterface; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.chwl.library.base.IMvpBaseView; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilySearchView.java b/app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilySearchView.java similarity index 51% rename from app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilySearchView.java rename to app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilySearchView.java index 325cf82a5..fe62ec99c 100644 --- a/app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilySearchView.java +++ b/app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilySearchView.java @@ -1,6 +1,6 @@ -package com.yizhuan.habu.family.contract.viewinterface; +package com.chwl.app.family.contract.viewinterface; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.chwl.library.base.IMvpBaseView; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilySelectFriendActivityView.java b/app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilySelectFriendActivityView.java similarity index 53% rename from app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilySelectFriendActivityView.java rename to app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilySelectFriendActivityView.java index 594f741fe..f2687e61c 100644 --- a/app/src/main/java/com/yizhuan/habu/family/contract/viewinterface/IFamilySelectFriendActivityView.java +++ b/app/src/main/java/com/chwl/app/family/contract/viewinterface/IFamilySelectFriendActivityView.java @@ -1,6 +1,6 @@ -package com.yizhuan.habu.family.contract.viewinterface; +package com.chwl.app.family.contract.viewinterface; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.chwl.library.base.IMvpBaseView; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/habu/family/presenter/FamilyAttentionPresenter.java b/app/src/main/java/com/chwl/app/family/presenter/FamilyAttentionPresenter.java similarity index 82% rename from app/src/main/java/com/yizhuan/habu/family/presenter/FamilyAttentionPresenter.java rename to app/src/main/java/com/chwl/app/family/presenter/FamilyAttentionPresenter.java index 7130ae1a0..e73d46f9e 100644 --- a/app/src/main/java/com/yizhuan/habu/family/presenter/FamilyAttentionPresenter.java +++ b/app/src/main/java/com/chwl/app/family/presenter/FamilyAttentionPresenter.java @@ -1,13 +1,13 @@ -package com.yizhuan.habu.family.presenter; +package com.chwl.app.family.presenter; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseMvpPresenter; -import com.yizhuan.habu.family.contract.viewinterface.IFamilyAttentionFragmentView; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.user.AttentionModel; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseMvpPresenter; +import com.chwl.app.family.contract.viewinterface.IFamilyAttentionFragmentView; +import com.chwl.core.Constants; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.user.AttentionModel; +import com.chwl.core.user.bean.AttentionInfo; +import com.chwl.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/family/presenter/FamilyCurrencyPresenter.java b/app/src/main/java/com/chwl/app/family/presenter/FamilyCurrencyPresenter.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/family/presenter/FamilyCurrencyPresenter.java rename to app/src/main/java/com/chwl/app/family/presenter/FamilyCurrencyPresenter.java index b938aaa56..fb730238a 100644 --- a/app/src/main/java/com/yizhuan/habu/family/presenter/FamilyCurrencyPresenter.java +++ b/app/src/main/java/com/chwl/app/family/presenter/FamilyCurrencyPresenter.java @@ -1,27 +1,27 @@ -package com.yizhuan.habu.family.presenter; +package com.chwl.app.family.presenter; import android.os.Bundle; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseMvpPresenter; -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseMvpPresenter; +import com.chwl.app.family.contract.viewinterface.IFamilyCurrencyView; +import com.chwl.core.Constants; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.family.bean.BillDateDivInfo; +import com.chwl.core.family.bean.TransactionRecordInfo; +import com.chwl.core.family.bean.VMBillItemInfo; +import com.chwl.core.family.bean.response.moneyManagement.FamilyMoneyManagementInfo; +import com.chwl.core.family.bean.response.moneyManagement.MonthlyRecord; +import com.chwl.core.family.bean.response.moneyManagement.TradeMoneyRecord; +import com.chwl.core.family.event.FamilyCurrencyUpdateEvent; +import com.chwl.core.family.model.FamilyModel; +import com.chwl.library.base.PresenterEvent; +import com.chwl.library.rxbus.RxBusHelper; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; import java.text.SimpleDateFormat; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/habu/family/presenter/FamilyFansListPresenter.java b/app/src/main/java/com/chwl/app/family/presenter/FamilyFansListPresenter.java similarity index 82% rename from app/src/main/java/com/yizhuan/habu/family/presenter/FamilyFansListPresenter.java rename to app/src/main/java/com/chwl/app/family/presenter/FamilyFansListPresenter.java index 099a51afd..2f6e72f64 100644 --- a/app/src/main/java/com/yizhuan/habu/family/presenter/FamilyFansListPresenter.java +++ b/app/src/main/java/com/chwl/app/family/presenter/FamilyFansListPresenter.java @@ -1,13 +1,13 @@ -package com.yizhuan.habu.family.presenter; +package com.chwl.app.family.presenter; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseMvpPresenter; -import com.yizhuan.habu.family.contract.viewinterface.IFamilyFansListFragmentView; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.user.AttentionModel; -import com.yizhuan.xchat_android_core.user.bean.FansListInfo; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseMvpPresenter; +import com.chwl.app.family.contract.viewinterface.IFamilyFansListFragmentView; +import com.chwl.core.Constants; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.user.AttentionModel; +import com.chwl.core.user.bean.FansListInfo; +import com.chwl.library.utils.ResUtil; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; diff --git a/app/src/main/java/com/yizhuan/habu/family/presenter/FamilyFriendListPresenter.java b/app/src/main/java/com/chwl/app/family/presenter/FamilyFriendListPresenter.java similarity index 84% rename from app/src/main/java/com/yizhuan/habu/family/presenter/FamilyFriendListPresenter.java rename to app/src/main/java/com/chwl/app/family/presenter/FamilyFriendListPresenter.java index ca856f822..486022a29 100644 --- a/app/src/main/java/com/yizhuan/habu/family/presenter/FamilyFriendListPresenter.java +++ b/app/src/main/java/com/chwl/app/family/presenter/FamilyFriendListPresenter.java @@ -1,12 +1,12 @@ -package com.yizhuan.habu.family.presenter; +package com.chwl.app.family.presenter; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseMvpPresenter; -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseMvpPresenter; +import com.chwl.app.family.contract.viewinterface.IFamilyFriendListFragmentView; +import com.chwl.core.Constants; +import com.chwl.core.im.friend.IMFriendModel; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/family/presenter/FamilyGameListPresenter.java b/app/src/main/java/com/chwl/app/family/presenter/FamilyGameListPresenter.java similarity index 80% rename from app/src/main/java/com/yizhuan/habu/family/presenter/FamilyGameListPresenter.java rename to app/src/main/java/com/chwl/app/family/presenter/FamilyGameListPresenter.java index c5228c94c..061edcab8 100644 --- a/app/src/main/java/com/yizhuan/habu/family/presenter/FamilyGameListPresenter.java +++ b/app/src/main/java/com/chwl/app/family/presenter/FamilyGameListPresenter.java @@ -1,14 +1,14 @@ -package com.yizhuan.habu.family.presenter; +package com.chwl.app.family.presenter; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseMvpPresenter; -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseMvpPresenter; +import com.chwl.app.family.contract.viewinterface.IFamilyGameListActivityView; +import com.chwl.core.Constants; +import com.chwl.core.family.bean.FamilyGameInfo; +import com.chwl.core.family.bean.FamilyInfo; +import com.chwl.core.family.model.FamilyModel; +import com.chwl.library.base.PresenterEvent; +import com.chwl.library.utils.ResUtil; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; diff --git a/app/src/main/java/com/yizhuan/habu/family/presenter/FamilyHomePresenter.java b/app/src/main/java/com/chwl/app/family/presenter/FamilyHomePresenter.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/family/presenter/FamilyHomePresenter.java rename to app/src/main/java/com/chwl/app/family/presenter/FamilyHomePresenter.java index 91218f4de..2c82e8a3e 100644 --- a/app/src/main/java/com/yizhuan/habu/family/presenter/FamilyHomePresenter.java +++ b/app/src/main/java/com/chwl/app/family/presenter/FamilyHomePresenter.java @@ -1,20 +1,20 @@ -package com.yizhuan.habu.family.presenter; +package com.chwl.app.family.presenter; import android.os.Bundle; import androidx.annotation.Nullable; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseMvpPresenter; -import com.yizhuan.habu.home.view.IFamilyHomeActivityView; -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.xchat_android_library.base.PresenterEvent; -import com.yizhuan.xchat_android_library.rxbus.RxBusHelper; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseMvpPresenter; +import com.chwl.app.home.view.IFamilyHomeActivityView; +import com.chwl.core.family.bean.FamilyInfo; +import com.chwl.core.family.event.FamilyCurrencyUpdateEvent; +import com.chwl.core.family.event.FamilyMemberUpdateEvent; +import com.chwl.core.family.event.FamilyUpdateEvent; +import com.chwl.core.family.model.FamilyModel; +import com.chwl.library.base.PresenterEvent; +import com.chwl.library.rxbus.RxBusHelper; +import com.chwl.library.utils.ResUtil; import io.reactivex.Single; import io.reactivex.SingleSource; diff --git a/app/src/main/java/com/yizhuan/habu/family/presenter/FamilyInfoPresenter.java b/app/src/main/java/com/chwl/app/family/presenter/FamilyInfoPresenter.java similarity index 82% rename from app/src/main/java/com/yizhuan/habu/family/presenter/FamilyInfoPresenter.java rename to app/src/main/java/com/chwl/app/family/presenter/FamilyInfoPresenter.java index f764a8bcf..243b40206 100644 --- a/app/src/main/java/com/yizhuan/habu/family/presenter/FamilyInfoPresenter.java +++ b/app/src/main/java/com/chwl/app/family/presenter/FamilyInfoPresenter.java @@ -1,12 +1,12 @@ -package com.yizhuan.habu.family.presenter; +package com.chwl.app.family.presenter; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseMvpPresenter; -import com.yizhuan.habu.family.contract.viewinterface.IFamilyInfoView; -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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseMvpPresenter; +import com.chwl.app.family.contract.viewinterface.IFamilyInfoView; +import com.chwl.core.family.bean.FamilyInfo; +import com.chwl.core.family.model.FamilyModel; +import com.chwl.library.base.PresenterEvent; +import com.chwl.library.utils.ResUtil; import io.reactivex.Single; diff --git a/app/src/main/java/com/yizhuan/habu/family/presenter/FamilyListPresenter.java b/app/src/main/java/com/chwl/app/family/presenter/FamilyListPresenter.java similarity index 68% rename from app/src/main/java/com/yizhuan/habu/family/presenter/FamilyListPresenter.java rename to app/src/main/java/com/chwl/app/family/presenter/FamilyListPresenter.java index bcf86d606..fbf676eba 100644 --- a/app/src/main/java/com/yizhuan/habu/family/presenter/FamilyListPresenter.java +++ b/app/src/main/java/com/chwl/app/family/presenter/FamilyListPresenter.java @@ -1,12 +1,12 @@ -package com.yizhuan.habu.family.presenter; +package com.chwl.app.family.presenter; -import com.yizhuan.habu.base.BaseMvpPresenter; -import com.yizhuan.habu.family.contract.viewinterface.IFamilySearchView; -import com.yizhuan.xchat_android_core.Constants; -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.chwl.app.base.BaseMvpPresenter; +import com.chwl.app.family.contract.viewinterface.IFamilySearchView; +import com.chwl.core.Constants; +import com.chwl.core.family.bean.response.RankingFamilyInfo; +import com.chwl.core.family.bean.response.RespFamilyRankList; +import com.chwl.core.family.model.FamilyModel; +import com.chwl.library.base.PresenterEvent; import java.util.List; diff --git a/app/src/main/java/com/chwl/app/family/presenter/FamilyManagePresenter.java b/app/src/main/java/com/chwl/app/family/presenter/FamilyManagePresenter.java new file mode 100644 index 000000000..71c4782bc --- /dev/null +++ b/app/src/main/java/com/chwl/app/family/presenter/FamilyManagePresenter.java @@ -0,0 +1,14 @@ +package com.chwl.app.family.presenter; + +import com.chwl.app.base.BaseMvpPresenter; +import com.chwl.app.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/habu/family/presenter/FamilyMemberCurrencyPresenter.java b/app/src/main/java/com/chwl/app/family/presenter/FamilyMemberCurrencyPresenter.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/family/presenter/FamilyMemberCurrencyPresenter.java rename to app/src/main/java/com/chwl/app/family/presenter/FamilyMemberCurrencyPresenter.java index 9849646a5..b3bbd6724 100644 --- a/app/src/main/java/com/yizhuan/habu/family/presenter/FamilyMemberCurrencyPresenter.java +++ b/app/src/main/java/com/chwl/app/family/presenter/FamilyMemberCurrencyPresenter.java @@ -1,23 +1,23 @@ -package com.yizhuan.habu.family.presenter; +package com.chwl.app.family.presenter; import android.os.Bundle; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseMvpPresenter; -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseMvpPresenter; +import com.chwl.app.family.contract.viewinterface.IFamilyCurrencyView; +import com.chwl.core.Constants; +import com.chwl.core.family.bean.BillDateDivInfo; +import com.chwl.core.family.bean.TransactionRecordInfo; +import com.chwl.core.family.bean.VMBillItemInfo; +import com.chwl.core.family.bean.response.moneyManagement.MonthlyRecord; +import com.chwl.core.family.bean.response.moneyManagement.TradeMoneyRecord; +import com.chwl.core.family.model.FamilyModel; +import com.chwl.library.base.PresenterEvent; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; import java.text.SimpleDateFormat; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/habu/family/presenter/FamilyMemberListPresenter.java b/app/src/main/java/com/chwl/app/family/presenter/FamilyMemberListPresenter.java similarity index 85% rename from app/src/main/java/com/yizhuan/habu/family/presenter/FamilyMemberListPresenter.java rename to app/src/main/java/com/chwl/app/family/presenter/FamilyMemberListPresenter.java index 63ef80b71..ff3b728e7 100644 --- a/app/src/main/java/com/yizhuan/habu/family/presenter/FamilyMemberListPresenter.java +++ b/app/src/main/java/com/chwl/app/family/presenter/FamilyMemberListPresenter.java @@ -1,21 +1,21 @@ -package com.yizhuan.habu.family.presenter; +package com.chwl.app.family.presenter; import android.os.Bundle; import androidx.annotation.Nullable; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseMvpPresenter; -import com.yizhuan.habu.family.contract.viewinterface.IFamilyMemberListView; -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.yizhuan.xchat_android_library.base.PresenterEvent; -import com.yizhuan.xchat_android_library.rxbus.RxBusHelper; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseMvpPresenter; +import com.chwl.app.family.contract.viewinterface.IFamilyMemberListView; +import com.chwl.core.Constants; +import com.chwl.core.family.bean.FamilyInfo; +import com.chwl.core.family.bean.FamilyMemberInfo; +import com.chwl.core.family.bean.response.memberList.RespFamilymember; +import com.chwl.core.family.event.FamilyMemberUpdateEvent; +import com.chwl.core.family.model.FamilyModel; +import com.chwl.library.base.PresenterEvent; +import com.chwl.library.rxbus.RxBusHelper; +import com.chwl.library.utils.ResUtil; import io.reactivex.Single; import io.reactivex.SingleSource; diff --git a/app/src/main/java/com/yizhuan/habu/family/presenter/FamilyMemberSearchPresenter.java b/app/src/main/java/com/chwl/app/family/presenter/FamilyMemberSearchPresenter.java similarity index 80% rename from app/src/main/java/com/yizhuan/habu/family/presenter/FamilyMemberSearchPresenter.java rename to app/src/main/java/com/chwl/app/family/presenter/FamilyMemberSearchPresenter.java index 12c27d15c..375f50d4e 100644 --- a/app/src/main/java/com/yizhuan/habu/family/presenter/FamilyMemberSearchPresenter.java +++ b/app/src/main/java/com/chwl/app/family/presenter/FamilyMemberSearchPresenter.java @@ -1,15 +1,15 @@ -package com.yizhuan.habu.family.presenter; +package com.chwl.app.family.presenter; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseMvpPresenter; -import com.yizhuan.habu.family.contract.viewinterface.IFamilyMemberSearchView; -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.model.FamilyModel; -import com.yizhuan.xchat_android_library.base.PresenterEvent; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseMvpPresenter; +import com.chwl.app.family.contract.viewinterface.IFamilyMemberSearchView; +import com.chwl.core.Constants; +import com.chwl.core.family.bean.FamilyInfo; +import com.chwl.core.family.bean.FamilyMemberInfo; +import com.chwl.core.family.bean.response.memberList.RespFamilymember; +import com.chwl.core.family.model.FamilyModel; +import com.chwl.library.base.PresenterEvent; +import com.chwl.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/family/presenter/FamilyPlazaPresenter.java b/app/src/main/java/com/chwl/app/family/presenter/FamilyPlazaPresenter.java similarity index 57% rename from app/src/main/java/com/yizhuan/habu/family/presenter/FamilyPlazaPresenter.java rename to app/src/main/java/com/chwl/app/family/presenter/FamilyPlazaPresenter.java index 91fa83d53..96cd8dd0d 100644 --- a/app/src/main/java/com/yizhuan/habu/family/presenter/FamilyPlazaPresenter.java +++ b/app/src/main/java/com/chwl/app/family/presenter/FamilyPlazaPresenter.java @@ -1,11 +1,11 @@ -package com.yizhuan.habu.family.presenter; +package com.chwl.app.family.presenter; -import com.yizhuan.habu.base.BaseMvpPresenter; -import com.yizhuan.habu.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.chwl.app.base.BaseMvpPresenter; +import com.chwl.app.family.contract.viewinterface.IFamilyPlazaActivityView; +import com.chwl.core.Constants; +import com.chwl.core.family.bean.response.RespFamilyRankList; +import com.chwl.core.family.model.FamilyModel; +import com.chwl.library.base.PresenterEvent; import io.reactivex.Single; diff --git a/app/src/main/java/com/yizhuan/habu/family/presenter/FamilySearchPresent.java b/app/src/main/java/com/chwl/app/family/presenter/FamilySearchPresent.java similarity index 76% rename from app/src/main/java/com/yizhuan/habu/family/presenter/FamilySearchPresent.java rename to app/src/main/java/com/chwl/app/family/presenter/FamilySearchPresent.java index 05901af5f..b95e17e2d 100644 --- a/app/src/main/java/com/yizhuan/habu/family/presenter/FamilySearchPresent.java +++ b/app/src/main/java/com/chwl/app/family/presenter/FamilySearchPresent.java @@ -1,14 +1,14 @@ -package com.yizhuan.habu.family.presenter; +package com.chwl.app.family.presenter; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseMvpPresenter; -import com.yizhuan.habu.family.contract.viewinterface.IFamilySearchView; -import com.yizhuan.xchat_android_core.Constants; -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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseMvpPresenter; +import com.chwl.app.family.contract.viewinterface.IFamilySearchView; +import com.chwl.core.Constants; +import com.chwl.core.family.bean.FamilyInfo; +import com.chwl.core.family.bean.response.familyPlaza.RespFamily; +import com.chwl.core.family.model.FamilyModel; +import com.chwl.library.base.PresenterEvent; +import com.chwl.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/chwl/app/family/presenter/FamilySelectFriendPresenter.java b/app/src/main/java/com/chwl/app/family/presenter/FamilySelectFriendPresenter.java new file mode 100644 index 000000000..8ff354eac --- /dev/null +++ b/app/src/main/java/com/chwl/app/family/presenter/FamilySelectFriendPresenter.java @@ -0,0 +1,14 @@ +package com.chwl.app.family.presenter; + + +import com.chwl.app.base.BaseMvpPresenter; +import com.chwl.app.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/habu/family/view/activity/FamilyCurrencyActivity.java b/app/src/main/java/com/chwl/app/family/view/activity/FamilyCurrencyActivity.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/family/view/activity/FamilyCurrencyActivity.java rename to app/src/main/java/com/chwl/app/family/view/activity/FamilyCurrencyActivity.java index 89dbacdad..478197ae1 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/activity/FamilyCurrencyActivity.java +++ b/app/src/main/java/com/chwl/app/family/view/activity/FamilyCurrencyActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.activity; +package com.chwl.app.family.view.activity; import android.content.Context; import android.content.DialogInterface; @@ -23,22 +23,22 @@ 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.habu.R; -import com.yizhuan.habu.base.BaseMvpActivity; -import com.yizhuan.habu.family.contract.viewinterface.IFamilyCurrencyView; -import com.yizhuan.habu.family.presenter.FamilyCurrencyPresenter; -import com.yizhuan.habu.family.view.adapter.FamilyCurrencyBillAdapter; -import com.yizhuan.habu.family.view.dialog.FamilyContributionDialog; -import com.yizhuan.habu.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.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.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseMvpActivity; +import com.chwl.app.family.contract.viewinterface.IFamilyCurrencyView; +import com.chwl.app.family.presenter.FamilyCurrencyPresenter; +import com.chwl.app.family.view.adapter.FamilyCurrencyBillAdapter; +import com.chwl.app.family.view.dialog.FamilyContributionDialog; +import com.chwl.app.ui.webview.CommonWebViewActivity; +import com.chwl.core.Constants; +import com.chwl.core.UriProvider; +import com.chwl.core.family.bean.FamilyMemberInfo; +import com.chwl.core.family.bean.VMBillItemInfo; +import com.chwl.core.family.bean.response.moneyManagement.FamilyMoneyManagementInfo; +import com.chwl.library.base.factory.CreatePresenter; +import com.chwl.library.utils.FormatUtils; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/family/view/activity/FamilyGameListActivity.java b/app/src/main/java/com/chwl/app/family/view/activity/FamilyGameListActivity.java similarity index 87% rename from app/src/main/java/com/yizhuan/habu/family/view/activity/FamilyGameListActivity.java rename to app/src/main/java/com/chwl/app/family/view/activity/FamilyGameListActivity.java index 73b77c280..df163a607 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/activity/FamilyGameListActivity.java +++ b/app/src/main/java/com/chwl/app/family/view/activity/FamilyGameListActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.activity; +package com.chwl.app.family.view.activity; import android.app.Activity; import android.content.Intent; @@ -15,19 +15,19 @@ 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.habu.R; -import com.yizhuan.habu.base.BaseMvpActivity; -import com.yizhuan.habu.family.contract.viewinterface.IFamilyGameListActivityView; -import com.yizhuan.habu.family.presenter.FamilyGameListPresenter; -import com.yizhuan.habu.family.view.adapter.FamilyGameListAdapter; -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseMvpActivity; +import com.chwl.app.family.contract.viewinterface.IFamilyGameListActivityView; +import com.chwl.app.family.presenter.FamilyGameListPresenter; +import com.chwl.app.family.view.adapter.FamilyGameListAdapter; +import com.chwl.app.ui.webview.CommonWebViewActivity; +import com.chwl.core.Constants; +import com.chwl.core.family.bean.FamilyGameInfo; +import com.chwl.core.family.bean.FamilyInfo; +import com.chwl.core.family.model.FamilyModel; +import com.chwl.library.base.factory.CreatePresenter; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/family/view/activity/FamilyHomeActivity.java b/app/src/main/java/com/chwl/app/family/view/activity/FamilyHomeActivity.java similarity index 92% rename from app/src/main/java/com/yizhuan/habu/family/view/activity/FamilyHomeActivity.java rename to app/src/main/java/com/chwl/app/family/view/activity/FamilyHomeActivity.java index 5dcbb2ae5..4ec17bb4e 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/activity/FamilyHomeActivity.java +++ b/app/src/main/java/com/chwl/app/family/view/activity/FamilyHomeActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.activity; +package com.chwl.app.family.view.activity; import android.content.Context; import android.content.DialogInterface; @@ -21,46 +21,46 @@ import androidx.recyclerview.widget.RecyclerView; import com.makeramen.roundedimageview.RoundedImageView; import com.netease.nim.uikit.support.glide.GlideApp; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseMvpActivity; -import com.yizhuan.habu.base.TitleBar; -import com.yizhuan.habu.common.util.Utils; -import com.yizhuan.habu.common.widget.CircleImageView; -import com.yizhuan.habu.constants.BundleKeys; -import com.yizhuan.habu.family.presenter.FamilyHomePresenter; -import com.yizhuan.habu.family.view.adapter.FamilyGamesAdapter; -import com.yizhuan.habu.family.view.adapter.FamilyGroupAdapter; -import com.yizhuan.habu.family.view.adapter.FamilyMemberAdapter; -import com.yizhuan.habu.family.view.dialog.FamilyDisbandDialog; -import com.yizhuan.habu.family.view.dialog.FamilyGuideDialog; -import com.yizhuan.habu.family.view.dialog.FamilyJoinDialog; -import com.yizhuan.habu.family.view.dialog.FamilyMenuDialog; -import com.yizhuan.habu.family.view.fragment.FamilyEmptyFragment; -import com.yizhuan.habu.friend.view.SelectFriendActivity; -import com.yizhuan.habu.home.view.IFamilyHomeActivityView; -import com.yizhuan.habu.team.view.CreateTeamMessageActivity; -import com.yizhuan.habu.team.view.NimTeamMessageActivity; -import com.yizhuan.habu.ui.user.activity.UserInfoActivity; -import com.yizhuan.habu.ui.webview.CommonWebViewActivity; -import com.yizhuan.habu.ui.widget.ShareDialog; -import com.yizhuan.habu.ui.widget.recyclerview.decoration.ColorDecoration; -import com.yizhuan.habu.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.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.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.log.MLog; -import com.yizhuan.xchat_android_library.widget.DrawableCenterTextView; +import com.chwl.app.R; +import com.chwl.app.base.BaseMvpActivity; +import com.chwl.app.base.TitleBar; +import com.chwl.app.common.util.Utils; +import com.chwl.app.common.widget.CircleImageView; +import com.chwl.app.constants.BundleKeys; +import com.chwl.app.family.presenter.FamilyHomePresenter; +import com.chwl.app.family.view.adapter.FamilyGamesAdapter; +import com.chwl.app.family.view.adapter.FamilyGroupAdapter; +import com.chwl.app.family.view.adapter.FamilyMemberAdapter; +import com.chwl.app.family.view.dialog.FamilyDisbandDialog; +import com.chwl.app.family.view.dialog.FamilyGuideDialog; +import com.chwl.app.family.view.dialog.FamilyJoinDialog; +import com.chwl.app.family.view.dialog.FamilyMenuDialog; +import com.chwl.app.family.view.fragment.FamilyEmptyFragment; +import com.chwl.app.friend.view.SelectFriendActivity; +import com.chwl.app.home.view.IFamilyHomeActivityView; +import com.chwl.app.team.view.CreateTeamMessageActivity; +import com.chwl.app.team.view.NimTeamMessageActivity; +import com.chwl.app.ui.user.activity.UserInfoActivity; +import com.chwl.app.ui.webview.CommonWebViewActivity; +import com.chwl.app.ui.widget.ShareDialog; +import com.chwl.app.ui.widget.recyclerview.decoration.ColorDecoration; +import com.chwl.app.ui.widget.recyclerview.layoutmanager.FullyLinearLayoutManager; +import com.chwl.core.family.bean.FamilyGameInfo; +import com.chwl.core.family.bean.FamilyGroupInfo; +import com.chwl.core.family.bean.FamilyInfo; +import com.chwl.core.family.bean.FamilyMemberInfo; +import com.chwl.core.family.model.FamilyModel; +import com.chwl.core.manager.IMNetEaseManager; +import com.chwl.core.share.ShareModel; +import com.chwl.core.share.bean.SessionType; +import com.chwl.core.utils.SharedPreferenceUtils; +import com.chwl.library.base.factory.CreatePresenter; +import com.chwl.library.utils.FormatUtils; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; +import com.chwl.library.utils.log.MLog; +import com.chwl.library.widget.DrawableCenterTextView; import cn.sharesdk.framework.Platform; import io.reactivex.SingleObserver; diff --git a/app/src/main/java/com/yizhuan/habu/family/view/activity/FamilyInfoActivity.java b/app/src/main/java/com/chwl/app/family/view/activity/FamilyInfoActivity.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/family/view/activity/FamilyInfoActivity.java rename to app/src/main/java/com/chwl/app/family/view/activity/FamilyInfoActivity.java index 32844f3b4..e65e8f0d2 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/activity/FamilyInfoActivity.java +++ b/app/src/main/java/com/chwl/app/family/view/activity/FamilyInfoActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.activity; +package com.chwl.app.family.view.activity; import android.annotation.SuppressLint; import android.app.Activity; @@ -11,19 +11,19 @@ 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.habu.ErbanTakePhotoActivity; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseMvpActivity; -import com.yizhuan.habu.family.contract.viewinterface.IFamilyInfoView; -import com.yizhuan.habu.family.presenter.FamilyInfoPresenter; -import com.yizhuan.habu.family.view.dialog.FamilyDisbandDialog; -import com.yizhuan.habu.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.utils.ResUtil; -import com.yizhuan.xchat_android_library.widget.IOSSwitchView; +import com.chwl.app.ErbanTakePhotoActivity; +import com.chwl.app.R; +import com.chwl.app.base.BaseMvpActivity; +import com.chwl.app.family.contract.viewinterface.IFamilyInfoView; +import com.chwl.app.family.presenter.FamilyInfoPresenter; +import com.chwl.app.family.view.dialog.FamilyDisbandDialog; +import com.chwl.app.ui.widget.ButtonItem; +import com.chwl.core.family.bean.FamilyInfo; +import com.chwl.core.family.model.FamilyModel; +import com.chwl.core.file.FileModel; +import com.chwl.library.base.factory.CreatePresenter; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.widget.IOSSwitchView; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/family/view/activity/FamilyListActivity.java b/app/src/main/java/com/chwl/app/family/view/activity/FamilyListActivity.java similarity index 86% rename from app/src/main/java/com/yizhuan/habu/family/view/activity/FamilyListActivity.java rename to app/src/main/java/com/chwl/app/family/view/activity/FamilyListActivity.java index 7c7b4e955..dfc631ae6 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/activity/FamilyListActivity.java +++ b/app/src/main/java/com/chwl/app/family/view/activity/FamilyListActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.activity; +package com.chwl.app.family.view.activity; import android.content.Context; import android.content.Intent; @@ -9,17 +9,17 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseMvpActivity; -import com.yizhuan.habu.base.TitleBar; -import com.yizhuan.habu.family.contract.viewinterface.IFamilySearchView; -import com.yizhuan.habu.family.presenter.FamilyListPresenter; -import com.yizhuan.habu.family.view.adapter.FamilyWeeklyRankBoardAdapter; -import com.yizhuan.habu.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.chwl.app.R; +import com.chwl.app.base.BaseMvpActivity; +import com.chwl.app.base.TitleBar; +import com.chwl.app.family.contract.viewinterface.IFamilySearchView; +import com.chwl.app.family.presenter.FamilyListPresenter; +import com.chwl.app.family.view.adapter.FamilyWeeklyRankBoardAdapter; +import com.chwl.app.ui.widget.recyclerview.decoration.ColorDecoration; +import com.chwl.core.family.bean.response.RankingFamilyInfo; +import com.chwl.library.base.factory.CreatePresenter; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.SizeUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/family/view/activity/FamilyManageActivity.java b/app/src/main/java/com/chwl/app/family/view/activity/FamilyManageActivity.java similarity index 85% rename from app/src/main/java/com/yizhuan/habu/family/view/activity/FamilyManageActivity.java rename to app/src/main/java/com/chwl/app/family/view/activity/FamilyManageActivity.java index e7840c04c..285a51812 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/activity/FamilyManageActivity.java +++ b/app/src/main/java/com/chwl/app/family/view/activity/FamilyManageActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.activity; +package com.chwl.app.family.view.activity; import android.content.Context; import android.content.Intent; @@ -9,15 +9,15 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseMvpActivity; -import com.yizhuan.habu.family.contract.viewinterface.IFamilyManageActivityView; -import com.yizhuan.habu.family.presenter.FamilyManagePresenter; -import com.yizhuan.habu.family.view.adapter.FamilyManageAdapter; -import com.yizhuan.xchat_android_core.family.bean.FamilyManageItemInfo; -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.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseMvpActivity; +import com.chwl.app.family.contract.viewinterface.IFamilyManageActivityView; +import com.chwl.app.family.presenter.FamilyManagePresenter; +import com.chwl.app.family.view.adapter.FamilyManageAdapter; +import com.chwl.core.family.bean.FamilyManageItemInfo; +import com.chwl.core.family.model.FamilyModel; +import com.chwl.library.base.factory.CreatePresenter; +import com.chwl.library.utils.ResUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/family/view/activity/FamilyMemberCurrencyActivity.java b/app/src/main/java/com/chwl/app/family/view/activity/FamilyMemberCurrencyActivity.java similarity index 87% rename from app/src/main/java/com/yizhuan/habu/family/view/activity/FamilyMemberCurrencyActivity.java rename to app/src/main/java/com/chwl/app/family/view/activity/FamilyMemberCurrencyActivity.java index 08943c797..e56b55a5a 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/activity/FamilyMemberCurrencyActivity.java +++ b/app/src/main/java/com/chwl/app/family/view/activity/FamilyMemberCurrencyActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.activity; +package com.chwl.app.family.view.activity; import android.content.Context; import android.content.Intent; @@ -13,17 +13,17 @@ 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.habu.R; -import com.yizhuan.habu.base.BaseMvpActivity; -import com.yizhuan.habu.constants.BundleKeys; -import com.yizhuan.habu.family.contract.viewinterface.IFamilyCurrencyView; -import com.yizhuan.habu.family.presenter.FamilyMemberCurrencyPresenter; -import com.yizhuan.habu.family.view.adapter.FamilyCurrencyBillAdapter; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.family.bean.VMBillItemInfo; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseMvpActivity; +import com.chwl.app.constants.BundleKeys; +import com.chwl.app.family.contract.viewinterface.IFamilyCurrencyView; +import com.chwl.app.family.presenter.FamilyMemberCurrencyPresenter; +import com.chwl.app.family.view.adapter.FamilyCurrencyBillAdapter; +import com.chwl.core.Constants; +import com.chwl.core.family.bean.VMBillItemInfo; +import com.chwl.library.base.factory.CreatePresenter; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/family/view/activity/FamilyMemberListActivity.java b/app/src/main/java/com/chwl/app/family/view/activity/FamilyMemberListActivity.java similarity index 92% rename from app/src/main/java/com/yizhuan/habu/family/view/activity/FamilyMemberListActivity.java rename to app/src/main/java/com/chwl/app/family/view/activity/FamilyMemberListActivity.java index 74c620524..bf723a2ef 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/activity/FamilyMemberListActivity.java +++ b/app/src/main/java/com/chwl/app/family/view/activity/FamilyMemberListActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.activity; +package com.chwl.app.family.view.activity; import android.app.Activity; import android.content.DialogInterface; @@ -13,20 +13,20 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseMvpActivity; -import com.yizhuan.habu.base.TitleBar; -import com.yizhuan.habu.constants.BundleKeys; -import com.yizhuan.habu.family.contract.viewinterface.IFamilyMemberListView; -import com.yizhuan.habu.family.presenter.FamilyMemberListPresenter; -import com.yizhuan.habu.family.view.adapter.FamilyMemberListAdapter; -import com.yizhuan.habu.family.view.dialog.FamilyTransferDialog; -import com.yizhuan.habu.ui.user.activity.UserInfoActivity; -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_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseMvpActivity; +import com.chwl.app.base.TitleBar; +import com.chwl.app.constants.BundleKeys; +import com.chwl.app.family.contract.viewinterface.IFamilyMemberListView; +import com.chwl.app.family.presenter.FamilyMemberListPresenter; +import com.chwl.app.family.view.adapter.FamilyMemberListAdapter; +import com.chwl.app.family.view.dialog.FamilyTransferDialog; +import com.chwl.app.ui.user.activity.UserInfoActivity; +import com.chwl.core.family.bean.FamilyMemberInfo; +import com.chwl.core.family.bean.response.memberList.RespFamilymember; +import com.chwl.library.base.factory.CreatePresenter; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/family/view/activity/FamilyMemberSearchActivity.java b/app/src/main/java/com/chwl/app/family/view/activity/FamilyMemberSearchActivity.java similarity index 92% rename from app/src/main/java/com/yizhuan/habu/family/view/activity/FamilyMemberSearchActivity.java rename to app/src/main/java/com/chwl/app/family/view/activity/FamilyMemberSearchActivity.java index 223bd1b19..eda1d6701 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/activity/FamilyMemberSearchActivity.java +++ b/app/src/main/java/com/chwl/app/family/view/activity/FamilyMemberSearchActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.activity; +package com.chwl.app.family.view.activity; import android.content.Context; import android.content.DialogInterface; @@ -19,20 +19,20 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseMvpActivity; -import com.yizhuan.habu.constants.BundleKeys; -import com.yizhuan.habu.family.contract.viewinterface.IFamilyMemberSearchView; -import com.yizhuan.habu.family.presenter.FamilyMemberSearchPresenter; -import com.yizhuan.habu.family.view.adapter.FamilyMemberListAdapter; -import com.yizhuan.habu.family.view.dialog.FamilyRemoveMemberDialog; -import com.yizhuan.habu.family.view.dialog.FamilyTransferDialog; -import com.yizhuan.habu.ui.user.activity.UserInfoActivity; -import com.yizhuan.habu.ui.widget.recyclerview.decoration.ColorDecoration; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseMvpActivity; +import com.chwl.app.constants.BundleKeys; +import com.chwl.app.family.contract.viewinterface.IFamilyMemberSearchView; +import com.chwl.app.family.presenter.FamilyMemberSearchPresenter; +import com.chwl.app.family.view.adapter.FamilyMemberListAdapter; +import com.chwl.app.family.view.dialog.FamilyRemoveMemberDialog; +import com.chwl.app.family.view.dialog.FamilyTransferDialog; +import com.chwl.app.ui.user.activity.UserInfoActivity; +import com.chwl.app.ui.widget.recyclerview.decoration.ColorDecoration; +import com.chwl.core.family.bean.FamilyMemberInfo; +import com.chwl.library.base.factory.CreatePresenter; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/family/view/activity/FamilyPlazaActivity.java b/app/src/main/java/com/chwl/app/family/view/activity/FamilyPlazaActivity.java similarity index 83% rename from app/src/main/java/com/yizhuan/habu/family/view/activity/FamilyPlazaActivity.java rename to app/src/main/java/com/chwl/app/family/view/activity/FamilyPlazaActivity.java index 490cab8dc..702c40112 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/activity/FamilyPlazaActivity.java +++ b/app/src/main/java/com/chwl/app/family/view/activity/FamilyPlazaActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.activity; +package com.chwl.app.family.view.activity; import android.content.Context; import android.content.Intent; @@ -11,19 +11,19 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseMvpActivity; -import com.yizhuan.habu.base.TitleBar; -import com.yizhuan.habu.family.contract.viewinterface.IFamilyPlazaActivityView; -import com.yizhuan.habu.family.presenter.FamilyPlazaPresenter; -import com.yizhuan.habu.family.view.adapter.FamilyWeeklyRankBoardAdapter; -import com.yizhuan.habu.ui.widget.recyclerview.decoration.ColorDecoration; -import com.yizhuan.habu.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.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.SizeUtils; +import com.chwl.app.R; +import com.chwl.app.base.BaseMvpActivity; +import com.chwl.app.base.TitleBar; +import com.chwl.app.family.contract.viewinterface.IFamilyPlazaActivityView; +import com.chwl.app.family.presenter.FamilyPlazaPresenter; +import com.chwl.app.family.view.adapter.FamilyWeeklyRankBoardAdapter; +import com.chwl.app.ui.widget.recyclerview.decoration.ColorDecoration; +import com.chwl.app.ui.widget.recyclerview.layoutmanager.FullyLinearLayoutManager; +import com.chwl.core.family.bean.response.RankingFamilyInfo; +import com.chwl.core.family.bean.response.RespFamilyRankList; +import com.chwl.library.base.factory.CreatePresenter; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.SizeUtils; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; diff --git a/app/src/main/java/com/yizhuan/habu/family/view/activity/FamilySearchActivity.java b/app/src/main/java/com/chwl/app/family/view/activity/FamilySearchActivity.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/family/view/activity/FamilySearchActivity.java rename to app/src/main/java/com/chwl/app/family/view/activity/FamilySearchActivity.java index 3017d5202..06a74c905 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/activity/FamilySearchActivity.java +++ b/app/src/main/java/com/chwl/app/family/view/activity/FamilySearchActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.activity; +package com.chwl.app.family.view.activity; import android.content.Context; import android.content.Intent; @@ -18,17 +18,17 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseMvpActivity; -import com.yizhuan.habu.family.contract.viewinterface.IFamilySearchView; -import com.yizhuan.habu.family.presenter.FamilySearchPresent; -import com.yizhuan.habu.family.view.adapter.FamilyAdapter; -import com.yizhuan.habu.ui.widget.recyclerview.decoration.ColorDecoration; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseMvpActivity; +import com.chwl.app.family.contract.viewinterface.IFamilySearchView; +import com.chwl.app.family.presenter.FamilySearchPresent; +import com.chwl.app.family.view.adapter.FamilyAdapter; +import com.chwl.app.ui.widget.recyclerview.decoration.ColorDecoration; +import com.chwl.core.family.bean.FamilyInfo; +import com.chwl.library.base.factory.CreatePresenter; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/family/view/activity/FamilySelectFriendActivity.java b/app/src/main/java/com/chwl/app/family/view/activity/FamilySelectFriendActivity.java similarity index 79% rename from app/src/main/java/com/yizhuan/habu/family/view/activity/FamilySelectFriendActivity.java rename to app/src/main/java/com/chwl/app/family/view/activity/FamilySelectFriendActivity.java index 45a617561..ce56d56c9 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/activity/FamilySelectFriendActivity.java +++ b/app/src/main/java/com/chwl/app/family/view/activity/FamilySelectFriendActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.activity; +package com.chwl.app.family.view.activity; import android.app.Activity; import android.content.Context; @@ -9,24 +9,24 @@ import android.os.Bundle; import androidx.fragment.app.Fragment; import androidx.viewpager.widget.ViewPager; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseMvpActivity; -import com.yizhuan.habu.base.TitleBar; -import com.yizhuan.habu.common.ViewPagerAdapter; -import com.yizhuan.habu.decoration.view.widgets.CarMagicIndicator; -import com.yizhuan.habu.family.contract.viewinterface.IFamilySelectFriendActivityView; -import com.yizhuan.habu.family.presenter.FamilySelectFriendPresenter; -import com.yizhuan.habu.family.view.dialog.FamilyInviteConfirmDialog; -import com.yizhuan.habu.family.view.fragment.FamilyAttentionFragment; -import com.yizhuan.habu.family.view.fragment.FamilyFansListFragment; -import com.yizhuan.habu.family.view.fragment.FamilyFriendListFragment; -import com.yizhuan.habu.ui.widget.magicindicator.MagicIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.ViewPagerHelper; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; -import com.yizhuan.xchat_android_core.home.bean.TabInfo; -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.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseMvpActivity; +import com.chwl.app.base.TitleBar; +import com.chwl.app.common.ViewPagerAdapter; +import com.chwl.app.decoration.view.widgets.CarMagicIndicator; +import com.chwl.app.family.contract.viewinterface.IFamilySelectFriendActivityView; +import com.chwl.app.family.presenter.FamilySelectFriendPresenter; +import com.chwl.app.family.view.dialog.FamilyInviteConfirmDialog; +import com.chwl.app.family.view.fragment.FamilyAttentionFragment; +import com.chwl.app.family.view.fragment.FamilyFansListFragment; +import com.chwl.app.family.view.fragment.FamilyFriendListFragment; +import com.chwl.app.ui.widget.magicindicator.MagicIndicator; +import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.chwl.core.home.bean.TabInfo; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.library.base.factory.CreatePresenter; +import com.chwl.library.utils.ResUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/family/view/activity/FamilyTextInputActivity.java b/app/src/main/java/com/chwl/app/family/view/activity/FamilyTextInputActivity.java similarity index 87% rename from app/src/main/java/com/yizhuan/habu/family/view/activity/FamilyTextInputActivity.java rename to app/src/main/java/com/chwl/app/family/view/activity/FamilyTextInputActivity.java index 8040a68fc..267493c47 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/activity/FamilyTextInputActivity.java +++ b/app/src/main/java/com/chwl/app/family/view/activity/FamilyTextInputActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.activity; +package com.chwl.app.family.view.activity; import android.content.Context; import android.content.Intent; @@ -6,12 +6,12 @@ import android.os.Bundle; import android.view.View; import android.widget.EditText; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseMvpActivity; -import com.yizhuan.habu.base.TitleBar; -import com.yizhuan.habu.constants.BundleKeys; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseMvpActivity; +import com.chwl.app.base.TitleBar; +import com.chwl.app.constants.BundleKeys; +import com.chwl.library.base.IMvpBaseView; +import com.chwl.library.utils.ResUtil; public class FamilyTextInputActivity extends BaseMvpActivity implements IMvpBaseView{ diff --git a/app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyAdapter.java b/app/src/main/java/com/chwl/app/family/view/adapter/FamilyAdapter.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyAdapter.java rename to app/src/main/java/com/chwl/app/family/view/adapter/FamilyAdapter.java index 724f38e43..8dbe838b4 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyAdapter.java +++ b/app/src/main/java/com/chwl/app/family/view/adapter/FamilyAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.adapter; +package com.chwl.app.family.view.adapter; import android.content.Context; import android.widget.TextView; @@ -10,9 +10,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.habu.R; -import com.yizhuan.habu.ui.widget.SquareImageView; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; +import com.chwl.app.R; +import com.chwl.app.ui.widget.SquareImageView; +import com.chwl.core.family.bean.FamilyInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyAttentionListAdapter.java b/app/src/main/java/com/chwl/app/family/view/adapter/FamilyAttentionListAdapter.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyAttentionListAdapter.java rename to app/src/main/java/com/chwl/app/family/view/adapter/FamilyAttentionListAdapter.java index dfd634081..1d026babc 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyAttentionListAdapter.java +++ b/app/src/main/java/com/chwl/app/family/view/adapter/FamilyAttentionListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.adapter; +package com.chwl.app.family.view.adapter; import android.text.TextUtils; import android.view.View; @@ -7,11 +7,11 @@ import androidx.appcompat.widget.AppCompatImageView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.habu.ui.widget.NobleAvatarView; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; +import com.chwl.app.R; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.app.ui.widget.NobleAvatarView; +import com.chwl.core.noble.NobleUtil; +import com.chwl.core.user.bean.AttentionInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyBannerAdapter.java b/app/src/main/java/com/chwl/app/family/view/adapter/FamilyBannerAdapter.java similarity index 84% rename from app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyBannerAdapter.java rename to app/src/main/java/com/chwl/app/family/view/adapter/FamilyBannerAdapter.java index 46c94e583..67ecee5f2 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyBannerAdapter.java +++ b/app/src/main/java/com/chwl/app/family/view/adapter/FamilyBannerAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.adapter; +package com.chwl.app.family.view.adapter; import android.content.Context; import android.text.TextUtils; @@ -7,12 +7,12 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; -import com.yizhuan.habu.R; -import com.yizhuan.habu.avroom.activity.AVRoomActivity; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.habu.ui.webview.CommonWebViewActivity; -import com.yizhuan.habu.ui.widget.rollviewpager.adapter.StaticPagerAdapter; -import com.yizhuan.xchat_android_core.family.bean.FindBannerInfo; +import com.chwl.app.R; +import com.chwl.app.avroom.activity.AVRoomActivity; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.app.ui.webview.CommonWebViewActivity; +import com.chwl.app.ui.widget.rollviewpager.adapter.StaticPagerAdapter; +import com.chwl.core.family.bean.FindBannerInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyCurrencyBillAdapter.java b/app/src/main/java/com/chwl/app/family/view/adapter/FamilyCurrencyBillAdapter.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyCurrencyBillAdapter.java rename to app/src/main/java/com/chwl/app/family/view/adapter/FamilyCurrencyBillAdapter.java index ca58b015a..cd522c642 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyCurrencyBillAdapter.java +++ b/app/src/main/java/com/chwl/app/family/view/adapter/FamilyCurrencyBillAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.adapter; +package com.chwl.app.family.view.adapter; import android.content.Context; import android.view.View; @@ -10,13 +10,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.habu.R; -import com.yizhuan.habu.common.widget.CircleImageView; -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.FormatUtils; +import com.chwl.app.R; +import com.chwl.app.common.widget.CircleImageView; +import com.chwl.app.ui.widget.UserInfoDialog; +import com.chwl.core.family.bean.BillDateDivInfo; +import com.chwl.core.family.bean.TransactionRecordInfo; +import com.chwl.core.family.bean.VMBillItemInfo; +import com.chwl.library.utils.FormatUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyFansViewAdapter.java b/app/src/main/java/com/chwl/app/family/view/adapter/FamilyFansViewAdapter.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyFansViewAdapter.java rename to app/src/main/java/com/chwl/app/family/view/adapter/FamilyFansViewAdapter.java index e4ebcab7e..2f062cc3f 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyFansViewAdapter.java +++ b/app/src/main/java/com/chwl/app/family/view/adapter/FamilyFansViewAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.adapter; +package com.chwl.app.family.view.adapter; import android.text.TextUtils; import android.view.View; @@ -7,11 +7,11 @@ import androidx.appcompat.widget.AppCompatImageView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.habu.ui.widget.NobleAvatarView; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.user.bean.FansInfo; +import com.chwl.app.R; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.app.ui.widget.NobleAvatarView; +import com.chwl.core.noble.NobleUtil; +import com.chwl.core.user.bean.FansInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyFriendListAdapter.java b/app/src/main/java/com/chwl/app/family/view/adapter/FamilyFriendListAdapter.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyFriendListAdapter.java rename to app/src/main/java/com/chwl/app/family/view/adapter/FamilyFriendListAdapter.java index 3d24fe238..a98915f28 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyFriendListAdapter.java +++ b/app/src/main/java/com/chwl/app/family/view/adapter/FamilyFriendListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.adapter; +package com.chwl.app.family.view.adapter; import android.content.Context; import android.text.TextUtils; @@ -9,11 +9,11 @@ import androidx.appcompat.widget.AppCompatImageView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.habu.ui.widget.NobleAvatarView; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.chwl.app.R; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.app.ui.widget.NobleAvatarView; +import com.chwl.core.noble.NobleUtil; +import com.chwl.core.user.bean.UserInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyGameListAdapter.java b/app/src/main/java/com/chwl/app/family/view/adapter/FamilyGameListAdapter.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyGameListAdapter.java rename to app/src/main/java/com/chwl/app/family/view/adapter/FamilyGameListAdapter.java index d4b133304..3cea51cce 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyGameListAdapter.java +++ b/app/src/main/java/com/chwl/app/family/view/adapter/FamilyGameListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.adapter; +package com.chwl.app.family.view.adapter; import android.content.Context; import android.text.TextUtils; @@ -10,8 +10,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.habu.R; -import com.yizhuan.xchat_android_core.family.bean.FamilyGameInfo; +import com.chwl.app.R; +import com.chwl.core.family.bean.FamilyGameInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyGamesAdapter.java b/app/src/main/java/com/chwl/app/family/view/adapter/FamilyGamesAdapter.java similarity index 89% rename from app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyGamesAdapter.java rename to app/src/main/java/com/chwl/app/family/view/adapter/FamilyGamesAdapter.java index 4c91bdc1f..3d986360d 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyGamesAdapter.java +++ b/app/src/main/java/com/chwl/app/family/view/adapter/FamilyGamesAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.adapter; +package com.chwl.app.family.view.adapter; import android.content.Context; import android.text.TextUtils; @@ -10,8 +10,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.habu.R; -import com.yizhuan.xchat_android_core.family.bean.FamilyGameInfo; +import com.chwl.app.R; +import com.chwl.core.family.bean.FamilyGameInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyGroupAdapter.java b/app/src/main/java/com/chwl/app/family/view/adapter/FamilyGroupAdapter.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyGroupAdapter.java rename to app/src/main/java/com/chwl/app/family/view/adapter/FamilyGroupAdapter.java index 083a1a956..29f7705b7 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyGroupAdapter.java +++ b/app/src/main/java/com/chwl/app/family/view/adapter/FamilyGroupAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.adapter; +package com.chwl.app.family.view.adapter; import android.content.Context; import android.text.TextUtils; @@ -13,9 +13,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.habu.R; -import com.yizhuan.habu.ui.widget.SquareImageView; -import com.yizhuan.xchat_android_core.family.bean.FamilyGroupInfo; +import com.chwl.app.R; +import com.chwl.app.ui.widget.SquareImageView; +import com.chwl.core.family.bean.FamilyGroupInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyManageAdapter.java b/app/src/main/java/com/chwl/app/family/view/adapter/FamilyManageAdapter.java similarity index 82% rename from app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyManageAdapter.java rename to app/src/main/java/com/chwl/app/family/view/adapter/FamilyManageAdapter.java index 26364b3bb..a8d20d0ec 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyManageAdapter.java +++ b/app/src/main/java/com/chwl/app/family/view/adapter/FamilyManageAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.adapter; +package com.chwl.app.family.view.adapter; import android.widget.TextView; @@ -6,9 +6,9 @@ import androidx.annotation.Nullable; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.widget.SquareImageView; -import com.yizhuan.xchat_android_core.family.bean.FamilyManageItemInfo; +import com.chwl.app.R; +import com.chwl.app.ui.widget.SquareImageView; +import com.chwl.core.family.bean.FamilyManageItemInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyMemberAdapter.java b/app/src/main/java/com/chwl/app/family/view/adapter/FamilyMemberAdapter.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyMemberAdapter.java rename to app/src/main/java/com/chwl/app/family/view/adapter/FamilyMemberAdapter.java index 5f927ff22..12e05fc28 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyMemberAdapter.java +++ b/app/src/main/java/com/chwl/app/family/view/adapter/FamilyMemberAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.adapter; +package com.chwl.app.family.view.adapter; import android.content.Context; import android.text.TextUtils; @@ -12,10 +12,10 @@ import androidx.annotation.Nullable; 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.habu.R; -import com.yizhuan.habu.common.widget.CircleImageView; -import com.yizhuan.habu.common.util.Utils; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; +import com.chwl.app.R; +import com.chwl.app.common.widget.CircleImageView; +import com.chwl.app.common.util.Utils; +import com.chwl.core.family.bean.FamilyMemberInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyMemberListAdapter.java b/app/src/main/java/com/chwl/app/family/view/adapter/FamilyMemberListAdapter.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyMemberListAdapter.java rename to app/src/main/java/com/chwl/app/family/view/adapter/FamilyMemberListAdapter.java index 388570cdc..76b1de74a 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyMemberListAdapter.java +++ b/app/src/main/java/com/chwl/app/family/view/adapter/FamilyMemberListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.adapter; +package com.chwl.app.family.view.adapter; import android.content.Context; import android.text.TextUtils; @@ -12,12 +12,12 @@ import androidx.annotation.Nullable; 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.habu.R; -import com.yizhuan.habu.common.widget.CircleImageView; -import com.yizhuan.habu.family.view.activity.FamilyMemberListActivity; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; -import com.yizhuan.xchat_android_core.level.UserLevelVo; +import com.chwl.app.R; +import com.chwl.app.common.widget.CircleImageView; +import com.chwl.app.family.view.activity.FamilyMemberListActivity; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.core.family.bean.FamilyMemberInfo; +import com.chwl.core.level.UserLevelVo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyWeeklyRankBoardAdapter.java b/app/src/main/java/com/chwl/app/family/view/adapter/FamilyWeeklyRankBoardAdapter.java similarity index 92% rename from app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyWeeklyRankBoardAdapter.java rename to app/src/main/java/com/chwl/app/family/view/adapter/FamilyWeeklyRankBoardAdapter.java index a2b142132..1f0ad1418 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/adapter/FamilyWeeklyRankBoardAdapter.java +++ b/app/src/main/java/com/chwl/app/family/view/adapter/FamilyWeeklyRankBoardAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.adapter; +package com.chwl.app.family.view.adapter; import android.content.Context; import android.view.View; @@ -11,10 +11,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.habu.R; -import com.yizhuan.habu.ui.widget.SquareImageView; -import com.yizhuan.xchat_android_core.family.bean.response.RankingFamilyInfo; -import com.yizhuan.xchat_android_library.utils.FormatUtils; +import com.chwl.app.R; +import com.chwl.app.ui.widget.SquareImageView; +import com.chwl.core.family.bean.response.RankingFamilyInfo; +import com.chwl.library.utils.FormatUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/family/view/dialog/FamilyContributionDialog.java b/app/src/main/java/com/chwl/app/family/view/dialog/FamilyContributionDialog.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/family/view/dialog/FamilyContributionDialog.java rename to app/src/main/java/com/chwl/app/family/view/dialog/FamilyContributionDialog.java index 461c255dd..76349d1d1 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/dialog/FamilyContributionDialog.java +++ b/app/src/main/java/com/chwl/app/family/view/dialog/FamilyContributionDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.dialog; +package com.chwl.app.family.view.dialog; import android.app.Dialog; import android.content.Context; @@ -13,12 +13,12 @@ import android.widget.TextView; import androidx.annotation.NonNull; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_core.family.bean.response.moneyManagement.FamilyMoneyManagementInfo; -import com.yizhuan.xchat_android_library.utils.FormatUtils; -import com.yizhuan.xchat_android_library.utils.ImeUtil; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.core.family.bean.response.moneyManagement.FamilyMoneyManagementInfo; +import com.chwl.library.utils.FormatUtils; +import com.chwl.library.utils.ImeUtil; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/habu/family/view/dialog/FamilyDisbandDialog.java b/app/src/main/java/com/chwl/app/family/view/dialog/FamilyDisbandDialog.java similarity index 83% rename from app/src/main/java/com/yizhuan/habu/family/view/dialog/FamilyDisbandDialog.java rename to app/src/main/java/com/chwl/app/family/view/dialog/FamilyDisbandDialog.java index 643944ece..f6ebf596e 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/dialog/FamilyDisbandDialog.java +++ b/app/src/main/java/com/chwl/app/family/view/dialog/FamilyDisbandDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.dialog; +package com.chwl.app.family.view.dialog; import android.app.Dialog; import android.content.Context; @@ -7,13 +7,13 @@ import android.widget.TextView; import androidx.annotation.NonNull; -import com.yizhuan.habu.R; -import com.yizhuan.habu.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.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.app.ui.im.avtivity.NimP2PMessageActivity; +import com.chwl.core.family.bean.CustomServiceInfo; +import com.chwl.core.family.bean.FamilyCustomServiceInfo; +import com.chwl.core.family.model.FamilyModel; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/habu/family/view/dialog/FamilyExitTipDialog.java b/app/src/main/java/com/chwl/app/family/view/dialog/FamilyExitTipDialog.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/family/view/dialog/FamilyExitTipDialog.java rename to app/src/main/java/com/chwl/app/family/view/dialog/FamilyExitTipDialog.java index 368ad6923..4508529a3 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/dialog/FamilyExitTipDialog.java +++ b/app/src/main/java/com/chwl/app/family/view/dialog/FamilyExitTipDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.dialog; +package com.chwl.app.family.view.dialog; import android.app.Dialog; import android.content.Context; @@ -8,8 +8,8 @@ import android.widget.TextView; import androidx.annotation.NonNull; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; +import com.chwl.app.R; +import com.chwl.core.family.bean.FamilyInfo; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/habu/family/view/dialog/FamilyGuideDialog.java b/app/src/main/java/com/chwl/app/family/view/dialog/FamilyGuideDialog.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/family/view/dialog/FamilyGuideDialog.java rename to app/src/main/java/com/chwl/app/family/view/dialog/FamilyGuideDialog.java index 95516aa38..94ca59e62 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/dialog/FamilyGuideDialog.java +++ b/app/src/main/java/com/chwl/app/family/view/dialog/FamilyGuideDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.dialog; +package com.chwl.app.family.view.dialog; import android.app.Dialog; import android.content.Context; @@ -12,7 +12,7 @@ import android.widget.ImageView; import androidx.annotation.NonNull; import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.habu.R; +import com.chwl.app.R; import java.util.ArrayList; import java.util.Iterator; diff --git a/app/src/main/java/com/yizhuan/habu/family/view/dialog/FamilyInviteConfirmDialog.java b/app/src/main/java/com/chwl/app/family/view/dialog/FamilyInviteConfirmDialog.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/family/view/dialog/FamilyInviteConfirmDialog.java rename to app/src/main/java/com/chwl/app/family/view/dialog/FamilyInviteConfirmDialog.java index 32fcf2128..0ed379bb5 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/dialog/FamilyInviteConfirmDialog.java +++ b/app/src/main/java/com/chwl/app/family/view/dialog/FamilyInviteConfirmDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.dialog; +package com.chwl.app.family.view.dialog; import android.app.Dialog; import android.content.Context; @@ -10,8 +10,8 @@ import android.widget.TextView; import androidx.annotation.NonNull; import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.habu.R; -import com.yizhuan.habu.common.widget.CircleImageView; +import com.chwl.app.R; +import com.chwl.app.common.widget.CircleImageView; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/habu/family/view/dialog/FamilyJoinDialog.java b/app/src/main/java/com/chwl/app/family/view/dialog/FamilyJoinDialog.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/family/view/dialog/FamilyJoinDialog.java rename to app/src/main/java/com/chwl/app/family/view/dialog/FamilyJoinDialog.java index fb449842d..fc814c75a 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/dialog/FamilyJoinDialog.java +++ b/app/src/main/java/com/chwl/app/family/view/dialog/FamilyJoinDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.dialog; +package com.chwl.app.family.view.dialog; import android.app.Dialog; import android.content.Context; @@ -10,8 +10,8 @@ import android.widget.TextView; import androidx.annotation.NonNull; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_library.utils.ImeUtil; +import com.chwl.app.R; +import com.chwl.library.utils.ImeUtil; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/habu/family/view/dialog/FamilyMenuDialog.java b/app/src/main/java/com/chwl/app/family/view/dialog/FamilyMenuDialog.java similarity index 92% rename from app/src/main/java/com/yizhuan/habu/family/view/dialog/FamilyMenuDialog.java rename to app/src/main/java/com/chwl/app/family/view/dialog/FamilyMenuDialog.java index 726f80798..70e23daa4 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/dialog/FamilyMenuDialog.java +++ b/app/src/main/java/com/chwl/app/family/view/dialog/FamilyMenuDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.dialog; +package com.chwl.app.family.view.dialog; import android.app.Dialog; import android.content.Context; @@ -12,10 +12,10 @@ import android.view.WindowManager; import androidx.annotation.NonNull; import androidx.core.content.ContextCompat; -import com.yizhuan.habu.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.chwl.app.R; +import com.chwl.core.family.bean.FamilyInfo; +import com.chwl.library.utils.SizeUtils; +import com.chwl.library.widget.DrawableCenterTextView; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/habu/family/view/dialog/FamilyRemoveMemberDialog.java b/app/src/main/java/com/chwl/app/family/view/dialog/FamilyRemoveMemberDialog.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/family/view/dialog/FamilyRemoveMemberDialog.java rename to app/src/main/java/com/chwl/app/family/view/dialog/FamilyRemoveMemberDialog.java index 6cd7dc11b..87c62d66c 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/dialog/FamilyRemoveMemberDialog.java +++ b/app/src/main/java/com/chwl/app/family/view/dialog/FamilyRemoveMemberDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.dialog; +package com.chwl.app.family.view.dialog; import android.app.Dialog; import android.content.Context; @@ -9,8 +9,8 @@ import android.widget.TextView; import androidx.annotation.NonNull; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; +import com.chwl.app.R; +import com.chwl.core.family.bean.FamilyMemberInfo; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/habu/family/view/dialog/FamilyTransferDialog.java b/app/src/main/java/com/chwl/app/family/view/dialog/FamilyTransferDialog.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/family/view/dialog/FamilyTransferDialog.java rename to app/src/main/java/com/chwl/app/family/view/dialog/FamilyTransferDialog.java index 27aa21a22..c9caf98c5 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/dialog/FamilyTransferDialog.java +++ b/app/src/main/java/com/chwl/app/family/view/dialog/FamilyTransferDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.dialog; +package com.chwl.app.family.view.dialog; import android.app.Dialog; import android.content.Context; @@ -12,14 +12,14 @@ import android.widget.TextView; import androidx.annotation.NonNull; -import com.yizhuan.habu.R; -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.FormatUtils; -import com.yizhuan.xchat_android_library.utils.ImeUtil; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.family.bean.FamilyInfo; +import com.chwl.core.family.bean.FamilyMemberInfo; +import com.chwl.library.utils.FormatUtils; +import com.chwl.library.utils.ImeUtil; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/habu/family/view/fragment/FamilyAttentionFragment.java b/app/src/main/java/com/chwl/app/family/view/fragment/FamilyAttentionFragment.java similarity index 86% rename from app/src/main/java/com/yizhuan/habu/family/view/fragment/FamilyAttentionFragment.java rename to app/src/main/java/com/chwl/app/family/view/fragment/FamilyAttentionFragment.java index 203090e93..b2f74d570 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/fragment/FamilyAttentionFragment.java +++ b/app/src/main/java/com/chwl/app/family/view/fragment/FamilyAttentionFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.fragment; +package com.chwl.app.family.view.fragment; import android.app.Activity; import android.view.View; @@ -9,16 +9,16 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseMvpFragment; -import com.yizhuan.habu.family.contract.viewinterface.IFamilyAttentionFragmentView; -import com.yizhuan.habu.family.presenter.FamilyAttentionPresenter; -import com.yizhuan.habu.family.view.activity.FamilySelectFriendActivity; -import com.yizhuan.habu.family.view.adapter.FamilyAttentionListAdapter; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; -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.chwl.app.R; +import com.chwl.app.base.BaseMvpFragment; +import com.chwl.app.family.contract.viewinterface.IFamilyAttentionFragmentView; +import com.chwl.app.family.presenter.FamilyAttentionPresenter; +import com.chwl.app.family.view.activity.FamilySelectFriendActivity; +import com.chwl.app.family.view.adapter.FamilyAttentionListAdapter; +import com.chwl.core.user.bean.AttentionInfo; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.library.base.factory.CreatePresenter; +import com.chwl.library.utils.ListUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/family/view/fragment/FamilyEmptyFragment.java b/app/src/main/java/com/chwl/app/family/view/fragment/FamilyEmptyFragment.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/family/view/fragment/FamilyEmptyFragment.java rename to app/src/main/java/com/chwl/app/family/view/fragment/FamilyEmptyFragment.java index 8eb8b902e..319b82a42 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/fragment/FamilyEmptyFragment.java +++ b/app/src/main/java/com/chwl/app/family/view/fragment/FamilyEmptyFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.fragment; +package com.chwl.app.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.habu.R; -import com.yizhuan.habu.common.AbsStatusFragment; +import com.chwl.app.R; +import com.chwl.app.common.AbsStatusFragment; /** * Created by xujiexing on 14-4-9. diff --git a/app/src/main/java/com/yizhuan/habu/family/view/fragment/FamilyFansListFragment.java b/app/src/main/java/com/chwl/app/family/view/fragment/FamilyFansListFragment.java similarity index 84% rename from app/src/main/java/com/yizhuan/habu/family/view/fragment/FamilyFansListFragment.java rename to app/src/main/java/com/chwl/app/family/view/fragment/FamilyFansListFragment.java index d30aeaa39..95192a0e8 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/fragment/FamilyFansListFragment.java +++ b/app/src/main/java/com/chwl/app/family/view/fragment/FamilyFansListFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.fragment; +package com.chwl.app.family.view.fragment; import android.app.Activity; 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.habu.R; -import com.yizhuan.habu.base.BaseMvpFragment; -import com.yizhuan.habu.family.contract.viewinterface.IFamilyFansListFragmentView; -import com.yizhuan.habu.family.presenter.FamilyFansListPresenter; -import com.yizhuan.habu.family.view.activity.FamilySelectFriendActivity; -import com.yizhuan.habu.family.view.adapter.FamilyFansViewAdapter; -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.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.chwl.app.R; +import com.chwl.app.base.BaseMvpFragment; +import com.chwl.app.family.contract.viewinterface.IFamilyFansListFragmentView; +import com.chwl.app.family.presenter.FamilyFansListPresenter; +import com.chwl.app.family.view.activity.FamilySelectFriendActivity; +import com.chwl.app.family.view.adapter.FamilyFansViewAdapter; +import com.chwl.core.user.bean.FansInfo; +import com.chwl.core.user.bean.FansListInfo; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.library.base.factory.CreatePresenter; +import com.chwl.library.utils.ListUtils; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/habu/family/view/fragment/FamilyFriendListFragment.java b/app/src/main/java/com/chwl/app/family/view/fragment/FamilyFriendListFragment.java similarity index 86% rename from app/src/main/java/com/yizhuan/habu/family/view/fragment/FamilyFriendListFragment.java rename to app/src/main/java/com/chwl/app/family/view/fragment/FamilyFriendListFragment.java index 02340ae28..df297066e 100644 --- a/app/src/main/java/com/yizhuan/habu/family/view/fragment/FamilyFriendListFragment.java +++ b/app/src/main/java/com/chwl/app/family/view/fragment/FamilyFriendListFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.family.view.fragment; +package com.chwl.app.family.view.fragment; import android.content.Context; 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.habu.R; -import com.yizhuan.habu.base.BaseMvpFragment; -import com.yizhuan.habu.family.contract.viewinterface.IFamilyFriendListFragmentView; -import com.yizhuan.habu.family.presenter.FamilyFriendListPresenter; -import com.yizhuan.habu.family.view.activity.FamilySelectFriendActivity; -import com.yizhuan.habu.family.view.adapter.FamilyFriendListAdapter; -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.chwl.app.R; +import com.chwl.app.base.BaseMvpFragment; +import com.chwl.app.family.contract.viewinterface.IFamilyFriendListFragmentView; +import com.chwl.app.family.presenter.FamilyFriendListPresenter; +import com.chwl.app.family.view.activity.FamilySelectFriendActivity; +import com.chwl.app.family.view.adapter.FamilyFriendListAdapter; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.library.base.factory.CreatePresenter; +import com.chwl.library.utils.ListUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/fansteam/FansTeamJoinActivity.kt b/app/src/main/java/com/chwl/app/fansteam/FansTeamJoinActivity.kt similarity index 85% rename from app/src/main/java/com/yizhuan/habu/fansteam/FansTeamJoinActivity.kt rename to app/src/main/java/com/chwl/app/fansteam/FansTeamJoinActivity.kt index 2db269126..c3d525638 100644 --- a/app/src/main/java/com/yizhuan/habu/fansteam/FansTeamJoinActivity.kt +++ b/app/src/main/java/com/chwl/app/fansteam/FansTeamJoinActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.fansteam +package com.chwl.app.fansteam import android.annotation.SuppressLint import android.content.Context @@ -6,18 +6,18 @@ import android.content.Intent import android.view.Gravity import android.view.WindowManager import androidx.activity.viewModels -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingActivity -import com.yizhuan.habu.databinding.ActivityFansTeamJoinBinding -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingActivity +import com.chwl.app.databinding.ActivityFansTeamJoinBinding +import com.chwl.app.ui.utils.load +import com.chwl.app.ui.webview.DialogWebViewActivity +import com.chwl.core.UriProvider +import com.chwl.core.gift.GiftModel +import com.chwl.core.manager.AvRoomDataManager +import com.chwl.core.utils.net.handleBeanData +import com.chwl.core.utils.subAndReplaceDot +import com.chwl.core.utils.toast +import com.chwl.library.utils.ResUtil class FansTeamJoinActivity : BaseViewBindingActivity() { diff --git a/app/src/main/java/com/yizhuan/habu/fansteam/FansTeamJoinedActivity.kt b/app/src/main/java/com/chwl/app/fansteam/FansTeamJoinedActivity.kt similarity index 85% rename from app/src/main/java/com/yizhuan/habu/fansteam/FansTeamJoinedActivity.kt rename to app/src/main/java/com/chwl/app/fansteam/FansTeamJoinedActivity.kt index 7d2d99c54..bdd0f7e7c 100644 --- a/app/src/main/java/com/yizhuan/habu/fansteam/FansTeamJoinedActivity.kt +++ b/app/src/main/java/com/chwl/app/fansteam/FansTeamJoinedActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.fansteam +package com.chwl.app.fansteam import android.annotation.SuppressLint import android.content.Context @@ -13,19 +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.habu.R -import com.yizhuan.habu.base.BaseViewBindingActivity -import com.yizhuan.habu.common.EmptyViewHelper -import com.yizhuan.habu.databinding.ActivityFansTeamJoinedBinding -import com.yizhuan.habu.ui.utils.RVDelegate -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.habu.ui.webview.DialogWebViewActivity -import com.yizhuan.xchat_android_core.UriProvider -import com.yizhuan.xchat_android_core.fansteam.FansTeamTaskInfo -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot -import com.yizhuan.xchat_android_core.utils.toast -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingActivity +import com.chwl.app.common.EmptyViewHelper +import com.chwl.app.databinding.ActivityFansTeamJoinedBinding +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.app.ui.utils.load +import com.chwl.app.ui.webview.DialogWebViewActivity +import com.chwl.core.UriProvider +import com.chwl.core.fansteam.FansTeamTaskInfo +import com.chwl.core.manager.AvRoomDataManager +import com.chwl.core.utils.subAndReplaceDot +import com.chwl.core.utils.toast +import com.chwl.library.utils.ResUtil class FansTeamJoinedActivity : BaseViewBindingActivity() { diff --git a/app/src/main/java/com/yizhuan/habu/fansteam/FansTeamListActivity.kt b/app/src/main/java/com/chwl/app/fansteam/FansTeamListActivity.kt similarity index 82% rename from app/src/main/java/com/yizhuan/habu/fansteam/FansTeamListActivity.kt rename to app/src/main/java/com/chwl/app/fansteam/FansTeamListActivity.kt index 0c6ae80b1..9d2c5b584 100644 --- a/app/src/main/java/com/yizhuan/habu/fansteam/FansTeamListActivity.kt +++ b/app/src/main/java/com/chwl/app/fansteam/FansTeamListActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.fansteam +package com.chwl.app.fansteam import android.annotation.SuppressLint import android.content.Context @@ -6,14 +6,14 @@ import android.content.Intent import androidx.activity.viewModels import androidx.recyclerview.widget.LinearLayoutManager import com.netease.nim.uikit.StatusBarUtil -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingActivity -import com.yizhuan.habu.common.EmptyViewHelper -import com.yizhuan.habu.databinding.ActivityFansTeamListBinding -import com.yizhuan.habu.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.fansteam.FansTeamInfo -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingActivity +import com.chwl.app.common.EmptyViewHelper +import com.chwl.app.databinding.ActivityFansTeamListBinding +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.core.fansteam.FansTeamInfo +import com.chwl.library.annatation.ActLayoutRes +import com.chwl.library.utils.ResUtil @ActLayoutRes(R.layout.activity_fans_team_list) class FansTeamListActivity : BaseViewBindingActivity() { diff --git a/app/src/main/java/com/yizhuan/habu/fansteam/FansTeamListAdapter.kt b/app/src/main/java/com/chwl/app/fansteam/FansTeamListAdapter.kt similarity index 78% rename from app/src/main/java/com/yizhuan/habu/fansteam/FansTeamListAdapter.kt rename to app/src/main/java/com/chwl/app/fansteam/FansTeamListAdapter.kt index b68504ab7..7da217f09 100644 --- a/app/src/main/java/com/yizhuan/habu/fansteam/FansTeamListAdapter.kt +++ b/app/src/main/java/com/chwl/app/fansteam/FansTeamListAdapter.kt @@ -1,11 +1,11 @@ -package com.yizhuan.habu.fansteam +package com.chwl.app.fansteam import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.user.activity.UserInfoActivity -import com.yizhuan.habu.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.fansteam.FansTeamInfo +import com.chwl.app.R +import com.chwl.app.ui.user.activity.UserInfoActivity +import com.chwl.app.ui.utils.ImageLoadUtils +import com.chwl.core.fansteam.FansTeamInfo class FansTeamListAdapter : diff --git a/app/src/main/java/com/yizhuan/habu/fansteam/FansTeamTaskAdapter.kt b/app/src/main/java/com/chwl/app/fansteam/FansTeamTaskAdapter.kt similarity index 85% rename from app/src/main/java/com/yizhuan/habu/fansteam/FansTeamTaskAdapter.kt rename to app/src/main/java/com/chwl/app/fansteam/FansTeamTaskAdapter.kt index e1b486649..d6ebb0f0e 100644 --- a/app/src/main/java/com/yizhuan/habu/fansteam/FansTeamTaskAdapter.kt +++ b/app/src/main/java/com/chwl/app/fansteam/FansTeamTaskAdapter.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.fansteam +package com.chwl.app.fansteam import android.graphics.Color import android.widget.ImageView @@ -6,10 +6,10 @@ 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.habu.R -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.xchat_android_core.fansteam.FansTeamTaskInfo -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.ui.utils.load +import com.chwl.core.fansteam.FansTeamTaskInfo +import com.chwl.library.utils.ResUtil class FansTeamTaskAdapter : BaseQuickAdapter(R.layout.item_fans_team_task) { diff --git a/app/src/main/java/com/yizhuan/habu/fansteam/FansTeamViewModel.kt b/app/src/main/java/com/chwl/app/fansteam/FansTeamViewModel.kt similarity index 89% rename from app/src/main/java/com/yizhuan/habu/fansteam/FansTeamViewModel.kt rename to app/src/main/java/com/chwl/app/fansteam/FansTeamViewModel.kt index f42aa9404..b66d77d30 100644 --- a/app/src/main/java/com/yizhuan/habu/fansteam/FansTeamViewModel.kt +++ b/app/src/main/java/com/chwl/app/fansteam/FansTeamViewModel.kt @@ -1,11 +1,11 @@ -package com.yizhuan.habu.fansteam +package com.chwl.app.fansteam import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import com.yizhuan.habu.base.BaseViewModel -import com.yizhuan.xchat_android_core.bean.response.ListResult -import com.yizhuan.xchat_android_core.fansteam.* -import com.yizhuan.xchat_android_core.utils.toast +import com.chwl.app.base.BaseViewModel +import com.chwl.core.bean.response.ListResult +import com.chwl.core.fansteam.* +import com.chwl.core.utils.toast class FansTeamViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/yizhuan/habu/friend/Holder.java b/app/src/main/java/com/chwl/app/friend/Holder.java similarity index 69% rename from app/src/main/java/com/yizhuan/habu/friend/Holder.java rename to app/src/main/java/com/chwl/app/friend/Holder.java index 40312d5bf..ffcd7203a 100644 --- a/app/src/main/java/com/yizhuan/habu/friend/Holder.java +++ b/app/src/main/java/com/chwl/app/friend/Holder.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.friend; +package com.chwl.app.friend; /** * Created by MadisonRong on 06/06/2018. diff --git a/app/src/main/java/com/yizhuan/habu/friend/action/AbstractSelectFriendAction.java b/app/src/main/java/com/chwl/app/friend/action/AbstractSelectFriendAction.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/friend/action/AbstractSelectFriendAction.java rename to app/src/main/java/com/chwl/app/friend/action/AbstractSelectFriendAction.java index ec812c0ba..737e42ac7 100644 --- a/app/src/main/java/com/yizhuan/habu/friend/action/AbstractSelectFriendAction.java +++ b/app/src/main/java/com/chwl/app/friend/action/AbstractSelectFriendAction.java @@ -1,8 +1,8 @@ -package com.yizhuan.habu.friend.action; +package com.chwl.app.friend.action; import android.content.Context; -import com.yizhuan.habu.common.widget.dialog.DialogManager; +import com.chwl.app.common.widget.dialog.DialogManager; /** * Created by MadisonRong on 06/06/2018. diff --git a/app/src/main/java/com/yizhuan/habu/friend/action/DefaultSelectFriendAction.java b/app/src/main/java/com/chwl/app/friend/action/DefaultSelectFriendAction.java similarity index 85% rename from app/src/main/java/com/yizhuan/habu/friend/action/DefaultSelectFriendAction.java rename to app/src/main/java/com/chwl/app/friend/action/DefaultSelectFriendAction.java index 4fa2be255..c4b462afd 100644 --- a/app/src/main/java/com/yizhuan/habu/friend/action/DefaultSelectFriendAction.java +++ b/app/src/main/java/com/chwl/app/friend/action/DefaultSelectFriendAction.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.friend.action; +package com.chwl.app.friend.action; /** * Created by MadisonRong on 06/06/2018. diff --git a/app/src/main/java/com/yizhuan/habu/friend/action/SelectFriendManager.java b/app/src/main/java/com/chwl/app/friend/action/SelectFriendManager.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/friend/action/SelectFriendManager.java rename to app/src/main/java/com/chwl/app/friend/action/SelectFriendManager.java index c5b75384b..8682ed9c3 100644 --- a/app/src/main/java/com/yizhuan/habu/friend/action/SelectFriendManager.java +++ b/app/src/main/java/com/chwl/app/friend/action/SelectFriendManager.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.friend.action; +package com.chwl.app.friend.action; /** * Created by MadisonRong on 07/06/2018. diff --git a/app/src/main/java/com/yizhuan/habu/friend/view/SelectFriendActivity.java b/app/src/main/java/com/chwl/app/friend/view/SelectFriendActivity.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/friend/view/SelectFriendActivity.java rename to app/src/main/java/com/chwl/app/friend/view/SelectFriendActivity.java index d68820207..721210a26 100644 --- a/app/src/main/java/com/yizhuan/habu/friend/view/SelectFriendActivity.java +++ b/app/src/main/java/com/chwl/app/friend/view/SelectFriendActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.friend.view; +package com.chwl.app.friend.view; import android.app.Activity; import android.content.Context; @@ -8,32 +8,32 @@ import android.view.View; import androidx.fragment.app.Fragment; import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseBindingActivity; -import com.yizhuan.habu.base.TitleBar; -import com.yizhuan.habu.common.ViewPagerAdapter; -import com.yizhuan.habu.common.widget.dialog.DialogManager; -import com.yizhuan.habu.databinding.ActivitySelectFriendBinding; -import com.yizhuan.habu.decoration.view.widgets.CarMagicIndicator; -import com.yizhuan.habu.friend.action.AbstractSelectFriendAction; -import com.yizhuan.habu.home.fragment.AttentionFragment; -import com.yizhuan.habu.team.view.TeamListFragment; -import com.yizhuan.habu.ui.im.friend.FriendListFragment; -import com.yizhuan.habu.ui.relation.FansListFragment; -import com.yizhuan.habu.ui.search.SearchActivity; -import com.yizhuan.habu.ui.widget.magicindicator.ViewPagerHelper; -import com.yizhuan.habu.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.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseBindingActivity; +import com.chwl.app.base.TitleBar; +import com.chwl.app.common.ViewPagerAdapter; +import com.chwl.app.common.widget.dialog.DialogManager; +import com.chwl.app.databinding.ActivitySelectFriendBinding; +import com.chwl.app.decoration.view.widgets.CarMagicIndicator; +import com.chwl.app.friend.action.AbstractSelectFriendAction; +import com.chwl.app.home.fragment.AttentionFragment; +import com.chwl.app.team.view.TeamListFragment; +import com.chwl.app.ui.im.friend.FriendListFragment; +import com.chwl.app.ui.relation.FansListFragment; +import com.chwl.app.ui.search.SearchActivity; +import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.chwl.core.community.dynamic.DynamicModel; +import com.chwl.core.community.im.DynamicImMsg; +import com.chwl.core.community.im.WorldDynamicAttachment; +import com.chwl.core.family.model.FamilyModel; +import com.chwl.core.home.bean.TabInfo; +import com.chwl.core.manager.IMNetEaseManager; +import com.chwl.core.share.bean.SessionType; +import com.chwl.core.utils.net.DontWarnObserver; +import com.chwl.library.annatation.ActLayoutRes; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/guide/GuideActivity.java b/app/src/main/java/com/chwl/app/guide/GuideActivity.java similarity index 92% rename from app/src/main/java/com/yizhuan/habu/guide/GuideActivity.java rename to app/src/main/java/com/chwl/app/guide/GuideActivity.java index f9d9cb61f..1f387177c 100644 --- a/app/src/main/java/com/yizhuan/habu/guide/GuideActivity.java +++ b/app/src/main/java/com/chwl/app/guide/GuideActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.guide; +package com.chwl.app.guide; import android.content.Context; import android.content.Intent; @@ -9,10 +9,10 @@ import android.widget.ImageView; import androidx.annotation.NonNull; import androidx.viewpager.widget.PagerAdapter; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseViewBindingActivity; -import com.yizhuan.habu.databinding.ActivityGuideBinding; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; +import com.chwl.app.R; +import com.chwl.app.base.BaseViewBindingActivity; +import com.chwl.app.databinding.ActivityGuideBinding; +import com.chwl.core.utils.SharedPreferenceUtils; public class GuideActivity extends BaseViewBindingActivity { diff --git a/app/src/main/java/com/yizhuan/habu/headline/HeadLineFragment.java b/app/src/main/java/com/chwl/app/headline/HeadLineFragment.java similarity index 60% rename from app/src/main/java/com/yizhuan/habu/headline/HeadLineFragment.java rename to app/src/main/java/com/chwl/app/headline/HeadLineFragment.java index 9c4dec86b..da135be0d 100644 --- a/app/src/main/java/com/yizhuan/habu/headline/HeadLineFragment.java +++ b/app/src/main/java/com/chwl/app/headline/HeadLineFragment.java @@ -1,11 +1,11 @@ -package com.yizhuan.habu.headline; +package com.chwl.app.headline; import android.os.Bundle; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.webview.CommonWebViewFragment; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; +import com.chwl.app.R; +import com.chwl.app.ui.webview.CommonWebViewFragment; +import com.chwl.core.UriProvider; +import com.chwl.library.annatation.ActLayoutRes; @ActLayoutRes(R.layout.fragment_common_web_view) public class HeadLineFragment extends CommonWebViewFragment { diff --git a/app/src/main/java/com/yizhuan/habu/headline/MyHeadLineFragment.java b/app/src/main/java/com/chwl/app/headline/MyHeadLineFragment.java similarity index 61% rename from app/src/main/java/com/yizhuan/habu/headline/MyHeadLineFragment.java rename to app/src/main/java/com/chwl/app/headline/MyHeadLineFragment.java index 2b9fa047e..250ff53c4 100644 --- a/app/src/main/java/com/yizhuan/habu/headline/MyHeadLineFragment.java +++ b/app/src/main/java/com/chwl/app/headline/MyHeadLineFragment.java @@ -1,11 +1,11 @@ -package com.yizhuan.habu.headline; +package com.chwl.app.headline; import android.os.Bundle; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.webview.CommonWebViewFragment; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; +import com.chwl.app.R; +import com.chwl.app.ui.webview.CommonWebViewFragment; +import com.chwl.core.UriProvider; +import com.chwl.library.annatation.ActLayoutRes; @ActLayoutRes(R.layout.fragment_common_web_view) public class MyHeadLineFragment extends CommonWebViewFragment { diff --git a/app/src/main/java/com/yizhuan/habu/home/HomeViewModel.kt b/app/src/main/java/com/chwl/app/home/HomeViewModel.kt similarity index 95% rename from app/src/main/java/com/yizhuan/habu/home/HomeViewModel.kt rename to app/src/main/java/com/chwl/app/home/HomeViewModel.kt index 0844a5934..8d5d5a504 100644 --- a/app/src/main/java/com/yizhuan/habu/home/HomeViewModel.kt +++ b/app/src/main/java/com/chwl/app/home/HomeViewModel.kt @@ -1,14 +1,14 @@ -package com.yizhuan.habu.home +package com.chwl.app.home import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import com.yizhuan.habu.base.BaseViewModel -import com.yizhuan.xchat_android_core.bean.response.ListResult -import com.yizhuan.xchat_android_core.home.bean.* -import com.yizhuan.xchat_android_core.home.model.HomeModel -import com.yizhuan.xchat_android_core.room.bean.AnchorInfo -import com.yizhuan.xchat_android_core.user.bean.UserInfo -import com.yizhuan.xchat_android_core.utils.toast +import com.chwl.app.base.BaseViewModel +import com.chwl.core.bean.response.ListResult +import com.chwl.core.home.bean.* +import com.chwl.core.home.model.HomeModel +import com.chwl.core.room.bean.AnchorInfo +import com.chwl.core.user.bean.UserInfo +import com.chwl.core.utils.toast import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.async diff --git a/app/src/main/java/com/yizhuan/habu/home/MeViewModel.kt b/app/src/main/java/com/chwl/app/home/MeViewModel.kt similarity index 77% rename from app/src/main/java/com/yizhuan/habu/home/MeViewModel.kt rename to app/src/main/java/com/chwl/app/home/MeViewModel.kt index c95a31c38..0fdfcbfe8 100644 --- a/app/src/main/java/com/yizhuan/habu/home/MeViewModel.kt +++ b/app/src/main/java/com/chwl/app/home/MeViewModel.kt @@ -1,11 +1,11 @@ -package com.yizhuan.habu.home +package com.chwl.app.home import androidx.lifecycle.MutableLiveData -import com.yizhuan.habu.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.user.bean.DiamondGiveHistoryInfo +import com.chwl.app.base.BaseViewModel +import com.chwl.core.home.bean.BannerInfo +import com.chwl.core.home.model.HomeModel +import com.chwl.core.room.bean.MeCenterInfo +import com.chwl.core.user.bean.DiamondGiveHistoryInfo class MeViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/yizhuan/habu/home/RoomCommonViewModel.kt b/app/src/main/java/com/chwl/app/home/RoomCommonViewModel.kt similarity index 70% rename from app/src/main/java/com/yizhuan/habu/home/RoomCommonViewModel.kt rename to app/src/main/java/com/chwl/app/home/RoomCommonViewModel.kt index 07929abfb..7858b64cb 100644 --- a/app/src/main/java/com/yizhuan/habu/home/RoomCommonViewModel.kt +++ b/app/src/main/java/com/chwl/app/home/RoomCommonViewModel.kt @@ -1,12 +1,12 @@ -package com.yizhuan.habu.home +package com.chwl.app.home import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import com.yizhuan.habu.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.yizhuan.xchat_android_core.utils.toast +import com.chwl.app.base.BaseViewModel +import com.chwl.core.bean.response.ListResult +import com.chwl.core.home.bean.HomeRoomInfo +import com.chwl.core.home.model.HomeModel +import com.chwl.core.utils.toast class RoomCommonViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/yizhuan/habu/home/RoomSingleViewModel.kt b/app/src/main/java/com/chwl/app/home/RoomSingleViewModel.kt similarity index 72% rename from app/src/main/java/com/yizhuan/habu/home/RoomSingleViewModel.kt rename to app/src/main/java/com/chwl/app/home/RoomSingleViewModel.kt index a960dfd69..e95fc6a0f 100644 --- a/app/src/main/java/com/yizhuan/habu/home/RoomSingleViewModel.kt +++ b/app/src/main/java/com/chwl/app/home/RoomSingleViewModel.kt @@ -1,11 +1,11 @@ -package com.yizhuan.habu.home +package com.chwl.app.home import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import com.yizhuan.habu.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.chwl.app.base.BaseViewModel +import com.chwl.core.bean.response.ListResult +import com.chwl.core.home.bean.HomeRoomInfo +import com.chwl.core.home.model.HomeModel class RoomSingleViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/yizhuan/habu/home/activity/AssociationActivity.kt b/app/src/main/java/com/chwl/app/home/activity/AssociationActivity.kt similarity index 79% rename from app/src/main/java/com/yizhuan/habu/home/activity/AssociationActivity.kt rename to app/src/main/java/com/chwl/app/home/activity/AssociationActivity.kt index ad0b8dc4a..6e0912a84 100644 --- a/app/src/main/java/com/yizhuan/habu/home/activity/AssociationActivity.kt +++ b/app/src/main/java/com/chwl/app/home/activity/AssociationActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.home.activity +package com.chwl.app.home.activity import android.content.Context import android.content.Intent @@ -7,17 +7,17 @@ import android.widget.TextView import androidx.fragment.app.Fragment import androidx.viewpager.widget.ViewPager import com.netease.nim.uikit.StatusBarUtil -import com.yizhuan.habu.R -import com.yizhuan.habu.module_hall.hall.fragment.AssociationFragment -import com.yizhuan.habu.module_hall.hall.fragment.AssociationRoomFragment -import com.yizhuan.habu.base.BaseViewBindingActivity -import com.yizhuan.habu.common.CommonPagerAdapter -import com.yizhuan.habu.databinding.ActivityAssociationBinding -import com.yizhuan.habu.ui.user.adapter.CommonWrapIndicatorAdapter -import com.yizhuan.habu.ui.widget.magicindicator.MagicIndicator -import com.yizhuan.habu.ui.widget.magicindicator.ViewPagerHelper -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.module_hall.hall.fragment.AssociationFragment +import com.chwl.app.module_hall.hall.fragment.AssociationRoomFragment +import com.chwl.app.base.BaseViewBindingActivity +import com.chwl.app.common.CommonPagerAdapter +import com.chwl.app.databinding.ActivityAssociationBinding +import com.chwl.app.ui.user.adapter.CommonWrapIndicatorAdapter +import com.chwl.app.ui.widget.magicindicator.MagicIndicator +import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator +import com.chwl.library.utils.ResUtil /** * 公会周榜 diff --git a/app/src/main/java/com/yizhuan/habu/home/activity/CollectionRoomActivity.java b/app/src/main/java/com/chwl/app/home/activity/CollectionRoomActivity.java similarity index 83% rename from app/src/main/java/com/yizhuan/habu/home/activity/CollectionRoomActivity.java rename to app/src/main/java/com/chwl/app/home/activity/CollectionRoomActivity.java index 0029f19aa..36e15e041 100644 --- a/app/src/main/java/com/yizhuan/habu/home/activity/CollectionRoomActivity.java +++ b/app/src/main/java/com/chwl/app/home/activity/CollectionRoomActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.home.activity; +package com.chwl.app.home.activity; import android.annotation.SuppressLint; import android.content.Context; @@ -9,16 +9,16 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.chad.library.adapter.base.BaseQuickAdapter; import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.habu.R; -import com.yizhuan.habu.avroom.activity.AVRoomActivity; -import com.yizhuan.habu.base.BaseViewBindingActivity; -import com.yizhuan.habu.databinding.ActivityCollectionRoomBinding; -import com.yizhuan.habu.home.adapter.CollectionRoomAdapter; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo; -import com.yizhuan.xchat_android_core.home.model.CollectionRoomModel; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.avroom.activity.AVRoomActivity; +import com.chwl.app.base.BaseViewBindingActivity; +import com.chwl.app.databinding.ActivityCollectionRoomBinding; +import com.chwl.app.home.adapter.CollectionRoomAdapter; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.home.bean.HomeRoomInfo; +import com.chwl.core.home.model.CollectionRoomModel; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/home/activity/CommunityNoticeAct.java b/app/src/main/java/com/chwl/app/home/activity/CommunityNoticeAct.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/home/activity/CommunityNoticeAct.java rename to app/src/main/java/com/chwl/app/home/activity/CommunityNoticeAct.java index 799cae412..eba2ba06f 100644 --- a/app/src/main/java/com/yizhuan/habu/home/activity/CommunityNoticeAct.java +++ b/app/src/main/java/com/chwl/app/home/activity/CommunityNoticeAct.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.home.activity; +package com.chwl.app.home.activity; import android.content.Context; import android.content.Intent; @@ -11,18 +11,18 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseMvpActivity; -import com.yizhuan.habu.base.TitleBar; -import com.yizhuan.habu.community.dynamic.view.DynamicDetailActivity; -import com.yizhuan.habu.home.adapter.CommunityNoticeAdapter; -import com.yizhuan.habu.home.presenter.CommunityNoticePresenter; -import com.yizhuan.habu.home.view.ICommunityNoticeAct; -import com.yizhuan.habu.ui.user.activity.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseMvpActivity; +import com.chwl.app.base.TitleBar; +import com.chwl.app.community.dynamic.view.DynamicDetailActivity; +import com.chwl.app.home.adapter.CommunityNoticeAdapter; +import com.chwl.app.home.presenter.CommunityNoticePresenter; +import com.chwl.app.home.view.ICommunityNoticeAct; +import com.chwl.app.ui.user.activity.UserInfoActivity; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.community.bean.CommunityNoticeInfo; +import com.chwl.library.base.factory.CreatePresenter; +import com.chwl.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/home/activity/NewUserListActivity.java b/app/src/main/java/com/chwl/app/home/activity/NewUserListActivity.java similarity index 87% rename from app/src/main/java/com/yizhuan/habu/home/activity/NewUserListActivity.java rename to app/src/main/java/com/chwl/app/home/activity/NewUserListActivity.java index 7cc9335a4..921870c8a 100644 --- a/app/src/main/java/com/yizhuan/habu/home/activity/NewUserListActivity.java +++ b/app/src/main/java/com/chwl/app/home/activity/NewUserListActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.home.activity; +package com.chwl.app.home.activity; import android.content.Context; import android.content.Intent; @@ -9,16 +9,16 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseMvpActivity; -import com.yizhuan.habu.home.adapter.FindNewUserListAdapter; -import com.yizhuan.habu.home.presenter.NewUserListPresenter; -import com.yizhuan.habu.home.view.INewUserListActivityView; -import com.yizhuan.habu.common.util.Utils; -import com.yizhuan.habu.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.chwl.app.R; +import com.chwl.app.base.BaseMvpActivity; +import com.chwl.app.home.adapter.FindNewUserListAdapter; +import com.chwl.app.home.presenter.NewUserListPresenter; +import com.chwl.app.home.view.INewUserListActivityView; +import com.chwl.app.common.util.Utils; +import com.chwl.app.ui.widget.recyclerview.decoration.SpacingDecoration; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.library.base.factory.CreatePresenter; +import com.chwl.library.utils.ListUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/home/activity/RoomHistoryListActivity.kt b/app/src/main/java/com/chwl/app/home/activity/RoomHistoryListActivity.kt similarity index 81% rename from app/src/main/java/com/yizhuan/habu/home/activity/RoomHistoryListActivity.kt rename to app/src/main/java/com/chwl/app/home/activity/RoomHistoryListActivity.kt index 93b4cd837..8959e5041 100644 --- a/app/src/main/java/com/yizhuan/habu/home/activity/RoomHistoryListActivity.kt +++ b/app/src/main/java/com/chwl/app/home/activity/RoomHistoryListActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.home.activity +package com.chwl.app.home.activity import android.annotation.SuppressLint import android.content.Context @@ -7,18 +7,18 @@ import android.graphics.Color import android.view.View import androidx.recyclerview.widget.LinearLayoutManager import com.netease.nim.uikit.StatusBarUtil -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingActivity -import com.yizhuan.habu.base.TitleBar -import com.yizhuan.habu.common.EmptyViewHelper -import com.yizhuan.habu.databinding.ActivityRoomHistoryListBinding -import com.yizhuan.habu.home.adapter.RoomHistoryListAdapter -import com.yizhuan.habu.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.ResUtil -import com.yizhuan.xchat_android_library.utils.SingleToastUtil +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingActivity +import com.chwl.app.base.TitleBar +import com.chwl.app.common.EmptyViewHelper +import com.chwl.app.databinding.ActivityRoomHistoryListBinding +import com.chwl.app.home.adapter.RoomHistoryListAdapter +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.core.bean.RoomHistoryInfo +import com.chwl.core.user.UserModel +import com.chwl.library.annatation.ActLayoutRes +import com.chwl.library.utils.ResUtil +import com.chwl.library.utils.SingleToastUtil @ActLayoutRes(R.layout.activity_room_history_list) class RoomHistoryListActivity : BaseViewBindingActivity() { diff --git a/app/src/main/java/com/yizhuan/habu/home/activity/VisitorListActivity.kt b/app/src/main/java/com/chwl/app/home/activity/VisitorListActivity.kt similarity index 77% rename from app/src/main/java/com/yizhuan/habu/home/activity/VisitorListActivity.kt rename to app/src/main/java/com/chwl/app/home/activity/VisitorListActivity.kt index 1371835c8..c07f5cbec 100644 --- a/app/src/main/java/com/yizhuan/habu/home/activity/VisitorListActivity.kt +++ b/app/src/main/java/com/chwl/app/home/activity/VisitorListActivity.kt @@ -1,21 +1,21 @@ -package com.yizhuan.habu.home.activity +package com.chwl.app.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.habu.R -import com.yizhuan.habu.base.BaseViewBindingActivity -import com.yizhuan.habu.common.EmptyViewHelper -import com.yizhuan.habu.databinding.ActivityVisitorListBinding -import com.yizhuan.habu.home.adapter.VisitorListAdapter -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingActivity +import com.chwl.app.common.EmptyViewHelper +import com.chwl.app.databinding.ActivityVisitorListBinding +import com.chwl.app.home.adapter.VisitorListAdapter +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.core.home.bean.VisitorInfo +import com.chwl.core.home.event.VisitorUnreadCountEvent +import com.chwl.core.user.UserModel +import com.chwl.library.annatation.ActLayoutRes +import com.chwl.library.utils.ResUtil import org.greenrobot.eventbus.EventBus @ActLayoutRes(R.layout.activity_visitor_list) diff --git a/app/src/main/java/com/yizhuan/habu/home/adapter/BannerAdapter.java b/app/src/main/java/com/chwl/app/home/adapter/BannerAdapter.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/home/adapter/BannerAdapter.java rename to app/src/main/java/com/chwl/app/home/adapter/BannerAdapter.java index c2a18c196..a11c756f2 100644 --- a/app/src/main/java/com/yizhuan/habu/home/adapter/BannerAdapter.java +++ b/app/src/main/java/com/chwl/app/home/adapter/BannerAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.home.adapter; +package com.chwl.app.home.adapter; import android.content.Context; import android.view.LayoutInflater; @@ -6,11 +6,11 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.habu.ui.widget.rollviewpager.adapter.StaticPagerAdapter; -import com.yizhuan.habu.utils.CommonJumpHelper; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; +import com.chwl.app.R; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.app.ui.widget.rollviewpager.adapter.StaticPagerAdapter; +import com.chwl.app.utils.CommonJumpHelper; +import com.chwl.core.home.bean.BannerInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/home/adapter/CollectionRoomAdapter.java b/app/src/main/java/com/chwl/app/home/adapter/CollectionRoomAdapter.java similarity index 82% rename from app/src/main/java/com/yizhuan/habu/home/adapter/CollectionRoomAdapter.java rename to app/src/main/java/com/chwl/app/home/adapter/CollectionRoomAdapter.java index cb1353eb0..9f43116cd 100644 --- a/app/src/main/java/com/yizhuan/habu/home/adapter/CollectionRoomAdapter.java +++ b/app/src/main/java/com/chwl/app/home/adapter/CollectionRoomAdapter.java @@ -1,12 +1,12 @@ -package com.yizhuan.habu.home.adapter; +package com.chwl.app.home.adapter; import android.widget.ImageView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2; -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo; +import com.chwl.app.R; +import com.chwl.app.ui.utils.ImageLoadUtilsV2; +import com.chwl.core.home.bean.HomeRoomInfo; /** * Created by yudi diff --git a/app/src/main/java/com/yizhuan/habu/home/adapter/CommunityNoticeAdapter.java b/app/src/main/java/com/chwl/app/home/adapter/CommunityNoticeAdapter.java similarity index 86% rename from app/src/main/java/com/yizhuan/habu/home/adapter/CommunityNoticeAdapter.java rename to app/src/main/java/com/chwl/app/home/adapter/CommunityNoticeAdapter.java index c7493c8d0..d2349809a 100644 --- a/app/src/main/java/com/yizhuan/habu/home/adapter/CommunityNoticeAdapter.java +++ b/app/src/main/java/com/chwl/app/home/adapter/CommunityNoticeAdapter.java @@ -1,17 +1,17 @@ -package com.yizhuan.habu.home.adapter; +package com.chwl.app.home.adapter; import android.text.TextUtils; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.R; -import com.yizhuan.habu.common.widget.CircleImageView; -import com.yizhuan.habu.common.widget.RectRoundImageView; -import com.yizhuan.habu.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.chwl.app.R; +import com.chwl.app.common.widget.CircleImageView; +import com.chwl.app.common.widget.RectRoundImageView; +import com.chwl.app.ui.utils.ImageLoadUtilsV2; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.community.bean.CommunityNoticeInfo; +import com.chwl.core.community.bean.DynamicMedia; +import com.chwl.library.utils.TimeUtils; public class CommunityNoticeAdapter extends BaseQuickAdapter { diff --git a/app/src/main/java/com/yizhuan/habu/home/adapter/ContactsIndicatorAdapter.java b/app/src/main/java/com/chwl/app/home/adapter/ContactsIndicatorAdapter.java similarity index 85% rename from app/src/main/java/com/yizhuan/habu/home/adapter/ContactsIndicatorAdapter.java rename to app/src/main/java/com/chwl/app/home/adapter/ContactsIndicatorAdapter.java index 0a53c1b69..02562d5b7 100644 --- a/app/src/main/java/com/yizhuan/habu/home/adapter/ContactsIndicatorAdapter.java +++ b/app/src/main/java/com/chwl/app/home/adapter/ContactsIndicatorAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.home.adapter; +package com.chwl.app.home.adapter; import android.content.Context; import android.view.Gravity; @@ -8,13 +8,13 @@ import android.widget.FrameLayout; import androidx.appcompat.widget.AppCompatTextView; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; -import com.yizhuan.habu.common.util.Utils; +import com.chwl.app.R; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; +import com.chwl.app.common.util.Utils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/home/adapter/FindNewUserListAdapter.java b/app/src/main/java/com/chwl/app/home/adapter/FindNewUserListAdapter.java similarity index 89% rename from app/src/main/java/com/yizhuan/habu/home/adapter/FindNewUserListAdapter.java rename to app/src/main/java/com/chwl/app/home/adapter/FindNewUserListAdapter.java index c694491ea..3e3e637a0 100644 --- a/app/src/main/java/com/yizhuan/habu/home/adapter/FindNewUserListAdapter.java +++ b/app/src/main/java/com/chwl/app/home/adapter/FindNewUserListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.home.adapter; +package com.chwl.app.home.adapter; import android.content.Context; import android.view.View; @@ -9,9 +9,9 @@ import androidx.annotation.Nullable; 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.habu.R; -import com.yizhuan.habu.ui.user.activity.UserInfoActivity; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.chwl.app.R; +import com.chwl.app.ui.user.activity.UserInfoActivity; +import com.chwl.core.user.bean.UserInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/home/adapter/FragmentViewPagerAdapter.java b/app/src/main/java/com/chwl/app/home/adapter/FragmentViewPagerAdapter.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/home/adapter/FragmentViewPagerAdapter.java rename to app/src/main/java/com/chwl/app/home/adapter/FragmentViewPagerAdapter.java index f0afbce46..f9bfb68a7 100644 --- a/app/src/main/java/com/yizhuan/habu/home/adapter/FragmentViewPagerAdapter.java +++ b/app/src/main/java/com/chwl/app/home/adapter/FragmentViewPagerAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.home.adapter; +package com.chwl.app.home.adapter; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; diff --git a/app/src/main/java/com/yizhuan/habu/home/adapter/HomeBannerAdapter.kt b/app/src/main/java/com/chwl/app/home/adapter/HomeBannerAdapter.kt similarity index 74% rename from app/src/main/java/com/yizhuan/habu/home/adapter/HomeBannerAdapter.kt rename to app/src/main/java/com/chwl/app/home/adapter/HomeBannerAdapter.kt index 1be6079d0..4222c5c28 100644 --- a/app/src/main/java/com/yizhuan/habu/home/adapter/HomeBannerAdapter.kt +++ b/app/src/main/java/com/chwl/app/home/adapter/HomeBannerAdapter.kt @@ -1,8 +1,8 @@ -package com.yizhuan.habu.home.adapter +package com.chwl.app.home.adapter -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.xchat_android_core.home.bean.BannerInfo +import com.chwl.app.R +import com.chwl.app.ui.utils.ImageLoadUtilsV2 +import com.chwl.core.home.bean.BannerInfo import com.zhpan.bannerview.BaseBannerAdapter import com.zhpan.bannerview.BaseViewHolder diff --git a/app/src/main/java/com/yizhuan/habu/home/adapter/HomeChatAdapter.kt b/app/src/main/java/com/chwl/app/home/adapter/HomeChatAdapter.kt similarity index 80% rename from app/src/main/java/com/yizhuan/habu/home/adapter/HomeChatAdapter.kt rename to app/src/main/java/com/chwl/app/home/adapter/HomeChatAdapter.kt index db81bdb3f..af151c797 100644 --- a/app/src/main/java/com/yizhuan/habu/home/adapter/HomeChatAdapter.kt +++ b/app/src/main/java/com/chwl/app/home/adapter/HomeChatAdapter.kt @@ -1,15 +1,15 @@ -package com.yizhuan.habu.home.adapter +package com.chwl.app.home.adapter import android.view.View import androidx.constraintlayout.widget.Group import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.opensource.svgaplayer.SVGAImageView -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.habu.ui.utils.loadFromAssets -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot +import com.chwl.app.R +import com.chwl.app.ui.utils.ImageLoadUtilsV2 +import com.chwl.app.ui.utils.loadFromAssets +import com.chwl.core.home.bean.HomeRoomInfo +import com.chwl.core.utils.subAndReplaceDot /** * create by lvzebiao @2019/11/13 diff --git a/app/src/main/java/com/yizhuan/habu/home/adapter/HomeConcernsAdapter.java b/app/src/main/java/com/chwl/app/home/adapter/HomeConcernsAdapter.java similarity index 81% rename from app/src/main/java/com/yizhuan/habu/home/adapter/HomeConcernsAdapter.java rename to app/src/main/java/com/chwl/app/home/adapter/HomeConcernsAdapter.java index 0102a8ffe..a8f2e767b 100644 --- a/app/src/main/java/com/yizhuan/habu/home/adapter/HomeConcernsAdapter.java +++ b/app/src/main/java/com/chwl/app/home/adapter/HomeConcernsAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.home.adapter; +package com.chwl.app.home.adapter; import android.graphics.drawable.AnimationDrawable; @@ -6,13 +6,13 @@ import androidx.annotation.NonNull; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.R; -import com.yizhuan.habu.avroom.activity.AVRoomActivity; -import com.yizhuan.habu.common.widget.CircleImageView; -import com.yizhuan.habu.ui.user.activity.UserInfoActivity; -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2; -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo; -import com.yizhuan.xchat_android_core.utils.StringExtensionKt; +import com.chwl.app.R; +import com.chwl.app.avroom.activity.AVRoomActivity; +import com.chwl.app.common.widget.CircleImageView; +import com.chwl.app.ui.user.activity.UserInfoActivity; +import com.chwl.app.ui.utils.ImageLoadUtilsV2; +import com.chwl.core.home.bean.HomeRoomInfo; +import com.chwl.core.utils.StringExtensionKt; public class HomeConcernsAdapter extends BaseQuickAdapter { diff --git a/app/src/main/java/com/yizhuan/habu/home/adapter/HomeHotAdapter.kt b/app/src/main/java/com/chwl/app/home/adapter/HomeHotAdapter.kt similarity index 88% rename from app/src/main/java/com/yizhuan/habu/home/adapter/HomeHotAdapter.kt rename to app/src/main/java/com/chwl/app/home/adapter/HomeHotAdapter.kt index 4fcc8e4ad..dfaab1809 100644 --- a/app/src/main/java/com/yizhuan/habu/home/adapter/HomeHotAdapter.kt +++ b/app/src/main/java/com/chwl/app/home/adapter/HomeHotAdapter.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.home.adapter +package com.chwl.app.home.adapter import android.view.View import android.widget.ImageView @@ -7,12 +7,12 @@ import androidx.core.view.isGone import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.opensource.svgaplayer.SVGAImageView -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.habu.ui.utils.loadFromAssets -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.utils.TextUtils +import com.chwl.app.R +import com.chwl.app.ui.utils.ImageLoadUtilsV2 +import com.chwl.app.ui.utils.load +import com.chwl.app.ui.utils.loadFromAssets +import com.chwl.core.home.bean.HomeRoomInfo +import com.chwl.core.utils.TextUtils /** * create by lvzebiao @2019/11/13 diff --git a/app/src/main/java/com/yizhuan/habu/home/adapter/HomeLiveTopAdapter.kt b/app/src/main/java/com/chwl/app/home/adapter/HomeLiveTopAdapter.kt similarity index 79% rename from app/src/main/java/com/yizhuan/habu/home/adapter/HomeLiveTopAdapter.kt rename to app/src/main/java/com/chwl/app/home/adapter/HomeLiveTopAdapter.kt index 603ca6133..1305079e1 100644 --- a/app/src/main/java/com/yizhuan/habu/home/adapter/HomeLiveTopAdapter.kt +++ b/app/src/main/java/com/chwl/app/home/adapter/HomeLiveTopAdapter.kt @@ -1,12 +1,12 @@ -package com.yizhuan.habu.home.adapter +package com.chwl.app.home.adapter import android.widget.ImageView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.habu.avroom.activity.AVRoomActivity -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.xchat_android_core.room.bean.HomeLiveTopInfo +import com.chwl.app.R +import com.chwl.app.avroom.activity.AVRoomActivity +import com.chwl.app.ui.utils.load +import com.chwl.core.room.bean.HomeLiveTopInfo class HomeLiveTopAdapter : diff --git a/app/src/main/java/com/yizhuan/habu/home/adapter/HomePlayAdapter.kt b/app/src/main/java/com/chwl/app/home/adapter/HomePlayAdapter.kt similarity index 88% rename from app/src/main/java/com/yizhuan/habu/home/adapter/HomePlayAdapter.kt rename to app/src/main/java/com/chwl/app/home/adapter/HomePlayAdapter.kt index eadd0c67b..ca296a650 100644 --- a/app/src/main/java/com/yizhuan/habu/home/adapter/HomePlayAdapter.kt +++ b/app/src/main/java/com/chwl/app/home/adapter/HomePlayAdapter.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.home.adapter +package com.chwl.app.home.adapter import android.graphics.Color import android.graphics.LinearGradient @@ -9,14 +9,14 @@ import androidx.core.view.isGone import com.chad.library.adapter.base.BaseMultiItemQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.makeramen.roundedimageview.RoundedImageView -import com.yizhuan.habu.R -import com.yizhuan.habu.home.helper.BannerHelper -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.home.helper.BannerHelper +import com.chwl.app.ui.utils.ImageLoadUtilsV2 +import com.chwl.app.ui.utils.load +import com.chwl.core.home.bean.HomeRoomInfo +import com.chwl.core.utils.TextUtils +import com.chwl.core.utils.ifNullOrEmpty +import com.chwl.library.utils.ResUtil /** * create by lvzebiao @2019/11/13 diff --git a/app/src/main/java/com/yizhuan/habu/home/adapter/HomeRoomFragmentAdapter.java b/app/src/main/java/com/chwl/app/home/adapter/HomeRoomFragmentAdapter.java similarity index 92% rename from app/src/main/java/com/yizhuan/habu/home/adapter/HomeRoomFragmentAdapter.java rename to app/src/main/java/com/chwl/app/home/adapter/HomeRoomFragmentAdapter.java index 3c5e17770..d676670c5 100644 --- a/app/src/main/java/com/yizhuan/habu/home/adapter/HomeRoomFragmentAdapter.java +++ b/app/src/main/java/com/chwl/app/home/adapter/HomeRoomFragmentAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.home.adapter; +package com.chwl.app.home.adapter; import android.content.Context; import android.text.TextUtils; @@ -10,10 +10,10 @@ 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.habu.R; -import com.yizhuan.habu.avroom.activity.AVRoomActivity; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.home.bean.HomeTabMapInfo; +import com.chwl.app.R; +import com.chwl.app.avroom.activity.AVRoomActivity; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.core.home.bean.HomeTabMapInfo; /** *

首页热门adapter

diff --git a/app/src/main/java/com/yizhuan/habu/home/adapter/HomeSingleAnchorAdapter.kt b/app/src/main/java/com/chwl/app/home/adapter/HomeSingleAnchorAdapter.kt similarity index 82% rename from app/src/main/java/com/yizhuan/habu/home/adapter/HomeSingleAnchorAdapter.kt rename to app/src/main/java/com/chwl/app/home/adapter/HomeSingleAnchorAdapter.kt index b1993f6da..a4cfcba9e 100644 --- a/app/src/main/java/com/yizhuan/habu/home/adapter/HomeSingleAnchorAdapter.kt +++ b/app/src/main/java/com/chwl/app/home/adapter/HomeSingleAnchorAdapter.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.home.adapter +package com.chwl.app.home.adapter import android.widget.ImageView import androidx.core.view.isGone @@ -6,13 +6,13 @@ 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.habu.R -import com.yizhuan.habu.avroom.activity.AVRoomActivity -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.habu.ui.utils.loadFromAssets -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.utils.TextUtils +import com.chwl.app.R +import com.chwl.app.avroom.activity.AVRoomActivity +import com.chwl.app.ui.utils.ImageLoadUtilsV2 +import com.chwl.app.ui.utils.load +import com.chwl.app.ui.utils.loadFromAssets +import com.chwl.core.home.bean.HomeRoomInfo +import com.chwl.core.utils.TextUtils /** * create by lvzebiao @2019/11/13 diff --git a/app/src/main/java/com/yizhuan/habu/home/adapter/HomeTopAdapter.java b/app/src/main/java/com/chwl/app/home/adapter/HomeTopAdapter.java similarity index 89% rename from app/src/main/java/com/yizhuan/habu/home/adapter/HomeTopAdapter.java rename to app/src/main/java/com/chwl/app/home/adapter/HomeTopAdapter.java index 8975352e0..761ce2ed6 100644 --- a/app/src/main/java/com/yizhuan/habu/home/adapter/HomeTopAdapter.java +++ b/app/src/main/java/com/chwl/app/home/adapter/HomeTopAdapter.java @@ -1,14 +1,14 @@ -package com.yizhuan.habu.home.adapter; +package com.chwl.app.home.adapter; import android.text.TextUtils; import android.view.View; import android.widget.ImageView; import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.home.bean.HomeTabMapInfo; -import com.yizhuan.xchat_android_library.common.application.BaseApp; +import com.chwl.app.R; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.core.home.bean.HomeTabMapInfo; +import com.chwl.library.common.application.BaseApp; import com.zhpan.bannerview.BaseBannerAdapter; import com.zhpan.bannerview.BaseViewHolder; diff --git a/app/src/main/java/com/yizhuan/habu/home/adapter/MainMagicIndicatorAdapter.java b/app/src/main/java/com/chwl/app/home/adapter/MainMagicIndicatorAdapter.java similarity index 84% rename from app/src/main/java/com/yizhuan/habu/home/adapter/MainMagicIndicatorAdapter.java rename to app/src/main/java/com/chwl/app/home/adapter/MainMagicIndicatorAdapter.java index dff887244..37bef66cf 100644 --- a/app/src/main/java/com/yizhuan/habu/home/adapter/MainMagicIndicatorAdapter.java +++ b/app/src/main/java/com/chwl/app/home/adapter/MainMagicIndicatorAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.home.adapter; +package com.chwl.app.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.habu.R; -import com.yizhuan.habu.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; +import com.chwl.app.R; +import com.chwl.app.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/home/adapter/MeCenterAdapter.kt b/app/src/main/java/com/chwl/app/home/adapter/MeCenterAdapter.kt similarity index 77% rename from app/src/main/java/com/yizhuan/habu/home/adapter/MeCenterAdapter.kt rename to app/src/main/java/com/chwl/app/home/adapter/MeCenterAdapter.kt index 61c9c9e88..e54f43e48 100644 --- a/app/src/main/java/com/yizhuan/habu/home/adapter/MeCenterAdapter.kt +++ b/app/src/main/java/com/chwl/app/home/adapter/MeCenterAdapter.kt @@ -1,12 +1,12 @@ -package com.yizhuan.habu.home.adapter +package com.chwl.app.home.adapter import android.widget.ImageView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.im.RouterHandler -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.xchat_android_core.room.bean.MeCenterInfo +import com.chwl.app.R +import com.chwl.app.ui.im.RouterHandler +import com.chwl.app.ui.utils.load +import com.chwl.core.room.bean.MeCenterInfo class MeCenterAdapter : diff --git a/app/src/main/java/com/yizhuan/habu/home/adapter/MeGameAdapter.kt b/app/src/main/java/com/chwl/app/home/adapter/MeGameAdapter.kt similarity index 72% rename from app/src/main/java/com/yizhuan/habu/home/adapter/MeGameAdapter.kt rename to app/src/main/java/com/chwl/app/home/adapter/MeGameAdapter.kt index 42e8742ce..be52a6fb9 100644 --- a/app/src/main/java/com/yizhuan/habu/home/adapter/MeGameAdapter.kt +++ b/app/src/main/java/com/chwl/app/home/adapter/MeGameAdapter.kt @@ -1,11 +1,11 @@ -package com.yizhuan.habu.home.adapter +package com.chwl.app.home.adapter import android.widget.ImageView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.xchat_android_core.room.game.GameInfo +import com.chwl.app.R +import com.chwl.app.ui.utils.load +import com.chwl.core.room.game.GameInfo class MeGameAdapter : diff --git a/app/src/main/java/com/yizhuan/habu/home/adapter/MoreSingleAnchorAdapter.kt b/app/src/main/java/com/chwl/app/home/adapter/MoreSingleAnchorAdapter.kt similarity index 82% rename from app/src/main/java/com/yizhuan/habu/home/adapter/MoreSingleAnchorAdapter.kt rename to app/src/main/java/com/chwl/app/home/adapter/MoreSingleAnchorAdapter.kt index d82661666..a84a67cae 100644 --- a/app/src/main/java/com/yizhuan/habu/home/adapter/MoreSingleAnchorAdapter.kt +++ b/app/src/main/java/com/chwl/app/home/adapter/MoreSingleAnchorAdapter.kt @@ -1,16 +1,16 @@ -package com.yizhuan.habu.home.adapter +package com.chwl.app.home.adapter import android.widget.ImageView 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.habu.R -import com.yizhuan.habu.avroom.activity.AVRoomActivity -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.habu.ui.utils.loadFromAssets -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.utils.TextUtils +import com.chwl.app.R +import com.chwl.app.avroom.activity.AVRoomActivity +import com.chwl.app.ui.utils.load +import com.chwl.app.ui.utils.loadFromAssets +import com.chwl.core.home.bean.HomeRoomInfo +import com.chwl.core.utils.TextUtils /** * create by lvzebiao @2019/11/13 diff --git a/app/src/main/java/com/yizhuan/habu/home/adapter/PartyMagicIndicatorAdapter.java b/app/src/main/java/com/chwl/app/home/adapter/PartyMagicIndicatorAdapter.java similarity index 79% rename from app/src/main/java/com/yizhuan/habu/home/adapter/PartyMagicIndicatorAdapter.java rename to app/src/main/java/com/chwl/app/home/adapter/PartyMagicIndicatorAdapter.java index 7fbd8149d..e53e69fc5 100644 --- a/app/src/main/java/com/yizhuan/habu/home/adapter/PartyMagicIndicatorAdapter.java +++ b/app/src/main/java/com/chwl/app/home/adapter/PartyMagicIndicatorAdapter.java @@ -1,17 +1,17 @@ -package com.yizhuan.habu.home.adapter; +package com.chwl.app.home.adapter; import android.content.Context; import android.widget.TextView; import androidx.core.content.ContextCompat; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.indicators.WrapPagerIndicator; +import com.chwl.app.R; +import com.chwl.app.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.WrapPagerIndicator; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/home/adapter/RoomActAdapter.kt b/app/src/main/java/com/chwl/app/home/adapter/RoomActAdapter.kt similarity index 78% rename from app/src/main/java/com/yizhuan/habu/home/adapter/RoomActAdapter.kt rename to app/src/main/java/com/chwl/app/home/adapter/RoomActAdapter.kt index 20a749239..6bfddf785 100644 --- a/app/src/main/java/com/yizhuan/habu/home/adapter/RoomActAdapter.kt +++ b/app/src/main/java/com/chwl/app/home/adapter/RoomActAdapter.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.home.adapter +package com.chwl.app.home.adapter import android.content.Context import android.view.LayoutInflater @@ -6,18 +6,18 @@ import android.view.View import android.view.ViewGroup import android.widget.ImageView import com.netease.nim.uikit.support.glide.GlideApp -import com.yizhuan.habu.R -import com.yizhuan.habu.avroom.firstcharge.FirstChargeDialog -import com.yizhuan.habu.shipantics.PullRadishActivity -import com.yizhuan.habu.treasure_box.widget.GoldBoxHelper -import com.yizhuan.habu.treasurefairy.HomeFairyActivity -import com.yizhuan.habu.ui.utils.ImageLoadUtils -import com.yizhuan.habu.ui.webview.room_banner.RoomBannerWebDialogActivity -import com.yizhuan.habu.ui.widget.rollviewpager.adapter.StaticPagerAdapter -import com.yizhuan.habu.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_library.utils.config.BasicConfig +import com.chwl.app.R +import com.chwl.app.avroom.firstcharge.FirstChargeDialog +import com.chwl.app.shipantics.PullRadishActivity +import com.chwl.app.treasure_box.widget.GoldBoxHelper +import com.chwl.app.treasurefairy.HomeFairyActivity +import com.chwl.app.ui.utils.ImageLoadUtils +import com.chwl.app.ui.webview.room_banner.RoomBannerWebDialogActivity +import com.chwl.app.ui.widget.rollviewpager.adapter.StaticPagerAdapter +import com.chwl.app.utils.CommonJumpHelper +import com.chwl.core.home.bean.BannerInfo +import com.chwl.core.room.model.AvRoomModel +import com.chwl.library.utils.config.BasicConfig import okhttp3.internal.filterList class RoomActAdapter(private val mContext: Context, private val data: List) : diff --git a/app/src/main/java/com/yizhuan/habu/home/adapter/RoomCommonAdapter.kt b/app/src/main/java/com/chwl/app/home/adapter/RoomCommonAdapter.kt similarity index 76% rename from app/src/main/java/com/yizhuan/habu/home/adapter/RoomCommonAdapter.kt rename to app/src/main/java/com/chwl/app/home/adapter/RoomCommonAdapter.kt index 78ef763b4..62d97ad9d 100644 --- a/app/src/main/java/com/yizhuan/habu/home/adapter/RoomCommonAdapter.kt +++ b/app/src/main/java/com/chwl/app/home/adapter/RoomCommonAdapter.kt @@ -1,14 +1,14 @@ -package com.yizhuan.habu.home.adapter +package com.chwl.app.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.habu.R -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.utils.TextUtils +import com.chwl.app.R +import com.chwl.app.ui.utils.ImageLoadUtilsV2 +import com.chwl.app.ui.utils.load +import com.chwl.core.home.bean.HomeRoomInfo +import com.chwl.core.utils.TextUtils class RoomCommonAdapter : BaseQuickAdapter(R.layout.item_room_common) { diff --git a/app/src/main/java/com/yizhuan/habu/home/adapter/RoomGameAdapter.kt b/app/src/main/java/com/chwl/app/home/adapter/RoomGameAdapter.kt similarity index 87% rename from app/src/main/java/com/yizhuan/habu/home/adapter/RoomGameAdapter.kt rename to app/src/main/java/com/chwl/app/home/adapter/RoomGameAdapter.kt index c86b24175..38eab42a0 100644 --- a/app/src/main/java/com/yizhuan/habu/home/adapter/RoomGameAdapter.kt +++ b/app/src/main/java/com/chwl/app/home/adapter/RoomGameAdapter.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.home.adapter +package com.chwl.app.home.adapter import android.graphics.Color import android.graphics.LinearGradient @@ -8,11 +8,11 @@ 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.habu.R -import com.yizhuan.habu.avroom.activity.AVRoomActivity -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.avroom.activity.AVRoomActivity +import com.chwl.app.ui.utils.load +import com.chwl.core.home.bean.HomeRoomInfo +import com.chwl.library.utils.ResUtil class RoomGameAdapter : BaseQuickAdapter(R.layout.item_room_game) { diff --git a/app/src/main/java/com/yizhuan/habu/home/adapter/RoomHistoryListAdapter.kt b/app/src/main/java/com/chwl/app/home/adapter/RoomHistoryListAdapter.kt similarity index 76% rename from app/src/main/java/com/yizhuan/habu/home/adapter/RoomHistoryListAdapter.kt rename to app/src/main/java/com/chwl/app/home/adapter/RoomHistoryListAdapter.kt index 5bb631c69..4760e0e6e 100644 --- a/app/src/main/java/com/yizhuan/habu/home/adapter/RoomHistoryListAdapter.kt +++ b/app/src/main/java/com/chwl/app/home/adapter/RoomHistoryListAdapter.kt @@ -1,13 +1,13 @@ -package com.yizhuan.habu.home.adapter +package com.chwl.app.home.adapter import android.widget.ImageView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.habu.avroom.activity.AVRoomActivity -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.xchat_android_core.bean.RoomHistoryInfo -import com.yizhuan.xchat_android_library.utils.TimeUtils +import com.chwl.app.R +import com.chwl.app.avroom.activity.AVRoomActivity +import com.chwl.app.ui.utils.load +import com.chwl.core.bean.RoomHistoryInfo +import com.chwl.library.utils.TimeUtils class RoomHistoryListAdapter : diff --git a/app/src/main/java/com/yizhuan/habu/home/adapter/RoomHotAdapter.kt b/app/src/main/java/com/chwl/app/home/adapter/RoomHotAdapter.kt similarity index 85% rename from app/src/main/java/com/yizhuan/habu/home/adapter/RoomHotAdapter.kt rename to app/src/main/java/com/chwl/app/home/adapter/RoomHotAdapter.kt index dccb3fe54..5f492eaeb 100644 --- a/app/src/main/java/com/yizhuan/habu/home/adapter/RoomHotAdapter.kt +++ b/app/src/main/java/com/chwl/app/home/adapter/RoomHotAdapter.kt @@ -1,15 +1,15 @@ -package com.yizhuan.habu.home.adapter +package com.chwl.app.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.habu.R -import com.yizhuan.habu.avroom.activity.AVRoomActivity -import com.yizhuan.habu.home.helper.BannerHelper -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.utils.TextUtils +import com.chwl.app.R +import com.chwl.app.avroom.activity.AVRoomActivity +import com.chwl.app.home.helper.BannerHelper +import com.chwl.app.ui.utils.load +import com.chwl.core.home.bean.HomeRoomInfo +import com.chwl.core.utils.TextUtils class RoomHotAdapter : BaseMultiItemQuickAdapter(null) { diff --git a/app/src/main/java/com/yizhuan/habu/home/adapter/RoomLikeAdapter.kt b/app/src/main/java/com/chwl/app/home/adapter/RoomLikeAdapter.kt similarity index 86% rename from app/src/main/java/com/yizhuan/habu/home/adapter/RoomLikeAdapter.kt rename to app/src/main/java/com/chwl/app/home/adapter/RoomLikeAdapter.kt index 9da0cef64..1fd58005b 100644 --- a/app/src/main/java/com/yizhuan/habu/home/adapter/RoomLikeAdapter.kt +++ b/app/src/main/java/com/chwl/app/home/adapter/RoomLikeAdapter.kt @@ -1,15 +1,15 @@ -package com.yizhuan.habu.home.adapter +package com.chwl.app.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.habu.R -import com.yizhuan.habu.avroom.activity.AVRoomActivity -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.utils.TextUtils +import com.chwl.app.R +import com.chwl.app.avroom.activity.AVRoomActivity +import com.chwl.app.ui.utils.ImageLoadUtilsV2 +import com.chwl.app.ui.utils.load +import com.chwl.core.home.bean.HomeRoomInfo +import com.chwl.core.utils.TextUtils class RoomLikeAdapter : BaseQuickAdapter(R.layout.item_room_like) { diff --git a/app/src/main/java/com/yizhuan/habu/home/adapter/RoomNewFriendsAdapter.kt b/app/src/main/java/com/chwl/app/home/adapter/RoomNewFriendsAdapter.kt similarity index 87% rename from app/src/main/java/com/yizhuan/habu/home/adapter/RoomNewFriendsAdapter.kt rename to app/src/main/java/com/chwl/app/home/adapter/RoomNewFriendsAdapter.kt index 1b27abc75..0836181c7 100644 --- a/app/src/main/java/com/yizhuan/habu/home/adapter/RoomNewFriendsAdapter.kt +++ b/app/src/main/java/com/chwl/app/home/adapter/RoomNewFriendsAdapter.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.home.adapter +package com.chwl.app.home.adapter import android.text.TextUtils import android.view.View @@ -13,26 +13,26 @@ import com.chad.library.adapter.base.BaseViewHolder import com.google.android.flexbox.AlignItems import com.google.android.flexbox.FlexDirection import com.opensource.svgaplayer.SVGAImageView -import com.yizhuan.habu.R -import com.yizhuan.habu.audio.helper.AudioPlayerHelper -import com.yizhuan.habu.audio.helper.OnPlayListener -import com.yizhuan.habu.avroom.activity.AVRoomActivity -import com.yizhuan.habu.ui.im.avtivity.NimP2PMessageActivity -import com.yizhuan.habu.ui.user.activity.UserInfoActivity -import com.yizhuan.habu.ui.user.adapter.UserInfoLabelAdapter -import com.yizhuan.habu.ui.utils.ImageLoadUtils -import com.yizhuan.habu.ui.utils.loadAvatar -import com.yizhuan.habu.ui.utils.loadFromAssets -import com.yizhuan.habu.view.GenderAgeTextView -import com.yizhuan.xchat_android_core.Constants -import com.yizhuan.xchat_android_core.manager.AudioEngineManager -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.user.bean.UserInfo -import com.yizhuan.xchat_android_core.utils.StarUtils -import com.yizhuan.xchat_android_core.utils.ifNullOrEmpty -import com.yizhuan.xchat_android_library.common.widget.LinesFlexBoxLayoutManager -import com.yizhuan.xchat_android_library.utils.ListUtils -import com.yizhuan.xchat_android_library.utils.SingleToastUtil +import com.chwl.app.R +import com.chwl.app.audio.helper.AudioPlayerHelper +import com.chwl.app.audio.helper.OnPlayListener +import com.chwl.app.avroom.activity.AVRoomActivity +import com.chwl.app.ui.im.avtivity.NimP2PMessageActivity +import com.chwl.app.ui.user.activity.UserInfoActivity +import com.chwl.app.ui.user.adapter.UserInfoLabelAdapter +import com.chwl.app.ui.utils.ImageLoadUtils +import com.chwl.app.ui.utils.loadAvatar +import com.chwl.app.ui.utils.loadFromAssets +import com.chwl.app.view.GenderAgeTextView +import com.chwl.core.Constants +import com.chwl.core.manager.AudioEngineManager +import com.chwl.core.manager.AvRoomDataManager +import com.chwl.core.user.bean.UserInfo +import com.chwl.core.utils.StarUtils +import com.chwl.core.utils.ifNullOrEmpty +import com.chwl.library.common.widget.LinesFlexBoxLayoutManager +import com.chwl.library.utils.ListUtils +import com.chwl.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/habu/home/adapter/TopMagicIndicatorAdapter.java b/app/src/main/java/com/chwl/app/home/adapter/TopMagicIndicatorAdapter.java similarity index 78% rename from app/src/main/java/com/yizhuan/habu/home/adapter/TopMagicIndicatorAdapter.java rename to app/src/main/java/com/chwl/app/home/adapter/TopMagicIndicatorAdapter.java index 1dbceb31f..88d43c5ab 100644 --- a/app/src/main/java/com/yizhuan/habu/home/adapter/TopMagicIndicatorAdapter.java +++ b/app/src/main/java/com/chwl/app/home/adapter/TopMagicIndicatorAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.home.adapter; +package com.chwl.app.home.adapter; import android.content.Context; import android.view.Gravity; @@ -7,14 +7,14 @@ import android.widget.FrameLayout; import androidx.core.content.ContextCompat; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.indicators.GradientLinePagerIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; +import com.chwl.app.R; +import com.chwl.app.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.GradientLinePagerIndicator; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/home/adapter/VisitorListAdapter.java b/app/src/main/java/com/chwl/app/home/adapter/VisitorListAdapter.java similarity index 79% rename from app/src/main/java/com/yizhuan/habu/home/adapter/VisitorListAdapter.java rename to app/src/main/java/com/chwl/app/home/adapter/VisitorListAdapter.java index e296a39dc..563a3a914 100644 --- a/app/src/main/java/com/yizhuan/habu/home/adapter/VisitorListAdapter.java +++ b/app/src/main/java/com/chwl/app/home/adapter/VisitorListAdapter.java @@ -1,13 +1,13 @@ -package com.yizhuan.habu.home.adapter; +package com.chwl.app.home.adapter; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.im.avtivity.NimP2PMessageActivity; -import com.yizhuan.habu.ui.user.activity.UserInfoActivity; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.home.bean.VisitorInfo; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.ui.im.avtivity.NimP2PMessageActivity; +import com.chwl.app.ui.user.activity.UserInfoActivity; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.core.home.bean.VisitorInfo; +import com.chwl.library.utils.ResUtil; import org.jetbrains.annotations.NotNull; diff --git a/app/src/main/java/com/yizhuan/habu/home/dialog/HelloMessageDialog.kt b/app/src/main/java/com/chwl/app/home/dialog/HelloMessageDialog.kt similarity index 83% rename from app/src/main/java/com/yizhuan/habu/home/dialog/HelloMessageDialog.kt rename to app/src/main/java/com/chwl/app/home/dialog/HelloMessageDialog.kt index 9ce20f5c3..a69ac7abf 100644 --- a/app/src/main/java/com/yizhuan/habu/home/dialog/HelloMessageDialog.kt +++ b/app/src/main/java/com/chwl/app/home/dialog/HelloMessageDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.home.dialog +package com.chwl.app.home.dialog import android.annotation.SuppressLint import android.os.Bundle @@ -6,13 +6,13 @@ import android.view.Gravity import android.view.WindowManager import android.widget.ImageView import androidx.core.view.isGone -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.databinding.DialogHelloMessageBinding -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.habu.room_chat.activity.RoomMsgActivity -import com.yizhuan.xchat_android_core.channel_page.bean.HelloMessageInfo -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.base.BaseDialog +import com.chwl.app.databinding.DialogHelloMessageBinding +import com.chwl.app.ui.utils.load +import com.chwl.app.room_chat.activity.RoomMsgActivity +import com.chwl.core.channel_page.bean.HelloMessageInfo +import com.chwl.library.utils.ResUtil class HelloMessageDialog : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/habu/home/dialog/NewUserHelloDialog.kt b/app/src/main/java/com/chwl/app/home/dialog/NewUserHelloDialog.kt similarity index 81% rename from app/src/main/java/com/yizhuan/habu/home/dialog/NewUserHelloDialog.kt rename to app/src/main/java/com/chwl/app/home/dialog/NewUserHelloDialog.kt index 67bdb089b..81ae9821a 100644 --- a/app/src/main/java/com/yizhuan/habu/home/dialog/NewUserHelloDialog.kt +++ b/app/src/main/java/com/chwl/app/home/dialog/NewUserHelloDialog.kt @@ -1,14 +1,14 @@ -package com.yizhuan.habu.home.dialog +package com.chwl.app.home.dialog import android.annotation.SuppressLint import android.os.Bundle import android.view.WindowManager -import com.yizhuan.habu.avroom.activity.AVRoomActivity -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.databinding.DialogNewUserHelloBinding -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.xchat_android_core.channel_page.bean.NewUserHelloInfo -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot +import com.chwl.app.avroom.activity.AVRoomActivity +import com.chwl.app.base.BaseDialog +import com.chwl.app.databinding.DialogNewUserHelloBinding +import com.chwl.app.ui.utils.load +import com.chwl.core.channel_page.bean.NewUserHelloInfo +import com.chwl.core.utils.subAndReplaceDot class NewUserHelloDialog : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/habu/home/dialog/ProtocolUpdateDialog.java b/app/src/main/java/com/chwl/app/home/dialog/ProtocolUpdateDialog.java similarity index 89% rename from app/src/main/java/com/yizhuan/habu/home/dialog/ProtocolUpdateDialog.java rename to app/src/main/java/com/chwl/app/home/dialog/ProtocolUpdateDialog.java index 2ad4ec01d..a135d065d 100644 --- a/app/src/main/java/com/yizhuan/habu/home/dialog/ProtocolUpdateDialog.java +++ b/app/src/main/java/com/chwl/app/home/dialog/ProtocolUpdateDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.home.dialog; +package com.chwl.app.home.dialog; import android.app.Activity; import android.content.Context; @@ -18,13 +18,13 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.core.content.ContextCompat; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseSdDialog; -import com.yizhuan.habu.common.widget.OriginalDrawStatusClickSpan; -import com.yizhuan.habu.ui.webview.CommonWebViewActivity; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.user.bean.ProtocolInfo; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; +import com.chwl.app.R; +import com.chwl.app.base.BaseSdDialog; +import com.chwl.app.common.widget.OriginalDrawStatusClickSpan; +import com.chwl.app.ui.webview.CommonWebViewActivity; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.core.user.bean.ProtocolInfo; +import com.chwl.core.utils.SharedPreferenceUtils; /** * 家长模式 提醒框 diff --git a/app/src/main/java/com/yizhuan/habu/home/dialog/RecommendRoomDialog.kt b/app/src/main/java/com/chwl/app/home/dialog/RecommendRoomDialog.kt similarity index 76% rename from app/src/main/java/com/yizhuan/habu/home/dialog/RecommendRoomDialog.kt rename to app/src/main/java/com/chwl/app/home/dialog/RecommendRoomDialog.kt index 67ddd4771..be5083b00 100644 --- a/app/src/main/java/com/yizhuan/habu/home/dialog/RecommendRoomDialog.kt +++ b/app/src/main/java/com/chwl/app/home/dialog/RecommendRoomDialog.kt @@ -1,12 +1,12 @@ -package com.yizhuan.habu.home.dialog +package com.chwl.app.home.dialog import android.annotation.SuppressLint import android.os.Bundle -import com.yizhuan.habu.avroom.activity.AVRoomActivity -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.databinding.DialogRecommendRoomBinding -import com.yizhuan.habu.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo +import com.chwl.app.avroom.activity.AVRoomActivity +import com.chwl.app.base.BaseDialog +import com.chwl.app.databinding.DialogRecommendRoomBinding +import com.chwl.app.ui.utils.ImageLoadUtils +import com.chwl.core.home.bean.HomeRoomInfo class RecommendRoomDialog : BaseDialog() { diff --git a/app/src/main/java/com/chwl/app/home/event/ContactTrashEvent.java b/app/src/main/java/com/chwl/app/home/event/ContactTrashEvent.java new file mode 100644 index 000000000..4dc558981 --- /dev/null +++ b/app/src/main/java/com/chwl/app/home/event/ContactTrashEvent.java @@ -0,0 +1,4 @@ +package com.chwl.app.home.event; + +public class ContactTrashEvent { +} diff --git a/app/src/main/java/com/yizhuan/habu/home/fragment/AccompanyFragment.kt b/app/src/main/java/com/chwl/app/home/fragment/AccompanyFragment.kt similarity index 83% rename from app/src/main/java/com/yizhuan/habu/home/fragment/AccompanyFragment.kt rename to app/src/main/java/com/chwl/app/home/fragment/AccompanyFragment.kt index f55db416c..090f733b4 100644 --- a/app/src/main/java/com/yizhuan/habu/home/fragment/AccompanyFragment.kt +++ b/app/src/main/java/com/chwl/app/home/fragment/AccompanyFragment.kt @@ -1,29 +1,29 @@ -package com.yizhuan.habu.home.fragment +package com.chwl.app.home.fragment import android.os.Bundle import android.view.View import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager import com.chad.library.adapter.base.BaseQuickAdapter -import com.yizhuan.habu.application.IReportConstants -import com.yizhuan.habu.application.ReportManager -import com.yizhuan.habu.avroom.activity.AVRoomActivity -import com.yizhuan.habu.avroom.dialog.CreateRoomDialog -import com.yizhuan.habu.base.BaseActivity -import com.yizhuan.habu.base.BaseViewBindingFragment -import com.yizhuan.habu.common.EmptyViewHelper -import com.yizhuan.habu.databinding.FragmentAccompanyBinding -import com.yizhuan.habu.home.HomeViewModel -import com.yizhuan.habu.home.adapter.HomeChatAdapter -import com.yizhuan.habu.home.adapter.RoomNewFriendsAdapter -import com.yizhuan.habu.home.helper.OpenRoomHelper -import com.yizhuan.habu.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.room.event.RoomShieldEvent -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.chwl.app.application.IReportConstants +import com.chwl.app.application.ReportManager +import com.chwl.app.avroom.activity.AVRoomActivity +import com.chwl.app.avroom.dialog.CreateRoomDialog +import com.chwl.app.base.BaseActivity +import com.chwl.app.base.BaseViewBindingFragment +import com.chwl.app.common.EmptyViewHelper +import com.chwl.app.databinding.FragmentAccompanyBinding +import com.chwl.app.home.HomeViewModel +import com.chwl.app.home.adapter.HomeChatAdapter +import com.chwl.app.home.adapter.RoomNewFriendsAdapter +import com.chwl.app.home.helper.OpenRoomHelper +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.core.home.bean.HomeRoomInfo +import com.chwl.core.home.event.RefreshHomeDataEvent +import com.chwl.core.room.event.RoomShieldEvent +import com.chwl.core.user.UserModel +import com.chwl.core.user.bean.UserInfo +import com.chwl.core.user.event.LoginUserInfoUpdateEvent import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/yizhuan/habu/home/fragment/AttentionFragment.java b/app/src/main/java/com/chwl/app/home/fragment/AttentionFragment.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/home/fragment/AttentionFragment.java rename to app/src/main/java/com/chwl/app/home/fragment/AttentionFragment.java index 1cd164030..d211cdbea 100644 --- a/app/src/main/java/com/yizhuan/habu/home/fragment/AttentionFragment.java +++ b/app/src/main/java/com/chwl/app/home/fragment/AttentionFragment.java @@ -1,7 +1,7 @@ -package com.yizhuan.habu.home.fragment; +package com.chwl.app.home.fragment; -import static com.yizhuan.habu.R.id.swipe_refresh; -import static com.yizhuan.habu.friend.action.AbstractSelectFriendAction.ROOM_MSG; +import static com.chwl.app.R.id.swipe_refresh; +import static com.chwl.app.friend.action.AbstractSelectFriendAction.ROOM_MSG; import android.annotation.SuppressLint; import android.app.Activity; @@ -14,22 +14,22 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.habu.R; -import com.yizhuan.habu.avroom.activity.AVRoomActivity; -import com.yizhuan.habu.base.BaseFragment; -import com.yizhuan.habu.common.NoDataFragment; -import com.yizhuan.habu.friend.action.AbstractSelectFriendAction; -import com.yizhuan.habu.friend.view.SelectFriendActivity; -import com.yizhuan.habu.ui.relation.adapter.AttentionListAdapter; -import com.yizhuan.habu.ui.user.activity.UserInfoActivity; -import com.yizhuan.habu.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.chwl.app.R; +import com.chwl.app.avroom.activity.AVRoomActivity; +import com.chwl.app.base.BaseFragment; +import com.chwl.app.common.NoDataFragment; +import com.chwl.app.friend.action.AbstractSelectFriendAction; +import com.chwl.app.friend.view.SelectFriendActivity; +import com.chwl.app.ui.relation.adapter.AttentionListAdapter; +import com.chwl.app.ui.user.activity.UserInfoActivity; +import com.chwl.app.room_chat.activity.NimRoomP2PMessageActivity; +import com.chwl.core.Constants; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.praise.event.PraiseEvent; +import com.chwl.core.user.AttentionModel; +import com.chwl.core.user.bean.AttentionInfo; +import com.chwl.core.user.event.LoginUserInfoUpdateEvent; +import com.chwl.library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/habu/home/fragment/ContactsListFragment.kt b/app/src/main/java/com/chwl/app/home/fragment/ContactsListFragment.kt similarity index 80% rename from app/src/main/java/com/yizhuan/habu/home/fragment/ContactsListFragment.kt rename to app/src/main/java/com/chwl/app/home/fragment/ContactsListFragment.kt index 52b0645ae..b6dbcff3f 100644 --- a/app/src/main/java/com/yizhuan/habu/home/fragment/ContactsListFragment.kt +++ b/app/src/main/java/com/chwl/app/home/fragment/ContactsListFragment.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.home.fragment +package com.chwl.app.home.fragment import android.widget.LinearLayout import android.widget.TextView @@ -6,20 +6,20 @@ import androidx.fragment.app.Fragment import androidx.viewpager.widget.ViewPager.OnPageChangeListener import com.netease.nimlib.sdk.NIMClient import com.netease.nimlib.sdk.msg.MsgService -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingFragment -import com.yizhuan.habu.common.widget.dialog.DialogManager.AbsOkDialogListener -import com.yizhuan.habu.databinding.FragmentContactListBinding -import com.yizhuan.habu.home.event.ContactTrashEvent -import com.yizhuan.habu.ui.im.friend.FriendListFragment -import com.yizhuan.habu.ui.im.recent.RecentListFragment -import com.yizhuan.habu.ui.relation.FansListFragment -import com.yizhuan.habu.ui.user.adapter.UserInfoIndicatorAdapter -import com.yizhuan.habu.ui.user.adapter.UserInfoPagerAdapter -import com.yizhuan.habu.ui.widget.magicindicator.ViewPagerHelper -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator -import com.yizhuan.xchat_android_core.Constants -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingFragment +import com.chwl.app.common.widget.dialog.DialogManager.AbsOkDialogListener +import com.chwl.app.databinding.FragmentContactListBinding +import com.chwl.app.home.event.ContactTrashEvent +import com.chwl.app.ui.im.friend.FriendListFragment +import com.chwl.app.ui.im.recent.RecentListFragment +import com.chwl.app.ui.relation.FansListFragment +import com.chwl.app.ui.user.adapter.UserInfoIndicatorAdapter +import com.chwl.app.ui.user.adapter.UserInfoPagerAdapter +import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator +import com.chwl.core.Constants +import com.chwl.library.utils.ResUtil import org.greenrobot.eventbus.EventBus /** diff --git a/app/src/main/java/com/yizhuan/habu/home/fragment/HomeFragment.kt b/app/src/main/java/com/chwl/app/home/fragment/HomeFragment.kt similarity index 85% rename from app/src/main/java/com/yizhuan/habu/home/fragment/HomeFragment.kt rename to app/src/main/java/com/chwl/app/home/fragment/HomeFragment.kt index 7fcbc345a..1c795d10d 100644 --- a/app/src/main/java/com/yizhuan/habu/home/fragment/HomeFragment.kt +++ b/app/src/main/java/com/chwl/app/home/fragment/HomeFragment.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.home.fragment +package com.chwl.app.home.fragment import android.view.Gravity import android.view.View @@ -7,31 +7,31 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.viewpager2.adapter.FragmentStateAdapter import com.netease.nim.uikit.common.util.sys.ScreenUtil -import com.yizhuan.habu.R -import com.yizhuan.habu.application.IReportConstants -import com.yizhuan.habu.application.ReportManager -import com.yizhuan.habu.avroom.activity.AVRoomActivity -import com.yizhuan.habu.base.BaseViewBindingFragment -import com.yizhuan.habu.databinding.FragmentHomeBinding -import com.yizhuan.habu.home.HomeViewModel -import com.yizhuan.habu.home.adapter.HomeBannerAdapter -import com.yizhuan.habu.home.dialog.RecommendRoomDialog -import com.yizhuan.habu.home.helper.OpenRoomHelper -import com.yizhuan.habu.ui.im.avtivity.NimP2PMessageActivity -import com.yizhuan.habu.ui.search.SearchActivity -import com.yizhuan.habu.ui.user.adapter.MainIndicatorAdapter -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.habu.ui.webview.CommonWebViewActivity -import com.yizhuan.habu.ui.widget.magicindicator.ViewPagerHelper -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator -import com.yizhuan.habu.utils.CommonJumpHelper -import com.yizhuan.xchat_android_core.DemoCache -import com.yizhuan.xchat_android_core.UriProvider -import com.yizhuan.xchat_android_core.home.bean.BannerInfo -import com.yizhuan.xchat_android_core.home.bean.HomeTagInfo -import com.yizhuan.xchat_android_library.utils.ListUtils -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.application.IReportConstants +import com.chwl.app.application.ReportManager +import com.chwl.app.avroom.activity.AVRoomActivity +import com.chwl.app.base.BaseViewBindingFragment +import com.chwl.app.databinding.FragmentHomeBinding +import com.chwl.app.home.HomeViewModel +import com.chwl.app.home.adapter.HomeBannerAdapter +import com.chwl.app.home.dialog.RecommendRoomDialog +import com.chwl.app.home.helper.OpenRoomHelper +import com.chwl.app.ui.im.avtivity.NimP2PMessageActivity +import com.chwl.app.ui.search.SearchActivity +import com.chwl.app.ui.user.adapter.MainIndicatorAdapter +import com.chwl.app.ui.utils.load +import com.chwl.app.ui.webview.CommonWebViewActivity +import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator +import com.chwl.app.utils.CommonJumpHelper +import com.chwl.core.DemoCache +import com.chwl.core.UriProvider +import com.chwl.core.home.bean.BannerInfo +import com.chwl.core.home.bean.HomeTagInfo +import com.chwl.library.utils.ListUtils +import com.chwl.library.utils.ResUtil import com.zhpan.bannerview.BannerViewPager /** diff --git a/app/src/main/java/com/yizhuan/habu/home/fragment/HomeTabHomeFragment.java b/app/src/main/java/com/chwl/app/home/fragment/HomeTabHomeFragment.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/home/fragment/HomeTabHomeFragment.java rename to app/src/main/java/com/chwl/app/home/fragment/HomeTabHomeFragment.java index 31e4c3874..1566116fd 100644 --- a/app/src/main/java/com/yizhuan/habu/home/fragment/HomeTabHomeFragment.java +++ b/app/src/main/java/com/chwl/app/home/fragment/HomeTabHomeFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.home.fragment; +package com.chwl.app.home.fragment; import android.annotation.SuppressLint; import android.os.Bundle; @@ -7,19 +7,19 @@ import android.view.ViewGroup; import androidx.annotation.Nullable; import com.trello.rxlifecycle3.android.FragmentEvent; -import com.yizhuan.habu.R; -import com.yizhuan.habu.application.IReportConstants; -import com.yizhuan.habu.application.ReportManager; -import com.yizhuan.habu.avroom.activity.AVRoomActivity; -import com.yizhuan.habu.base.BaseFragment; -import com.yizhuan.habu.home.adapter.HomeTopAdapter; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -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.room.event.RoomShieldEvent; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.chwl.app.R; +import com.chwl.app.application.IReportConstants; +import com.chwl.app.application.ReportManager; +import com.chwl.app.avroom.activity.AVRoomActivity; +import com.chwl.app.base.BaseFragment; +import com.chwl.app.home.adapter.HomeTopAdapter; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.core.home.bean.HomeTabMapInfo; +import com.chwl.core.home.event.RefreshHomeDataEvent; +import com.chwl.core.home.model.GameHomeModel; +import com.chwl.core.room.event.RoomShieldEvent; +import com.chwl.core.utils.net.RxHelper; +import com.chwl.library.utils.ListUtils; import com.zhpan.bannerview.BannerViewPager; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/yizhuan/habu/home/fragment/MeFragment.kt b/app/src/main/java/com/chwl/app/home/fragment/MeFragment.kt similarity index 84% rename from app/src/main/java/com/yizhuan/habu/home/fragment/MeFragment.kt rename to app/src/main/java/com/chwl/app/home/fragment/MeFragment.kt index 708b87668..0f6988ad5 100644 --- a/app/src/main/java/com/yizhuan/habu/home/fragment/MeFragment.kt +++ b/app/src/main/java/com/chwl/app/home/fragment/MeFragment.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.home.fragment +package com.chwl.app.home.fragment import android.annotation.SuppressLint import android.content.ClipData @@ -13,57 +13,57 @@ import androidx.core.view.isVisible import androidx.databinding.DataBindingUtil import androidx.fragment.app.activityViewModels import androidx.fragment.app.viewModels -import com.yizhuan.habu.R -import com.yizhuan.habu.UIHelper -import com.yizhuan.habu.application.IReportConstants -import com.yizhuan.habu.application.ReportManager -import com.yizhuan.habu.avroom.activity.AVRoomActivity -import com.yizhuan.habu.avroom.fragment.RoomRankDialogUtils -import com.yizhuan.habu.base.BaseActivity -import com.yizhuan.habu.base.BaseFragment -import com.yizhuan.habu.base.list.LineColorDecoration -import com.yizhuan.habu.databinding.FragmentMeBinding -import com.yizhuan.habu.earn.activity.EarnRecordActivity -import com.yizhuan.habu.home.HomeViewModel -import com.yizhuan.habu.home.MeViewModel -import com.yizhuan.habu.home.activity.AssociationActivity -import com.yizhuan.habu.home.adapter.MeCenterAdapter -import com.yizhuan.habu.home.helper.BannerHelper -import com.yizhuan.habu.home.helper.OpenRoomHelper -import com.yizhuan.habu.module_hall.hall.activity.ModuleClanActivity -import com.yizhuan.habu.module_hall.hall.activity.ModuleHallActivity -import com.yizhuan.habu.pay.activity.GiveGoldActivity -import com.yizhuan.habu.ui.pay.ChargeActivity -import com.yizhuan.habu.ui.relation.AttentionListActivity -import com.yizhuan.habu.ui.relation.FansListActivity -import com.yizhuan.habu.ui.utils.ImageLoadUtils -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.habu.ui.webview.CommonWebViewActivity -import com.yizhuan.habu.vip.VipMainActivity -import com.yizhuan.habu.vip.VipViewModel -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.initial.InitialModel -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.module_hall.hall.HallModel -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanAndHallInfo -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.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.Logger -import com.yizhuan.xchat_android_core.utils.StarUtils -import com.yizhuan.xchat_android_library.common.util.DeviceUtil -import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil -import com.yizhuan.xchat_android_library.utils.FormatUtils +import com.chwl.app.R +import com.chwl.app.UIHelper +import com.chwl.app.application.IReportConstants +import com.chwl.app.application.ReportManager +import com.chwl.app.avroom.activity.AVRoomActivity +import com.chwl.app.avroom.fragment.RoomRankDialogUtils +import com.chwl.app.base.BaseActivity +import com.chwl.app.base.BaseFragment +import com.chwl.app.base.list.LineColorDecoration +import com.chwl.app.databinding.FragmentMeBinding +import com.chwl.app.earn.activity.EarnRecordActivity +import com.chwl.app.home.HomeViewModel +import com.chwl.app.home.MeViewModel +import com.chwl.app.home.activity.AssociationActivity +import com.chwl.app.home.adapter.MeCenterAdapter +import com.chwl.app.home.helper.BannerHelper +import com.chwl.app.home.helper.OpenRoomHelper +import com.chwl.app.module_hall.hall.activity.ModuleClanActivity +import com.chwl.app.module_hall.hall.activity.ModuleHallActivity +import com.chwl.app.pay.activity.GiveGoldActivity +import com.chwl.app.ui.pay.ChargeActivity +import com.chwl.app.ui.relation.AttentionListActivity +import com.chwl.app.ui.relation.FansListActivity +import com.chwl.app.ui.utils.ImageLoadUtils +import com.chwl.app.ui.utils.ImageLoadUtilsV2 +import com.chwl.app.ui.utils.load +import com.chwl.app.ui.webview.CommonWebViewActivity +import com.chwl.app.vip.VipMainActivity +import com.chwl.app.vip.VipViewModel +import com.chwl.core.Constants +import com.chwl.core.UriProvider +import com.chwl.core.auth.AuthModel +import com.chwl.core.initial.InitialModel +import com.chwl.core.level.UserLevelVo +import com.chwl.core.manager.IMNetEaseManager +import com.chwl.core.manager.RelationShipEvent +import com.chwl.core.module_hall.hall.HallModel +import com.chwl.core.module_hall.hall.bean.ClanAndHallInfo +import com.chwl.core.pay.PayModel +import com.chwl.core.pay.event.GetWalletInfoEvent +import com.chwl.core.pay.event.UpdateWalletInfoEvent +import com.chwl.core.room.bean.MeCenterInfo +import com.chwl.core.room.bean.RoomInfo +import com.chwl.core.user.UserModel +import com.chwl.core.user.bean.UserInfo +import com.chwl.core.user.event.LoginUserInfoUpdateEvent +import com.chwl.core.utils.Logger +import com.chwl.core.utils.StarUtils +import com.chwl.library.common.util.DeviceUtil +import com.chwl.library.utils.AppMetaDataUtil +import com.chwl.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/habu/home/fragment/PartyFragment.kt b/app/src/main/java/com/chwl/app/home/fragment/PartyFragment.kt similarity index 87% rename from app/src/main/java/com/yizhuan/habu/home/fragment/PartyFragment.kt rename to app/src/main/java/com/chwl/app/home/fragment/PartyFragment.kt index 764df6a10..05719c505 100644 --- a/app/src/main/java/com/yizhuan/habu/home/fragment/PartyFragment.kt +++ b/app/src/main/java/com/chwl/app/home/fragment/PartyFragment.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.home.fragment +package com.chwl.app.home.fragment import android.os.Bundle import android.view.Gravity @@ -8,17 +8,17 @@ 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.habu.R -import com.yizhuan.habu.avroom.adapter.RoomVPAdapter -import com.yizhuan.habu.base.BaseFragment -import com.yizhuan.habu.databinding.FragmentPartyBinding -import com.yizhuan.habu.home.HomeViewModel -import com.yizhuan.habu.home.adapter.PartyMagicIndicatorAdapter -import com.yizhuan.habu.ui.widget.magicindicator.ViewPagerHelper -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.avroom.adapter.RoomVPAdapter +import com.chwl.app.base.BaseFragment +import com.chwl.app.databinding.FragmentPartyBinding +import com.chwl.app.home.HomeViewModel +import com.chwl.app.home.adapter.PartyMagicIndicatorAdapter +import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator +import com.chwl.core.home.bean.HomeTagInfo +import com.chwl.core.home.event.RefreshHomeDataEvent +import com.chwl.library.utils.ResUtil import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/yizhuan/habu/home/fragment/RecommendFragment.kt b/app/src/main/java/com/chwl/app/home/fragment/RecommendFragment.kt similarity index 82% rename from app/src/main/java/com/yizhuan/habu/home/fragment/RecommendFragment.kt rename to app/src/main/java/com/chwl/app/home/fragment/RecommendFragment.kt index 87e25ef52..0c7e6e798 100644 --- a/app/src/main/java/com/yizhuan/habu/home/fragment/RecommendFragment.kt +++ b/app/src/main/java/com/chwl/app/home/fragment/RecommendFragment.kt @@ -1,22 +1,22 @@ -package com.yizhuan.habu.home.fragment +package com.chwl.app.home.fragment import android.os.Bundle import android.view.View import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.GridLayoutManager import com.chad.library.adapter.base.BaseQuickAdapter -import com.yizhuan.habu.application.IReportConstants -import com.yizhuan.habu.application.ReportManager -import com.yizhuan.habu.avroom.activity.AVRoomActivity -import com.yizhuan.habu.base.BaseViewBindingFragment -import com.yizhuan.habu.common.EmptyViewHelper -import com.yizhuan.habu.databinding.FragmentRecommendBinding -import com.yizhuan.habu.home.HomeViewModel -import com.yizhuan.habu.home.adapter.HomeHotAdapter -import com.yizhuan.habu.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.room.event.RoomShieldEvent +import com.chwl.app.application.IReportConstants +import com.chwl.app.application.ReportManager +import com.chwl.app.avroom.activity.AVRoomActivity +import com.chwl.app.base.BaseViewBindingFragment +import com.chwl.app.common.EmptyViewHelper +import com.chwl.app.databinding.FragmentRecommendBinding +import com.chwl.app.home.HomeViewModel +import com.chwl.app.home.adapter.HomeHotAdapter +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.core.home.bean.HomeRoomInfo +import com.chwl.core.home.event.RefreshHomeDataEvent +import com.chwl.core.room.event.RoomShieldEvent import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/yizhuan/habu/home/fragment/RoomCommonFragment.kt b/app/src/main/java/com/chwl/app/home/fragment/RoomCommonFragment.kt similarity index 82% rename from app/src/main/java/com/yizhuan/habu/home/fragment/RoomCommonFragment.kt rename to app/src/main/java/com/chwl/app/home/fragment/RoomCommonFragment.kt index d09209d6a..bc6f31131 100644 --- a/app/src/main/java/com/yizhuan/habu/home/fragment/RoomCommonFragment.kt +++ b/app/src/main/java/com/chwl/app/home/fragment/RoomCommonFragment.kt @@ -1,21 +1,21 @@ -package com.yizhuan.habu.home.fragment +package com.chwl.app.home.fragment import android.annotation.SuppressLint import android.os.Bundle import androidx.fragment.app.viewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.yizhuan.habu.R -import com.yizhuan.habu.avroom.activity.AVRoomActivity -import com.yizhuan.habu.base.BaseViewBindingFragment -import com.yizhuan.habu.common.EmptyViewHelper -import com.yizhuan.habu.databinding.FragmentRoomCommonBinding -import com.yizhuan.habu.home.RoomCommonViewModel -import com.yizhuan.habu.home.adapter.RoomCommonAdapter -import com.yizhuan.habu.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.room.event.RoomShieldEvent -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.avroom.activity.AVRoomActivity +import com.chwl.app.base.BaseViewBindingFragment +import com.chwl.app.common.EmptyViewHelper +import com.chwl.app.databinding.FragmentRoomCommonBinding +import com.chwl.app.home.RoomCommonViewModel +import com.chwl.app.home.adapter.RoomCommonAdapter +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.core.home.bean.HomeRoomInfo +import com.chwl.core.home.event.RefreshHomeDataEvent +import com.chwl.core.room.event.RoomShieldEvent +import com.chwl.library.utils.ResUtil import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/yizhuan/habu/home/fragment/RoomGameFragment.kt b/app/src/main/java/com/chwl/app/home/fragment/RoomGameFragment.kt similarity index 82% rename from app/src/main/java/com/yizhuan/habu/home/fragment/RoomGameFragment.kt rename to app/src/main/java/com/chwl/app/home/fragment/RoomGameFragment.kt index 18c91982f..454f7b2be 100644 --- a/app/src/main/java/com/yizhuan/habu/home/fragment/RoomGameFragment.kt +++ b/app/src/main/java/com/chwl/app/home/fragment/RoomGameFragment.kt @@ -1,20 +1,20 @@ -package com.yizhuan.habu.home.fragment +package com.chwl.app.home.fragment import android.os.Bundle import androidx.fragment.app.viewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.yizhuan.habu.R -import com.yizhuan.habu.avroom.activity.AVRoomActivity -import com.yizhuan.habu.base.BaseViewBindingFragment -import com.yizhuan.habu.common.EmptyViewHelper -import com.yizhuan.habu.databinding.FragmentRoomGameBinding -import com.yizhuan.habu.home.HomeViewModel -import com.yizhuan.habu.home.adapter.RoomGameAdapter -import com.yizhuan.habu.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.room.event.RoomShieldEvent -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.avroom.activity.AVRoomActivity +import com.chwl.app.base.BaseViewBindingFragment +import com.chwl.app.common.EmptyViewHelper +import com.chwl.app.databinding.FragmentRoomGameBinding +import com.chwl.app.home.HomeViewModel +import com.chwl.app.home.adapter.RoomGameAdapter +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.core.home.bean.HomeRoomInfo +import com.chwl.core.home.event.RefreshHomeDataEvent +import com.chwl.core.room.event.RoomShieldEvent +import com.chwl.library.utils.ResUtil import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/yizhuan/habu/home/fragment/RoomLikeFragment.kt b/app/src/main/java/com/chwl/app/home/fragment/RoomLikeFragment.kt similarity index 85% rename from app/src/main/java/com/yizhuan/habu/home/fragment/RoomLikeFragment.kt rename to app/src/main/java/com/chwl/app/home/fragment/RoomLikeFragment.kt index d9cdb4574..f2b4216c3 100644 --- a/app/src/main/java/com/yizhuan/habu/home/fragment/RoomLikeFragment.kt +++ b/app/src/main/java/com/chwl/app/home/fragment/RoomLikeFragment.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.home.fragment +package com.chwl.app.home.fragment import android.os.Bundle import androidx.core.view.isGone @@ -7,19 +7,19 @@ 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.habu.R -import com.yizhuan.habu.base.BaseViewBindingFragment -import com.yizhuan.habu.common.EmptyViewHelper -import com.yizhuan.habu.databinding.FragmentRoomLikeBinding -import com.yizhuan.habu.home.HomeViewModel -import com.yizhuan.habu.home.adapter.HomeConcernsAdapter -import com.yizhuan.habu.home.adapter.RoomLikeAdapter -import com.yizhuan.habu.ui.relation.AttentionListActivity -import com.yizhuan.habu.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.room.event.RoomShieldEvent -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingFragment +import com.chwl.app.common.EmptyViewHelper +import com.chwl.app.databinding.FragmentRoomLikeBinding +import com.chwl.app.home.HomeViewModel +import com.chwl.app.home.adapter.HomeConcernsAdapter +import com.chwl.app.home.adapter.RoomLikeAdapter +import com.chwl.app.ui.relation.AttentionListActivity +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.core.home.bean.HomeRoomInfo +import com.chwl.core.home.event.RefreshHomeDataEvent +import com.chwl.core.room.event.RoomShieldEvent +import com.chwl.library.utils.ResUtil import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/yizhuan/habu/home/helper/BannerHelper.kt b/app/src/main/java/com/chwl/app/home/helper/BannerHelper.kt similarity index 86% rename from app/src/main/java/com/yizhuan/habu/home/helper/BannerHelper.kt rename to app/src/main/java/com/chwl/app/home/helper/BannerHelper.kt index dfcb91003..e648fe0da 100644 --- a/app/src/main/java/com/yizhuan/habu/home/helper/BannerHelper.kt +++ b/app/src/main/java/com/chwl/app/home/helper/BannerHelper.kt @@ -1,17 +1,17 @@ -package com.yizhuan.habu.home.helper +package com.chwl.app.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.habu.R -import com.yizhuan.habu.home.adapter.BannerAdapter -import com.yizhuan.habu.ui.widget.rollviewpager.RollPagerView -import com.yizhuan.habu.ui.widget.rollviewpager.Util -import com.yizhuan.habu.ui.widget.rollviewpager.hintview.ColorPointHintView -import com.yizhuan.xchat_android_core.home.bean.BannerInfo -import com.yizhuan.xchat_android_library.utils.ListUtils +import com.chwl.app.R +import com.chwl.app.home.adapter.BannerAdapter +import com.chwl.app.ui.widget.rollviewpager.RollPagerView +import com.chwl.app.ui.widget.rollviewpager.Util +import com.chwl.app.ui.widget.rollviewpager.hintview.ColorPointHintView +import com.chwl.core.home.bean.BannerInfo +import com.chwl.library.utils.ListUtils class BannerHelper { companion object { diff --git a/app/src/main/java/com/yizhuan/habu/home/helper/LoadPageDataHelper.java b/app/src/main/java/com/chwl/app/home/helper/LoadPageDataHelper.java similarity index 89% rename from app/src/main/java/com/yizhuan/habu/home/helper/LoadPageDataHelper.java rename to app/src/main/java/com/chwl/app/home/helper/LoadPageDataHelper.java index 15b5036ea..dd0e9d4a0 100644 --- a/app/src/main/java/com/yizhuan/habu/home/helper/LoadPageDataHelper.java +++ b/app/src/main/java/com/chwl/app/home/helper/LoadPageDataHelper.java @@ -1,8 +1,8 @@ -package com.yizhuan.habu.home.helper; +package com.chwl.app.home.helper; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.core.Constants; +import com.chwl.library.utils.ResUtil; import io.reactivex.Single; import io.reactivex.android.schedulers.AndroidSchedulers; diff --git a/app/src/main/java/com/yizhuan/habu/home/helper/OpenRoomHelper.java b/app/src/main/java/com/chwl/app/home/helper/OpenRoomHelper.java similarity index 85% rename from app/src/main/java/com/yizhuan/habu/home/helper/OpenRoomHelper.java rename to app/src/main/java/com/chwl/app/home/helper/OpenRoomHelper.java index ed1d54ca5..89b98aa7b 100644 --- a/app/src/main/java/com/yizhuan/habu/home/helper/OpenRoomHelper.java +++ b/app/src/main/java/com/chwl/app/home/helper/OpenRoomHelper.java @@ -1,8 +1,8 @@ -package com.yizhuan.habu.home.helper; +package com.chwl.app.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.chwl.core.certification.CertificationModel.CER_TYPE_FORCE; +import static com.chwl.core.certification.CertificationModel.CER_TYPE_GUIDE; +import static com.chwl.core.certification.CertificationModel.CER_TYPE_NONE; import android.annotation.SuppressLint; import android.text.Spannable; @@ -13,27 +13,27 @@ import android.text.style.ForegroundColorSpan; import androidx.annotation.NonNull; import androidx.core.content.ContextCompat; -import com.yizhuan.habu.MainActivity; -import com.yizhuan.habu.R; -import com.yizhuan.habu.avroom.activity.AVRoomActivity; -import com.yizhuan.habu.avroom.dialog.CreateRoomDialog; -import com.yizhuan.habu.base.BaseActivity; -import com.yizhuan.habu.common.widget.dialog.DialogManager; -import com.yizhuan.habu.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.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.MainActivity; +import com.chwl.app.R; +import com.chwl.app.avroom.activity.AVRoomActivity; +import com.chwl.app.avroom.dialog.CreateRoomDialog; +import com.chwl.app.base.BaseActivity; +import com.chwl.app.common.widget.dialog.DialogManager; +import com.chwl.app.ui.webview.CommonWebViewActivity; +import com.chwl.core.UriProvider; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.certification.CertificationModel; +import com.chwl.core.patriarch.exception.PmRoomLimitException; +import com.chwl.core.room.bean.RoomInfo; +import com.chwl.core.room.model.AvRoomModel; +import com.chwl.core.room.model.RoomSettingModel; +import com.chwl.core.user.UserModel; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.core.utils.net.BeanObserver; +import com.chwl.core.utils.net.DontWarnObserver; +import com.chwl.core.utils.net.RxHelper; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; public class OpenRoomHelper { diff --git a/app/src/main/java/com/yizhuan/habu/home/presenter/CommunityNoticePresenter.java b/app/src/main/java/com/chwl/app/home/presenter/CommunityNoticePresenter.java similarity index 86% rename from app/src/main/java/com/yizhuan/habu/home/presenter/CommunityNoticePresenter.java rename to app/src/main/java/com/chwl/app/home/presenter/CommunityNoticePresenter.java index cd8b75b8b..404bddbc6 100644 --- a/app/src/main/java/com/yizhuan/habu/home/presenter/CommunityNoticePresenter.java +++ b/app/src/main/java/com/chwl/app/home/presenter/CommunityNoticePresenter.java @@ -1,14 +1,14 @@ -package com.yizhuan.habu.home.presenter; +package com.chwl.app.home.presenter; import android.annotation.SuppressLint; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseMvpPresenter; -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseMvpPresenter; +import com.chwl.app.home.view.ICommunityNoticeAct; +import com.chwl.core.Constants; +import com.chwl.core.community.bean.CommunityNoticeInfo; +import com.chwl.core.home.model.CommunityNoticeModel; +import com.chwl.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/home/presenter/MainFragmentPresenter.java b/app/src/main/java/com/chwl/app/home/presenter/MainFragmentPresenter.java similarity index 86% rename from app/src/main/java/com/yizhuan/habu/home/presenter/MainFragmentPresenter.java rename to app/src/main/java/com/chwl/app/home/presenter/MainFragmentPresenter.java index 70cd5b37b..32972dcb3 100644 --- a/app/src/main/java/com/yizhuan/habu/home/presenter/MainFragmentPresenter.java +++ b/app/src/main/java/com/chwl/app/home/presenter/MainFragmentPresenter.java @@ -1,14 +1,14 @@ -package com.yizhuan.habu.home.presenter; +package com.chwl.app.home.presenter; import android.os.Bundle; import androidx.annotation.Nullable; -import com.yizhuan.habu.base.BaseMvpPresenter; -import com.yizhuan.habu.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.chwl.app.base.BaseMvpPresenter; +import com.chwl.app.home.view.IMainFragmentView; +import com.chwl.core.room.bean.RoomInfo; +import com.chwl.core.room.model.AvRoomModel; +import com.chwl.library.net.rxnet.callback.CallBack; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/yizhuan/habu/home/presenter/MainPresenter.java b/app/src/main/java/com/chwl/app/home/presenter/MainPresenter.java similarity index 66% rename from app/src/main/java/com/yizhuan/habu/home/presenter/MainPresenter.java rename to app/src/main/java/com/chwl/app/home/presenter/MainPresenter.java index 4d300d46b..6b2f66d87 100644 --- a/app/src/main/java/com/yizhuan/habu/home/presenter/MainPresenter.java +++ b/app/src/main/java/com/chwl/app/home/presenter/MainPresenter.java @@ -1,10 +1,10 @@ -package com.yizhuan.habu.home.presenter; +package com.chwl.app.home.presenter; -import com.yizhuan.habu.base.BaseMvpPresenter; -import com.yizhuan.habu.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.chwl.app.base.BaseMvpPresenter; +import com.chwl.app.home.view.IMainView; +import com.chwl.core.room.bean.RoomInfo; +import com.chwl.core.room.model.AvRoomModel; +import com.chwl.library.net.rxnet.callback.CallBack; /** *

diff --git a/app/src/main/java/com/yizhuan/habu/home/presenter/NewUserListPresenter.java b/app/src/main/java/com/chwl/app/home/presenter/NewUserListPresenter.java similarity index 71% rename from app/src/main/java/com/yizhuan/habu/home/presenter/NewUserListPresenter.java rename to app/src/main/java/com/chwl/app/home/presenter/NewUserListPresenter.java index 5255f9829..b74f137b8 100644 --- a/app/src/main/java/com/yizhuan/habu/home/presenter/NewUserListPresenter.java +++ b/app/src/main/java/com/chwl/app/home/presenter/NewUserListPresenter.java @@ -1,12 +1,12 @@ -package com.yizhuan.habu.home.presenter; +package com.chwl.app.home.presenter; -import com.yizhuan.habu.base.BaseMvpPresenter; -import com.yizhuan.habu.home.helper.LoadPageDataHelper; -import com.yizhuan.habu.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.bean.UserInfo; -import com.yizhuan.xchat_android_library.base.PresenterEvent; +import com.chwl.app.base.BaseMvpPresenter; +import com.chwl.app.home.helper.LoadPageDataHelper; +import com.chwl.app.home.view.INewUserListActivityView; +import com.chwl.core.Constants; +import com.chwl.core.home.model.HomeModel; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.library.base.PresenterEvent; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/home/refresh/FunGameBase.java b/app/src/main/java/com/chwl/app/home/refresh/FunGameBase.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/home/refresh/FunGameBase.java rename to app/src/main/java/com/chwl/app/home/refresh/FunGameBase.java index 49689d464..af0dc16d6 100644 --- a/app/src/main/java/com/yizhuan/habu/home/refresh/FunGameBase.java +++ b/app/src/main/java/com/chwl/app/home/refresh/FunGameBase.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.home.refresh; +package com.chwl.app.home.refresh; import static android.view.MotionEvent.ACTION_MASK; diff --git a/app/src/main/java/com/yizhuan/habu/home/refresh/FunGameHeader.java b/app/src/main/java/com/chwl/app/home/refresh/FunGameHeader.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/home/refresh/FunGameHeader.java rename to app/src/main/java/com/chwl/app/home/refresh/FunGameHeader.java index eef37a865..d41a72b93 100644 --- a/app/src/main/java/com/yizhuan/habu/home/refresh/FunGameHeader.java +++ b/app/src/main/java/com/chwl/app/home/refresh/FunGameHeader.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.home.refresh; +package com.chwl.app.home.refresh; import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; @@ -26,8 +26,8 @@ import com.scwang.smartrefresh.layout.api.RefreshKernel; import com.scwang.smartrefresh.layout.api.RefreshLayout; import com.scwang.smartrefresh.layout.util.ColorUtils; import com.scwang.smartrefresh.layout.util.DensityUtil; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.library.utils.ResUtil; /** * 游戏 header diff --git a/app/src/main/java/com/yizhuan/habu/home/refresh/FunGameHitBlockHeader.java b/app/src/main/java/com/chwl/app/home/refresh/FunGameHitBlockHeader.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/home/refresh/FunGameHitBlockHeader.java rename to app/src/main/java/com/chwl/app/home/refresh/FunGameHitBlockHeader.java index 9e4cbb3b7..a7428d0a6 100644 --- a/app/src/main/java/com/yizhuan/habu/home/refresh/FunGameHitBlockHeader.java +++ b/app/src/main/java/com/chwl/app/home/refresh/FunGameHitBlockHeader.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.home.refresh; +package com.chwl.app.home.refresh; import android.content.Context; @@ -14,7 +14,7 @@ import androidx.annotation.RequiresApi; import com.scwang.smartrefresh.layout.util.ColorUtils; import com.scwang.smartrefresh.layout.util.DensityUtil; -import com.yizhuan.habu.R; +import com.chwl.app.R; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/home/refresh/FunGameView.java b/app/src/main/java/com/chwl/app/home/refresh/FunGameView.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/home/refresh/FunGameView.java rename to app/src/main/java/com/chwl/app/home/refresh/FunGameView.java index d8021ab78..2e2492fb5 100644 --- a/app/src/main/java/com/yizhuan/habu/home/refresh/FunGameView.java +++ b/app/src/main/java/com/chwl/app/home/refresh/FunGameView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.home.refresh; +package com.chwl.app.home.refresh; import android.content.Context; import android.content.res.TypedArray; @@ -19,8 +19,8 @@ import com.scwang.smartrefresh.layout.api.RefreshKernel; import com.scwang.smartrefresh.layout.api.RefreshLayout; import com.scwang.smartrefresh.layout.util.ColorUtils; import com.scwang.smartrefresh.layout.util.DensityUtil; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.library.utils.ResUtil; /** diff --git a/app/src/main/java/com/yizhuan/habu/home/view/ICommunityNoticeAct.java b/app/src/main/java/com/chwl/app/home/view/ICommunityNoticeAct.java similarity index 59% rename from app/src/main/java/com/yizhuan/habu/home/view/ICommunityNoticeAct.java rename to app/src/main/java/com/chwl/app/home/view/ICommunityNoticeAct.java index d1a22578c..f4a9cd5df 100644 --- a/app/src/main/java/com/yizhuan/habu/home/view/ICommunityNoticeAct.java +++ b/app/src/main/java/com/chwl/app/home/view/ICommunityNoticeAct.java @@ -1,7 +1,7 @@ -package com.yizhuan.habu.home.view; +package com.chwl.app.home.view; -import com.yizhuan.xchat_android_core.community.bean.CommunityNoticeInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.chwl.core.community.bean.CommunityNoticeInfo; +import com.chwl.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/home/view/IFamilyHomeActivityView.java b/app/src/main/java/com/chwl/app/home/view/IFamilyHomeActivityView.java similarity index 63% rename from app/src/main/java/com/yizhuan/habu/home/view/IFamilyHomeActivityView.java rename to app/src/main/java/com/chwl/app/home/view/IFamilyHomeActivityView.java index bc6adf3c7..e72e3f430 100644 --- a/app/src/main/java/com/yizhuan/habu/home/view/IFamilyHomeActivityView.java +++ b/app/src/main/java/com/chwl/app/home/view/IFamilyHomeActivityView.java @@ -1,7 +1,7 @@ -package com.yizhuan.habu.home.view; +package com.chwl.app.home.view; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.chwl.core.family.bean.FamilyInfo; +import com.chwl.library.base.IMvpBaseView; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/habu/home/view/IMainFragmentView.java b/app/src/main/java/com/chwl/app/home/view/IMainFragmentView.java similarity index 75% rename from app/src/main/java/com/yizhuan/habu/home/view/IMainFragmentView.java rename to app/src/main/java/com/chwl/app/home/view/IMainFragmentView.java index 97c4a1516..ee6acc832 100644 --- a/app/src/main/java/com/yizhuan/habu/home/view/IMainFragmentView.java +++ b/app/src/main/java/com/chwl/app/home/view/IMainFragmentView.java @@ -1,7 +1,7 @@ -package com.yizhuan.habu.home.view; +package com.chwl.app.home.view; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.chwl.core.room.bean.RoomInfo; +import com.chwl.library.base.IMvpBaseView; /** * @author jiajie diff --git a/app/src/main/java/com/yizhuan/habu/home/view/IMainView.java b/app/src/main/java/com/chwl/app/home/view/IMainView.java similarity index 55% rename from app/src/main/java/com/yizhuan/habu/home/view/IMainView.java rename to app/src/main/java/com/chwl/app/home/view/IMainView.java index ed21b1b87..21a1ca6a8 100644 --- a/app/src/main/java/com/yizhuan/habu/home/view/IMainView.java +++ b/app/src/main/java/com/chwl/app/home/view/IMainView.java @@ -1,7 +1,7 @@ -package com.yizhuan.habu.home.view; +package com.chwl.app.home.view; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.chwl.core.room.bean.RoomInfo; +import com.chwl.library.base.IMvpBaseView; /** *

diff --git a/app/src/main/java/com/yizhuan/habu/home/view/INewUserListActivityView.java b/app/src/main/java/com/chwl/app/home/view/INewUserListActivityView.java similarity index 57% rename from app/src/main/java/com/yizhuan/habu/home/view/INewUserListActivityView.java rename to app/src/main/java/com/chwl/app/home/view/INewUserListActivityView.java index 41a527dfb..b218b43fa 100644 --- a/app/src/main/java/com/yizhuan/habu/home/view/INewUserListActivityView.java +++ b/app/src/main/java/com/chwl/app/home/view/INewUserListActivityView.java @@ -1,6 +1,6 @@ -package com.yizhuan.habu.home.view; +package com.chwl.app.home.view; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.chwl.library.base.IMvpBaseView; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/habu/home/widget/AnchorCardView.kt b/app/src/main/java/com/chwl/app/home/widget/AnchorCardView.kt similarity index 90% rename from app/src/main/java/com/yizhuan/habu/home/widget/AnchorCardView.kt rename to app/src/main/java/com/chwl/app/home/widget/AnchorCardView.kt index 9a88fbba8..d8ad91d15 100644 --- a/app/src/main/java/com/yizhuan/habu/home/widget/AnchorCardView.kt +++ b/app/src/main/java/com/chwl/app/home/widget/AnchorCardView.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.home.widget +package com.chwl.app.home.widget import android.animation.Animator import android.animation.AnimatorListenerAdapter @@ -18,21 +18,21 @@ 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.habu.R -import com.yizhuan.habu.audio.helper.AudioPlayerHelper -import com.yizhuan.habu.audio.helper.OnPlayListener -import com.yizhuan.habu.avroom.activity.AVRoomActivity -import com.yizhuan.habu.databinding.LayoutAnchorCardViewBinding -import com.yizhuan.habu.ui.user.activity.UserInfoActivity -import com.yizhuan.habu.ui.user.decorationsend.UserInfoSkillDecoration -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.habu.ui.utils.loadAvatar -import com.yizhuan.xchat_android_core.room.bean.AnchorInfo -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.chwl.app.R +import com.chwl.app.audio.helper.AudioPlayerHelper +import com.chwl.app.audio.helper.OnPlayListener +import com.chwl.app.avroom.activity.AVRoomActivity +import com.chwl.app.databinding.LayoutAnchorCardViewBinding +import com.chwl.app.ui.user.activity.UserInfoActivity +import com.chwl.app.ui.user.decorationsend.UserInfoSkillDecoration +import com.chwl.app.ui.utils.load +import com.chwl.app.ui.utils.loadAvatar +import com.chwl.core.room.bean.AnchorInfo +import com.chwl.core.user.bean.UserInfo +import com.chwl.core.user.bean.UserInfoSkillEntity +import com.chwl.core.utils.subAndReplaceDot +import com.chwl.library.utils.ListUtils +import com.chwl.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/habu/home/widget/ListViewAdaptWidth.java b/app/src/main/java/com/chwl/app/home/widget/ListViewAdaptWidth.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/home/widget/ListViewAdaptWidth.java rename to app/src/main/java/com/chwl/app/home/widget/ListViewAdaptWidth.java index 1e62e1ed4..0fc100bad 100644 --- a/app/src/main/java/com/yizhuan/habu/home/widget/ListViewAdaptWidth.java +++ b/app/src/main/java/com/chwl/app/home/widget/ListViewAdaptWidth.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.home.widget; +package com.chwl.app.home.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yizhuan/habu/home/widget/MePageIndicatorView.java b/app/src/main/java/com/chwl/app/home/widget/MePageIndicatorView.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/home/widget/MePageIndicatorView.java rename to app/src/main/java/com/chwl/app/home/widget/MePageIndicatorView.java index 7a7f16c2c..398dd0a97 100644 --- a/app/src/main/java/com/yizhuan/habu/home/widget/MePageIndicatorView.java +++ b/app/src/main/java/com/chwl/app/home/widget/MePageIndicatorView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.home.widget; +package com.chwl.app.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.habu.R; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.R; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/home/widget/StickyScrollView.java b/app/src/main/java/com/chwl/app/home/widget/StickyScrollView.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/home/widget/StickyScrollView.java rename to app/src/main/java/com/chwl/app/home/widget/StickyScrollView.java index 5a65174d3..5865689ce 100644 --- a/app/src/main/java/com/yizhuan/habu/home/widget/StickyScrollView.java +++ b/app/src/main/java/com/chwl/app/home/widget/StickyScrollView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.home.widget; +package com.chwl.app.home.widget; import android.content.Context; @@ -14,7 +14,7 @@ import android.view.animation.AlphaAnimation; import androidx.core.widget.NestedScrollView; -import com.yizhuan.habu.R; +import com.chwl.app.R; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/habu/luckymoney/adapter/LuckyMoneyMemberListAdapter.java b/app/src/main/java/com/chwl/app/luckymoney/adapter/LuckyMoneyMemberListAdapter.java similarity index 81% rename from app/src/main/java/com/yizhuan/habu/luckymoney/adapter/LuckyMoneyMemberListAdapter.java rename to app/src/main/java/com/chwl/app/luckymoney/adapter/LuckyMoneyMemberListAdapter.java index a506dc445..665064e2d 100644 --- a/app/src/main/java/com/yizhuan/habu/luckymoney/adapter/LuckyMoneyMemberListAdapter.java +++ b/app/src/main/java/com/chwl/app/luckymoney/adapter/LuckyMoneyMemberListAdapter.java @@ -1,17 +1,17 @@ -package com.yizhuan.habu.luckymoney.adapter; +package com.chwl.app.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.habu.BR; -import com.yizhuan.habu.R; -import com.yizhuan.habu.bindadapter.BaseAdapter; -import com.yizhuan.habu.bindadapter.BindingViewHolder; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyUserInfo; +import com.chwl.app.BR; +import com.chwl.app.R; +import com.chwl.app.bindadapter.BaseAdapter; +import com.chwl.app.bindadapter.BindingViewHolder; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.core.family.model.FamilyModel; +import com.chwl.core.luckymoney.LuckyMoneyUserInfo; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/app/src/main/java/com/yizhuan/habu/luckymoney/dialog/LuckyMoneyComfirmToPayDialog.java b/app/src/main/java/com/chwl/app/luckymoney/dialog/LuckyMoneyComfirmToPayDialog.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/luckymoney/dialog/LuckyMoneyComfirmToPayDialog.java rename to app/src/main/java/com/chwl/app/luckymoney/dialog/LuckyMoneyComfirmToPayDialog.java index b8c33234a..84427a535 100644 --- a/app/src/main/java/com/yizhuan/habu/luckymoney/dialog/LuckyMoneyComfirmToPayDialog.java +++ b/app/src/main/java/com/chwl/app/luckymoney/dialog/LuckyMoneyComfirmToPayDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.luckymoney.dialog; +package com.chwl.app.luckymoney.dialog; import android.content.Context; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/habu/luckymoney/dialog/LuckyMoneyDialog.java b/app/src/main/java/com/chwl/app/luckymoney/dialog/LuckyMoneyDialog.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/luckymoney/dialog/LuckyMoneyDialog.java rename to app/src/main/java/com/chwl/app/luckymoney/dialog/LuckyMoneyDialog.java index 166e6814a..25cfee17d 100644 --- a/app/src/main/java/com/yizhuan/habu/luckymoney/dialog/LuckyMoneyDialog.java +++ b/app/src/main/java/com/chwl/app/luckymoney/dialog/LuckyMoneyDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.luckymoney.dialog; +package com.chwl.app.luckymoney.dialog; import android.content.Context; import android.graphics.Color; @@ -15,22 +15,22 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatDialog; -import com.yizhuan.habu.R; -import com.yizhuan.habu.luckymoney.view.LuckyMoneyDetailActivity; -import com.yizhuan.habu.team.viewmodel.TeamVM; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -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.luckymoney.LuckyMoneyInfo; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -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.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.chwl.app.R; +import com.chwl.app.luckymoney.view.LuckyMoneyDetailActivity; +import com.chwl.app.team.viewmodel.TeamVM; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.family.bean.FamilyInfo; +import com.chwl.core.family.model.FamilyModel; +import com.chwl.core.luckymoney.LuckyMoneyInfo; +import com.chwl.core.manager.IMNetEaseManager; +import com.chwl.core.share.bean.SessionType; +import com.chwl.core.team.bean.TeamEvent; +import com.chwl.core.team.model.TeamModel; +import com.chwl.core.user.UserModel; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.library.rxbus.RxBus; +import com.chwl.library.utils.SingleToastUtil; import io.reactivex.disposables.Disposable; diff --git a/app/src/main/java/com/yizhuan/habu/luckymoney/view/LuckyMoneyCreationActivity.java b/app/src/main/java/com/chwl/app/luckymoney/view/LuckyMoneyCreationActivity.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/luckymoney/view/LuckyMoneyCreationActivity.java rename to app/src/main/java/com/chwl/app/luckymoney/view/LuckyMoneyCreationActivity.java index 1a7d5e1ee..808133845 100644 --- a/app/src/main/java/com/yizhuan/habu/luckymoney/view/LuckyMoneyCreationActivity.java +++ b/app/src/main/java/com/chwl/app/luckymoney/view/LuckyMoneyCreationActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.luckymoney.view; +package com.chwl.app.luckymoney.view; import android.content.Context; import android.content.Intent; @@ -14,31 +14,31 @@ 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.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseBindingActivity; -import com.yizhuan.habu.base.TitleBar; -import com.yizhuan.habu.common.widget.dialog.DialogManager; -import com.yizhuan.habu.databinding.ActivityLuckyMoneyCreationBinding; -import com.yizhuan.habu.team.viewmodel.TeamVM; -import com.yizhuan.habu.ui.pay.ChargeActivity; -import com.yizhuan.habu.ui.webview.CommonWebViewActivity; -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.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.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.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.net.BalanceNotEnoughExeption; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.common.util.DeviceUtil; -import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil; -import com.yizhuan.xchat_android_library.utils.JavaUtil; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseBindingActivity; +import com.chwl.app.base.TitleBar; +import com.chwl.app.common.widget.dialog.DialogManager; +import com.chwl.app.databinding.ActivityLuckyMoneyCreationBinding; +import com.chwl.app.team.viewmodel.TeamVM; +import com.chwl.app.ui.pay.ChargeActivity; +import com.chwl.app.ui.webview.CommonWebViewActivity; +import com.chwl.core.Constants; +import com.chwl.core.UriProvider; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.family.bean.FamilyInfo; +import com.chwl.core.family.model.FamilyModel; +import com.chwl.core.manager.IMNetEaseManager; +import com.chwl.core.share.bean.SessionType; +import com.chwl.core.team.bean.TeamInfo; +import com.chwl.core.team.model.TeamModel; +import com.chwl.core.user.UserModel; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.core.utils.net.BalanceNotEnoughExeption; +import com.chwl.library.annatation.ActLayoutRes; +import com.chwl.library.common.util.DeviceUtil; +import com.chwl.library.utils.AppMetaDataUtil; +import com.chwl.library.utils.JavaUtil; +import com.chwl.library.utils.ResUtil; import java.util.Objects; diff --git a/app/src/main/java/com/yizhuan/habu/luckymoney/view/LuckyMoneyDetailActivity.java b/app/src/main/java/com/chwl/app/luckymoney/view/LuckyMoneyDetailActivity.java similarity index 84% rename from app/src/main/java/com/yizhuan/habu/luckymoney/view/LuckyMoneyDetailActivity.java rename to app/src/main/java/com/chwl/app/luckymoney/view/LuckyMoneyDetailActivity.java index fcca78c1f..6a2890fb8 100644 --- a/app/src/main/java/com/yizhuan/habu/luckymoney/view/LuckyMoneyDetailActivity.java +++ b/app/src/main/java/com/chwl/app/luckymoney/view/LuckyMoneyDetailActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.luckymoney.view; +package com.chwl.app.luckymoney.view; import android.content.Context; import android.content.Intent; @@ -7,22 +7,22 @@ import android.view.View; import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.LinearLayoutManager; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseBindingActivity; -import com.yizhuan.habu.base.TitleBar; -import com.yizhuan.habu.databinding.ActivityLuckyMoneyDetailBinding; -import com.yizhuan.habu.luckymoney.adapter.LuckyMoneyMemberListAdapter; -import com.yizhuan.habu.team.viewmodel.TeamVM; -import com.yizhuan.habu.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.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.FormatUtils; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.chwl.app.R; +import com.chwl.app.base.BaseBindingActivity; +import com.chwl.app.base.TitleBar; +import com.chwl.app.databinding.ActivityLuckyMoneyDetailBinding; +import com.chwl.app.luckymoney.adapter.LuckyMoneyMemberListAdapter; +import com.chwl.app.team.viewmodel.TeamVM; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.core.family.bean.FamilyInfo; +import com.chwl.core.family.model.FamilyModel; +import com.chwl.core.luckymoney.LuckyMoneyInfo; +import com.chwl.core.luckymoney.LuckyMoneyUserInfo; +import com.chwl.core.user.UserModel; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.library.annatation.ActLayoutRes; +import com.chwl.library.utils.FormatUtils; +import com.chwl.library.utils.ListUtils; import java.util.List; import java.util.Objects; diff --git a/app/src/main/java/com/yizhuan/habu/luckymoney/viewholder/LuckyMoneyMsgViewHolder.java b/app/src/main/java/com/chwl/app/luckymoney/viewholder/LuckyMoneyMsgViewHolder.java similarity index 87% rename from app/src/main/java/com/yizhuan/habu/luckymoney/viewholder/LuckyMoneyMsgViewHolder.java rename to app/src/main/java/com/chwl/app/luckymoney/viewholder/LuckyMoneyMsgViewHolder.java index a3ba9fc77..7485182ef 100644 --- a/app/src/main/java/com/yizhuan/habu/luckymoney/viewholder/LuckyMoneyMsgViewHolder.java +++ b/app/src/main/java/com/chwl/app/luckymoney/viewholder/LuckyMoneyMsgViewHolder.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.luckymoney.viewholder; +package com.chwl.app.luckymoney.viewholder; import android.util.Log; import android.view.View; @@ -10,16 +10,16 @@ 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.habu.R; -import com.yizhuan.habu.luckymoney.dialog.LuckyMoneyDialog; -import com.yizhuan.habu.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.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.app.luckymoney.dialog.LuckyMoneyDialog; +import com.chwl.app.luckymoney.view.LuckyMoneyDetailActivity; +import com.chwl.core.im.custom.bean.LuckyMoneyAttachment; +import com.chwl.core.luckymoney.LuckyMoneyInfo; +import com.chwl.core.manager.IMNetEaseManager; +import com.chwl.core.team.bean.TeamInfo; +import com.chwl.core.team.model.TeamModel; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; import java.util.Objects; diff --git a/app/src/main/java/com/yizhuan/habu/luckymoney/viewholder/LuckyMoneyTipsViewHolder.java b/app/src/main/java/com/chwl/app/luckymoney/viewholder/LuckyMoneyTipsViewHolder.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/luckymoney/viewholder/LuckyMoneyTipsViewHolder.java rename to app/src/main/java/com/chwl/app/luckymoney/viewholder/LuckyMoneyTipsViewHolder.java index 469a2e5d5..39ef0d7c6 100644 --- a/app/src/main/java/com/yizhuan/habu/luckymoney/viewholder/LuckyMoneyTipsViewHolder.java +++ b/app/src/main/java/com/chwl/app/luckymoney/viewholder/LuckyMoneyTipsViewHolder.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.luckymoney.viewholder; +package com.chwl.app.luckymoney.viewholder; import android.text.SpannableStringBuilder; import android.text.Spanned; @@ -10,11 +10,11 @@ import androidx.core.content.ContextCompat; import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.im.custom.bean.LuckyMoneyTipsAttachment; +import com.chwl.core.luckymoney.LuckyMoneyInfo; +import com.chwl.library.utils.ResUtil; import java.util.Objects; diff --git a/app/src/main/java/com/yizhuan/habu/main/helper/NoticationsUiHelper.java b/app/src/main/java/com/chwl/app/main/helper/NoticationsUiHelper.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/main/helper/NoticationsUiHelper.java rename to app/src/main/java/com/chwl/app/main/helper/NoticationsUiHelper.java index 9fa8e0207..e974ddc7b 100644 --- a/app/src/main/java/com/yizhuan/habu/main/helper/NoticationsUiHelper.java +++ b/app/src/main/java/com/chwl/app/main/helper/NoticationsUiHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.main.helper; +package com.chwl.app.main.helper; import static android.Manifest.permission.POST_NOTIFICATIONS; @@ -8,14 +8,14 @@ import android.os.Build; import androidx.core.app.ActivityCompat; -import com.yizhuan.habu.R; -import com.yizhuan.habu.common.widget.dialog.DialogManager; -import com.yizhuan.habu.utils.NotificationsUtils; -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.ResUtil; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.chwl.app.R; +import com.chwl.app.common.widget.dialog.DialogManager; +import com.chwl.app.utils.NotificationsUtils; +import com.chwl.core.utils.SharedPreferenceUtils; +import com.chwl.core.utils.net.DontWarnObserver; +import com.chwl.core.utils.net.RxHelper; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.TimeUtils; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/com/yizhuan/habu/module/Extras.java b/app/src/main/java/com/chwl/app/module/Extras.java similarity index 87% rename from app/src/main/java/com/yizhuan/habu/module/Extras.java rename to app/src/main/java/com/chwl/app/module/Extras.java index 17d5b4e15..4ba2ad6a6 100644 --- a/app/src/main/java/com/yizhuan/habu/module/Extras.java +++ b/app/src/main/java/com/chwl/app/module/Extras.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.module; +package com.chwl.app.module; public interface Extras { diff --git a/app/src/main/java/com/yizhuan/habu/module/IRoomNewbieMessageView.java b/app/src/main/java/com/chwl/app/module/IRoomNewbieMessageView.java similarity index 53% rename from app/src/main/java/com/yizhuan/habu/module/IRoomNewbieMessageView.java rename to app/src/main/java/com/chwl/app/module/IRoomNewbieMessageView.java index 7460b119b..84c060b53 100644 --- a/app/src/main/java/com/yizhuan/habu/module/IRoomNewbieMessageView.java +++ b/app/src/main/java/com/chwl/app/module/IRoomNewbieMessageView.java @@ -1,7 +1,7 @@ -package com.yizhuan.habu.module; +package com.chwl.app.module; -import com.yizhuan.xchat_android_core.bean.RoomNewbieMessageInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.chwl.core.bean.RoomNewbieMessageInfo; +import com.chwl.library.base.IMvpBaseView; public interface IRoomNewbieMessageView extends IMvpBaseView { void getRoomNewbieMessageSuccess(RoomNewbieMessageInfo info); diff --git a/app/src/main/java/com/yizhuan/habu/module/IRoomNewbieView.java b/app/src/main/java/com/chwl/app/module/IRoomNewbieView.java similarity index 66% rename from app/src/main/java/com/yizhuan/habu/module/IRoomNewbieView.java rename to app/src/main/java/com/chwl/app/module/IRoomNewbieView.java index 5a778b20e..031812682 100644 --- a/app/src/main/java/com/yizhuan/habu/module/IRoomNewbieView.java +++ b/app/src/main/java/com/chwl/app/module/IRoomNewbieView.java @@ -1,7 +1,7 @@ -package com.yizhuan.habu.module; +package com.chwl.app.module; -import com.yizhuan.xchat_android_core.bean.RoomNewbieInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.chwl.core.bean.RoomNewbieInfo; +import com.chwl.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/module/RoomNewbieModel.java b/app/src/main/java/com/chwl/app/module/RoomNewbieModel.java similarity index 86% rename from app/src/main/java/com/yizhuan/habu/module/RoomNewbieModel.java rename to app/src/main/java/com/chwl/app/module/RoomNewbieModel.java index ec13f94f2..b38817eb9 100644 --- a/app/src/main/java/com/yizhuan/habu/module/RoomNewbieModel.java +++ b/app/src/main/java/com/chwl/app/module/RoomNewbieModel.java @@ -1,12 +1,12 @@ -package com.yizhuan.habu.module; +package com.chwl.app.module; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.RoomNewbieInfo; -import com.yizhuan.xchat_android_core.bean.RoomNewbieMessageInfo; -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.chwl.core.auth.AuthModel; +import com.chwl.core.bean.RoomNewbieInfo; +import com.chwl.core.bean.RoomNewbieMessageInfo; +import com.chwl.core.bean.response.ServiceResult; +import com.chwl.core.community.CommunityConstant; +import com.chwl.core.utils.net.RxHelper; +import com.chwl.library.net.rxnet.RxNet; import org.json.JSONObject; diff --git a/app/src/main/java/com/yizhuan/habu/monsterhunting/ImpactValueLayout.java b/app/src/main/java/com/chwl/app/monsterhunting/ImpactValueLayout.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/monsterhunting/ImpactValueLayout.java rename to app/src/main/java/com/chwl/app/monsterhunting/ImpactValueLayout.java index 2c1701b68..8c072c635 100644 --- a/app/src/main/java/com/yizhuan/habu/monsterhunting/ImpactValueLayout.java +++ b/app/src/main/java/com/chwl/app/monsterhunting/ImpactValueLayout.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.monsterhunting; +package com.chwl.app.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.habu.R; -import com.yizhuan.habu.ui.gift.widget.StrokeTextView; -import com.yizhuan.xchat_android_library.animator.AbstractPathAnimator; -import com.yizhuan.xchat_android_library.animator.PathAnimator; +import com.chwl.app.R; +import com.chwl.app.ui.gift.widget.StrokeTextView; +import com.chwl.library.animator.AbstractPathAnimator; +import com.chwl.library.animator.PathAnimator; public class ImpactValueLayout extends RelativeLayout { diff --git a/app/src/main/java/com/yizhuan/habu/monsterhunting/MonsterEscapeDialog.java b/app/src/main/java/com/chwl/app/monsterhunting/MonsterEscapeDialog.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/monsterhunting/MonsterEscapeDialog.java rename to app/src/main/java/com/chwl/app/monsterhunting/MonsterEscapeDialog.java index 3d5fe22f3..e56d681fb 100644 --- a/app/src/main/java/com/yizhuan/habu/monsterhunting/MonsterEscapeDialog.java +++ b/app/src/main/java/com/chwl/app/monsterhunting/MonsterEscapeDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.monsterhunting; +package com.chwl.app.monsterhunting; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; @@ -15,10 +15,10 @@ import androidx.annotation.Nullable; import androidx.fragment.app.DialogFragment; import androidx.fragment.app.FragmentManager; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterInfo; -import com.yizhuan.xchat_android_core.monsterhunting.manager.MonsterDataManager; +import com.chwl.app.R; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.core.monsterhunting.bean.MonsterInfo; +import com.chwl.core.monsterhunting.manager.MonsterDataManager; /** * Created by MadisonRong on 03/04/2018. diff --git a/app/src/main/java/com/yizhuan/habu/monsterhunting/MonsterHuntingAnimationManager.java b/app/src/main/java/com/chwl/app/monsterhunting/MonsterHuntingAnimationManager.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/monsterhunting/MonsterHuntingAnimationManager.java rename to app/src/main/java/com/chwl/app/monsterhunting/MonsterHuntingAnimationManager.java index cb8c1e72e..98b9e356b 100644 --- a/app/src/main/java/com/yizhuan/habu/monsterhunting/MonsterHuntingAnimationManager.java +++ b/app/src/main/java/com/chwl/app/monsterhunting/MonsterHuntingAnimationManager.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.monsterhunting; +package com.chwl.app.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.habu.R; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.monsterhunting.SimpleAnimationListener; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterEvent; +import com.chwl.app.R; +import com.chwl.core.manager.IMNetEaseManager; +import com.chwl.core.monsterhunting.SimpleAnimationListener; +import com.chwl.core.monsterhunting.bean.MonsterEvent; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.processors.PublishProcessor; diff --git a/app/src/main/java/com/yizhuan/habu/monsterhunting/MonsterHuntingIntroductionDialog.java b/app/src/main/java/com/chwl/app/monsterhunting/MonsterHuntingIntroductionDialog.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/monsterhunting/MonsterHuntingIntroductionDialog.java rename to app/src/main/java/com/chwl/app/monsterhunting/MonsterHuntingIntroductionDialog.java index 121703061..206898ae2 100644 --- a/app/src/main/java/com/yizhuan/habu/monsterhunting/MonsterHuntingIntroductionDialog.java +++ b/app/src/main/java/com/chwl/app/monsterhunting/MonsterHuntingIntroductionDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.monsterhunting; +package com.chwl.app.monsterhunting; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; @@ -14,8 +14,8 @@ import androidx.annotation.Nullable; import androidx.fragment.app.DialogFragment; import androidx.fragment.app.FragmentManager; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.R; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; /** * Created by MadisonRong on 02/04/2018. diff --git a/app/src/main/java/com/yizhuan/habu/monsterhunting/MonsterHuntingRewardDialog.java b/app/src/main/java/com/chwl/app/monsterhunting/MonsterHuntingRewardDialog.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/monsterhunting/MonsterHuntingRewardDialog.java rename to app/src/main/java/com/chwl/app/monsterhunting/MonsterHuntingRewardDialog.java index ad0ee628b..09e87620f 100644 --- a/app/src/main/java/com/yizhuan/habu/monsterhunting/MonsterHuntingRewardDialog.java +++ b/app/src/main/java/com/chwl/app/monsterhunting/MonsterHuntingRewardDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.monsterhunting; +package com.chwl.app.monsterhunting; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; @@ -19,16 +19,16 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.OrientationHelper; import androidx.recyclerview.widget.RecyclerView; -import com.yizhuan.habu.R; -import com.yizhuan.habu.UIHelper; -import com.yizhuan.habu.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.chwl.app.R; +import com.chwl.app.UIHelper; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.core.monsterhunting.bean.MonsterHunter; +import com.chwl.core.monsterhunting.bean.MonsterHuntingResult; +import com.chwl.core.monsterhunting.bean.MonsterHuntingReward; +import com.chwl.core.monsterhunting.bean.MonsterInfo; +import com.chwl.core.monsterhunting.manager.MonsterDataManager; +import com.chwl.core.monsterhunting.model.MonsterHuntingModel; +import com.chwl.library.utils.SingleToastUtil; import java.util.List; import java.util.Locale; diff --git a/app/src/main/java/com/yizhuan/habu/monsterhunting/MonsterHuntingRewardsAdapter.java b/app/src/main/java/com/chwl/app/monsterhunting/MonsterHuntingRewardsAdapter.java similarity index 89% rename from app/src/main/java/com/yizhuan/habu/monsterhunting/MonsterHuntingRewardsAdapter.java rename to app/src/main/java/com/chwl/app/monsterhunting/MonsterHuntingRewardsAdapter.java index c39aa4cc7..23d8ec4f5 100644 --- a/app/src/main/java/com/yizhuan/habu/monsterhunting/MonsterHuntingRewardsAdapter.java +++ b/app/src/main/java/com/chwl/app/monsterhunting/MonsterHuntingRewardsAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.monsterhunting; +package com.chwl.app.monsterhunting; import android.content.Context; import android.view.LayoutInflater; @@ -9,12 +9,12 @@ import android.widget.TextView; import androidx.recyclerview.widget.RecyclerView; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterHuntingReward; -import com.yizhuan.xchat_android_library.adapters.BaseListRecyclerViewAdapter; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.core.monsterhunting.bean.MonsterHuntingReward; +import com.chwl.library.adapters.BaseListRecyclerViewAdapter; +import com.chwl.library.utils.ResUtil; import java.util.Collection; diff --git a/app/src/main/java/com/yizhuan/habu/monsterhunting/MonsterHuntingSvgaManager.java b/app/src/main/java/com/chwl/app/monsterhunting/MonsterHuntingSvgaManager.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/monsterhunting/MonsterHuntingSvgaManager.java rename to app/src/main/java/com/chwl/app/monsterhunting/MonsterHuntingSvgaManager.java index 5656dbc82..e49bce6ca 100644 --- a/app/src/main/java/com/yizhuan/habu/monsterhunting/MonsterHuntingSvgaManager.java +++ b/app/src/main/java/com/chwl/app/monsterhunting/MonsterHuntingSvgaManager.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.monsterhunting; +package com.chwl.app.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.habu.common.svga.SimpleSvgaCallback; -import com.yizhuan.habu.common.svga.SimpleSvgaParseCompletion; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterEvent; +import com.chwl.app.common.svga.SimpleSvgaCallback; +import com.chwl.app.common.svga.SimpleSvgaParseCompletion; +import com.chwl.core.monsterhunting.bean.MonsterEvent; import java.net.MalformedURLException; import java.net.URL; diff --git a/app/src/main/java/com/yizhuan/habu/monsterhunting/QuitConfirmDialog.java b/app/src/main/java/com/chwl/app/monsterhunting/QuitConfirmDialog.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/monsterhunting/QuitConfirmDialog.java rename to app/src/main/java/com/chwl/app/monsterhunting/QuitConfirmDialog.java index 70d2e68f1..67973700f 100644 --- a/app/src/main/java/com/yizhuan/habu/monsterhunting/QuitConfirmDialog.java +++ b/app/src/main/java/com/chwl/app/monsterhunting/QuitConfirmDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.monsterhunting; +package com.chwl.app.monsterhunting; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; @@ -14,7 +14,7 @@ import androidx.annotation.Nullable; import androidx.fragment.app.DialogFragment; import androidx.fragment.app.FragmentManager; -import com.yizhuan.habu.R; +import com.chwl.app.R; /** * Created by MadisonRong on 02/04/2018. diff --git a/app/src/main/java/com/yizhuan/habu/monsterhunting/SimpleCountDownTimer.java b/app/src/main/java/com/chwl/app/monsterhunting/SimpleCountDownTimer.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/monsterhunting/SimpleCountDownTimer.java rename to app/src/main/java/com/chwl/app/monsterhunting/SimpleCountDownTimer.java index ce304a44d..b420208ca 100644 --- a/app/src/main/java/com/yizhuan/habu/monsterhunting/SimpleCountDownTimer.java +++ b/app/src/main/java/com/chwl/app/monsterhunting/SimpleCountDownTimer.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.monsterhunting; +package com.chwl.app.monsterhunting; import android.os.CountDownTimer; diff --git a/app/src/main/java/com/yizhuan/habu/monsterhunting/bean/AttackMonsterResultInfo.java b/app/src/main/java/com/chwl/app/monsterhunting/bean/AttackMonsterResultInfo.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/monsterhunting/bean/AttackMonsterResultInfo.java rename to app/src/main/java/com/chwl/app/monsterhunting/bean/AttackMonsterResultInfo.java index cff61933e..38f3642a0 100644 --- a/app/src/main/java/com/yizhuan/habu/monsterhunting/bean/AttackMonsterResultInfo.java +++ b/app/src/main/java/com/chwl/app/monsterhunting/bean/AttackMonsterResultInfo.java @@ -1,9 +1,9 @@ -package com.yizhuan.habu.monsterhunting.bean; +package com.chwl.app.monsterhunting.bean; import androidx.databinding.BaseObservable; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterAttackInfo; +import com.chwl.core.monsterhunting.bean.MonsterAttackInfo; public class AttackMonsterResultInfo extends BaseObservable{ diff --git a/app/src/main/java/com/yizhuan/habu/monsterhunting/bean/UpdateMyGoldInfo.java b/app/src/main/java/com/chwl/app/monsterhunting/bean/UpdateMyGoldInfo.java similarity index 84% rename from app/src/main/java/com/yizhuan/habu/monsterhunting/bean/UpdateMyGoldInfo.java rename to app/src/main/java/com/chwl/app/monsterhunting/bean/UpdateMyGoldInfo.java index 72b76a3d4..d33eb5c5f 100644 --- a/app/src/main/java/com/yizhuan/habu/monsterhunting/bean/UpdateMyGoldInfo.java +++ b/app/src/main/java/com/chwl/app/monsterhunting/bean/UpdateMyGoldInfo.java @@ -1,8 +1,8 @@ -package com.yizhuan.habu.monsterhunting.bean; +package com.chwl.app.monsterhunting.bean; import androidx.databinding.BaseObservable; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; +import com.chwl.core.pay.bean.WalletInfo; public class UpdateMyGoldInfo extends BaseObservable { diff --git a/app/src/main/java/com/yizhuan/habu/other/SplashBitmapTransformation.java b/app/src/main/java/com/chwl/app/other/SplashBitmapTransformation.java similarity index 92% rename from app/src/main/java/com/yizhuan/habu/other/SplashBitmapTransformation.java rename to app/src/main/java/com/chwl/app/other/SplashBitmapTransformation.java index 21c35df9e..7709f2ce2 100644 --- a/app/src/main/java/com/yizhuan/habu/other/SplashBitmapTransformation.java +++ b/app/src/main/java/com/chwl/app/other/SplashBitmapTransformation.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.other; +package com.chwl.app.other; import android.graphics.Bitmap; @@ -13,7 +13,7 @@ import java.security.MessageDigest; * splash 适配图片 */ public class SplashBitmapTransformation extends BitmapTransformation { - private static final String ID = "com.yizhuan.habu.other.SplashBitmapTransformation"; + private static final String ID = "com.chwl.app.other.SplashBitmapTransformation"; private static final byte[] ID_BYTES = ID.getBytes(CHARSET); public SplashBitmapTransformation() { diff --git a/app/src/main/java/com/yizhuan/habu/other/activity/SplashActivity.java b/app/src/main/java/com/chwl/app/other/activity/SplashActivity.java similarity index 86% rename from app/src/main/java/com/yizhuan/habu/other/activity/SplashActivity.java rename to app/src/main/java/com/chwl/app/other/activity/SplashActivity.java index c316205f9..05b910641 100644 --- a/app/src/main/java/com/yizhuan/habu/other/activity/SplashActivity.java +++ b/app/src/main/java/com/chwl/app/other/activity/SplashActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.other.activity; +package com.chwl.app.other.activity; import android.annotation.SuppressLint; import android.content.Context; @@ -14,22 +14,22 @@ import androidx.databinding.DataBindingUtil; import com.bumptech.glide.request.RequestOptions; import com.netease.nim.uikit.StatusBarUtil; import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.habu.MainActivity; -import com.yizhuan.habu.NimMiddleActivity; -import com.yizhuan.habu.R; -import com.yizhuan.habu.application.XChatApplication; -import com.yizhuan.habu.databinding.ActivitySplashBinding; -import com.yizhuan.habu.other.SplashBitmapTransformation; -import com.yizhuan.habu.other.dialog.PrivacyAgreementDialog; -import com.yizhuan.habu.ui.login.LoginActivity; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.auth.entity.AccountInfo; -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.yizhuan.xchat_android_library.common.util.DeviceUtil; +import com.chwl.app.MainActivity; +import com.chwl.app.NimMiddleActivity; +import com.chwl.app.R; +import com.chwl.app.application.XChatApplication; +import com.chwl.app.databinding.ActivitySplashBinding; +import com.chwl.app.other.SplashBitmapTransformation; +import com.chwl.app.other.dialog.PrivacyAgreementDialog; +import com.chwl.app.ui.login.LoginActivity; +import com.chwl.core.DemoCache; +import com.chwl.core.auth.entity.AccountInfo; +import com.chwl.core.channel_page.model.ChannelPageModel; +import com.chwl.core.initial.InitialModel; +import com.chwl.core.initial.SplashComponent; +import com.chwl.core.utils.OaidUtil; +import com.chwl.core.utils.SharedPreferenceUtils; +import com.chwl.library.common.util.DeviceUtil; /** * @author xiaoyu diff --git a/app/src/main/java/com/yizhuan/habu/other/dialog/PrivacyAgreementDialog.java b/app/src/main/java/com/chwl/app/other/dialog/PrivacyAgreementDialog.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/other/dialog/PrivacyAgreementDialog.java rename to app/src/main/java/com/chwl/app/other/dialog/PrivacyAgreementDialog.java index d58238ef1..b9932e651 100644 --- a/app/src/main/java/com/yizhuan/habu/other/dialog/PrivacyAgreementDialog.java +++ b/app/src/main/java/com/chwl/app/other/dialog/PrivacyAgreementDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.other.dialog; +package com.chwl.app.other.dialog; import android.annotation.SuppressLint; import android.app.Dialog; @@ -18,16 +18,16 @@ import android.widget.TextView; import androidx.annotation.NonNull; -import com.yizhuan.habu.MainActivity; -import com.yizhuan.habu.R; -import com.yizhuan.habu.application.IReportConstants; -import com.yizhuan.habu.application.ReportManager; -import com.yizhuan.habu.common.widget.OriginalDrawStatusClickSpan; -import com.yizhuan.habu.ui.webview.SimpleWebViewActivity; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.ScreenUtils; +import com.chwl.app.MainActivity; +import com.chwl.app.R; +import com.chwl.app.application.IReportConstants; +import com.chwl.app.application.ReportManager; +import com.chwl.app.common.widget.OriginalDrawStatusClickSpan; +import com.chwl.app.ui.webview.SimpleWebViewActivity; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.core.UriProvider; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.ScreenUtils; import java.util.HashMap; diff --git a/app/src/main/java/com/yizhuan/habu/other/present/SplashPresenter.java b/app/src/main/java/com/chwl/app/other/present/SplashPresenter.java similarity index 50% rename from app/src/main/java/com/yizhuan/habu/other/present/SplashPresenter.java rename to app/src/main/java/com/chwl/app/other/present/SplashPresenter.java index 5a9284d63..032be9c7b 100644 --- a/app/src/main/java/com/yizhuan/habu/other/present/SplashPresenter.java +++ b/app/src/main/java/com/chwl/app/other/present/SplashPresenter.java @@ -1,7 +1,7 @@ -package com.yizhuan.habu.other.present; +package com.chwl.app.other.present; -import com.yizhuan.habu.base.BaseMvpPresenter; -import com.yizhuan.habu.other.view.ISplashView; +import com.chwl.app.base.BaseMvpPresenter; +import com.chwl.app.other.view.ISplashView; /** *

diff --git a/app/src/main/java/com/yizhuan/habu/other/view/ISplashView.java b/app/src/main/java/com/chwl/app/other/view/ISplashView.java similarity index 61% rename from app/src/main/java/com/yizhuan/habu/other/view/ISplashView.java rename to app/src/main/java/com/chwl/app/other/view/ISplashView.java index 91bac19f2..3ec75124d 100644 --- a/app/src/main/java/com/yizhuan/habu/other/view/ISplashView.java +++ b/app/src/main/java/com/chwl/app/other/view/ISplashView.java @@ -1,7 +1,7 @@ -package com.yizhuan.habu.other.view; +package com.chwl.app.other.view; -import com.yizhuan.xchat_android_core.home.bean.TabInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.chwl.core.home.bean.TabInfo; +import com.chwl.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/pay/GiveGoldModel.kt b/app/src/main/java/com/chwl/app/pay/GiveGoldModel.kt similarity index 84% rename from app/src/main/java/com/yizhuan/habu/pay/GiveGoldModel.kt rename to app/src/main/java/com/chwl/app/pay/GiveGoldModel.kt index 14ad5d168..dc1218727 100644 --- a/app/src/main/java/com/yizhuan/habu/pay/GiveGoldModel.kt +++ b/app/src/main/java/com/chwl/app/pay/GiveGoldModel.kt @@ -1,12 +1,12 @@ -package com.yizhuan.habu.pay +package com.chwl.app.pay import androidx.lifecycle.MutableLiveData -import com.yizhuan.habu.base.BaseViewModel -import com.yizhuan.xchat_android_core.bean.response.ListResult -import com.yizhuan.xchat_android_core.home.model.HomeModel -import com.yizhuan.xchat_android_core.user.bean.DiamondGiveHistoryInfo -import com.yizhuan.xchat_android_core.user.bean.SearchUserInfo -import com.yizhuan.xchat_android_core.utils.toast +import com.chwl.app.base.BaseViewModel +import com.chwl.core.bean.response.ListResult +import com.chwl.core.home.model.HomeModel +import com.chwl.core.user.bean.DiamondGiveHistoryInfo +import com.chwl.core.user.bean.SearchUserInfo +import com.chwl.core.utils.toast class GiveGoldModel : BaseViewModel() { diff --git a/app/src/main/java/com/yizhuan/habu/pay/activity/GiveGoldActivity.kt b/app/src/main/java/com/chwl/app/pay/activity/GiveGoldActivity.kt similarity index 88% rename from app/src/main/java/com/yizhuan/habu/pay/activity/GiveGoldActivity.kt rename to app/src/main/java/com/chwl/app/pay/activity/GiveGoldActivity.kt index 3ba8715f5..3057a0f2f 100644 --- a/app/src/main/java/com/yizhuan/habu/pay/activity/GiveGoldActivity.kt +++ b/app/src/main/java/com/chwl/app/pay/activity/GiveGoldActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.pay.activity +package com.chwl.app.pay.activity import android.annotation.SuppressLint import android.content.Context @@ -10,16 +10,16 @@ import android.widget.TextView.OnEditorActionListener import androidx.activity.viewModels import androidx.recyclerview.widget.LinearLayoutManager import com.netease.nim.uikit.StatusBarUtil -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingActivity -import com.yizhuan.habu.common.EmptyViewHelper -import com.yizhuan.habu.databinding.ActivityGiveGoldBinding -import com.yizhuan.habu.pay.GiveGoldModel -import com.yizhuan.habu.pay.adapter.LatelyGiveAdapter -import com.yizhuan.habu.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.gift.GiftModel -import com.yizhuan.xchat_android_core.user.bean.DiamondGiveHistoryInfo -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingActivity +import com.chwl.app.common.EmptyViewHelper +import com.chwl.app.databinding.ActivityGiveGoldBinding +import com.chwl.app.pay.GiveGoldModel +import com.chwl.app.pay.adapter.LatelyGiveAdapter +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.core.gift.GiftModel +import com.chwl.core.user.bean.DiamondGiveHistoryInfo +import com.chwl.library.utils.ResUtil /** * 轉贈鉆石頁面 diff --git a/app/src/main/java/com/yizhuan/habu/pay/activity/GiveGoldDetailActivity.kt b/app/src/main/java/com/chwl/app/pay/activity/GiveGoldDetailActivity.kt similarity index 81% rename from app/src/main/java/com/yizhuan/habu/pay/activity/GiveGoldDetailActivity.kt rename to app/src/main/java/com/chwl/app/pay/activity/GiveGoldDetailActivity.kt index 553518fa4..7f6e32438 100644 --- a/app/src/main/java/com/yizhuan/habu/pay/activity/GiveGoldDetailActivity.kt +++ b/app/src/main/java/com/chwl/app/pay/activity/GiveGoldDetailActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.pay.activity +package com.chwl.app.pay.activity import android.content.Context import android.content.Intent @@ -8,19 +8,19 @@ import android.widget.TextView import androidx.fragment.app.Fragment import androidx.viewpager.widget.ViewPager import com.netease.nim.uikit.StatusBarUtil -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingActivity -import com.yizhuan.habu.databinding.ActivityGiveGoldDetailBinding -import com.yizhuan.habu.pay.fragment.GiveDiamondFragment -import com.yizhuan.habu.pay.fragment.GiveGiftFragment -import com.yizhuan.habu.ui.user.adapter.CommonWrapIndicatorAdapter -import com.yizhuan.habu.ui.user.adapter.UserInfoPagerAdapter -import com.yizhuan.habu.ui.widget.magicindicator.MagicIndicator -import com.yizhuan.habu.ui.widget.magicindicator.ViewPagerHelper -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator -import com.yizhuan.xchat_android_core.initial.InitialModel -import com.yizhuan.xchat_android_core.user.UserModel -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingActivity +import com.chwl.app.databinding.ActivityGiveGoldDetailBinding +import com.chwl.app.pay.fragment.GiveDiamondFragment +import com.chwl.app.pay.fragment.GiveGiftFragment +import com.chwl.app.ui.user.adapter.CommonWrapIndicatorAdapter +import com.chwl.app.ui.user.adapter.UserInfoPagerAdapter +import com.chwl.app.ui.widget.magicindicator.MagicIndicator +import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator +import com.chwl.core.initial.InitialModel +import com.chwl.core.user.UserModel +import com.chwl.library.utils.ResUtil /** * 轉贈鉆石頁面 diff --git a/app/src/main/java/com/yizhuan/habu/pay/activity/GiveGoldSearchActivity.kt b/app/src/main/java/com/chwl/app/pay/activity/GiveGoldSearchActivity.kt similarity index 84% rename from app/src/main/java/com/yizhuan/habu/pay/activity/GiveGoldSearchActivity.kt rename to app/src/main/java/com/chwl/app/pay/activity/GiveGoldSearchActivity.kt index a838cdf5d..e7ef48370 100644 --- a/app/src/main/java/com/yizhuan/habu/pay/activity/GiveGoldSearchActivity.kt +++ b/app/src/main/java/com/chwl/app/pay/activity/GiveGoldSearchActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.pay.activity +package com.chwl.app.pay.activity import android.annotation.SuppressLint @@ -11,15 +11,15 @@ import android.text.TextWatcher import android.widget.EditText import android.widget.TextView import androidx.recyclerview.widget.LinearLayoutManager -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseActivity -import com.yizhuan.habu.common.EmptyViewHelper -import com.yizhuan.habu.pay.adapter.GiveSearchAdapter -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.base.BaseActivity +import com.chwl.app.common.EmptyViewHelper +import com.chwl.app.pay.adapter.GiveSearchAdapter +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.core.room.bean.SearchRoomInfo +import com.chwl.core.room.model.AvRoomModel +import com.chwl.core.utils.net.RxHelper +import com.chwl.library.utils.ResUtil class GiveGoldSearchActivity : BaseActivity(), TextWatcher { diff --git a/app/src/main/java/com/yizhuan/habu/pay/activity/GiveGoldSuccessActivity.kt b/app/src/main/java/com/chwl/app/pay/activity/GiveGoldSuccessActivity.kt similarity index 86% rename from app/src/main/java/com/yizhuan/habu/pay/activity/GiveGoldSuccessActivity.kt rename to app/src/main/java/com/chwl/app/pay/activity/GiveGoldSuccessActivity.kt index d02d2cc0a..8cb58e850 100644 --- a/app/src/main/java/com/yizhuan/habu/pay/activity/GiveGoldSuccessActivity.kt +++ b/app/src/main/java/com/chwl/app/pay/activity/GiveGoldSuccessActivity.kt @@ -1,12 +1,12 @@ -package com.yizhuan.habu.pay.activity +package com.chwl.app.pay.activity import android.content.Context import android.content.Intent import android.os.Bundle import android.widget.TextView -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseActivity -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.base.BaseActivity +import com.chwl.library.utils.ResUtil class GiveGoldSuccessActivity : BaseActivity() { diff --git a/app/src/main/java/com/yizhuan/habu/pay/activity/GiveGoldToUserActivity.kt b/app/src/main/java/com/chwl/app/pay/activity/GiveGoldToUserActivity.kt similarity index 92% rename from app/src/main/java/com/yizhuan/habu/pay/activity/GiveGoldToUserActivity.kt rename to app/src/main/java/com/chwl/app/pay/activity/GiveGoldToUserActivity.kt index 8cd1086db..6e6d8e41b 100644 --- a/app/src/main/java/com/yizhuan/habu/pay/activity/GiveGoldToUserActivity.kt +++ b/app/src/main/java/com/chwl/app/pay/activity/GiveGoldToUserActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.pay.activity +package com.chwl.app.pay.activity import android.annotation.SuppressLint import android.content.Context @@ -17,29 +17,29 @@ import androidx.recyclerview.widget.RecyclerView import androidx.viewpager.widget.PagerAdapter import com.chad.library.adapter.base.BaseQuickAdapter import com.netease.nim.uikit.StatusBarUtil -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingActivity -import com.yizhuan.habu.databinding.ActivityGiveGoldToUserBinding -import com.yizhuan.habu.miniworld.listener.DoubleClickCheckListener -import com.yizhuan.habu.pay.GiveGoldModel -import com.yizhuan.habu.pay.adapter.GiveGiftAdapter -import com.yizhuan.habu.pay.password.GiveGoldPassWordFragment -import com.yizhuan.habu.pay.widget.GridPasswordNoFocusView -import com.yizhuan.habu.ui.setting.ModifyPwdActivity -import com.yizhuan.habu.ui.utils.ImageLoadUtils -import com.yizhuan.habu.ui.widget.OnPageSelectedListener -import com.yizhuan.habu.ui.widget.dialog.CommonTipDialog -import com.yizhuan.habu.ui.widget.dialog.GiveDiamondTipDialog -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil -import com.yizhuan.habu.ui.widget.recyclerview.decoration.GridSpacingItemNewDecoration -import com.yizhuan.xchat_android_core.DemoCache -import com.yizhuan.xchat_android_core.gift.GiftModel -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo -import com.yizhuan.xchat_android_core.initial.InitialModel -import com.yizhuan.xchat_android_core.pay.PayModel -import com.yizhuan.xchat_android_core.user.UserModel -import com.yizhuan.xchat_android_core.user.bean.SearchUserInfo -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingActivity +import com.chwl.app.databinding.ActivityGiveGoldToUserBinding +import com.chwl.app.miniworld.listener.DoubleClickCheckListener +import com.chwl.app.pay.GiveGoldModel +import com.chwl.app.pay.adapter.GiveGiftAdapter +import com.chwl.app.pay.password.GiveGoldPassWordFragment +import com.chwl.app.pay.widget.GridPasswordNoFocusView +import com.chwl.app.ui.setting.ModifyPwdActivity +import com.chwl.app.ui.utils.ImageLoadUtils +import com.chwl.app.ui.widget.OnPageSelectedListener +import com.chwl.app.ui.widget.dialog.CommonTipDialog +import com.chwl.app.ui.widget.dialog.GiveDiamondTipDialog +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil +import com.chwl.app.ui.widget.recyclerview.decoration.GridSpacingItemNewDecoration +import com.chwl.core.DemoCache +import com.chwl.core.gift.GiftModel +import com.chwl.core.gift.bean.GiftInfo +import com.chwl.core.initial.InitialModel +import com.chwl.core.pay.PayModel +import com.chwl.core.user.UserModel +import com.chwl.core.user.bean.SearchUserInfo +import com.chwl.library.utils.ResUtil class GiveGoldToUserActivity : BaseViewBindingActivity(), GridPasswordNoFocusView.OnPasswordChangedListener, diff --git a/app/src/main/java/com/yizhuan/habu/pay/adapter/ChargeAdapter.java b/app/src/main/java/com/chwl/app/pay/adapter/ChargeAdapter.java similarity index 87% rename from app/src/main/java/com/yizhuan/habu/pay/adapter/ChargeAdapter.java rename to app/src/main/java/com/chwl/app/pay/adapter/ChargeAdapter.java index 6c146a685..eb22224eb 100644 --- a/app/src/main/java/com/yizhuan/habu/pay/adapter/ChargeAdapter.java +++ b/app/src/main/java/com/chwl/app/pay/adapter/ChargeAdapter.java @@ -1,11 +1,11 @@ -package com.yizhuan.habu.pay.adapter; +package com.chwl.app.pay.adapter; import android.text.TextUtils; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_core.pay.bean.ChargeBean; +import com.chwl.app.R; +import com.chwl.core.pay.bean.ChargeBean; /** diff --git a/app/src/main/java/com/yizhuan/habu/pay/adapter/GiveDiamondDetailAdapter.kt b/app/src/main/java/com/chwl/app/pay/adapter/GiveDiamondDetailAdapter.kt similarity index 80% rename from app/src/main/java/com/yizhuan/habu/pay/adapter/GiveDiamondDetailAdapter.kt rename to app/src/main/java/com/chwl/app/pay/adapter/GiveDiamondDetailAdapter.kt index 067a08e07..fc6c45733 100644 --- a/app/src/main/java/com/yizhuan/habu/pay/adapter/GiveDiamondDetailAdapter.kt +++ b/app/src/main/java/com/chwl/app/pay/adapter/GiveDiamondDetailAdapter.kt @@ -1,12 +1,12 @@ -package com.yizhuan.habu.pay.adapter +package com.chwl.app.pay.adapter import android.annotation.SuppressLint import android.widget.TextView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.xchat_android_core.user.bean.DiamondGiveHistoryInfo -import com.yizhuan.xchat_android_library.utils.TimeUtils +import com.chwl.app.R +import com.chwl.core.user.bean.DiamondGiveHistoryInfo +import com.chwl.library.utils.TimeUtils class GiveDiamondDetailAdapter : diff --git a/app/src/main/java/com/yizhuan/habu/pay/adapter/GiveGiftAdapter.java b/app/src/main/java/com/chwl/app/pay/adapter/GiveGiftAdapter.java similarity index 82% rename from app/src/main/java/com/yizhuan/habu/pay/adapter/GiveGiftAdapter.java rename to app/src/main/java/com/chwl/app/pay/adapter/GiveGiftAdapter.java index 1dee661e4..4fb065d60 100644 --- a/app/src/main/java/com/yizhuan/habu/pay/adapter/GiveGiftAdapter.java +++ b/app/src/main/java/com/chwl/app/pay/adapter/GiveGiftAdapter.java @@ -1,13 +1,13 @@ -package com.yizhuan.habu.pay.adapter; +package com.chwl.app.pay.adapter; import android.widget.ImageView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; +import com.chwl.app.R; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.core.gift.bean.GiftInfo; /** * 赠送礼物 diff --git a/app/src/main/java/com/yizhuan/habu/pay/adapter/GiveGiftDetailAdapter.kt b/app/src/main/java/com/chwl/app/pay/adapter/GiveGiftDetailAdapter.kt similarity index 71% rename from app/src/main/java/com/yizhuan/habu/pay/adapter/GiveGiftDetailAdapter.kt rename to app/src/main/java/com/chwl/app/pay/adapter/GiveGiftDetailAdapter.kt index 673f1fa69..64fd0011f 100644 --- a/app/src/main/java/com/yizhuan/habu/pay/adapter/GiveGiftDetailAdapter.kt +++ b/app/src/main/java/com/chwl/app/pay/adapter/GiveGiftDetailAdapter.kt @@ -1,14 +1,14 @@ -package com.yizhuan.habu.pay.adapter +package com.chwl.app.pay.adapter import android.annotation.SuppressLint import android.widget.TextView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.utils.ImageLoadUtils -import com.yizhuan.habu.utils.TimeUiUtils -import com.yizhuan.xchat_android_core.user.bean.DiamondGiveHistoryInfo -import com.yizhuan.xchat_android_library.utils.TimeUtils +import com.chwl.app.R +import com.chwl.app.ui.utils.ImageLoadUtils +import com.chwl.app.utils.TimeUiUtils +import com.chwl.core.user.bean.DiamondGiveHistoryInfo +import com.chwl.library.utils.TimeUtils class GiveGiftDetailAdapter : diff --git a/app/src/main/java/com/yizhuan/habu/pay/adapter/GiveSearchAdapter.kt b/app/src/main/java/com/chwl/app/pay/adapter/GiveSearchAdapter.kt similarity index 78% rename from app/src/main/java/com/yizhuan/habu/pay/adapter/GiveSearchAdapter.kt rename to app/src/main/java/com/chwl/app/pay/adapter/GiveSearchAdapter.kt index 67a7f2d7c..f203ed529 100644 --- a/app/src/main/java/com/yizhuan/habu/pay/adapter/GiveSearchAdapter.kt +++ b/app/src/main/java/com/chwl/app/pay/adapter/GiveSearchAdapter.kt @@ -1,12 +1,12 @@ -package com.yizhuan.habu.pay.adapter +package com.chwl.app.pay.adapter import android.annotation.SuppressLint import android.widget.TextView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo +import com.chwl.app.R +import com.chwl.app.ui.utils.ImageLoadUtils +import com.chwl.core.room.bean.SearchRoomInfo class GiveSearchAdapter : diff --git a/app/src/main/java/com/yizhuan/habu/pay/adapter/LatelyGiveAdapter.kt b/app/src/main/java/com/chwl/app/pay/adapter/LatelyGiveAdapter.kt similarity index 78% rename from app/src/main/java/com/yizhuan/habu/pay/adapter/LatelyGiveAdapter.kt rename to app/src/main/java/com/chwl/app/pay/adapter/LatelyGiveAdapter.kt index a8260c897..50c8fcf9f 100644 --- a/app/src/main/java/com/yizhuan/habu/pay/adapter/LatelyGiveAdapter.kt +++ b/app/src/main/java/com/chwl/app/pay/adapter/LatelyGiveAdapter.kt @@ -1,12 +1,12 @@ -package com.yizhuan.habu.pay.adapter +package com.chwl.app.pay.adapter import android.annotation.SuppressLint import android.widget.TextView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.user.bean.DiamondGiveHistoryInfo +import com.chwl.app.R +import com.chwl.app.ui.utils.ImageLoadUtils +import com.chwl.core.user.bean.DiamondGiveHistoryInfo class LatelyGiveAdapter : diff --git a/app/src/main/java/com/yizhuan/habu/pay/fragment/GiveDiamondFragment.kt b/app/src/main/java/com/chwl/app/pay/fragment/GiveDiamondFragment.kt similarity index 76% rename from app/src/main/java/com/yizhuan/habu/pay/fragment/GiveDiamondFragment.kt rename to app/src/main/java/com/chwl/app/pay/fragment/GiveDiamondFragment.kt index ef692e6f1..dece9b7c7 100644 --- a/app/src/main/java/com/yizhuan/habu/pay/fragment/GiveDiamondFragment.kt +++ b/app/src/main/java/com/chwl/app/pay/fragment/GiveDiamondFragment.kt @@ -1,20 +1,20 @@ -package com.yizhuan.habu.pay.fragment +package com.chwl.app.pay.fragment import android.annotation.SuppressLint import android.os.Bundle import androidx.fragment.app.viewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingFragment -import com.yizhuan.habu.common.EmptyViewHelper -import com.yizhuan.habu.databinding.FragmentGiveDiamondBinding -import com.yizhuan.habu.pay.GiveGoldModel -import com.yizhuan.habu.pay.activity.GiveGoldDetailActivity -import com.yizhuan.habu.pay.adapter.GiveDiamondDetailAdapter -import com.yizhuan.habu.pay.adapter.LatelyGiveAdapter -import com.yizhuan.habu.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.user.bean.DiamondGiveHistoryInfo -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingFragment +import com.chwl.app.common.EmptyViewHelper +import com.chwl.app.databinding.FragmentGiveDiamondBinding +import com.chwl.app.pay.GiveGoldModel +import com.chwl.app.pay.activity.GiveGoldDetailActivity +import com.chwl.app.pay.adapter.GiveDiamondDetailAdapter +import com.chwl.app.pay.adapter.LatelyGiveAdapter +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.core.user.bean.DiamondGiveHistoryInfo +import com.chwl.library.utils.ResUtil class GiveDiamondFragment : BaseViewBindingFragment() { diff --git a/app/src/main/java/com/yizhuan/habu/pay/fragment/GiveGiftFragment.kt b/app/src/main/java/com/chwl/app/pay/fragment/GiveGiftFragment.kt similarity index 75% rename from app/src/main/java/com/yizhuan/habu/pay/fragment/GiveGiftFragment.kt rename to app/src/main/java/com/chwl/app/pay/fragment/GiveGiftFragment.kt index 60f050ff1..fa91c248f 100644 --- a/app/src/main/java/com/yizhuan/habu/pay/fragment/GiveGiftFragment.kt +++ b/app/src/main/java/com/chwl/app/pay/fragment/GiveGiftFragment.kt @@ -1,21 +1,21 @@ -package com.yizhuan.habu.pay.fragment +package com.chwl.app.pay.fragment import android.annotation.SuppressLint import android.os.Bundle import androidx.fragment.app.viewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingFragment -import com.yizhuan.habu.common.EmptyViewHelper -import com.yizhuan.habu.databinding.FragmentGiveDiamondBinding -import com.yizhuan.habu.databinding.FragmentGiveGiftBinding -import com.yizhuan.habu.pay.GiveGoldModel -import com.yizhuan.habu.pay.activity.GiveGoldDetailActivity -import com.yizhuan.habu.pay.adapter.GiveGiftDetailAdapter -import com.yizhuan.habu.pay.adapter.LatelyGiveAdapter -import com.yizhuan.habu.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.user.bean.DiamondGiveHistoryInfo -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingFragment +import com.chwl.app.common.EmptyViewHelper +import com.chwl.app.databinding.FragmentGiveDiamondBinding +import com.chwl.app.databinding.FragmentGiveGiftBinding +import com.chwl.app.pay.GiveGoldModel +import com.chwl.app.pay.activity.GiveGoldDetailActivity +import com.chwl.app.pay.adapter.GiveGiftDetailAdapter +import com.chwl.app.pay.adapter.LatelyGiveAdapter +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.core.user.bean.DiamondGiveHistoryInfo +import com.chwl.library.utils.ResUtil class GiveGiftFragment : BaseViewBindingFragment() { diff --git a/app/src/main/java/com/yizhuan/habu/pay/interfaces/PasswordView.java b/app/src/main/java/com/chwl/app/pay/interfaces/PasswordView.java similarity index 81% rename from app/src/main/java/com/yizhuan/habu/pay/interfaces/PasswordView.java rename to app/src/main/java/com/chwl/app/pay/interfaces/PasswordView.java index 330f01ac6..3643c5300 100644 --- a/app/src/main/java/com/yizhuan/habu/pay/interfaces/PasswordView.java +++ b/app/src/main/java/com/chwl/app/pay/interfaces/PasswordView.java @@ -1,7 +1,7 @@ -package com.yizhuan.habu.pay.interfaces; +package com.chwl.app.pay.interfaces; import com.jungly.gridpasswordview.PasswordType; -import com.yizhuan.habu.pay.widget.GridPasswordNoFocusView; +import com.chwl.app.pay.widget.GridPasswordNoFocusView; public interface PasswordView { diff --git a/app/src/main/java/com/yizhuan/habu/pay/password/GiveGoldPassWordFragment.java b/app/src/main/java/com/chwl/app/pay/password/GiveGoldPassWordFragment.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/pay/password/GiveGoldPassWordFragment.java rename to app/src/main/java/com/chwl/app/pay/password/GiveGoldPassWordFragment.java index a44ca0fa4..56d9d1d68 100644 --- a/app/src/main/java/com/yizhuan/habu/pay/password/GiveGoldPassWordFragment.java +++ b/app/src/main/java/com/chwl/app/pay/password/GiveGoldPassWordFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.pay.password; +package com.chwl.app.pay.password; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; @@ -15,10 +15,10 @@ import androidx.annotation.Nullable; import androidx.fragment.app.DialogFragment; import androidx.fragment.app.FragmentManager; -import com.yizhuan.habu.R; -import com.yizhuan.habu.pay.widget.GridPasswordNoFocusView; -import com.yizhuan.habu.ui.setting.ModifyPwdActivity; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.pay.widget.GridPasswordNoFocusView; +import com.chwl.app.ui.setting.ModifyPwdActivity; +import com.chwl.library.utils.ResUtil; //也可继承design中的BottomSheetDialogFragment diff --git a/app/src/main/java/com/yizhuan/habu/pay/password/GiveGoldPasswordView.java b/app/src/main/java/com/chwl/app/pay/password/GiveGoldPasswordView.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/pay/password/GiveGoldPasswordView.java rename to app/src/main/java/com/chwl/app/pay/password/GiveGoldPasswordView.java index b712df0e1..02219d16d 100644 --- a/app/src/main/java/com/yizhuan/habu/pay/password/GiveGoldPasswordView.java +++ b/app/src/main/java/com/chwl/app/pay/password/GiveGoldPasswordView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.pay.password; +package com.chwl.app.pay.password; import android.content.Context; import android.util.AttributeSet; @@ -7,9 +7,9 @@ import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; -import com.yizhuan.habu.R; -import com.yizhuan.habu.pay.widget.GridPasswordNoFocusView; -import com.yizhuan.habu.ui.widget.password.PasswordKeyboardView; +import com.chwl.app.R; +import com.chwl.app.pay.widget.GridPasswordNoFocusView; +import com.chwl.app.ui.widget.password.PasswordKeyboardView; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/pay/presenter/ChargePresenter.java b/app/src/main/java/com/chwl/app/pay/presenter/ChargePresenter.java similarity index 79% rename from app/src/main/java/com/yizhuan/habu/pay/presenter/ChargePresenter.java rename to app/src/main/java/com/chwl/app/pay/presenter/ChargePresenter.java index 7bcc8bf33..e50f4993c 100644 --- a/app/src/main/java/com/yizhuan/habu/pay/presenter/ChargePresenter.java +++ b/app/src/main/java/com/chwl/app/pay/presenter/ChargePresenter.java @@ -1,12 +1,12 @@ -package com.yizhuan.habu.pay.presenter; +package com.chwl.app.pay.presenter; import android.annotation.SuppressLint; import com.hjq.toast.ToastUtils; -import com.yizhuan.habu.pay.view.IChargeView; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_library.base.PresenterEvent; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.chwl.app.pay.view.IChargeView; +import com.chwl.core.pay.PayModel; +import com.chwl.library.base.PresenterEvent; +import com.chwl.library.utils.ListUtils; /** * Created by MadisonRong on 05/01/2018. diff --git a/app/src/main/java/com/yizhuan/habu/pay/presenter/PayPresenter.java b/app/src/main/java/com/chwl/app/pay/presenter/PayPresenter.java similarity index 78% rename from app/src/main/java/com/yizhuan/habu/pay/presenter/PayPresenter.java rename to app/src/main/java/com/chwl/app/pay/presenter/PayPresenter.java index dce91b0a8..fd0996e6e 100644 --- a/app/src/main/java/com/yizhuan/habu/pay/presenter/PayPresenter.java +++ b/app/src/main/java/com/chwl/app/pay/presenter/PayPresenter.java @@ -1,13 +1,13 @@ -package com.yizhuan.habu.pay.presenter; +package com.chwl.app.pay.presenter; import android.annotation.SuppressLint; -import com.yizhuan.habu.R; -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.pay.view.IPayView; +import com.chwl.core.pay.PayModel; +import com.chwl.core.pay.bean.WalletInfo; +import com.chwl.library.base.factory.AbstractMvpPresenter; +import com.chwl.library.utils.ResUtil; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; diff --git a/app/src/main/java/com/yizhuan/habu/pay/view/IChargeView.java b/app/src/main/java/com/chwl/app/pay/view/IChargeView.java similarity index 66% rename from app/src/main/java/com/yizhuan/habu/pay/view/IChargeView.java rename to app/src/main/java/com/chwl/app/pay/view/IChargeView.java index 00d28062a..a7b64a51e 100644 --- a/app/src/main/java/com/yizhuan/habu/pay/view/IChargeView.java +++ b/app/src/main/java/com/chwl/app/pay/view/IChargeView.java @@ -1,7 +1,7 @@ -package com.yizhuan.habu.pay.view; +package com.chwl.app.pay.view; -import com.yizhuan.xchat_android_core.pay.bean.Banner; +import com.chwl.core.pay.bean.Banner; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/pay/view/IPayView.java b/app/src/main/java/com/chwl/app/pay/view/IPayView.java similarity index 59% rename from app/src/main/java/com/yizhuan/habu/pay/view/IPayView.java rename to app/src/main/java/com/chwl/app/pay/view/IPayView.java index d6389d494..6d2ae5359 100644 --- a/app/src/main/java/com/yizhuan/habu/pay/view/IPayView.java +++ b/app/src/main/java/com/chwl/app/pay/view/IPayView.java @@ -1,8 +1,8 @@ -package com.yizhuan.habu.pay.view; +package com.chwl.app.pay.view; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.chwl.core.pay.bean.WalletInfo; +import com.chwl.library.base.IMvpBaseView; /** * Created by MadisonRong on 08/01/2018. diff --git a/app/src/main/java/com/yizhuan/habu/pay/widget/GridPasswordNoFocusView.java b/app/src/main/java/com/chwl/app/pay/widget/GridPasswordNoFocusView.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/pay/widget/GridPasswordNoFocusView.java rename to app/src/main/java/com/chwl/app/pay/widget/GridPasswordNoFocusView.java index 27fe5f090..96cb42671 100644 --- a/app/src/main/java/com/yizhuan/habu/pay/widget/GridPasswordNoFocusView.java +++ b/app/src/main/java/com/chwl/app/pay/widget/GridPasswordNoFocusView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.pay.widget; +package com.chwl.app.pay.widget; import android.content.Context; import android.content.res.ColorStateList; @@ -25,8 +25,8 @@ import com.jungly.gridpasswordview.CustomPasswordTransformationMethod; import com.jungly.gridpasswordview.PasswordType; import com.jungly.gridpasswordview.Util; import com.jungly.gridpasswordview.imebugfixer.ImeDelBugFixedEditText; -import com.yizhuan.habu.R; -import com.yizhuan.habu.pay.interfaces.PasswordView; +import com.chwl.app.R; +import com.chwl.app.pay.interfaces.PasswordView; public class GridPasswordNoFocusView extends LinearLayout implements PasswordView { private static final int DEFAULT_PASSWORDLENGTH = 6; diff --git a/app/src/main/java/com/yizhuan/habu/radish/activity/RadishRecordActivity.java b/app/src/main/java/com/chwl/app/radish/activity/RadishRecordActivity.java similarity index 79% rename from app/src/main/java/com/yizhuan/habu/radish/activity/RadishRecordActivity.java rename to app/src/main/java/com/chwl/app/radish/activity/RadishRecordActivity.java index 606c19059..20432a54c 100644 --- a/app/src/main/java/com/yizhuan/habu/radish/activity/RadishRecordActivity.java +++ b/app/src/main/java/com/chwl/app/radish/activity/RadishRecordActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.radish.activity; +package com.chwl.app.radish.activity; import android.content.Context; import android.content.Intent; @@ -12,23 +12,23 @@ import androidx.lifecycle.Observer; import androidx.viewpager.widget.ViewPager; import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.habu.R; -import com.yizhuan.habu.avroom.adapter.RoomContributeListAdapter; -import com.yizhuan.habu.base.BaseMvpActivity; -import com.yizhuan.habu.base.TitleBar; -import com.yizhuan.habu.radish.presenter.RadishRecordPresenter; -import com.yizhuan.habu.radish.view.IRadishRecordView; -import com.yizhuan.habu.radish.wallet.RadishWalletManager; -import com.yizhuan.habu.radish.widget.RadishRecordNavAdapter; -import com.yizhuan.habu.ui.radish.RadishRecordFragment; -import com.yizhuan.habu.ui.webview.CommonWebViewActivity; -import com.yizhuan.habu.ui.widget.magicindicator.MagicIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.ViewPagerHelper; -import com.yizhuan.habu.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_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.avroom.adapter.RoomContributeListAdapter; +import com.chwl.app.base.BaseMvpActivity; +import com.chwl.app.base.TitleBar; +import com.chwl.app.radish.presenter.RadishRecordPresenter; +import com.chwl.app.radish.view.IRadishRecordView; +import com.chwl.app.radish.wallet.RadishWalletManager; +import com.chwl.app.radish.widget.RadishRecordNavAdapter; +import com.chwl.app.ui.radish.RadishRecordFragment; +import com.chwl.app.ui.webview.CommonWebViewActivity; +import com.chwl.app.ui.widget.magicindicator.MagicIndicator; +import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.chwl.core.UriProvider; +import com.chwl.core.radish.RadishWalletInfo; +import com.chwl.library.base.factory.CreatePresenter; +import com.chwl.library.utils.ResUtil; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/habu/radish/adapter/RadishRecordAdapter.java b/app/src/main/java/com/chwl/app/radish/adapter/RadishRecordAdapter.java similarity index 74% rename from app/src/main/java/com/yizhuan/habu/radish/adapter/RadishRecordAdapter.java rename to app/src/main/java/com/chwl/app/radish/adapter/RadishRecordAdapter.java index 1baad3891..f7df4d935 100644 --- a/app/src/main/java/com/yizhuan/habu/radish/adapter/RadishRecordAdapter.java +++ b/app/src/main/java/com/chwl/app/radish/adapter/RadishRecordAdapter.java @@ -1,15 +1,15 @@ -package com.yizhuan.habu.radish.adapter; +package com.chwl.app.radish.adapter; -import static com.yizhuan.habu.ui.radish.RadishRecordFragment.TYPE_RADISH_INCOME; +import static com.chwl.app.ui.radish.RadishRecordFragment.TYPE_RADISH_INCOME; import androidx.core.content.ContextCompat; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.R; -import com.yizhuan.habu.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.chwl.app.R; +import com.chwl.app.bills.adapter.BillBaseAdapter; +import com.chwl.core.bills.bean.BillItemEntity; +import com.chwl.core.bills.bean.RadishRecordInfo; +import com.chwl.library.utils.TimeUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/radish/helper/PrizeAnimUiHelper.java b/app/src/main/java/com/chwl/app/radish/helper/PrizeAnimUiHelper.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/radish/helper/PrizeAnimUiHelper.java rename to app/src/main/java/com/chwl/app/radish/helper/PrizeAnimUiHelper.java index a9e44b39c..95797d511 100644 --- a/app/src/main/java/com/yizhuan/habu/radish/helper/PrizeAnimUiHelper.java +++ b/app/src/main/java/com/chwl/app/radish/helper/PrizeAnimUiHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.radish.helper; +package com.chwl.app.radish.helper; import android.animation.AnimatorSet; import android.animation.ObjectAnimator; @@ -11,17 +11,17 @@ import android.view.animation.DecelerateInterpolator; import android.widget.ImageView; import android.widget.TextView; -import com.yizhuan.habu.R; -import com.yizhuan.habu.common.widget.dialog.DialogManager; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.habu.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.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.app.common.widget.dialog.DialogManager; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.app.ui.widget.ShareDialog; +import com.chwl.core.radish.signin.SignInModel; +import com.chwl.core.radish.task.bean.PrizeAnim; +import com.chwl.core.share.ShareModel; +import com.chwl.core.utils.net.BeanObserver; +import com.chwl.core.utils.net.RxHelper; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/com/yizhuan/habu/radish/helper/TaskCenterDialogHelper.java b/app/src/main/java/com/chwl/app/radish/helper/TaskCenterDialogHelper.java similarity index 83% rename from app/src/main/java/com/yizhuan/habu/radish/helper/TaskCenterDialogHelper.java rename to app/src/main/java/com/chwl/app/radish/helper/TaskCenterDialogHelper.java index 200633499..578923d50 100644 --- a/app/src/main/java/com/yizhuan/habu/radish/helper/TaskCenterDialogHelper.java +++ b/app/src/main/java/com/chwl/app/radish/helper/TaskCenterDialogHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.radish.helper; +package com.chwl.app.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.habu.R; -import com.yizhuan.habu.common.widget.dialog.DialogManager; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; +import com.chwl.app.R; +import com.chwl.app.common.widget.dialog.DialogManager; +import com.chwl.app.ui.utils.ImageLoadUtils; public class TaskCenterDialogHelper { diff --git a/app/src/main/java/com/yizhuan/habu/radish/presenter/RadishRecordFrgPresenter.java b/app/src/main/java/com/chwl/app/radish/presenter/RadishRecordFrgPresenter.java similarity index 83% rename from app/src/main/java/com/yizhuan/habu/radish/presenter/RadishRecordFrgPresenter.java rename to app/src/main/java/com/chwl/app/radish/presenter/RadishRecordFrgPresenter.java index 58ec7f5dd..441616165 100644 --- a/app/src/main/java/com/yizhuan/habu/radish/presenter/RadishRecordFrgPresenter.java +++ b/app/src/main/java/com/chwl/app/radish/presenter/RadishRecordFrgPresenter.java @@ -1,9 +1,9 @@ -package com.yizhuan.habu.radish.presenter; +package com.chwl.app.radish.presenter; -import com.yizhuan.habu.base.BaseMvpPresenter; -import com.yizhuan.habu.radish.view.IRadishRecordFrgView; -import com.yizhuan.xchat_android_core.radish.RadishModel; -import com.yizhuan.xchat_android_core.radish.RadishRecordResult; +import com.chwl.app.base.BaseMvpPresenter; +import com.chwl.app.radish.view.IRadishRecordFrgView; +import com.chwl.core.radish.RadishModel; +import com.chwl.core.radish.RadishRecordResult; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; diff --git a/app/src/main/java/com/yizhuan/habu/radish/presenter/RadishRecordPresenter.java b/app/src/main/java/com/chwl/app/radish/presenter/RadishRecordPresenter.java similarity index 74% rename from app/src/main/java/com/yizhuan/habu/radish/presenter/RadishRecordPresenter.java rename to app/src/main/java/com/chwl/app/radish/presenter/RadishRecordPresenter.java index 53a44d5f0..65b1a1c8e 100644 --- a/app/src/main/java/com/yizhuan/habu/radish/presenter/RadishRecordPresenter.java +++ b/app/src/main/java/com/chwl/app/radish/presenter/RadishRecordPresenter.java @@ -1,8 +1,8 @@ -package com.yizhuan.habu.radish.presenter; +package com.chwl.app.radish.presenter; -import com.yizhuan.habu.base.BaseMvpPresenter; -import com.yizhuan.habu.radish.view.IRadishRecordView; -import com.yizhuan.xchat_android_core.radish.RadishModel; +import com.chwl.app.base.BaseMvpPresenter; +import com.chwl.app.radish.view.IRadishRecordView; +import com.chwl.core.radish.RadishModel; import java.math.RoundingMode; import java.text.DecimalFormat; diff --git a/app/src/main/java/com/yizhuan/habu/radish/signin/SignDialogTimeManager.java b/app/src/main/java/com/chwl/app/radish/signin/SignDialogTimeManager.java similarity index 85% rename from app/src/main/java/com/yizhuan/habu/radish/signin/SignDialogTimeManager.java rename to app/src/main/java/com/chwl/app/radish/signin/SignDialogTimeManager.java index b6eee4ecf..431f1213d 100644 --- a/app/src/main/java/com/yizhuan/habu/radish/signin/SignDialogTimeManager.java +++ b/app/src/main/java/com/chwl/app/radish/signin/SignDialogTimeManager.java @@ -1,22 +1,22 @@ -package com.yizhuan.habu.radish.signin; +package com.chwl.app.radish.signin; import android.content.Context; import android.text.TextUtils; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.yizhuan.habu.guide.GuideActivity; -import com.yizhuan.habu.other.activity.SplashActivity; -import com.yizhuan.habu.radish.signin.view.SignInDialog; -import com.yizhuan.habu.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.chwl.app.guide.GuideActivity; +import com.chwl.app.other.activity.SplashActivity; +import com.chwl.app.radish.signin.view.SignInDialog; +import com.chwl.app.ui.login.AddUserInfoActivity; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.radish.signin.SignInModel; +import com.chwl.core.radish.signin.bean.SignDetailInfo; +import com.chwl.core.utils.ActivityUtil; +import com.chwl.core.utils.SharedPreferenceUtils; +import com.chwl.core.utils.net.BeanObserver; +import com.chwl.core.utils.net.RxHelper; +import com.chwl.library.utils.UIUtils; import java.util.Calendar; import java.util.HashMap; diff --git a/app/src/main/java/com/yizhuan/habu/radish/signin/SignInActivity.java b/app/src/main/java/com/chwl/app/radish/signin/SignInActivity.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/radish/signin/SignInActivity.java rename to app/src/main/java/com/chwl/app/radish/signin/SignInActivity.java index 65eab6c4b..3a06e0bd0 100644 --- a/app/src/main/java/com/yizhuan/habu/radish/signin/SignInActivity.java +++ b/app/src/main/java/com/chwl/app/radish/signin/SignInActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.radish.signin; +package com.chwl.app.radish.signin; import android.annotation.SuppressLint; import android.content.Context; @@ -18,44 +18,44 @@ import androidx.constraintlayout.widget.ConstraintLayout; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseMvpActivity; -import com.yizhuan.habu.common.widget.TutuSwitchView; -import com.yizhuan.habu.common.widget.dialog.DialogManager; -import com.yizhuan.habu.common.widget.dialog.DialogUiHelper; -import com.yizhuan.habu.radish.helper.PrizeAnimUiHelper; -import com.yizhuan.habu.radish.signin.adpter.RewardListAdapter; -import com.yizhuan.habu.radish.signin.adpter.RewardTotalNoticeAdapter; -import com.yizhuan.habu.radish.signin.helper.SignInUiHelper; -import com.yizhuan.habu.radish.signin.presenter.SignInPresenter; -import com.yizhuan.habu.radish.signin.view.CarveUpGoldAdapter; -import com.yizhuan.habu.radish.signin.view.ISignInView; -import com.yizhuan.habu.radish.signin.view.RuleDialog; -import com.yizhuan.habu.ui.widget.ShareDialog; -import com.yizhuan.habu.ui.widget.marqueeview.BetterMarqueeView; -import com.yizhuan.habu.utils.CertificateHelper; -import com.yizhuan.habu.utils.NumberFormatUtil; -import com.yizhuan.habu.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.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.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.widget.IOSSwitchView; +import com.chwl.app.R; +import com.chwl.app.base.BaseMvpActivity; +import com.chwl.app.common.widget.TutuSwitchView; +import com.chwl.app.common.widget.dialog.DialogManager; +import com.chwl.app.common.widget.dialog.DialogUiHelper; +import com.chwl.app.radish.helper.PrizeAnimUiHelper; +import com.chwl.app.radish.signin.adpter.RewardListAdapter; +import com.chwl.app.radish.signin.adpter.RewardTotalNoticeAdapter; +import com.chwl.app.radish.signin.helper.SignInUiHelper; +import com.chwl.app.radish.signin.presenter.SignInPresenter; +import com.chwl.app.radish.signin.view.CarveUpGoldAdapter; +import com.chwl.app.radish.signin.view.ISignInView; +import com.chwl.app.radish.signin.view.RuleDialog; +import com.chwl.app.ui.widget.ShareDialog; +import com.chwl.app.ui.widget.marqueeview.BetterMarqueeView; +import com.chwl.app.utils.CertificateHelper; +import com.chwl.app.utils.NumberFormatUtil; +import com.chwl.app.utils.SpannableBuilder; +import com.chwl.core.radish.signin.SignInModel; +import com.chwl.core.radish.signin.bean.DrawNoticeInfo; +import com.chwl.core.radish.signin.bean.ReceiveTotalRewardInfo; +import com.chwl.core.radish.signin.bean.ReplenishSignInfo; +import com.chwl.core.radish.signin.bean.RewardNoticeInfo; +import com.chwl.core.radish.signin.bean.RsPlatformType; +import com.chwl.core.radish.signin.bean.SignDetailInfo; +import com.chwl.core.radish.signin.bean.SignDrawInfo; +import com.chwl.core.radish.signin.bean.SignInfo; +import com.chwl.core.radish.task.bean.PrizeAnim; +import com.chwl.core.share.ShareModel; +import com.chwl.core.utils.net.BeanObserver; +import com.chwl.core.utils.net.DontWarnObserver; +import com.chwl.core.utils.net.RadishNotEnoughException; +import com.chwl.core.utils.net.RxHelper; +import com.chwl.library.base.factory.CreatePresenter; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; +import com.chwl.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/habu/radish/signin/adpter/RewardListAdapter.java b/app/src/main/java/com/chwl/app/radish/signin/adpter/RewardListAdapter.java similarity index 92% rename from app/src/main/java/com/yizhuan/habu/radish/signin/adpter/RewardListAdapter.java rename to app/src/main/java/com/chwl/app/radish/signin/adpter/RewardListAdapter.java index 61a59dc0b..38dd206aa 100644 --- a/app/src/main/java/com/yizhuan/habu/radish/signin/adpter/RewardListAdapter.java +++ b/app/src/main/java/com/chwl/app/radish/signin/adpter/RewardListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.radish.signin.adpter; +package com.chwl.app.radish.signin.adpter; import android.view.View; import android.widget.ImageView; @@ -8,11 +8,11 @@ import androidx.core.content.ContextCompat; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.habu.ui.widget.RedPointView; -import com.yizhuan.xchat_android_core.radish.signin.bean.RewardNoticeInfo; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.app.ui.widget.RedPointView; +import com.chwl.core.radish.signin.bean.RewardNoticeInfo; +import com.chwl.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/radish/signin/adpter/RewardTotalNoticeAdapter.java b/app/src/main/java/com/chwl/app/radish/signin/adpter/RewardTotalNoticeAdapter.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/radish/signin/adpter/RewardTotalNoticeAdapter.java rename to app/src/main/java/com/chwl/app/radish/signin/adpter/RewardTotalNoticeAdapter.java index d176e59fc..19adc4473 100644 --- a/app/src/main/java/com/yizhuan/habu/radish/signin/adpter/RewardTotalNoticeAdapter.java +++ b/app/src/main/java/com/chwl/app/radish/signin/adpter/RewardTotalNoticeAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.radish.signin.adpter; +package com.chwl.app.radish.signin.adpter; import android.view.View; import android.widget.ImageView; @@ -7,11 +7,11 @@ import android.widget.TextView; import androidx.core.content.ContextCompat; import com.coorchice.library.SuperTextView; -import com.yizhuan.habu.R; -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.radish.signin.view.RewardProgressView; +import com.chwl.core.radish.signin.bean.RewardNoticeInfo; +import com.chwl.core.radish.signin.bean.SignDetailInfo; +import com.chwl.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/radish/signin/helper/SignInUiHelper.java b/app/src/main/java/com/chwl/app/radish/signin/helper/SignInUiHelper.java similarity index 86% rename from app/src/main/java/com/yizhuan/habu/radish/signin/helper/SignInUiHelper.java rename to app/src/main/java/com/chwl/app/radish/signin/helper/SignInUiHelper.java index 0298d00cb..aad2fd3fd 100644 --- a/app/src/main/java/com/yizhuan/habu/radish/signin/helper/SignInUiHelper.java +++ b/app/src/main/java/com/chwl/app/radish/signin/helper/SignInUiHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.radish.signin.helper; +package com.chwl.app.radish.signin.helper; import android.content.Context; import android.text.TextUtils; @@ -6,10 +6,10 @@ import android.text.style.ForegroundColorSpan; import android.view.View; import android.widget.TextView; -import com.yizhuan.habu.R; -import com.yizhuan.habu.common.widget.dialog.DialogManager; -import com.yizhuan.habu.utils.SpannableBuilder; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.common.widget.dialog.DialogManager; +import com.chwl.app.utils.SpannableBuilder; +import com.chwl.library.utils.ResUtil; /** * create by lvzebiao @2019/4/28 diff --git a/app/src/main/java/com/yizhuan/habu/radish/signin/presenter/SignInPresenter.java b/app/src/main/java/com/chwl/app/radish/signin/presenter/SignInPresenter.java similarity index 86% rename from app/src/main/java/com/yizhuan/habu/radish/signin/presenter/SignInPresenter.java rename to app/src/main/java/com/chwl/app/radish/signin/presenter/SignInPresenter.java index 4e52a6bd1..0dc9f7bc8 100644 --- a/app/src/main/java/com/yizhuan/habu/radish/signin/presenter/SignInPresenter.java +++ b/app/src/main/java/com/chwl/app/radish/signin/presenter/SignInPresenter.java @@ -1,16 +1,16 @@ -package com.yizhuan.habu.radish.signin.presenter; +package com.chwl.app.radish.signin.presenter; -import com.yizhuan.habu.base.BaseMvpPresenter; -import com.yizhuan.habu.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.chwl.app.base.BaseMvpPresenter; +import com.chwl.app.radish.signin.view.ISignInView; +import com.chwl.core.radish.signin.ISignInModel; +import com.chwl.core.radish.signin.SignInModel; +import com.chwl.core.radish.signin.bean.DrawNoticeInfo; +import com.chwl.core.radish.signin.bean.ReceiveTotalRewardInfo; +import com.chwl.core.radish.signin.bean.RewardNoticeInfo; +import com.chwl.core.radish.signin.bean.SignDetailInfo; +import com.chwl.core.radish.signin.bean.SignDrawInfo; +import com.chwl.core.radish.signin.bean.SignInfo; +import com.chwl.core.utils.net.BeanObserver; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/radish/signin/view/CarveUpGoldAdapter.java b/app/src/main/java/com/chwl/app/radish/signin/view/CarveUpGoldAdapter.java similarity index 92% rename from app/src/main/java/com/yizhuan/habu/radish/signin/view/CarveUpGoldAdapter.java rename to app/src/main/java/com/chwl/app/radish/signin/view/CarveUpGoldAdapter.java index cb2b9c46c..0d030728c 100644 --- a/app/src/main/java/com/yizhuan/habu/radish/signin/view/CarveUpGoldAdapter.java +++ b/app/src/main/java/com/chwl/app/radish/signin/view/CarveUpGoldAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.radish.signin.view; +package com.chwl.app.radish.signin.view; import android.content.Context; import android.text.SpannableString; @@ -10,10 +10,10 @@ import android.widget.TextView; import androidx.core.content.ContextCompat; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.widget.marqueeview.BetterMarqueeView; -import com.yizhuan.xchat_android_core.radish.signin.bean.DrawNoticeInfo; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.ui.widget.marqueeview.BetterMarqueeView; +import com.chwl.core.radish.signin.bean.DrawNoticeInfo; +import com.chwl.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/radish/signin/view/ISignInView.java b/app/src/main/java/com/chwl/app/radish/signin/view/ISignInView.java similarity index 68% rename from app/src/main/java/com/yizhuan/habu/radish/signin/view/ISignInView.java rename to app/src/main/java/com/chwl/app/radish/signin/view/ISignInView.java index 4292a3ad7..4878eec71 100644 --- a/app/src/main/java/com/yizhuan/habu/radish/signin/view/ISignInView.java +++ b/app/src/main/java/com/chwl/app/radish/signin/view/ISignInView.java @@ -1,11 +1,11 @@ -package com.yizhuan.habu.radish.signin.view; +package com.chwl.app.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.chwl.core.radish.signin.bean.DrawNoticeInfo; +import com.chwl.core.radish.signin.bean.ReceiveTotalRewardInfo; +import com.chwl.core.radish.signin.bean.RewardNoticeInfo; +import com.chwl.core.radish.signin.bean.SignDetailInfo; +import com.chwl.core.radish.signin.bean.SignDrawInfo; +import com.chwl.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/radish/signin/view/RewardProgressView.java b/app/src/main/java/com/chwl/app/radish/signin/view/RewardProgressView.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/radish/signin/view/RewardProgressView.java rename to app/src/main/java/com/chwl/app/radish/signin/view/RewardProgressView.java index de2cf797e..ffeae511e 100644 --- a/app/src/main/java/com/yizhuan/habu/radish/signin/view/RewardProgressView.java +++ b/app/src/main/java/com/chwl/app/radish/signin/view/RewardProgressView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.radish.signin.view; +package com.chwl.app.radish.signin.view; import android.content.Context; import android.graphics.Canvas; @@ -9,8 +9,8 @@ import android.view.View; import androidx.annotation.Nullable; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.R; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; /** * 签到奖品的进度 diff --git a/app/src/main/java/com/yizhuan/habu/radish/signin/view/RuleDialog.java b/app/src/main/java/com/chwl/app/radish/signin/view/RuleDialog.java similarity index 80% rename from app/src/main/java/com/yizhuan/habu/radish/signin/view/RuleDialog.java rename to app/src/main/java/com/chwl/app/radish/signin/view/RuleDialog.java index 46282d180..c8602b368 100644 --- a/app/src/main/java/com/yizhuan/habu/radish/signin/view/RuleDialog.java +++ b/app/src/main/java/com/chwl/app/radish/signin/view/RuleDialog.java @@ -1,15 +1,15 @@ -package com.yizhuan.habu.radish.signin.view; +package com.chwl.app.radish.signin.view; import android.content.Context; import android.os.Build; import android.webkit.WebSettings; import android.webkit.WebViewClient; -import com.yizhuan.habu.R; -import com.yizhuan.habu.databinding.DialogRuleBinding; -import com.yizhuan.habu.treasure_box.widget.dialog.BaseBindingDialog; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; +import com.chwl.app.R; +import com.chwl.app.databinding.DialogRuleBinding; +import com.chwl.app.treasure_box.widget.dialog.BaseBindingDialog; +import com.chwl.core.UriProvider; +import com.chwl.library.annatation.ActLayoutRes; @ActLayoutRes(R.layout.dialog_rule) public class RuleDialog extends BaseBindingDialog { diff --git a/app/src/main/java/com/yizhuan/habu/radish/signin/view/SignInDialog.java b/app/src/main/java/com/chwl/app/radish/signin/view/SignInDialog.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/radish/signin/view/SignInDialog.java rename to app/src/main/java/com/chwl/app/radish/signin/view/SignInDialog.java index 670528bea..d8714e163 100644 --- a/app/src/main/java/com/yizhuan/habu/radish/signin/view/SignInDialog.java +++ b/app/src/main/java/com/chwl/app/radish/signin/view/SignInDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.radish.signin.view; +package com.chwl.app.radish.signin.view; import android.content.Context; import android.graphics.Color; @@ -14,17 +14,17 @@ import android.widget.TextView; import androidx.appcompat.app.AppCompatDialog; -import com.yizhuan.habu.R; -import com.yizhuan.habu.radish.signin.SignInActivity; -import com.yizhuan.habu.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.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.app.radish.signin.SignInActivity; +import com.chwl.app.utils.NumberFormatUtil; +import com.chwl.core.radish.signin.ISignInModel; +import com.chwl.core.radish.signin.SignInModel; +import com.chwl.core.radish.signin.bean.SignDetailInfo; +import com.chwl.core.radish.signin.bean.SignInfo; +import com.chwl.core.utils.net.BeanObserver; +import com.chwl.core.utils.net.RxHelper; +import com.chwl.library.utils.ResUtil; +import com.chwl.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/habu/radish/task/activity/TaskCenterActivity.java b/app/src/main/java/com/chwl/app/radish/task/activity/TaskCenterActivity.java similarity index 84% rename from app/src/main/java/com/yizhuan/habu/radish/task/activity/TaskCenterActivity.java rename to app/src/main/java/com/chwl/app/radish/task/activity/TaskCenterActivity.java index 5a292e03f..dadd03ad4 100644 --- a/app/src/main/java/com/yizhuan/habu/radish/task/activity/TaskCenterActivity.java +++ b/app/src/main/java/com/chwl/app/radish/task/activity/TaskCenterActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.radish.task.activity; +package com.chwl.app.radish.task.activity; import android.content.Context; import android.content.Intent; @@ -11,22 +11,22 @@ import android.widget.TextView; import androidx.fragment.app.Fragment; import androidx.viewpager.widget.ViewPager; -import com.yizhuan.habu.R; -import com.yizhuan.habu.avroom.adapter.RoomContributeListAdapter; -import com.yizhuan.habu.base.BaseMvpActivity; -import com.yizhuan.habu.radish.helper.PrizeAnimUiHelper; -import com.yizhuan.habu.radish.task.fragment.TaskCenterFragment; -import com.yizhuan.habu.radish.task.presenter.TaskCenterPresenter; -import com.yizhuan.habu.radish.task.view.ITaskCenterView; -import com.yizhuan.habu.radish.widget.TaskCenterNavAdapter; -import com.yizhuan.habu.ui.widget.magicindicator.MagicIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.ViewPagerHelper; -import com.yizhuan.habu.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.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.avroom.adapter.RoomContributeListAdapter; +import com.chwl.app.base.BaseMvpActivity; +import com.chwl.app.radish.helper.PrizeAnimUiHelper; +import com.chwl.app.radish.task.fragment.TaskCenterFragment; +import com.chwl.app.radish.task.presenter.TaskCenterPresenter; +import com.chwl.app.radish.task.view.ITaskCenterView; +import com.chwl.app.radish.widget.TaskCenterNavAdapter; +import com.chwl.app.ui.widget.magicindicator.MagicIndicator; +import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.chwl.core.radish.task.bean.PrizeAnim; +import com.chwl.core.radish.task.bean.TaskInfo; +import com.chwl.core.utils.SharedPreferenceUtils; +import com.chwl.library.base.factory.CreatePresenter; +import com.chwl.library.utils.ResUtil; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/habu/radish/task/adpter/TaskCenterAdapter.java b/app/src/main/java/com/chwl/app/radish/task/adpter/TaskCenterAdapter.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/radish/task/adpter/TaskCenterAdapter.java rename to app/src/main/java/com/chwl/app/radish/task/adpter/TaskCenterAdapter.java index 893a21383..f7ebf8b0f 100644 --- a/app/src/main/java/com/yizhuan/habu/radish/task/adpter/TaskCenterAdapter.java +++ b/app/src/main/java/com/chwl/app/radish/task/adpter/TaskCenterAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.radish.task.adpter; +package com.chwl.app.radish.task.adpter; import android.content.Context; import android.text.TextUtils; @@ -8,9 +8,9 @@ import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.radish.task.bean.TaskInfo; +import com.chwl.app.R; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.core.radish.task.bean.TaskInfo; /** * create by lvzebiao @2019/3/26 diff --git a/app/src/main/java/com/yizhuan/habu/radish/task/fragment/TaskCenterFragment.java b/app/src/main/java/com/chwl/app/radish/task/fragment/TaskCenterFragment.java similarity index 86% rename from app/src/main/java/com/yizhuan/habu/radish/task/fragment/TaskCenterFragment.java rename to app/src/main/java/com/chwl/app/radish/task/fragment/TaskCenterFragment.java index 0c17074fd..067d31ee6 100644 --- a/app/src/main/java/com/yizhuan/habu/radish/task/fragment/TaskCenterFragment.java +++ b/app/src/main/java/com/chwl/app/radish/task/fragment/TaskCenterFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.radish.task.fragment; +package com.chwl.app.radish.task.fragment; import android.annotation.SuppressLint; import android.os.Bundle; @@ -10,24 +10,24 @@ import androidx.recyclerview.widget.SimpleItemAnimator; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseMvpFragment; -import com.yizhuan.habu.radish.helper.TaskCenterDialogHelper; -import com.yizhuan.habu.radish.task.adpter.TaskCenterAdapter; -import com.yizhuan.habu.radish.task.presenter.TaskCenterFrgPresenter; -import com.yizhuan.habu.radish.task.view.ITaskCenterView; -import com.yizhuan.habu.radish.task.view.ITaskCenterViewFrg; -import com.yizhuan.habu.ui.im.RouterHandler; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.habu.ui.widget.recyclerview.decoration.HorizontalDecoration; +import com.chwl.app.R; +import com.chwl.app.base.BaseMvpFragment; +import com.chwl.app.radish.helper.TaskCenterDialogHelper; +import com.chwl.app.radish.task.adpter.TaskCenterAdapter; +import com.chwl.app.radish.task.presenter.TaskCenterFrgPresenter; +import com.chwl.app.radish.task.view.ITaskCenterView; +import com.chwl.app.radish.task.view.ITaskCenterViewFrg; +import com.chwl.app.ui.im.RouterHandler; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.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.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.chwl.core.radish.task.ITaskModel; +import com.chwl.core.radish.task.TaskModel; +import com.chwl.core.radish.task.bean.TaskInfo; +import com.chwl.core.utils.net.DontWarnObserver; +import com.chwl.core.utils.net.RxHelper; +import com.chwl.library.base.factory.CreatePresenter; +import com.chwl.library.utils.SingleToastUtil; @CreatePresenter(TaskCenterFrgPresenter.class) public class TaskCenterFragment extends BaseMvpFragment implements ITaskCenterViewFrg{ diff --git a/app/src/main/java/com/chwl/app/radish/task/presenter/TaskCenterFrgPresenter.java b/app/src/main/java/com/chwl/app/radish/task/presenter/TaskCenterFrgPresenter.java new file mode 100644 index 000000000..15e12f62a --- /dev/null +++ b/app/src/main/java/com/chwl/app/radish/task/presenter/TaskCenterFrgPresenter.java @@ -0,0 +1,7 @@ +package com.chwl.app.radish.task.presenter; + +import com.chwl.app.base.BaseMvpPresenter; +import com.chwl.app.radish.task.view.ITaskCenterViewFrg; + +public class TaskCenterFrgPresenter extends BaseMvpPresenter { +} diff --git a/app/src/main/java/com/chwl/app/radish/task/presenter/TaskCenterPresenter.java b/app/src/main/java/com/chwl/app/radish/task/presenter/TaskCenterPresenter.java new file mode 100644 index 000000000..915de70a7 --- /dev/null +++ b/app/src/main/java/com/chwl/app/radish/task/presenter/TaskCenterPresenter.java @@ -0,0 +1,12 @@ +package com.chwl.app.radish.task.presenter; + +import com.chwl.app.base.BaseMvpPresenter; +import com.chwl.app.radish.task.view.ITaskCenterView; + +/** + * create by lvzebiao @2019/3/27 + */ +public class TaskCenterPresenter extends BaseMvpPresenter { + + +} diff --git a/app/src/main/java/com/chwl/app/radish/task/view/ITaskCenterView.java b/app/src/main/java/com/chwl/app/radish/task/view/ITaskCenterView.java new file mode 100644 index 000000000..b29d9b8a0 --- /dev/null +++ b/app/src/main/java/com/chwl/app/radish/task/view/ITaskCenterView.java @@ -0,0 +1,11 @@ +package com.chwl.app.radish.task.view; + +import com.chwl.core.radish.task.bean.TaskInfo; +import com.chwl.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/chwl/app/radish/task/view/ITaskCenterViewFrg.java b/app/src/main/java/com/chwl/app/radish/task/view/ITaskCenterViewFrg.java new file mode 100644 index 000000000..103fa2543 --- /dev/null +++ b/app/src/main/java/com/chwl/app/radish/task/view/ITaskCenterViewFrg.java @@ -0,0 +1,6 @@ +package com.chwl.app.radish.task.view; + +import com.chwl.library.base.IMvpBaseView; + +public interface ITaskCenterViewFrg extends IMvpBaseView { +} diff --git a/app/src/main/java/com/yizhuan/habu/radish/view/IRadishRecordFrgView.java b/app/src/main/java/com/chwl/app/radish/view/IRadishRecordFrgView.java similarity index 50% rename from app/src/main/java/com/yizhuan/habu/radish/view/IRadishRecordFrgView.java rename to app/src/main/java/com/chwl/app/radish/view/IRadishRecordFrgView.java index c49f37db4..58432dbf2 100644 --- a/app/src/main/java/com/yizhuan/habu/radish/view/IRadishRecordFrgView.java +++ b/app/src/main/java/com/chwl/app/radish/view/IRadishRecordFrgView.java @@ -1,7 +1,7 @@ -package com.yizhuan.habu.radish.view; +package com.chwl.app.radish.view; -import com.yizhuan.xchat_android_core.bills.bean.RadishRecordListInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.chwl.core.bills.bean.RadishRecordListInfo; +import com.chwl.library.base.IMvpBaseView; public interface IRadishRecordFrgView extends IMvpBaseView { void getRadishRecordSuccess(RadishRecordListInfo list); diff --git a/app/src/main/java/com/chwl/app/radish/view/IRadishRecordView.java b/app/src/main/java/com/chwl/app/radish/view/IRadishRecordView.java new file mode 100644 index 000000000..881c5fc39 --- /dev/null +++ b/app/src/main/java/com/chwl/app/radish/view/IRadishRecordView.java @@ -0,0 +1,6 @@ +package com.chwl.app.radish.view; + +import com.chwl.library.base.IMvpBaseView; + +public interface IRadishRecordView extends IMvpBaseView { +} diff --git a/app/src/main/java/com/yizhuan/habu/radish/wallet/RadishWalletManager.java b/app/src/main/java/com/chwl/app/radish/wallet/RadishWalletManager.java similarity index 86% rename from app/src/main/java/com/yizhuan/habu/radish/wallet/RadishWalletManager.java rename to app/src/main/java/com/chwl/app/radish/wallet/RadishWalletManager.java index 2b8c619c5..0cc3768eb 100644 --- a/app/src/main/java/com/yizhuan/habu/radish/wallet/RadishWalletManager.java +++ b/app/src/main/java/com/chwl/app/radish/wallet/RadishWalletManager.java @@ -1,12 +1,12 @@ -package com.yizhuan.habu.radish.wallet; +package com.chwl.app.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.chwl.core.radish.RadishModel; +import com.chwl.core.radish.RadishWalletInfo; +import com.chwl.core.radish.event.RadishWalletInfoUpdateEvent; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/habu/radish/widget/RadishRecordNavAdapter.java b/app/src/main/java/com/chwl/app/radish/widget/RadishRecordNavAdapter.java similarity index 79% rename from app/src/main/java/com/yizhuan/habu/radish/widget/RadishRecordNavAdapter.java rename to app/src/main/java/com/chwl/app/radish/widget/RadishRecordNavAdapter.java index 1490afba1..b63aa502c 100644 --- a/app/src/main/java/com/yizhuan/habu/radish/widget/RadishRecordNavAdapter.java +++ b/app/src/main/java/com/chwl/app/radish/widget/RadishRecordNavAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.radish.widget; +package com.chwl.app.radish.widget; import android.content.Context; import android.graphics.Color; @@ -7,14 +7,14 @@ import android.widget.FrameLayout; import androidx.core.content.ContextCompat; -import com.yizhuan.habu.R; -import com.yizhuan.habu.decoration.view.widgets.BadgeScaleTransitionPagerTitleView; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.decoration.view.widgets.BadgeScaleTransitionPagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; +import com.chwl.library.utils.ResUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/radish/widget/TaskCenterNavAdapter.java b/app/src/main/java/com/chwl/app/radish/widget/TaskCenterNavAdapter.java similarity index 78% rename from app/src/main/java/com/yizhuan/habu/radish/widget/TaskCenterNavAdapter.java rename to app/src/main/java/com/chwl/app/radish/widget/TaskCenterNavAdapter.java index c1e823673..744ee2636 100644 --- a/app/src/main/java/com/yizhuan/habu/radish/widget/TaskCenterNavAdapter.java +++ b/app/src/main/java/com/chwl/app/radish/widget/TaskCenterNavAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.radish.widget; +package com.chwl.app.radish.widget; import android.content.Context; import android.graphics.Color; @@ -7,14 +7,14 @@ import android.widget.FrameLayout; import androidx.core.content.ContextCompat; -import com.yizhuan.habu.R; -import com.yizhuan.habu.decoration.view.widgets.BadgeScaleTransitionPagerTitleView; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.decoration.view.widgets.BadgeScaleTransitionPagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; +import com.chwl.library.utils.ResUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/reciever/IncomingCallReceiver.java b/app/src/main/java/com/chwl/app/reciever/IncomingCallReceiver.java similarity index 85% rename from app/src/main/java/com/yizhuan/habu/reciever/IncomingCallReceiver.java rename to app/src/main/java/com/chwl/app/reciever/IncomingCallReceiver.java index 82ba69b74..3628f93f1 100644 --- a/app/src/main/java/com/yizhuan/habu/reciever/IncomingCallReceiver.java +++ b/app/src/main/java/com/chwl/app/reciever/IncomingCallReceiver.java @@ -1,11 +1,11 @@ -package com.yizhuan.habu.reciever; +package com.chwl.app.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.chwl.core.im.state.PhoneCallStateModel; /** * Created by zhouxiangfeng on 2017/5/31. diff --git a/app/src/main/java/com/yizhuan/habu/reciever/NotificationClickReceiver.java b/app/src/main/java/com/chwl/app/reciever/NotificationClickReceiver.java similarity index 70% rename from app/src/main/java/com/yizhuan/habu/reciever/NotificationClickReceiver.java rename to app/src/main/java/com/chwl/app/reciever/NotificationClickReceiver.java index 31332f1e4..cd6f4feda 100644 --- a/app/src/main/java/com/yizhuan/habu/reciever/NotificationClickReceiver.java +++ b/app/src/main/java/com/chwl/app/reciever/NotificationClickReceiver.java @@ -1,12 +1,12 @@ -package com.yizhuan.habu.reciever; +package com.chwl.app.reciever; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import com.yizhuan.habu.avroom.activity.AVRoomActivity; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; +import com.chwl.app.avroom.activity.AVRoomActivity; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.room.bean.RoomInfo; /** * Created by chenran on 2017/11/16. diff --git a/app/src/main/java/com/yizhuan/habu/reciever/OnePixelReceiver.java b/app/src/main/java/com/chwl/app/reciever/OnePixelReceiver.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/reciever/OnePixelReceiver.java rename to app/src/main/java/com/chwl/app/reciever/OnePixelReceiver.java index d7e53c620..9bfeca713 100644 --- a/app/src/main/java/com/yizhuan/habu/reciever/OnePixelReceiver.java +++ b/app/src/main/java/com/chwl/app/reciever/OnePixelReceiver.java @@ -1,10 +1,10 @@ -package com.yizhuan.habu.reciever; +package com.chwl.app.reciever; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import com.yizhuan.habu.ui.keepalive.OnePiexlActivity; +import com.chwl.app.ui.keepalive.OnePiexlActivity; /** * diff --git a/app/src/main/java/com/yizhuan/habu/relation/cp/CpDataManager.java b/app/src/main/java/com/chwl/app/relation/cp/CpDataManager.java similarity index 84% rename from app/src/main/java/com/yizhuan/habu/relation/cp/CpDataManager.java rename to app/src/main/java/com/chwl/app/relation/cp/CpDataManager.java index d27d864a8..5fe3eca4e 100644 --- a/app/src/main/java/com/yizhuan/habu/relation/cp/CpDataManager.java +++ b/app/src/main/java/com/chwl/app/relation/cp/CpDataManager.java @@ -1,7 +1,7 @@ -package com.yizhuan.habu.relation.cp; +package com.chwl.app.relation.cp; -import com.yizhuan.xchat_android_core.relation.cp.CpInviteInfo; +import com.chwl.core.relation.cp.CpInviteInfo; public class CpDataManager { diff --git a/app/src/main/java/com/yizhuan/habu/relation/cp/CpDataParser.kt b/app/src/main/java/com/chwl/app/relation/cp/CpDataParser.kt similarity index 88% rename from app/src/main/java/com/yizhuan/habu/relation/cp/CpDataParser.kt rename to app/src/main/java/com/chwl/app/relation/cp/CpDataParser.kt index c3cdf4597..02f00c135 100644 --- a/app/src/main/java/com/yizhuan/habu/relation/cp/CpDataParser.kt +++ b/app/src/main/java/com/chwl/app/relation/cp/CpDataParser.kt @@ -1,7 +1,7 @@ -package com.yizhuan.habu.relation.cp +package com.chwl.app.relation.cp -import com.yizhuan.xchat_android_core.relation.cp.CpInviteDetailEntity -import com.yizhuan.xchat_android_core.relation.cp.CpInviteInfo +import com.chwl.core.relation.cp.CpInviteDetailEntity +import com.chwl.core.relation.cp.CpInviteInfo object CpDataParser { fun inviteMsg2cpDetailEntity(msgEntity: CpInviteInfo) = CpInviteDetailEntity( diff --git a/app/src/main/java/com/yizhuan/habu/relation/cp/CpViewHelper.kt b/app/src/main/java/com/chwl/app/relation/cp/CpViewHelper.kt similarity index 96% rename from app/src/main/java/com/yizhuan/habu/relation/cp/CpViewHelper.kt rename to app/src/main/java/com/chwl/app/relation/cp/CpViewHelper.kt index 7c0d659c6..f585ebdca 100644 --- a/app/src/main/java/com/yizhuan/habu/relation/cp/CpViewHelper.kt +++ b/app/src/main/java/com/chwl/app/relation/cp/CpViewHelper.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.relation.cp +package com.chwl.app.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.habu.R -import com.yizhuan.habu.common.widget.dialog.DialogManager +import com.chwl.app.R +import com.chwl.app.common.widget.dialog.DialogManager object CpViewHelper { diff --git a/app/src/main/java/com/yizhuan/habu/relation/cp/activity/CpHomeActivity.kt b/app/src/main/java/com/chwl/app/relation/cp/activity/CpHomeActivity.kt similarity index 82% rename from app/src/main/java/com/yizhuan/habu/relation/cp/activity/CpHomeActivity.kt rename to app/src/main/java/com/chwl/app/relation/cp/activity/CpHomeActivity.kt index ed4e61743..cadb985b3 100644 --- a/app/src/main/java/com/yizhuan/habu/relation/cp/activity/CpHomeActivity.kt +++ b/app/src/main/java/com/chwl/app/relation/cp/activity/CpHomeActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.relation.cp.activity +package com.chwl.app.relation.cp.activity import android.content.Context import android.content.Intent @@ -6,18 +6,18 @@ import android.graphics.Color import android.view.View import androidx.activity.viewModels import com.netease.nim.uikit.StatusBarUtil -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseBindingActivity -import com.yizhuan.habu.base.TitleBar -import com.yizhuan.habu.databinding.ActivityCpHomeBinding -import com.yizhuan.habu.relation.cp.viewmodel.CpViewModel -import com.yizhuan.habu.relation.cp.widget.RelationCpCardView.Companion.PAGE_TYPE_SELF_CP -import com.yizhuan.habu.ui.relation.FansListActivity -import com.yizhuan.habu.ui.user.activity.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.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.base.BaseBindingActivity +import com.chwl.app.base.TitleBar +import com.chwl.app.databinding.ActivityCpHomeBinding +import com.chwl.app.relation.cp.viewmodel.CpViewModel +import com.chwl.app.relation.cp.widget.RelationCpCardView.Companion.PAGE_TYPE_SELF_CP +import com.chwl.app.ui.relation.FansListActivity +import com.chwl.app.ui.user.activity.UserInfoActivity +import com.chwl.core.auth.AuthModel +import com.chwl.core.relation.cp.CpBindUnbindEvent +import com.chwl.library.annatation.ActLayoutRes +import com.chwl.library.utils.ResUtil import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/yizhuan/habu/relation/cp/activity/CpInviteRecordActivity.kt b/app/src/main/java/com/chwl/app/relation/cp/activity/CpInviteRecordActivity.kt similarity index 82% rename from app/src/main/java/com/yizhuan/habu/relation/cp/activity/CpInviteRecordActivity.kt rename to app/src/main/java/com/chwl/app/relation/cp/activity/CpInviteRecordActivity.kt index ba527bd92..3ae6813a6 100644 --- a/app/src/main/java/com/yizhuan/habu/relation/cp/activity/CpInviteRecordActivity.kt +++ b/app/src/main/java/com/chwl/app/relation/cp/activity/CpInviteRecordActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.relation.cp.activity +package com.chwl.app.relation.cp.activity import android.content.Context import android.content.Intent @@ -6,22 +6,22 @@ import android.graphics.Color import androidx.activity.viewModels import androidx.recyclerview.widget.LinearLayoutManager import com.netease.nim.uikit.StatusBarUtil -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseBindingActivity -import com.yizhuan.habu.common.EmptyViewHelper -import com.yizhuan.habu.databinding.ActivityCpInviteRecordBinding -import com.yizhuan.habu.relation.cp.CpDataManager -import com.yizhuan.habu.relation.cp.CpViewHelper -import com.yizhuan.habu.relation.cp.adapter.InviteRecordAdapter -import com.yizhuan.habu.relation.cp.dialog.CpInviteReplyConfirmDialog -import com.yizhuan.habu.relation.cp.dialog.CpInviteReplyDialog -import com.yizhuan.habu.relation.cp.viewmodel.CpViewModel -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.base.BaseBindingActivity +import com.chwl.app.common.EmptyViewHelper +import com.chwl.app.databinding.ActivityCpInviteRecordBinding +import com.chwl.app.relation.cp.CpDataManager +import com.chwl.app.relation.cp.CpViewHelper +import com.chwl.app.relation.cp.adapter.InviteRecordAdapter +import com.chwl.app.relation.cp.dialog.CpInviteReplyConfirmDialog +import com.chwl.app.relation.cp.dialog.CpInviteReplyDialog +import com.chwl.app.relation.cp.viewmodel.CpViewModel +import com.chwl.app.ui.widget.dialog.CommonTipDialog +import com.chwl.core.relation.cp.CpBindUnbindEvent +import com.chwl.core.relation.cp.CpInviteDetailEntity +import com.chwl.core.relation.cp.UserCpListEntity +import com.chwl.library.annatation.ActLayoutRes +import com.chwl.library.utils.ResUtil import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/yizhuan/habu/relation/cp/activity/CpTaskActivity.kt b/app/src/main/java/com/chwl/app/relation/cp/activity/CpTaskActivity.kt similarity index 84% rename from app/src/main/java/com/yizhuan/habu/relation/cp/activity/CpTaskActivity.kt rename to app/src/main/java/com/chwl/app/relation/cp/activity/CpTaskActivity.kt index 0a8d0a139..eb93c163c 100644 --- a/app/src/main/java/com/yizhuan/habu/relation/cp/activity/CpTaskActivity.kt +++ b/app/src/main/java/com/chwl/app/relation/cp/activity/CpTaskActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.relation.cp.activity +package com.chwl.app.relation.cp.activity import android.content.Context import android.content.Intent @@ -7,23 +7,23 @@ 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.habu.R -import com.yizhuan.habu.base.BaseBindingActivity -import com.yizhuan.habu.databinding.ActivityCpTaskBinding -import com.yizhuan.habu.relation.cp.adapter.CpTaskIndicatorAdapter -import com.yizhuan.habu.relation.cp.adapter.TaskPagerAdapter -import com.yizhuan.habu.relation.cp.fragment.CpTaskFragment -import com.yizhuan.habu.relation.cp.viewmodel.CpViewModel -import com.yizhuan.habu.relation.cp.widget.CpTaskDescriptionView -import com.yizhuan.habu.relation.extention.visibility -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.habu.ui.widget.OnPageSelectedListener -import com.yizhuan.habu.ui.widget.magicindicator.ViewPagerHelper -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.base.BaseBindingActivity +import com.chwl.app.databinding.ActivityCpTaskBinding +import com.chwl.app.relation.cp.adapter.CpTaskIndicatorAdapter +import com.chwl.app.relation.cp.adapter.TaskPagerAdapter +import com.chwl.app.relation.cp.fragment.CpTaskFragment +import com.chwl.app.relation.cp.viewmodel.CpViewModel +import com.chwl.app.relation.cp.widget.CpTaskDescriptionView +import com.chwl.app.relation.extention.visibility +import com.chwl.app.ui.utils.ImageLoadUtilsV2 +import com.chwl.app.ui.widget.OnPageSelectedListener +import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator +import com.chwl.core.auth.AuthModel +import com.chwl.core.relation.cp.CpTaskEntity +import com.chwl.library.annatation.ActLayoutRes +import com.chwl.library.utils.ResUtil @ActLayoutRes(R.layout.activity_cp_task) class CpTaskActivity : BaseBindingActivity(), diff --git a/app/src/main/java/com/yizhuan/habu/relation/cp/adapter/CpTaskAdapter.kt b/app/src/main/java/com/chwl/app/relation/cp/adapter/CpTaskAdapter.kt similarity index 81% rename from app/src/main/java/com/yizhuan/habu/relation/cp/adapter/CpTaskAdapter.kt rename to app/src/main/java/com/chwl/app/relation/cp/adapter/CpTaskAdapter.kt index 452e61527..1f0e3c8cd 100644 --- a/app/src/main/java/com/yizhuan/habu/relation/cp/adapter/CpTaskAdapter.kt +++ b/app/src/main/java/com/chwl/app/relation/cp/adapter/CpTaskAdapter.kt @@ -1,11 +1,11 @@ -package com.yizhuan.habu.relation.cp.adapter +package com.chwl.app.relation.cp.adapter import android.widget.TextView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.xchat_android_core.relation.cp.Task -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.core.relation.cp.Task +import com.chwl.library.utils.ResUtil class CpTaskAdapter : BaseQuickAdapter(R.layout.item_cp_task) { override fun convert(helper: BaseViewHolder, item: Task?) { diff --git a/app/src/main/java/com/yizhuan/habu/relation/cp/adapter/CpTaskIndicatorAdapter.java b/app/src/main/java/com/chwl/app/relation/cp/adapter/CpTaskIndicatorAdapter.java similarity index 87% rename from app/src/main/java/com/yizhuan/habu/relation/cp/adapter/CpTaskIndicatorAdapter.java rename to app/src/main/java/com/chwl/app/relation/cp/adapter/CpTaskIndicatorAdapter.java index 2f1506ee7..196df7f76 100644 --- a/app/src/main/java/com/yizhuan/habu/relation/cp/adapter/CpTaskIndicatorAdapter.java +++ b/app/src/main/java/com/chwl/app/relation/cp/adapter/CpTaskIndicatorAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.relation.cp.adapter; +package com.chwl.app.relation.cp.adapter; import android.content.Context; import android.view.LayoutInflater; @@ -7,10 +7,10 @@ import android.widget.TextView; import androidx.core.content.ContextCompat; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.chwl.app.R; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/relation/cp/adapter/DeclarationRecommondAdapter.kt b/app/src/main/java/com/chwl/app/relation/cp/adapter/DeclarationRecommondAdapter.kt similarity index 83% rename from app/src/main/java/com/yizhuan/habu/relation/cp/adapter/DeclarationRecommondAdapter.kt rename to app/src/main/java/com/chwl/app/relation/cp/adapter/DeclarationRecommondAdapter.kt index 2b355cfcd..aedf516dd 100644 --- a/app/src/main/java/com/yizhuan/habu/relation/cp/adapter/DeclarationRecommondAdapter.kt +++ b/app/src/main/java/com/chwl/app/relation/cp/adapter/DeclarationRecommondAdapter.kt @@ -1,8 +1,8 @@ -package com.yizhuan.habu.relation.cp.adapter +package com.chwl.app.relation.cp.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R +import com.chwl.app.R class DeclarationRecommendAdapter : BaseQuickAdapter(R.layout.item_cp_declaration_recommend) { diff --git a/app/src/main/java/com/yizhuan/habu/relation/cp/adapter/InviteRecordAdapter.kt b/app/src/main/java/com/chwl/app/relation/cp/adapter/InviteRecordAdapter.kt similarity index 90% rename from app/src/main/java/com/yizhuan/habu/relation/cp/adapter/InviteRecordAdapter.kt rename to app/src/main/java/com/chwl/app/relation/cp/adapter/InviteRecordAdapter.kt index d07578c22..127b585ce 100644 --- a/app/src/main/java/com/yizhuan/habu/relation/cp/adapter/InviteRecordAdapter.kt +++ b/app/src/main/java/com/chwl/app/relation/cp/adapter/InviteRecordAdapter.kt @@ -1,13 +1,13 @@ -package com.yizhuan.habu.relation.cp.adapter +package com.chwl.app.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.habu.R -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.xchat_android_core.relation.cp.UserCpListEntity +import com.chwl.app.R +import com.chwl.app.ui.utils.ImageLoadUtilsV2 +import com.chwl.core.relation.cp.UserCpListEntity class InviteRecordAdapter(private val context: Context) : diff --git a/app/src/main/java/com/yizhuan/habu/relation/cp/adapter/TaskPagerAdapter.kt b/app/src/main/java/com/chwl/app/relation/cp/adapter/TaskPagerAdapter.kt similarity index 83% rename from app/src/main/java/com/yizhuan/habu/relation/cp/adapter/TaskPagerAdapter.kt rename to app/src/main/java/com/chwl/app/relation/cp/adapter/TaskPagerAdapter.kt index 78d82dee9..c82756bfe 100644 --- a/app/src/main/java/com/yizhuan/habu/relation/cp/adapter/TaskPagerAdapter.kt +++ b/app/src/main/java/com/chwl/app/relation/cp/adapter/TaskPagerAdapter.kt @@ -1,9 +1,9 @@ -package com.yizhuan.habu.relation.cp.adapter +package com.chwl.app.relation.cp.adapter import android.annotation.SuppressLint import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentStatePagerAdapter -import com.yizhuan.habu.base.BaseFragment +import com.chwl.app.base.BaseFragment @SuppressLint("WrongConstant") class TaskPagerAdapter(fm: FragmentManager, private val list: List) : diff --git a/app/src/main/java/com/yizhuan/habu/relation/cp/dialog/CpGlobalDialog.kt b/app/src/main/java/com/chwl/app/relation/cp/dialog/CpGlobalDialog.kt similarity index 86% rename from app/src/main/java/com/yizhuan/habu/relation/cp/dialog/CpGlobalDialog.kt rename to app/src/main/java/com/chwl/app/relation/cp/dialog/CpGlobalDialog.kt index 63eda5a84..10659ee8c 100644 --- a/app/src/main/java/com/yizhuan/habu/relation/cp/dialog/CpGlobalDialog.kt +++ b/app/src/main/java/com/chwl/app/relation/cp/dialog/CpGlobalDialog.kt @@ -1,18 +1,18 @@ -package com.yizhuan.habu.relation.cp.dialog +package com.chwl.app.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.habu.R -import com.yizhuan.habu.databinding.DialogCpGlobalBinding -import com.yizhuan.habu.relation.cp.CpDataManager -import com.yizhuan.habu.relation.cp.activity.CpInviteRecordActivity -import com.yizhuan.habu.treasure_box.widget.dialog.BaseBindingDialog -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.xchat_android_core.relation.cp.CpInviteInfo -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes +import com.chwl.app.R +import com.chwl.app.databinding.DialogCpGlobalBinding +import com.chwl.app.relation.cp.CpDataManager +import com.chwl.app.relation.cp.activity.CpInviteRecordActivity +import com.chwl.app.treasure_box.widget.dialog.BaseBindingDialog +import com.chwl.app.ui.utils.ImageLoadUtilsV2 +import com.chwl.core.relation.cp.CpInviteInfo +import com.chwl.library.annatation.ActLayoutRes import io.reactivex.Observable import io.reactivex.Observer import io.reactivex.android.schedulers.AndroidSchedulers diff --git a/app/src/main/java/com/yizhuan/habu/relation/cp/dialog/CpInvitePageDialog.kt b/app/src/main/java/com/chwl/app/relation/cp/dialog/CpInvitePageDialog.kt similarity index 82% rename from app/src/main/java/com/yizhuan/habu/relation/cp/dialog/CpInvitePageDialog.kt rename to app/src/main/java/com/chwl/app/relation/cp/dialog/CpInvitePageDialog.kt index 69980c46b..f30909cf1 100644 --- a/app/src/main/java/com/yizhuan/habu/relation/cp/dialog/CpInvitePageDialog.kt +++ b/app/src/main/java/com/chwl/app/relation/cp/dialog/CpInvitePageDialog.kt @@ -1,20 +1,20 @@ -package com.yizhuan.habu.relation.cp.dialog +package com.chwl.app.relation.cp.dialog import android.content.Context import android.graphics.Color import android.text.style.AbsoluteSizeSpan import android.view.View import com.netease.nim.uikit.common.util.sys.ScreenUtil -import com.yizhuan.habu.R -import com.yizhuan.habu.databinding.DialogCpInviteBinding -import com.yizhuan.habu.relation.cp.CpViewHelper -import com.yizhuan.habu.relation.cp.adapter.DeclarationRecommendAdapter -import com.yizhuan.habu.treasure_box.widget.dialog.BaseBindingDialog -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.habu.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.chwl.app.R +import com.chwl.app.databinding.DialogCpInviteBinding +import com.chwl.app.relation.cp.CpViewHelper +import com.chwl.app.relation.cp.adapter.DeclarationRecommendAdapter +import com.chwl.app.treasure_box.widget.dialog.BaseBindingDialog +import com.chwl.app.ui.utils.ImageLoadUtilsV2 +import com.chwl.app.ui.widget.LinearLayoutManagerWrapper +import com.chwl.core.relation.cp.CpInvitePageEntity +import com.chwl.library.annatation.ActLayoutRes +import com.chwl.library.utils.ScreenUtils @ActLayoutRes(R.layout.dialog_cp_invite) class CpInvitePageDialog(context: Context) : View.OnClickListener, diff --git a/app/src/main/java/com/yizhuan/habu/relation/cp/dialog/CpInviteReplyConfirmDialog.kt b/app/src/main/java/com/chwl/app/relation/cp/dialog/CpInviteReplyConfirmDialog.kt similarity index 76% rename from app/src/main/java/com/yizhuan/habu/relation/cp/dialog/CpInviteReplyConfirmDialog.kt rename to app/src/main/java/com/chwl/app/relation/cp/dialog/CpInviteReplyConfirmDialog.kt index 9458fc429..a085894ab 100644 --- a/app/src/main/java/com/yizhuan/habu/relation/cp/dialog/CpInviteReplyConfirmDialog.kt +++ b/app/src/main/java/com/chwl/app/relation/cp/dialog/CpInviteReplyConfirmDialog.kt @@ -1,14 +1,14 @@ -package com.yizhuan.habu.relation.cp.dialog +package com.chwl.app.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.habu.R -import com.yizhuan.habu.databinding.DialogCpInviteReplyConfirmBinding -import com.yizhuan.habu.treasure_box.widget.dialog.BaseBindingDialog -import com.yizhuan.habu.ui.widget.dialog.CommonTipDialog -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes +import com.chwl.app.R +import com.chwl.app.databinding.DialogCpInviteReplyConfirmBinding +import com.chwl.app.treasure_box.widget.dialog.BaseBindingDialog +import com.chwl.app.ui.widget.dialog.CommonTipDialog +import com.chwl.library.annatation.ActLayoutRes @ActLayoutRes(R.layout.dialog_cp_invite_reply_confirm) class CpInviteReplyConfirmDialog(context: Context) : diff --git a/app/src/main/java/com/yizhuan/habu/relation/cp/dialog/CpInviteReplyDialog.kt b/app/src/main/java/com/chwl/app/relation/cp/dialog/CpInviteReplyDialog.kt similarity index 86% rename from app/src/main/java/com/yizhuan/habu/relation/cp/dialog/CpInviteReplyDialog.kt rename to app/src/main/java/com/chwl/app/relation/cp/dialog/CpInviteReplyDialog.kt index f28e6788e..e59e4bc1d 100644 --- a/app/src/main/java/com/yizhuan/habu/relation/cp/dialog/CpInviteReplyDialog.kt +++ b/app/src/main/java/com/chwl/app/relation/cp/dialog/CpInviteReplyDialog.kt @@ -1,18 +1,18 @@ -package com.yizhuan.habu.relation.cp.dialog +package com.chwl.app.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.habu.R -import com.yizhuan.habu.databinding.DialogCpInviteReplyBinding -import com.yizhuan.habu.relation.cp.CpViewHelper -import com.yizhuan.habu.relation.cp.CpViewHelper.getColorSpan -import com.yizhuan.habu.relation.extention.toTimeString -import com.yizhuan.habu.treasure_box.widget.dialog.BaseBindingDialog -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.xchat_android_core.relation.cp.CpInviteDetailEntity -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes +import com.chwl.app.R +import com.chwl.app.databinding.DialogCpInviteReplyBinding +import com.chwl.app.relation.cp.CpViewHelper +import com.chwl.app.relation.cp.CpViewHelper.getColorSpan +import com.chwl.app.relation.extention.toTimeString +import com.chwl.app.treasure_box.widget.dialog.BaseBindingDialog +import com.chwl.app.ui.utils.ImageLoadUtilsV2 +import com.chwl.core.relation.cp.CpInviteDetailEntity +import com.chwl.library.annatation.ActLayoutRes import io.reactivex.Observable import io.reactivex.Observer import io.reactivex.android.schedulers.AndroidSchedulers diff --git a/app/src/main/java/com/yizhuan/habu/relation/cp/dialog/CpMpDialog.kt b/app/src/main/java/com/chwl/app/relation/cp/dialog/CpMpDialog.kt similarity index 82% rename from app/src/main/java/com/yizhuan/habu/relation/cp/dialog/CpMpDialog.kt rename to app/src/main/java/com/chwl/app/relation/cp/dialog/CpMpDialog.kt index 82a0223f2..ef7d0403e 100644 --- a/app/src/main/java/com/yizhuan/habu/relation/cp/dialog/CpMpDialog.kt +++ b/app/src/main/java/com/chwl/app/relation/cp/dialog/CpMpDialog.kt @@ -1,13 +1,13 @@ -package com.yizhuan.habu.relation.cp.dialog +package com.chwl.app.relation.cp.dialog import android.content.Context import android.text.Editable import android.view.View -import com.yizhuan.habu.R -import com.yizhuan.habu.databinding.DialogCpMpBinding -import com.yizhuan.habu.treasure_box.widget.dialog.BaseBindingDialog -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes -import com.yizhuan.xchat_android_library.utils.TextWatcherWrapper +import com.chwl.app.R +import com.chwl.app.databinding.DialogCpMpBinding +import com.chwl.app.treasure_box.widget.dialog.BaseBindingDialog +import com.chwl.library.annatation.ActLayoutRes +import com.chwl.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/habu/relation/cp/fragment/CpTaskFragment.kt b/app/src/main/java/com/chwl/app/relation/cp/fragment/CpTaskFragment.kt similarity index 78% rename from app/src/main/java/com/yizhuan/habu/relation/cp/fragment/CpTaskFragment.kt rename to app/src/main/java/com/chwl/app/relation/cp/fragment/CpTaskFragment.kt index ba226fa95..d6bf7f8ef 100644 --- a/app/src/main/java/com/yizhuan/habu/relation/cp/fragment/CpTaskFragment.kt +++ b/app/src/main/java/com/chwl/app/relation/cp/fragment/CpTaskFragment.kt @@ -1,14 +1,14 @@ -package com.yizhuan.habu.relation.cp.fragment +package com.chwl.app.relation.cp.fragment import android.os.Bundle import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseBindingFragment -import com.yizhuan.habu.databinding.FragmentCpTaskBinding -import com.yizhuan.habu.relation.cp.adapter.CpTaskAdapter -import com.yizhuan.habu.relation.cp.viewmodel.CpViewModel -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes +import com.chwl.app.R +import com.chwl.app.base.BaseBindingFragment +import com.chwl.app.databinding.FragmentCpTaskBinding +import com.chwl.app.relation.cp.adapter.CpTaskAdapter +import com.chwl.app.relation.cp.viewmodel.CpViewModel +import com.chwl.library.annatation.ActLayoutRes @ActLayoutRes(R.layout.fragment_cp_task) class CpTaskFragment : BaseBindingFragment() { diff --git a/app/src/main/java/com/yizhuan/habu/relation/cp/fragment/UserInfoCpFragment.kt b/app/src/main/java/com/chwl/app/relation/cp/fragment/UserInfoCpFragment.kt similarity index 83% rename from app/src/main/java/com/yizhuan/habu/relation/cp/fragment/UserInfoCpFragment.kt rename to app/src/main/java/com/chwl/app/relation/cp/fragment/UserInfoCpFragment.kt index 5b3d77c6f..cffda8474 100644 --- a/app/src/main/java/com/yizhuan/habu/relation/cp/fragment/UserInfoCpFragment.kt +++ b/app/src/main/java/com/chwl/app/relation/cp/fragment/UserInfoCpFragment.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.relation.cp.fragment +package com.chwl.app.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.habu.R -import com.yizhuan.habu.base.BaseViewBindingFragment -import com.yizhuan.habu.databinding.FragmentUserinfoCpBinding -import com.yizhuan.habu.relation.cp.viewmodel.CpViewModel -import com.yizhuan.habu.relation.cp.widget.RelationCpCardView -import com.yizhuan.habu.ui.im.friend.FriendFragmentCpDelegate -import com.yizhuan.habu.ui.relation.FansListActivity -import com.yizhuan.habu.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.chwl.app.R +import com.chwl.app.base.BaseViewBindingFragment +import com.chwl.app.databinding.FragmentUserinfoCpBinding +import com.chwl.app.relation.cp.viewmodel.CpViewModel +import com.chwl.app.relation.cp.widget.RelationCpCardView +import com.chwl.app.ui.im.friend.FriendFragmentCpDelegate +import com.chwl.app.ui.relation.FansListActivity +import com.chwl.app.ui.utils.ImageLoadUtils +import com.chwl.core.auth.AuthModel +import com.chwl.core.noble.NobleResourceType +import com.chwl.core.noble.NobleUtil +import com.chwl.library.annatation.ActLayoutRes import java.io.File import java.net.URL diff --git a/app/src/main/java/com/yizhuan/habu/relation/cp/model/Api.kt b/app/src/main/java/com/chwl/app/relation/cp/model/Api.kt similarity index 94% rename from app/src/main/java/com/yizhuan/habu/relation/cp/model/Api.kt rename to app/src/main/java/com/chwl/app/relation/cp/model/Api.kt index 89870041a..3ea845b4d 100644 --- a/app/src/main/java/com/yizhuan/habu/relation/cp/model/Api.kt +++ b/app/src/main/java/com/chwl/app/relation/cp/model/Api.kt @@ -1,7 +1,7 @@ -package com.yizhuan.habu.relation.cp.model +package com.chwl.app.relation.cp.model -import com.yizhuan.xchat_android_core.bean.response.ServiceResult -import com.yizhuan.xchat_android_core.relation.cp.* +import com.chwl.core.bean.response.ServiceResult +import com.chwl.core.relation.cp.* import retrofit2.http.* interface Api { diff --git a/app/src/main/java/com/yizhuan/habu/relation/cp/model/CpModel.kt b/app/src/main/java/com/chwl/app/relation/cp/model/CpModel.kt similarity index 86% rename from app/src/main/java/com/yizhuan/habu/relation/cp/model/CpModel.kt rename to app/src/main/java/com/chwl/app/relation/cp/model/CpModel.kt index 114b8357a..7117804d6 100644 --- a/app/src/main/java/com/yizhuan/habu/relation/cp/model/CpModel.kt +++ b/app/src/main/java/com/chwl/app/relation/cp/model/CpModel.kt @@ -1,9 +1,9 @@ -package com.yizhuan.habu.relation.cp.model +package com.chwl.app.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.chwl.core.base.BaseModel +import com.chwl.core.relation.cp.* +import com.chwl.core.utils.net.launchRequest +import com.chwl.library.net.rxnet.RxNet object CpModel : BaseModel() { private val api = RxNet.create(Api::class.java) diff --git a/app/src/main/java/com/yizhuan/habu/relation/cp/viewmodel/CpViewModel.kt b/app/src/main/java/com/chwl/app/relation/cp/viewmodel/CpViewModel.kt similarity index 90% rename from app/src/main/java/com/yizhuan/habu/relation/cp/viewmodel/CpViewModel.kt rename to app/src/main/java/com/chwl/app/relation/cp/viewmodel/CpViewModel.kt index 00312bac9..f423b2249 100644 --- a/app/src/main/java/com/yizhuan/habu/relation/cp/viewmodel/CpViewModel.kt +++ b/app/src/main/java/com/chwl/app/relation/cp/viewmodel/CpViewModel.kt @@ -1,15 +1,15 @@ -package com.yizhuan.habu.relation.cp.viewmodel +package com.chwl.app.relation.cp.viewmodel import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewModel -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.base.BaseViewModel +import com.chwl.app.relation.cp.model.CpModel +import com.chwl.core.relation.cp.* +import com.chwl.core.utils.net.BalanceNotEnoughExeption +import com.chwl.core.utils.net.ServerException +import com.chwl.core.utils.toast +import com.chwl.library.utils.ResUtil import org.greenrobot.eventbus.EventBus class CpViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/yizhuan/habu/relation/cp/widget/CpTaskDescriptionView.kt b/app/src/main/java/com/chwl/app/relation/cp/widget/CpTaskDescriptionView.kt similarity index 97% rename from app/src/main/java/com/yizhuan/habu/relation/cp/widget/CpTaskDescriptionView.kt rename to app/src/main/java/com/chwl/app/relation/cp/widget/CpTaskDescriptionView.kt index e7b585842..040306b0a 100644 --- a/app/src/main/java/com/yizhuan/habu/relation/cp/widget/CpTaskDescriptionView.kt +++ b/app/src/main/java/com/chwl/app/relation/cp/widget/CpTaskDescriptionView.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.relation.cp.widget +package com.chwl.app.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.habu.R +import com.chwl.app.R class CpTaskDescriptionView(context: Context, attr: AttributeSet?, def: Int) : LinearLayout( diff --git a/app/src/main/java/com/yizhuan/habu/relation/cp/widget/RelationCpCardView.kt b/app/src/main/java/com/chwl/app/relation/cp/widget/RelationCpCardView.kt similarity index 94% rename from app/src/main/java/com/yizhuan/habu/relation/cp/widget/RelationCpCardView.kt rename to app/src/main/java/com/chwl/app/relation/cp/widget/RelationCpCardView.kt index 46abaf716..54f450bc7 100644 --- a/app/src/main/java/com/yizhuan/habu/relation/cp/widget/RelationCpCardView.kt +++ b/app/src/main/java/com/chwl/app/relation/cp/widget/RelationCpCardView.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.relation.cp.widget +package com.chwl.app.relation.cp.widget import android.content.Context import android.graphics.Color @@ -10,13 +10,13 @@ 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.habu.R -import com.yizhuan.habu.databinding.LayoutCpCardBinding -import com.yizhuan.habu.relation.extention.visibility -import com.yizhuan.habu.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.relation.cp.CpInvitePageEntity -import com.yizhuan.xchat_android_core.relation.cp.CpRelation -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.databinding.LayoutCpCardBinding +import com.chwl.app.relation.extention.visibility +import com.chwl.app.ui.utils.ImageLoadUtils +import com.chwl.core.relation.cp.CpInvitePageEntity +import com.chwl.core.relation.cp.CpRelation +import com.chwl.library.utils.ResUtil class RelationCpCardView(context: Context, attr: AttributeSet?, def: Int) : FrameLayout(context, attr, def) { diff --git a/app/src/main/java/com/yizhuan/habu/relation/extention/RelationExtention.kt b/app/src/main/java/com/chwl/app/relation/extention/RelationExtention.kt similarity index 79% rename from app/src/main/java/com/yizhuan/habu/relation/extention/RelationExtention.kt rename to app/src/main/java/com/chwl/app/relation/extention/RelationExtention.kt index cecb27949..84c6d8947 100644 --- a/app/src/main/java/com/yizhuan/habu/relation/extention/RelationExtention.kt +++ b/app/src/main/java/com/chwl/app/relation/extention/RelationExtention.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.relation.extention +package com.chwl.app.relation.extention import android.view.View diff --git a/app/src/main/java/com/yizhuan/habu/service/DaemonService.java b/app/src/main/java/com/chwl/app/service/DaemonService.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/service/DaemonService.java rename to app/src/main/java/com/chwl/app/service/DaemonService.java index a23940a26..411867026 100644 --- a/app/src/main/java/com/yizhuan/habu/service/DaemonService.java +++ b/app/src/main/java/com/chwl/app/service/DaemonService.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.service; +package com.chwl.app.service; import android.app.Notification; import android.app.NotificationChannel; @@ -12,11 +12,11 @@ import android.os.IBinder; import androidx.annotation.Nullable; -import com.yizhuan.habu.R; -import com.yizhuan.habu.reciever.NotificationClickReceiver; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.reciever.NotificationClickReceiver; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.room.bean.RoomInfo; +import com.chwl.library.utils.ResUtil; /** * @author chenran diff --git a/app/src/main/java/com/yizhuan/habu/share/Holder.java b/app/src/main/java/com/chwl/app/share/Holder.java similarity index 70% rename from app/src/main/java/com/yizhuan/habu/share/Holder.java rename to app/src/main/java/com/chwl/app/share/Holder.java index bd578ea19..1073d5ade 100644 --- a/app/src/main/java/com/yizhuan/habu/share/Holder.java +++ b/app/src/main/java/com/chwl/app/share/Holder.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.share; +package com.chwl.app.share; /** * Created by MadisonRong on 08/06/2018. diff --git a/app/src/main/java/com/yizhuan/habu/share/viewholder/InAppSharingMsgViewHolder.java b/app/src/main/java/com/chwl/app/share/viewholder/InAppSharingMsgViewHolder.java similarity index 82% rename from app/src/main/java/com/yizhuan/habu/share/viewholder/InAppSharingMsgViewHolder.java rename to app/src/main/java/com/chwl/app/share/viewholder/InAppSharingMsgViewHolder.java index 5cbf448e3..d27fc6b36 100644 --- a/app/src/main/java/com/yizhuan/habu/share/viewholder/InAppSharingMsgViewHolder.java +++ b/app/src/main/java/com/chwl/app/share/viewholder/InAppSharingMsgViewHolder.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.share.viewholder; +package com.chwl.app.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.habu.R; -import com.yizhuan.habu.ui.im.RouterHandler; -import com.yizhuan.habu.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.chwl.app.R; +import com.chwl.app.ui.im.RouterHandler; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.core.im.custom.bean.CustomAttachment; +import com.chwl.core.im.custom.bean.InAppSharingFamilyAttachment; +import com.chwl.core.im.custom.bean.InAppSharingMiniWorldAttachment; +import com.chwl.core.im.custom.bean.InAppSharingRoomAttachment; +import com.chwl.core.im.custom.bean.InAppSharingTeamAttachment; +import com.chwl.core.im.custom.bean.RouterType; +import com.chwl.core.share.bean.InAppSharingInfo; +import com.chwl.core.share.bean.InAppSharingTeamInfo; +import com.chwl.core.team.bean.TeamInfo; /** * Created by MadisonRong on 08/06/2018. diff --git a/app/src/main/java/com/yizhuan/habu/skill/SKillDataParser.kt b/app/src/main/java/com/chwl/app/skill/SKillDataParser.kt similarity index 90% rename from app/src/main/java/com/yizhuan/habu/skill/SKillDataParser.kt rename to app/src/main/java/com/chwl/app/skill/SKillDataParser.kt index 7314dcf2d..879e3ac26 100644 --- a/app/src/main/java/com/yizhuan/habu/skill/SKillDataParser.kt +++ b/app/src/main/java/com/chwl/app/skill/SKillDataParser.kt @@ -1,10 +1,10 @@ -package com.yizhuan.habu.skill +package com.chwl.app.skill -import com.yizhuan.habu.skill.widget.ItemAttribute -import com.yizhuan.habu.skill.widget.ItemEventListener -import com.yizhuan.habu.skill.widget.SkillAttribute -import com.yizhuan.habu.skill.widget.SkillItem -import com.yizhuan.xchat_android_core.skill.entity.* +import com.chwl.app.skill.widget.ItemAttribute +import com.chwl.app.skill.widget.ItemEventListener +import com.chwl.app.skill.widget.SkillAttribute +import com.chwl.app.skill.widget.SkillItem +import com.chwl.core.skill.entity.* object SKillDataParser { private fun parseItemRecordToAttribute( diff --git a/app/src/main/java/com/yizhuan/habu/skill/SkillDataDelegate.kt b/app/src/main/java/com/chwl/app/skill/SkillDataDelegate.kt similarity index 90% rename from app/src/main/java/com/yizhuan/habu/skill/SkillDataDelegate.kt rename to app/src/main/java/com/chwl/app/skill/SkillDataDelegate.kt index 81de8a058..1b582b79c 100644 --- a/app/src/main/java/com/yizhuan/habu/skill/SkillDataDelegate.kt +++ b/app/src/main/java/com/chwl/app/skill/SkillDataDelegate.kt @@ -1,20 +1,20 @@ -package com.yizhuan.habu.skill +package com.chwl.app.skill import android.annotation.SuppressLint -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseActivity -import com.yizhuan.habu.skill.dialog.SkillSelectionDialog -import com.yizhuan.habu.skill.repository.SkillDataManager -import com.yizhuan.habu.skill.repository.SkillModel -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.base.BaseActivity +import com.chwl.app.skill.dialog.SkillSelectionDialog +import com.chwl.app.skill.repository.SkillDataManager +import com.chwl.app.skill.repository.SkillModel +import com.chwl.app.skill.widget.* +import com.chwl.core.file.FileModel +import com.chwl.core.skill.entity.PropRefEntity +import com.chwl.core.skill.entity.PropsEntity +import com.chwl.core.skill.entity.SkillPostServerEntity +import com.chwl.core.skill.entity.SkillPropertyEntity +import com.chwl.core.skill.event.SkillEvent +import com.chwl.core.utils.toast +import com.chwl.library.utils.ResUtil import org.greenrobot.eventbus.EventBus import java.io.File diff --git a/app/src/main/java/com/yizhuan/habu/skill/activity/AddSkillActivity.kt b/app/src/main/java/com/chwl/app/skill/activity/AddSkillActivity.kt similarity index 88% rename from app/src/main/java/com/yizhuan/habu/skill/activity/AddSkillActivity.kt rename to app/src/main/java/com/chwl/app/skill/activity/AddSkillActivity.kt index 2142a8fea..04ae4d7a5 100644 --- a/app/src/main/java/com/yizhuan/habu/skill/activity/AddSkillActivity.kt +++ b/app/src/main/java/com/chwl/app/skill/activity/AddSkillActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.skill.activity +package com.chwl.app.skill.activity import android.Manifest import android.annotation.SuppressLint @@ -6,15 +6,15 @@ import android.content.Context import android.content.Intent import android.view.View import com.netease.nim.uikit.StatusBarUtil -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseBindingActivity -import com.yizhuan.habu.databinding.ActivitySkillEditBinding -import com.yizhuan.habu.skill.repository.SkillDataManager -import com.yizhuan.habu.skill.repository.SkillModel -import com.yizhuan.habu.skill.widget.CARD_TYPE_AUDIO -import com.yizhuan.xchat_android_core.skill.entity.SkillPropertyEntity -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.base.BaseBindingActivity +import com.chwl.app.databinding.ActivitySkillEditBinding +import com.chwl.app.skill.repository.SkillDataManager +import com.chwl.app.skill.repository.SkillModel +import com.chwl.app.skill.widget.CARD_TYPE_AUDIO +import com.chwl.core.skill.entity.SkillPropertyEntity +import com.chwl.library.annatation.ActLayoutRes +import com.chwl.library.utils.ResUtil @ActLayoutRes(R.layout.activity_skill_edit) class AddSkillActivity : BaseBindingActivity() { diff --git a/app/src/main/java/com/yizhuan/habu/skill/activity/EditSkillActivity.kt b/app/src/main/java/com/chwl/app/skill/activity/EditSkillActivity.kt similarity index 89% rename from app/src/main/java/com/yizhuan/habu/skill/activity/EditSkillActivity.kt rename to app/src/main/java/com/chwl/app/skill/activity/EditSkillActivity.kt index c761de060..f8ecd6efc 100644 --- a/app/src/main/java/com/yizhuan/habu/skill/activity/EditSkillActivity.kt +++ b/app/src/main/java/com/chwl/app/skill/activity/EditSkillActivity.kt @@ -1,16 +1,16 @@ -package com.yizhuan.habu.skill.activity +package com.chwl.app.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.habu.R -import com.yizhuan.habu.base.BaseBindingActivity -import com.yizhuan.habu.databinding.ActivitySkillEditBinding -import com.yizhuan.habu.skill.repository.SkillModel -import com.yizhuan.habu.ui.widget.dialog.CommonTipDialog -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes +import com.chwl.app.R +import com.chwl.app.base.BaseBindingActivity +import com.chwl.app.databinding.ActivitySkillEditBinding +import com.chwl.app.skill.repository.SkillModel +import com.chwl.app.ui.widget.dialog.CommonTipDialog +import com.chwl.library.annatation.ActLayoutRes @ActLayoutRes(R.layout.activity_skill_edit) class EditSkillActivity : BaseBindingActivity() { diff --git a/app/src/main/java/com/yizhuan/habu/skill/activity/SkillDetailActivity.kt b/app/src/main/java/com/chwl/app/skill/activity/SkillDetailActivity.kt similarity index 86% rename from app/src/main/java/com/yizhuan/habu/skill/activity/SkillDetailActivity.kt rename to app/src/main/java/com/chwl/app/skill/activity/SkillDetailActivity.kt index c7a61f8ac..77b22a650 100644 --- a/app/src/main/java/com/yizhuan/habu/skill/activity/SkillDetailActivity.kt +++ b/app/src/main/java/com/chwl/app/skill/activity/SkillDetailActivity.kt @@ -1,15 +1,15 @@ -package com.yizhuan.habu.skill.activity +package com.chwl.app.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.habu.R -import com.yizhuan.habu.base.BaseBindingActivity -import com.yizhuan.habu.databinding.ActivitySkillEditBinding -import com.yizhuan.habu.skill.repository.SkillModel -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes +import com.chwl.app.R +import com.chwl.app.base.BaseBindingActivity +import com.chwl.app.databinding.ActivitySkillEditBinding +import com.chwl.app.skill.repository.SkillModel +import com.chwl.library.annatation.ActLayoutRes /** * 客态显示 diff --git a/app/src/main/java/com/yizhuan/habu/skill/activity/SkillEditableDelegate.kt b/app/src/main/java/com/chwl/app/skill/activity/SkillEditableDelegate.kt similarity index 81% rename from app/src/main/java/com/yizhuan/habu/skill/activity/SkillEditableDelegate.kt rename to app/src/main/java/com/chwl/app/skill/activity/SkillEditableDelegate.kt index 436cbb9e5..a1fc56dac 100644 --- a/app/src/main/java/com/yizhuan/habu/skill/activity/SkillEditableDelegate.kt +++ b/app/src/main/java/com/chwl/app/skill/activity/SkillEditableDelegate.kt @@ -1,14 +1,14 @@ -package com.yizhuan.habu.skill.activity +package com.chwl.app.skill.activity -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseBindingActivity -import com.yizhuan.habu.databinding.ActivitySkillEditBinding -import com.yizhuan.habu.skill.SKillDataParser -import com.yizhuan.habu.skill.SkillDataDelegate -import com.yizhuan.habu.ui.widget.dialog.CommonTipDialog -import com.yizhuan.xchat_android_core.skill.entity.SkillPropertyEntity -import com.yizhuan.xchat_android_core.skill.entity.SkillRecordEntity -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.base.BaseBindingActivity +import com.chwl.app.databinding.ActivitySkillEditBinding +import com.chwl.app.skill.SKillDataParser +import com.chwl.app.skill.SkillDataDelegate +import com.chwl.app.ui.widget.dialog.CommonTipDialog +import com.chwl.core.skill.entity.SkillPropertyEntity +import com.chwl.core.skill.entity.SkillRecordEntity +import com.chwl.library.utils.ResUtil /** * 编辑-添加 界面 diff --git a/app/src/main/java/com/yizhuan/habu/skill/activity/SkillHomeActivity.kt b/app/src/main/java/com/chwl/app/skill/activity/SkillHomeActivity.kt similarity index 88% rename from app/src/main/java/com/yizhuan/habu/skill/activity/SkillHomeActivity.kt rename to app/src/main/java/com/chwl/app/skill/activity/SkillHomeActivity.kt index 730d96888..4323e33c7 100644 --- a/app/src/main/java/com/yizhuan/habu/skill/activity/SkillHomeActivity.kt +++ b/app/src/main/java/com/chwl/app/skill/activity/SkillHomeActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.skill.activity +package com.chwl.app.skill.activity import android.annotation.SuppressLint import android.content.Context @@ -10,20 +10,20 @@ import android.widget.FrameLayout import android.widget.ImageView import androidx.recyclerview.widget.LinearLayoutManager import com.netease.nim.uikit.StatusBarUtil -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseBindingActivity -import com.yizhuan.habu.common.EmptyViewHelper -import com.yizhuan.habu.databinding.ActivitySkillHomeBinding -import com.yizhuan.habu.skill.adapter.MineSkillCardAdapter -import com.yizhuan.habu.skill.decoration.SkillLinearVerticalDecoration -import com.yizhuan.habu.skill.dialog.AddSkillCardDialog -import com.yizhuan.habu.skill.repository.SkillDataManager -import com.yizhuan.habu.skill.repository.SkillModel -import com.yizhuan.habu.skill.widget.CARD_TYPE_AUDIO -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil -import com.yizhuan.xchat_android_core.skill.event.SkillEvent -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.base.BaseBindingActivity +import com.chwl.app.common.EmptyViewHelper +import com.chwl.app.databinding.ActivitySkillHomeBinding +import com.chwl.app.skill.adapter.MineSkillCardAdapter +import com.chwl.app.skill.decoration.SkillLinearVerticalDecoration +import com.chwl.app.skill.dialog.AddSkillCardDialog +import com.chwl.app.skill.repository.SkillDataManager +import com.chwl.app.skill.repository.SkillModel +import com.chwl.app.skill.widget.CARD_TYPE_AUDIO +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil +import com.chwl.core.skill.event.SkillEvent +import com.chwl.library.annatation.ActLayoutRes +import com.chwl.library.utils.ResUtil import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/yizhuan/habu/skill/adapter/AddSkillCardAdapter.kt b/app/src/main/java/com/chwl/app/skill/adapter/AddSkillCardAdapter.kt similarity index 76% rename from app/src/main/java/com/yizhuan/habu/skill/adapter/AddSkillCardAdapter.kt rename to app/src/main/java/com/chwl/app/skill/adapter/AddSkillCardAdapter.kt index bf3a5065b..6e664d4b9 100644 --- a/app/src/main/java/com/yizhuan/habu/skill/adapter/AddSkillCardAdapter.kt +++ b/app/src/main/java/com/chwl/app/skill/adapter/AddSkillCardAdapter.kt @@ -1,11 +1,11 @@ -package com.yizhuan.habu.skill.adapter +package com.chwl.app.skill.adapter import android.text.TextUtils import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.xchat_android_core.skill.entity.SkillTypeEntity +import com.chwl.app.R +import com.chwl.app.ui.utils.ImageLoadUtilsV2 +import com.chwl.core.skill.entity.SkillTypeEntity class AddSkillCardAdapter : BaseQuickAdapter(R.layout.item_add_skill_select_card) { diff --git a/app/src/main/java/com/yizhuan/habu/skill/adapter/MineSkillCardAdapter.kt b/app/src/main/java/com/chwl/app/skill/adapter/MineSkillCardAdapter.kt similarity index 73% rename from app/src/main/java/com/yizhuan/habu/skill/adapter/MineSkillCardAdapter.kt rename to app/src/main/java/com/chwl/app/skill/adapter/MineSkillCardAdapter.kt index 6c5e9689e..aa7711ea4 100644 --- a/app/src/main/java/com/yizhuan/habu/skill/adapter/MineSkillCardAdapter.kt +++ b/app/src/main/java/com/chwl/app/skill/adapter/MineSkillCardAdapter.kt @@ -1,14 +1,14 @@ -package com.yizhuan.habu.skill.adapter +package com.chwl.app.skill.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseActivity -import com.yizhuan.habu.skill.SKillDataParser -import com.yizhuan.habu.skill.SkillDataDelegate -import com.yizhuan.habu.skill.widget.CARD_TYPE_AUDIO -import com.yizhuan.habu.skill.widget.SkillCardView -import com.yizhuan.xchat_android_core.skill.entity.SkillRecordEntity +import com.chwl.app.R +import com.chwl.app.base.BaseActivity +import com.chwl.app.skill.SKillDataParser +import com.chwl.app.skill.SkillDataDelegate +import com.chwl.app.skill.widget.CARD_TYPE_AUDIO +import com.chwl.app.skill.widget.SkillCardView +import com.chwl.core.skill.entity.SkillRecordEntity /** * 用户所有技能卡 显示 diff --git a/app/src/main/java/com/yizhuan/habu/skill/adapter/SkillSelectionAdapter.kt b/app/src/main/java/com/chwl/app/skill/adapter/SkillSelectionAdapter.kt similarity index 93% rename from app/src/main/java/com/yizhuan/habu/skill/adapter/SkillSelectionAdapter.kt rename to app/src/main/java/com/chwl/app/skill/adapter/SkillSelectionAdapter.kt index 85d9cbabb..af7c4a096 100644 --- a/app/src/main/java/com/yizhuan/habu/skill/adapter/SkillSelectionAdapter.kt +++ b/app/src/main/java/com/chwl/app/skill/adapter/SkillSelectionAdapter.kt @@ -1,13 +1,13 @@ -package com.yizhuan.habu.skill.adapter +package com.chwl.app.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.habu.R -import com.yizhuan.habu.skill.widget.ItemAttribute -import com.yizhuan.xchat_android_core.skill.entity.PropDictVo -import com.yizhuan.xchat_android_core.utils.toast +import com.chwl.app.R +import com.chwl.app.skill.widget.ItemAttribute +import com.chwl.core.skill.entity.PropDictVo +import com.chwl.core.utils.toast class SkillSelectionAdapter( diff --git a/app/src/main/java/com/yizhuan/habu/skill/decoration/SkillGridDecoration.kt b/app/src/main/java/com/chwl/app/skill/decoration/SkillGridDecoration.kt similarity index 89% rename from app/src/main/java/com/yizhuan/habu/skill/decoration/SkillGridDecoration.kt rename to app/src/main/java/com/chwl/app/skill/decoration/SkillGridDecoration.kt index 0679f8ea6..dff53369e 100644 --- a/app/src/main/java/com/yizhuan/habu/skill/decoration/SkillGridDecoration.kt +++ b/app/src/main/java/com/chwl/app/skill/decoration/SkillGridDecoration.kt @@ -1,10 +1,10 @@ -package com.yizhuan.habu.skill.decoration +package com.chwl.app.skill.decoration import android.content.Context import android.graphics.Rect import android.view.View import androidx.recyclerview.widget.RecyclerView -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil class SkillGridDecoration(context: Context, horizontalDp: Int, verticalDp: Int) : RecyclerView.ItemDecoration() { diff --git a/app/src/main/java/com/yizhuan/habu/skill/decoration/SkillLinearVerticalDecoration.kt b/app/src/main/java/com/chwl/app/skill/decoration/SkillLinearVerticalDecoration.kt similarity index 90% rename from app/src/main/java/com/yizhuan/habu/skill/decoration/SkillLinearVerticalDecoration.kt rename to app/src/main/java/com/chwl/app/skill/decoration/SkillLinearVerticalDecoration.kt index 295b70cd0..42a164b58 100644 --- a/app/src/main/java/com/yizhuan/habu/skill/decoration/SkillLinearVerticalDecoration.kt +++ b/app/src/main/java/com/chwl/app/skill/decoration/SkillLinearVerticalDecoration.kt @@ -1,10 +1,10 @@ -package com.yizhuan.habu.skill.decoration +package com.chwl.app.skill.decoration import android.content.Context import android.graphics.Rect import android.view.View import androidx.recyclerview.widget.RecyclerView -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil class SkillLinearVerticalDecoration(context: Context, topSpaceDp: Int, bottomSpaceDp: Int) : RecyclerView.ItemDecoration() { diff --git a/app/src/main/java/com/yizhuan/habu/skill/dialog/AddSkillCardDialog.kt b/app/src/main/java/com/chwl/app/skill/dialog/AddSkillCardDialog.kt similarity index 70% rename from app/src/main/java/com/yizhuan/habu/skill/dialog/AddSkillCardDialog.kt rename to app/src/main/java/com/chwl/app/skill/dialog/AddSkillCardDialog.kt index 7944331d8..1199ab050 100644 --- a/app/src/main/java/com/yizhuan/habu/skill/dialog/AddSkillCardDialog.kt +++ b/app/src/main/java/com/chwl/app/skill/dialog/AddSkillCardDialog.kt @@ -1,17 +1,17 @@ -package com.yizhuan.habu.skill.dialog +package com.chwl.app.skill.dialog import android.content.Context import android.view.Gravity import android.view.View import androidx.recyclerview.widget.GridLayoutManager -import com.yizhuan.habu.R -import com.yizhuan.habu.databinding.DialogAddSkillItemBinding -import com.yizhuan.habu.skill.adapter.AddSkillCardAdapter -import com.yizhuan.habu.skill.decoration.SkillGridDecoration -import com.yizhuan.habu.treasure_box.widget.dialog.BaseBindingDialog -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil -import com.yizhuan.xchat_android_core.skill.entity.SkillTypeEntity -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes +import com.chwl.app.R +import com.chwl.app.databinding.DialogAddSkillItemBinding +import com.chwl.app.skill.adapter.AddSkillCardAdapter +import com.chwl.app.skill.decoration.SkillGridDecoration +import com.chwl.app.treasure_box.widget.dialog.BaseBindingDialog +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil +import com.chwl.core.skill.entity.SkillTypeEntity +import com.chwl.library.annatation.ActLayoutRes @ActLayoutRes(R.layout.dialog_add_skill_item) class AddSkillCardDialog( diff --git a/app/src/main/java/com/yizhuan/habu/skill/dialog/SkillSelectionDialog.kt b/app/src/main/java/com/chwl/app/skill/dialog/SkillSelectionDialog.kt similarity index 69% rename from app/src/main/java/com/yizhuan/habu/skill/dialog/SkillSelectionDialog.kt rename to app/src/main/java/com/chwl/app/skill/dialog/SkillSelectionDialog.kt index 6a1418b0e..f97b9ac9f 100644 --- a/app/src/main/java/com/yizhuan/habu/skill/dialog/SkillSelectionDialog.kt +++ b/app/src/main/java/com/chwl/app/skill/dialog/SkillSelectionDialog.kt @@ -1,18 +1,18 @@ -package com.yizhuan.habu.skill.dialog +package com.chwl.app.skill.dialog import android.content.Context import android.view.Gravity import android.view.View import androidx.recyclerview.widget.GridLayoutManager -import com.yizhuan.habu.R -import com.yizhuan.habu.databinding.DialogAddSkillItemBinding -import com.yizhuan.habu.skill.adapter.SkillSelectionAdapter -import com.yizhuan.habu.skill.decoration.SkillGridDecoration -import com.yizhuan.habu.treasure_box.widget.dialog.BaseBindingDialog -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil -import com.yizhuan.xchat_android_core.skill.entity.PropDictVo -import com.yizhuan.xchat_android_core.skill.entity.PropsEntity -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes +import com.chwl.app.R +import com.chwl.app.databinding.DialogAddSkillItemBinding +import com.chwl.app.skill.adapter.SkillSelectionAdapter +import com.chwl.app.skill.decoration.SkillGridDecoration +import com.chwl.app.treasure_box.widget.dialog.BaseBindingDialog +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil +import com.chwl.core.skill.entity.PropDictVo +import com.chwl.core.skill.entity.PropsEntity +import com.chwl.library.annatation.ActLayoutRes @ActLayoutRes(R.layout.dialog_add_skill_item) class SkillSelectionDialog( diff --git a/app/src/main/java/com/yizhuan/habu/skill/repository/Api.kt b/app/src/main/java/com/chwl/app/skill/repository/Api.kt similarity index 73% rename from app/src/main/java/com/yizhuan/habu/skill/repository/Api.kt rename to app/src/main/java/com/chwl/app/skill/repository/Api.kt index 351e956a9..4d8cdea6e 100644 --- a/app/src/main/java/com/yizhuan/habu/skill/repository/Api.kt +++ b/app/src/main/java/com/chwl/app/skill/repository/Api.kt @@ -1,11 +1,11 @@ -package com.yizhuan.habu.skill.repository +package com.chwl.app.skill.repository import com.google.gson.JsonElement -import com.yizhuan.xchat_android_core.bean.response.ServiceResult -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.chwl.core.bean.response.ServiceResult +import com.chwl.core.skill.entity.SkillPropertyEntity +import com.chwl.core.skill.entity.SkillRecordEntity +import com.chwl.core.skill.entity.SkillTypeEntity +import com.chwl.core.user.bean.UserInfoSkillEntity import io.reactivex.Single import okhttp3.RequestBody import retrofit2.http.* diff --git a/app/src/main/java/com/yizhuan/habu/skill/repository/ISkillModel.kt b/app/src/main/java/com/chwl/app/skill/repository/ISkillModel.kt similarity index 56% rename from app/src/main/java/com/yizhuan/habu/skill/repository/ISkillModel.kt rename to app/src/main/java/com/chwl/app/skill/repository/ISkillModel.kt index cbae11a39..79367f881 100644 --- a/app/src/main/java/com/yizhuan/habu/skill/repository/ISkillModel.kt +++ b/app/src/main/java/com/chwl/app/skill/repository/ISkillModel.kt @@ -1,10 +1,10 @@ -package com.yizhuan.habu.skill.repository +package com.chwl.app.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.chwl.core.skill.entity.SkillPostServerEntity +import com.chwl.core.skill.entity.SkillPropertyEntity +import com.chwl.core.skill.entity.SkillRecordEntity +import com.chwl.core.skill.entity.SkillTypeEntity +import com.chwl.core.user.bean.UserInfoSkillEntity import io.reactivex.Single diff --git a/app/src/main/java/com/yizhuan/habu/skill/repository/SkillDataManager.java b/app/src/main/java/com/chwl/app/skill/repository/SkillDataManager.java similarity index 85% rename from app/src/main/java/com/yizhuan/habu/skill/repository/SkillDataManager.java rename to app/src/main/java/com/chwl/app/skill/repository/SkillDataManager.java index 2fee596e5..4d4395c5a 100644 --- a/app/src/main/java/com/yizhuan/habu/skill/repository/SkillDataManager.java +++ b/app/src/main/java/com/chwl/app/skill/repository/SkillDataManager.java @@ -1,9 +1,9 @@ -package com.yizhuan.habu.skill.repository; +package com.chwl.app.skill.repository; import android.util.SparseArray; -import com.yizhuan.xchat_android_core.skill.entity.SkillPropertyEntity; +import com.chwl.core.skill.entity.SkillPropertyEntity; public class SkillDataManager { private static final class Helper { diff --git a/app/src/main/java/com/yizhuan/habu/skill/repository/SkillModel.kt b/app/src/main/java/com/chwl/app/skill/repository/SkillModel.kt similarity index 75% rename from app/src/main/java/com/yizhuan/habu/skill/repository/SkillModel.kt rename to app/src/main/java/com/chwl/app/skill/repository/SkillModel.kt index 078e1692e..0878ce368 100644 --- a/app/src/main/java/com/yizhuan/habu/skill/repository/SkillModel.kt +++ b/app/src/main/java/com/chwl/app/skill/repository/SkillModel.kt @@ -1,14 +1,14 @@ -package com.yizhuan.habu.skill.repository +package com.chwl.app.skill.repository import com.google.gson.Gson -import com.yizhuan.xchat_android_core.base.BaseModel -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.yizhuan.xchat_android_core.utils.net.RxHelper -import com.yizhuan.xchat_android_library.net.rxnet.RxNet +import com.chwl.core.base.BaseModel +import com.chwl.core.skill.entity.SkillPostServerEntity +import com.chwl.core.skill.entity.SkillPropertyEntity +import com.chwl.core.skill.entity.SkillRecordEntity +import com.chwl.core.skill.entity.SkillTypeEntity +import com.chwl.core.user.bean.UserInfoSkillEntity +import com.chwl.core.utils.net.RxHelper +import com.chwl.library.net.rxnet.RxNet import io.reactivex.Single import okhttp3.MediaType.Companion.toMediaType import okhttp3.RequestBody.Companion.toRequestBody diff --git a/app/src/main/java/com/yizhuan/habu/skill/widget/EditItem.kt b/app/src/main/java/com/chwl/app/skill/widget/EditItem.kt similarity index 90% rename from app/src/main/java/com/yizhuan/habu/skill/widget/EditItem.kt rename to app/src/main/java/com/chwl/app/skill/widget/EditItem.kt index 8bbb8699c..9363a3dbf 100644 --- a/app/src/main/java/com/yizhuan/habu/skill/widget/EditItem.kt +++ b/app/src/main/java/com/chwl/app/skill/widget/EditItem.kt @@ -1,13 +1,13 @@ -package com.yizhuan.habu.skill.widget +package com.chwl.app.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.habu.R -import com.yizhuan.xchat_android_core.skill.entity.PropRefEntity -import com.yizhuan.xchat_android_core.utils.TextUtils +import com.chwl.app.R +import com.chwl.core.skill.entity.PropRefEntity +import com.chwl.core.utils.TextUtils class EditItem(private val itemAttr: ItemAttribute) : SkillItem { private lateinit var contentView: EditText diff --git a/app/src/main/java/com/yizhuan/habu/skill/widget/ItemAttribute.kt b/app/src/main/java/com/chwl/app/skill/widget/ItemAttribute.kt similarity index 89% rename from app/src/main/java/com/yizhuan/habu/skill/widget/ItemAttribute.kt rename to app/src/main/java/com/chwl/app/skill/widget/ItemAttribute.kt index 8f4766640..563952bcb 100644 --- a/app/src/main/java/com/yizhuan/habu/skill/widget/ItemAttribute.kt +++ b/app/src/main/java/com/chwl/app/skill/widget/ItemAttribute.kt @@ -1,6 +1,6 @@ -package com.yizhuan.habu.skill.widget +package com.chwl.app.skill.widget -import com.yizhuan.xchat_android_core.skill.entity.PropRefEntity +import com.chwl.core.skill.entity.PropRefEntity import java.io.File data class ItemAttribute( diff --git a/app/src/main/java/com/yizhuan/habu/skill/widget/RecordDurationItem.kt b/app/src/main/java/com/chwl/app/skill/widget/RecordDurationItem.kt similarity index 93% rename from app/src/main/java/com/yizhuan/habu/skill/widget/RecordDurationItem.kt rename to app/src/main/java/com/chwl/app/skill/widget/RecordDurationItem.kt index e0f3c26b8..7f238a195 100644 --- a/app/src/main/java/com/yizhuan/habu/skill/widget/RecordDurationItem.kt +++ b/app/src/main/java/com/chwl/app/skill/widget/RecordDurationItem.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.skill.widget +package com.chwl.app.skill.widget import android.content.Context import android.view.View diff --git a/app/src/main/java/com/yizhuan/habu/skill/widget/RecordIResourceItem.kt b/app/src/main/java/com/chwl/app/skill/widget/RecordIResourceItem.kt similarity index 93% rename from app/src/main/java/com/yizhuan/habu/skill/widget/RecordIResourceItem.kt rename to app/src/main/java/com/chwl/app/skill/widget/RecordIResourceItem.kt index 00c5bbbb1..0cc01f053 100644 --- a/app/src/main/java/com/yizhuan/habu/skill/widget/RecordIResourceItem.kt +++ b/app/src/main/java/com/chwl/app/skill/widget/RecordIResourceItem.kt @@ -1,18 +1,18 @@ -package com.yizhuan.habu.skill.widget +package com.chwl.app.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.habu.R -import com.yizhuan.habu.audio.helper.AudioPlayerHelper -import com.yizhuan.habu.audio.helper.OnPlayListener -import com.yizhuan.habu.databinding.LayoutSkillAudioBinding -import com.yizhuan.habu.ui.widget.dialog.CommonTipDialog -import com.yizhuan.xchat_android_core.utils.TextUtils -import com.yizhuan.xchat_android_core.utils.toast -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.audio.helper.AudioPlayerHelper +import com.chwl.app.audio.helper.OnPlayListener +import com.chwl.app.databinding.LayoutSkillAudioBinding +import com.chwl.app.ui.widget.dialog.CommonTipDialog +import com.chwl.core.utils.TextUtils +import com.chwl.core.utils.toast +import com.chwl.library.utils.ResUtil import java.io.File class RecordIResourceItem(private val itemAttribute: ItemAttribute) : SkillItem, diff --git a/app/src/main/java/com/yizhuan/habu/skill/widget/SelectionItem.kt b/app/src/main/java/com/chwl/app/skill/widget/SelectionItem.kt similarity index 94% rename from app/src/main/java/com/yizhuan/habu/skill/widget/SelectionItem.kt rename to app/src/main/java/com/chwl/app/skill/widget/SelectionItem.kt index 5e977ae38..1c501da1e 100644 --- a/app/src/main/java/com/yizhuan/habu/skill/widget/SelectionItem.kt +++ b/app/src/main/java/com/chwl/app/skill/widget/SelectionItem.kt @@ -1,12 +1,12 @@ -package com.yizhuan.habu.skill.widget +package com.chwl.app.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.habu.R -import com.yizhuan.xchat_android_core.utils.TextUtils +import com.chwl.app.R +import com.chwl.core.utils.TextUtils class SelectionItem(private val itemAttr: ItemAttribute) : SkillItem { private lateinit var contentView: TextView diff --git a/app/src/main/java/com/yizhuan/habu/skill/widget/SkillAttribute.kt b/app/src/main/java/com/chwl/app/skill/widget/SkillAttribute.kt similarity index 91% rename from app/src/main/java/com/yizhuan/habu/skill/widget/SkillAttribute.kt rename to app/src/main/java/com/chwl/app/skill/widget/SkillAttribute.kt index 834dd1b7f..57615ddd4 100644 --- a/app/src/main/java/com/yizhuan/habu/skill/widget/SkillAttribute.kt +++ b/app/src/main/java/com/chwl/app/skill/widget/SkillAttribute.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.skill.widget +package com.chwl.app.skill.widget const val CARD_TYPE_GAME = 1 const val CARD_TYPE_ART = 2 diff --git a/app/src/main/java/com/yizhuan/habu/skill/widget/SkillCardView.kt b/app/src/main/java/com/chwl/app/skill/widget/SkillCardView.kt similarity index 94% rename from app/src/main/java/com/yizhuan/habu/skill/widget/SkillCardView.kt rename to app/src/main/java/com/chwl/app/skill/widget/SkillCardView.kt index f54b17d74..972173772 100644 --- a/app/src/main/java/com/yizhuan/habu/skill/widget/SkillCardView.kt +++ b/app/src/main/java/com/chwl/app/skill/widget/SkillCardView.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.skill.widget +package com.chwl.app.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.habu.R -import com.yizhuan.habu.ui.utils.ImageLoadUtils -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil +import com.chwl.app.R +import com.chwl.app.ui.utils.ImageLoadUtils +import com.chwl.app.ui.utils.ImageLoadUtilsV2 +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil /** * 技能卡 diff --git a/app/src/main/java/com/yizhuan/habu/skill/widget/SkillItem.kt b/app/src/main/java/com/chwl/app/skill/widget/SkillItem.kt similarity index 84% rename from app/src/main/java/com/yizhuan/habu/skill/widget/SkillItem.kt rename to app/src/main/java/com/chwl/app/skill/widget/SkillItem.kt index 4b922fa69..e6544af96 100644 --- a/app/src/main/java/com/yizhuan/habu/skill/widget/SkillItem.kt +++ b/app/src/main/java/com/chwl/app/skill/widget/SkillItem.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.skill.widget +package com.chwl.app.skill.widget import android.content.Context import android.view.View diff --git a/app/src/main/java/com/yizhuan/habu/skill/widget/SkillItemHelper.kt b/app/src/main/java/com/chwl/app/skill/widget/SkillItemHelper.kt similarity index 90% rename from app/src/main/java/com/yizhuan/habu/skill/widget/SkillItemHelper.kt rename to app/src/main/java/com/chwl/app/skill/widget/SkillItemHelper.kt index 4e709e0e5..7ba886527 100644 --- a/app/src/main/java/com/yizhuan/habu/skill/widget/SkillItemHelper.kt +++ b/app/src/main/java/com/chwl/app/skill/widget/SkillItemHelper.kt @@ -1,12 +1,12 @@ -package com.yizhuan.habu.skill.widget +package com.chwl.app.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.habu.skill.widget.ItemAttribute.Companion.STATE_AUDIO -import com.yizhuan.habu.skill.widget.ItemAttribute.Companion.STATE_DURATION +import com.chwl.app.skill.widget.ItemAttribute.Companion.STATE_AUDIO +import com.chwl.app.skill.widget.ItemAttribute.Companion.STATE_DURATION object SkillItemHelper { /** diff --git a/app/src/main/java/com/yizhuan/habu/skill/widget/TimerRecorderView.kt b/app/src/main/java/com/chwl/app/skill/widget/TimerRecorderView.kt similarity index 98% rename from app/src/main/java/com/yizhuan/habu/skill/widget/TimerRecorderView.kt rename to app/src/main/java/com/chwl/app/skill/widget/TimerRecorderView.kt index 7fe1b7af9..0cd062e16 100644 --- a/app/src/main/java/com/yizhuan/habu/skill/widget/TimerRecorderView.kt +++ b/app/src/main/java/com/chwl/app/skill/widget/TimerRecorderView.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.skill.widget +package com.chwl.app.skill.widget import android.animation.ValueAnimator import android.content.Context @@ -13,7 +13,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.habu.R +import com.chwl.app.R import java.io.File private const val STATE_PAUSED = 0 diff --git a/app/src/main/java/com/yizhuan/habu/sys/ErbanSysMsgViewModel.java b/app/src/main/java/com/chwl/app/sys/ErbanSysMsgViewModel.java similarity index 68% rename from app/src/main/java/com/yizhuan/habu/sys/ErbanSysMsgViewModel.java rename to app/src/main/java/com/chwl/app/sys/ErbanSysMsgViewModel.java index a9885840c..16693868c 100644 --- a/app/src/main/java/com/yizhuan/habu/sys/ErbanSysMsgViewModel.java +++ b/app/src/main/java/com/chwl/app/sys/ErbanSysMsgViewModel.java @@ -1,10 +1,10 @@ -package com.yizhuan.habu.sys; +package com.chwl.app.sys; -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.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.msg.sys.ApproveMsgInfo; +import com.chwl.core.msg.sys.ErbanSysMsgModel; +import com.chwl.core.utils.net.RxHelper; +import com.chwl.library.net.rxnet.RxNet; import java.util.Map; diff --git a/app/src/main/java/com/yizhuan/habu/team/adapter/AddTeamMemberAdapter.java b/app/src/main/java/com/chwl/app/team/adapter/AddTeamMemberAdapter.java similarity index 86% rename from app/src/main/java/com/yizhuan/habu/team/adapter/AddTeamMemberAdapter.java rename to app/src/main/java/com/chwl/app/team/adapter/AddTeamMemberAdapter.java index 99f736ba7..5ece0e752 100644 --- a/app/src/main/java/com/yizhuan/habu/team/adapter/AddTeamMemberAdapter.java +++ b/app/src/main/java/com/chwl/app/team/adapter/AddTeamMemberAdapter.java @@ -1,14 +1,14 @@ -package com.yizhuan.habu.team.adapter; +package com.chwl.app.team.adapter; import android.content.Context; import android.view.View; import android.widget.TextView; -import com.yizhuan.habu.BR; -import com.yizhuan.habu.R; -import com.yizhuan.habu.bindadapter.BaseAdapter; -import com.yizhuan.habu.bindadapter.BindingViewHolder; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; +import com.chwl.app.BR; +import com.chwl.app.R; +import com.chwl.app.bindadapter.BaseAdapter; +import com.chwl.app.bindadapter.BindingViewHolder; +import com.chwl.core.family.bean.FamilyMemberInfo; /** * Created by MadisonRong on 29/05/2018. diff --git a/app/src/main/java/com/yizhuan/habu/team/adapter/TeamListAdapter.java b/app/src/main/java/com/chwl/app/team/adapter/TeamListAdapter.java similarity index 74% rename from app/src/main/java/com/yizhuan/habu/team/adapter/TeamListAdapter.java rename to app/src/main/java/com/chwl/app/team/adapter/TeamListAdapter.java index 6d2b7fb23..ef41cd9e7 100644 --- a/app/src/main/java/com/yizhuan/habu/team/adapter/TeamListAdapter.java +++ b/app/src/main/java/com/chwl/app/team/adapter/TeamListAdapter.java @@ -1,16 +1,16 @@ -package com.yizhuan.habu.team.adapter; +package com.chwl.app.team.adapter; import android.content.Context; import android.widget.ImageView; import android.widget.TextView; -import com.yizhuan.habu.BR; -import com.yizhuan.habu.R; -import com.yizhuan.habu.bindadapter.BaseAdapter; -import com.yizhuan.habu.bindadapter.BindingViewHolder; -import com.yizhuan.habu.friend.action.AbstractSelectFriendAction; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.team.bean.TeamInfo; +import com.chwl.app.BR; +import com.chwl.app.R; +import com.chwl.app.bindadapter.BaseAdapter; +import com.chwl.app.bindadapter.BindingViewHolder; +import com.chwl.app.friend.action.AbstractSelectFriendAction; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.core.team.bean.TeamInfo; /** * Created by MadisonRong on 11/06/2018. diff --git a/app/src/main/java/com/yizhuan/habu/team/adapter/TeamMemberListAdapter.java b/app/src/main/java/com/chwl/app/team/adapter/TeamMemberListAdapter.java similarity index 92% rename from app/src/main/java/com/yizhuan/habu/team/adapter/TeamMemberListAdapter.java rename to app/src/main/java/com/chwl/app/team/adapter/TeamMemberListAdapter.java index 5ac193f5e..344e74950 100644 --- a/app/src/main/java/com/yizhuan/habu/team/adapter/TeamMemberListAdapter.java +++ b/app/src/main/java/com/chwl/app/team/adapter/TeamMemberListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.team.adapter; +package com.chwl.app.team.adapter; import android.content.Context; import android.text.TextUtils; @@ -11,15 +11,15 @@ import androidx.databinding.ViewDataBinding; import com.netease.nim.uikit.common.ui.imageview.HeadImageView; import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.habu.BR; -import com.yizhuan.habu.R; -import com.yizhuan.habu.bindadapter.BaseAdapter; -import com.yizhuan.habu.bindadapter.BindingViewHolder; -import com.yizhuan.habu.team.view.TeamMemberListActivity; -import com.yizhuan.habu.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.chwl.app.BR; +import com.chwl.app.R; +import com.chwl.app.bindadapter.BaseAdapter; +import com.chwl.app.bindadapter.BindingViewHolder; +import com.chwl.app.team.view.TeamMemberListActivity; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.level.UserLevelVo; +import com.chwl.core.team.bean.TeamMemberInfo; /** * Created by MadisonRong on 30/05/2018. diff --git a/app/src/main/java/com/yizhuan/habu/team/adapter/TeamWeeklyBillAdapter.java b/app/src/main/java/com/chwl/app/team/adapter/TeamWeeklyBillAdapter.java similarity index 78% rename from app/src/main/java/com/yizhuan/habu/team/adapter/TeamWeeklyBillAdapter.java rename to app/src/main/java/com/chwl/app/team/adapter/TeamWeeklyBillAdapter.java index afcf9459f..51e4b08b8 100644 --- a/app/src/main/java/com/yizhuan/habu/team/adapter/TeamWeeklyBillAdapter.java +++ b/app/src/main/java/com/chwl/app/team/adapter/TeamWeeklyBillAdapter.java @@ -1,20 +1,20 @@ -package com.yizhuan.habu.team.adapter; +package com.chwl.app.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.habu.BR; -import com.yizhuan.habu.R; -import com.yizhuan.habu.bindadapter.BaseAdapter; -import com.yizhuan.habu.bindadapter.BindingViewHolder; -import com.yizhuan.habu.common.widget.CircleImageView; -import com.yizhuan.habu.ui.widget.UserInfoDialog; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_core.team.bean.TeamTransactionRecordInfo; -import com.yizhuan.xchat_android_library.utils.FormatUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.BR; +import com.chwl.app.R; +import com.chwl.app.bindadapter.BaseAdapter; +import com.chwl.app.bindadapter.BindingViewHolder; +import com.chwl.app.common.widget.CircleImageView; +import com.chwl.app.ui.widget.UserInfoDialog; +import com.chwl.core.family.model.FamilyModel; +import com.chwl.core.team.bean.TeamTransactionRecordInfo; +import com.chwl.library.utils.FormatUtils; +import com.chwl.library.utils.ResUtil; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/app/src/main/java/com/yizhuan/habu/team/bean/NimTeamMember.java b/app/src/main/java/com/chwl/app/team/bean/NimTeamMember.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/team/bean/NimTeamMember.java rename to app/src/main/java/com/chwl/app/team/bean/NimTeamMember.java index f7ccbca8f..1cd57aee2 100644 --- a/app/src/main/java/com/yizhuan/habu/team/bean/NimTeamMember.java +++ b/app/src/main/java/com/chwl/app/team/bean/NimTeamMember.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.team.bean; +package com.chwl.app.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/habu/team/dialog/QuitTeamDialog.java b/app/src/main/java/com/chwl/app/team/dialog/QuitTeamDialog.java similarity index 61% rename from app/src/main/java/com/yizhuan/habu/team/dialog/QuitTeamDialog.java rename to app/src/main/java/com/chwl/app/team/dialog/QuitTeamDialog.java index df5ac5c1f..a5f8b48d9 100644 --- a/app/src/main/java/com/yizhuan/habu/team/dialog/QuitTeamDialog.java +++ b/app/src/main/java/com/chwl/app/team/dialog/QuitTeamDialog.java @@ -1,9 +1,9 @@ -package com.yizhuan.habu.team.dialog; +package com.chwl.app.team.dialog; import androidx.appcompat.app.AppCompatDialogFragment; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; +import com.chwl.app.R; +import com.chwl.library.annatation.ActLayoutRes; /** * Created by MadisonRong on 29/05/2018. diff --git a/app/src/main/java/com/yizhuan/habu/team/event/TeamMemberUpdateEvent.java b/app/src/main/java/com/chwl/app/team/event/TeamMemberUpdateEvent.java similarity index 73% rename from app/src/main/java/com/yizhuan/habu/team/event/TeamMemberUpdateEvent.java rename to app/src/main/java/com/chwl/app/team/event/TeamMemberUpdateEvent.java index 4cff80f7a..4eb56490d 100644 --- a/app/src/main/java/com/yizhuan/habu/team/event/TeamMemberUpdateEvent.java +++ b/app/src/main/java/com/chwl/app/team/event/TeamMemberUpdateEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.team.event; +package com.chwl.app.team.event; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/habu/team/view/AddMemberActivity.java b/app/src/main/java/com/chwl/app/team/view/AddMemberActivity.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/team/view/AddMemberActivity.java rename to app/src/main/java/com/chwl/app/team/view/AddMemberActivity.java index c0075bf99..b0b75dc78 100644 --- a/app/src/main/java/com/yizhuan/habu/team/view/AddMemberActivity.java +++ b/app/src/main/java/com/chwl/app/team/view/AddMemberActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.team.view; +package com.chwl.app.team.view; import android.app.Activity; import android.content.Intent; @@ -9,16 +9,16 @@ import androidx.recyclerview.widget.LinearLayoutManager; 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.habu.R; -import com.yizhuan.habu.base.BaseBindingActivity; -import com.yizhuan.habu.databinding.ActivityAddTeamMemberBinding; -import com.yizhuan.habu.team.adapter.AddTeamMemberAdapter; -import com.yizhuan.habu.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.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseBindingActivity; +import com.chwl.app.databinding.ActivityAddTeamMemberBinding; +import com.chwl.app.team.adapter.AddTeamMemberAdapter; +import com.chwl.app.team.viewmodel.FamilyMemberVM; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.family.bean.FamilyMemberInfo; +import com.chwl.library.annatation.ActLayoutRes; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; import java.util.ArrayList; import java.util.Iterator; diff --git a/app/src/main/java/com/yizhuan/habu/team/view/AddMemberSearchActivity.java b/app/src/main/java/com/chwl/app/team/view/AddMemberSearchActivity.java similarity index 92% rename from app/src/main/java/com/yizhuan/habu/team/view/AddMemberSearchActivity.java rename to app/src/main/java/com/chwl/app/team/view/AddMemberSearchActivity.java index 815622566..5abbb0d7d 100644 --- a/app/src/main/java/com/yizhuan/habu/team/view/AddMemberSearchActivity.java +++ b/app/src/main/java/com/chwl/app/team/view/AddMemberSearchActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.team.view; +package com.chwl.app.team.view; import android.app.Activity; import android.content.Intent; @@ -11,17 +11,17 @@ import android.view.inputmethod.EditorInfo; import androidx.recyclerview.widget.LinearLayoutManager; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseBindingActivity; -import com.yizhuan.habu.databinding.ActivityAddTeamMemberSearchListBinding; -import com.yizhuan.habu.team.adapter.AddTeamMemberAdapter; -import com.yizhuan.habu.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.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseBindingActivity; +import com.chwl.app.databinding.ActivityAddTeamMemberSearchListBinding; +import com.chwl.app.team.adapter.AddTeamMemberAdapter; +import com.chwl.app.team.viewmodel.FamilyMemberVM; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.family.bean.FamilyMemberInfo; +import com.chwl.library.annatation.ActLayoutRes; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; import java.util.ArrayList; import java.util.Iterator; diff --git a/app/src/main/java/com/yizhuan/habu/team/view/CreateTeamMessageActivity.java b/app/src/main/java/com/chwl/app/team/view/CreateTeamMessageActivity.java similarity index 92% rename from app/src/main/java/com/yizhuan/habu/team/view/CreateTeamMessageActivity.java rename to app/src/main/java/com/chwl/app/team/view/CreateTeamMessageActivity.java index f9131252e..6a4448b52 100644 --- a/app/src/main/java/com/yizhuan/habu/team/view/CreateTeamMessageActivity.java +++ b/app/src/main/java/com/chwl/app/team/view/CreateTeamMessageActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.team.view; +package com.chwl.app.team.view; import android.content.Context; import android.content.Intent; @@ -9,16 +9,16 @@ import android.view.View; import android.widget.ImageView; import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseBindingTakePhotoActivity; -import com.yizhuan.habu.databinding.ActivityCreateTeamMessageBinding; -import com.yizhuan.habu.team.viewmodel.TeamVM; -import com.yizhuan.habu.utils.KeyBoardUtils; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseBindingTakePhotoActivity; +import com.chwl.app.databinding.ActivityCreateTeamMessageBinding; +import com.chwl.app.team.viewmodel.TeamVM; +import com.chwl.app.utils.KeyBoardUtils; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.family.bean.FamilyMemberInfo; +import com.chwl.core.family.model.FamilyModel; +import com.chwl.library.annatation.ActLayoutRes; +import com.chwl.library.utils.ResUtil; import java.util.ArrayList; import java.util.Objects; diff --git a/app/src/main/java/com/yizhuan/habu/team/view/NimTeamManagementActivity.java b/app/src/main/java/com/chwl/app/team/view/NimTeamManagementActivity.java similarity index 92% rename from app/src/main/java/com/yizhuan/habu/team/view/NimTeamManagementActivity.java rename to app/src/main/java/com/chwl/app/team/view/NimTeamManagementActivity.java index 18c15d54a..8a589c517 100644 --- a/app/src/main/java/com/yizhuan/habu/team/view/NimTeamManagementActivity.java +++ b/app/src/main/java/com/chwl/app/team/view/NimTeamManagementActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.team.view; +package com.chwl.app.team.view; import android.content.Context; import android.content.Intent; @@ -7,29 +7,29 @@ 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.habu.R; -import com.yizhuan.habu.base.BaseBindingTakePhotoActivity; -import com.yizhuan.habu.base.TitleBar; -import com.yizhuan.habu.common.widget.dialog.DialogManager; -import com.yizhuan.habu.databinding.ActivityTeamManagementBinding; -import com.yizhuan.habu.friend.view.SelectFriendActivity; -import com.yizhuan.habu.team.viewmodel.TeamVM; -import com.yizhuan.habu.ui.widget.ButtonItem; -import com.yizhuan.habu.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.utils.ResUtil; -import com.yizhuan.xchat_android_library.widget.IOSSwitchView; +import com.chwl.app.R; +import com.chwl.app.base.BaseBindingTakePhotoActivity; +import com.chwl.app.base.TitleBar; +import com.chwl.app.common.widget.dialog.DialogManager; +import com.chwl.app.databinding.ActivityTeamManagementBinding; +import com.chwl.app.friend.view.SelectFriendActivity; +import com.chwl.app.team.viewmodel.TeamVM; +import com.chwl.app.ui.widget.ButtonItem; +import com.chwl.app.ui.widget.ShareDialog; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.family.bean.FamilyInfo; +import com.chwl.core.family.model.FamilyModel; +import com.chwl.core.manager.IMNetEaseManager; +import com.chwl.core.share.ShareModel; +import com.chwl.core.share.bean.SessionType; +import com.chwl.core.team.bean.TeamEvent; +import com.chwl.core.team.bean.TeamInfo; +import com.chwl.core.team.bean.TeamMemberInfo; +import com.chwl.core.team.model.TeamModel; +import com.chwl.library.annatation.ActLayoutRes; +import com.chwl.library.rxbus.RxBus; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.widget.IOSSwitchView; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/team/view/NimTeamMessageActivity.java b/app/src/main/java/com/chwl/app/team/view/NimTeamMessageActivity.java similarity index 92% rename from app/src/main/java/com/yizhuan/habu/team/view/NimTeamMessageActivity.java rename to app/src/main/java/com/chwl/app/team/view/NimTeamMessageActivity.java index 5b884d0c7..9d9232908 100644 --- a/app/src/main/java/com/yizhuan/habu/team/view/NimTeamMessageActivity.java +++ b/app/src/main/java/com/chwl/app/team/view/NimTeamMessageActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.team.view; +package com.chwl.app.team.view; import android.content.Context; import android.content.Intent; @@ -28,26 +28,26 @@ 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.habu.R; -import com.yizhuan.habu.common.widget.DragLayout; -import com.yizhuan.habu.family.view.activity.FamilyHomeActivity; -import com.yizhuan.habu.team.viewmodel.TeamVM; -import com.yizhuan.habu.ui.im.actions.FamilyGameAction; -import com.yizhuan.habu.ui.im.actions.LuckyMoneyAction; -import com.yizhuan.habu.ui.im.avtivity.BaseMessageActivity; -import com.yizhuan.habu.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.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.app.common.widget.DragLayout; +import com.chwl.app.family.view.activity.FamilyHomeActivity; +import com.chwl.app.team.viewmodel.TeamVM; +import com.chwl.app.ui.im.actions.FamilyGameAction; +import com.chwl.app.ui.im.actions.LuckyMoneyAction; +import com.chwl.app.ui.im.avtivity.BaseMessageActivity; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.core.family.bean.FamilyInfo; +import com.chwl.core.family.model.FamilyModel; +import com.chwl.core.initial.InitialModel; +import com.chwl.core.initial.bean.InitInfo; +import com.chwl.core.level.UserLevelVo; +import com.chwl.core.team.bean.TeamEvent; +import com.chwl.core.team.model.TeamModel; +import com.chwl.core.user.UserModel; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.library.rxbus.RxBus; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/habu/team/view/NimTeamMessageFragment.java b/app/src/main/java/com/chwl/app/team/view/NimTeamMessageFragment.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/team/view/NimTeamMessageFragment.java rename to app/src/main/java/com/chwl/app/team/view/NimTeamMessageFragment.java index 8267c85e0..e5cbf0b10 100644 --- a/app/src/main/java/com/yizhuan/habu/team/view/NimTeamMessageFragment.java +++ b/app/src/main/java/com/chwl/app/team/view/NimTeamMessageFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.team.view; +package com.chwl.app.team.view; import android.Manifest; import android.annotation.SuppressLint; @@ -16,10 +16,10 @@ 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.tbruyelle.rxpermissions2.RxPermissions; -import com.yizhuan.habu.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.chwl.app.R; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.manager.IMMessageManager; +import com.chwl.library.utils.SingleToastUtil; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; diff --git a/app/src/main/java/com/yizhuan/habu/team/view/TeamListFragment.java b/app/src/main/java/com/chwl/app/team/view/TeamListFragment.java similarity index 78% rename from app/src/main/java/com/yizhuan/habu/team/view/TeamListFragment.java rename to app/src/main/java/com/chwl/app/team/view/TeamListFragment.java index f30a5a6f4..a3a16bb25 100644 --- a/app/src/main/java/com/yizhuan/habu/team/view/TeamListFragment.java +++ b/app/src/main/java/com/chwl/app/team/view/TeamListFragment.java @@ -1,20 +1,20 @@ -package com.yizhuan.habu.team.view; +package com.chwl.app.team.view; import android.app.Activity; import android.os.Bundle; import androidx.recyclerview.widget.LinearLayoutManager; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseBindingFragment; -import com.yizhuan.habu.databinding.FragmentTeamListBinding; -import com.yizhuan.habu.friend.action.AbstractSelectFriendAction; -import com.yizhuan.habu.friend.view.SelectFriendActivity; -import com.yizhuan.habu.team.adapter.TeamListAdapter; -import com.yizhuan.habu.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.chwl.app.R; +import com.chwl.app.base.BaseBindingFragment; +import com.chwl.app.databinding.FragmentTeamListBinding; +import com.chwl.app.friend.action.AbstractSelectFriendAction; +import com.chwl.app.friend.view.SelectFriendActivity; +import com.chwl.app.team.adapter.TeamListAdapter; +import com.chwl.app.team.viewmodel.TeamVM; +import com.chwl.core.team.bean.TeamInfo; +import com.chwl.library.annatation.ActLayoutRes; +import com.chwl.library.utils.ListUtils; /** * Created by MadisonRong on 11/06/2018. diff --git a/app/src/main/java/com/yizhuan/habu/team/view/TeamMemberListActivity.java b/app/src/main/java/com/chwl/app/team/view/TeamMemberListActivity.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/team/view/TeamMemberListActivity.java rename to app/src/main/java/com/chwl/app/team/view/TeamMemberListActivity.java index d3aa6ad5e..2abfddef2 100644 --- a/app/src/main/java/com/yizhuan/habu/team/view/TeamMemberListActivity.java +++ b/app/src/main/java/com/chwl/app/team/view/TeamMemberListActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.team.view; +package com.chwl.app.team.view; import android.app.Activity; import android.content.Context; @@ -13,22 +13,22 @@ 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.habu.R; -import com.yizhuan.habu.base.BaseBindingActivity; -import com.yizhuan.habu.base.TitleBar; -import com.yizhuan.habu.databinding.ActivityTeamMemberListBinding; -import com.yizhuan.habu.team.adapter.TeamMemberListAdapter; -import com.yizhuan.habu.team.bean.NimTeamMember; -import com.yizhuan.habu.team.event.TeamMemberUpdateEvent; -import com.yizhuan.habu.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.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.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseBindingActivity; +import com.chwl.app.base.TitleBar; +import com.chwl.app.databinding.ActivityTeamMemberListBinding; +import com.chwl.app.team.adapter.TeamMemberListAdapter; +import com.chwl.app.team.bean.NimTeamMember; +import com.chwl.app.team.event.TeamMemberUpdateEvent; +import com.chwl.app.team.viewmodel.TeamVM; +import com.chwl.core.family.bean.FamilyMemberInfo; +import com.chwl.core.team.bean.TeamInfo; +import com.chwl.core.team.bean.TeamMemberInfo; +import com.chwl.core.team.model.TeamModel; +import com.chwl.library.annatation.ActLayoutRes; +import com.chwl.library.rxbus.RxBusHelper; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/team/view/TeamMemberSearchListActivity.java b/app/src/main/java/com/chwl/app/team/view/TeamMemberSearchListActivity.java similarity index 89% rename from app/src/main/java/com/yizhuan/habu/team/view/TeamMemberSearchListActivity.java rename to app/src/main/java/com/chwl/app/team/view/TeamMemberSearchListActivity.java index dbbb39286..9b5828101 100644 --- a/app/src/main/java/com/yizhuan/habu/team/view/TeamMemberSearchListActivity.java +++ b/app/src/main/java/com/chwl/app/team/view/TeamMemberSearchListActivity.java @@ -1,10 +1,10 @@ -package com.yizhuan.habu.team.view; +package com.chwl.app.team.view; -import static com.yizhuan.habu.team.view.TeamMemberListActivity.EXTRA_ID; -import static com.yizhuan.habu.team.view.TeamMemberListActivity.KEY_OPERATION_TYPE; -import static com.yizhuan.habu.team.view.TeamMemberListActivity.OP_TEAM_MEMBER_NORMAL; -import static com.yizhuan.habu.team.view.TeamMemberListActivity.REQUEST_CODE; -import static com.yizhuan.habu.team.view.TeamMemberListActivity.RESULT_DATA; +import static com.chwl.app.team.view.TeamMemberListActivity.EXTRA_ID; +import static com.chwl.app.team.view.TeamMemberListActivity.KEY_OPERATION_TYPE; +import static com.chwl.app.team.view.TeamMemberListActivity.OP_TEAM_MEMBER_NORMAL; +import static com.chwl.app.team.view.TeamMemberListActivity.REQUEST_CODE; +import static com.chwl.app.team.view.TeamMemberListActivity.RESULT_DATA; import android.app.Activity; import android.content.Context; @@ -20,22 +20,22 @@ import android.view.inputmethod.EditorInfo; import androidx.recyclerview.widget.LinearLayoutManager; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseBindingActivity; -import com.yizhuan.habu.common.widget.dialog.DialogManager; -import com.yizhuan.habu.databinding.ActivityTeamMemberSearchListBinding; -import com.yizhuan.habu.team.adapter.TeamMemberListAdapter; -import com.yizhuan.habu.team.bean.NimTeamMember; -import com.yizhuan.habu.team.event.TeamMemberUpdateEvent; -import com.yizhuan.habu.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.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.rxbus.RxBusHelper; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseBindingActivity; +import com.chwl.app.common.widget.dialog.DialogManager; +import com.chwl.app.databinding.ActivityTeamMemberSearchListBinding; +import com.chwl.app.team.adapter.TeamMemberListAdapter; +import com.chwl.app.team.bean.NimTeamMember; +import com.chwl.app.team.event.TeamMemberUpdateEvent; +import com.chwl.app.team.viewmodel.TeamVM; +import com.chwl.core.team.bean.TeamInfo; +import com.chwl.core.team.bean.TeamMemberInfo; +import com.chwl.core.team.model.TeamModel; +import com.chwl.library.annatation.ActLayoutRes; +import com.chwl.library.rxbus.RxBusHelper; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; import java.util.Iterator; diff --git a/app/src/main/java/com/yizhuan/habu/team/view/TeamWeeklyBillActivity.java b/app/src/main/java/com/chwl/app/team/view/TeamWeeklyBillActivity.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/team/view/TeamWeeklyBillActivity.java rename to app/src/main/java/com/chwl/app/team/view/TeamWeeklyBillActivity.java index ff68194ca..e30d9cba6 100644 --- a/app/src/main/java/com/yizhuan/habu/team/view/TeamWeeklyBillActivity.java +++ b/app/src/main/java/com/chwl/app/team/view/TeamWeeklyBillActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.team.view; +package com.chwl.app.team.view; import android.content.Context; import android.content.Intent; @@ -13,16 +13,16 @@ import androidx.recyclerview.widget.LinearLayoutManager; 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.habu.R; -import com.yizhuan.habu.base.BaseBindingActivity; -import com.yizhuan.habu.databinding.ActivityTeamWeeklyBillBinding; -import com.yizhuan.habu.team.adapter.TeamWeeklyBillAdapter; -import com.yizhuan.habu.team.viewmodel.TeamVM; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_core.team.bean.TeamTransactionRecordInfo; -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.chwl.app.R; +import com.chwl.app.base.BaseBindingActivity; +import com.chwl.app.databinding.ActivityTeamWeeklyBillBinding; +import com.chwl.app.team.adapter.TeamWeeklyBillAdapter; +import com.chwl.app.team.viewmodel.TeamVM; +import com.chwl.core.family.model.FamilyModel; +import com.chwl.core.team.bean.TeamTransactionRecordInfo; +import com.chwl.library.annatation.ActLayoutRes; +import com.chwl.library.utils.FormatUtils; +import com.chwl.library.utils.ListUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/team/view/TeamWeeklyBillSearchActivity.java b/app/src/main/java/com/chwl/app/team/view/TeamWeeklyBillSearchActivity.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/team/view/TeamWeeklyBillSearchActivity.java rename to app/src/main/java/com/chwl/app/team/view/TeamWeeklyBillSearchActivity.java index 99e85354b..e0673d8dd 100644 --- a/app/src/main/java/com/yizhuan/habu/team/view/TeamWeeklyBillSearchActivity.java +++ b/app/src/main/java/com/chwl/app/team/view/TeamWeeklyBillSearchActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.team.view; +package com.chwl.app.team.view; import android.content.Context; import android.content.Intent; @@ -14,16 +14,16 @@ import androidx.recyclerview.widget.LinearLayoutManager; 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.habu.R; -import com.yizhuan.habu.base.BaseBindingActivity; -import com.yizhuan.habu.databinding.ActivityTeamWeeklyBillSearchBinding; -import com.yizhuan.habu.team.adapter.TeamWeeklyBillAdapter; -import com.yizhuan.habu.team.viewmodel.TeamVM; -import com.yizhuan.xchat_android_core.team.bean.TeamTransactionRecordInfo; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseBindingActivity; +import com.chwl.app.databinding.ActivityTeamWeeklyBillSearchBinding; +import com.chwl.app.team.adapter.TeamWeeklyBillAdapter; +import com.chwl.app.team.viewmodel.TeamVM; +import com.chwl.core.team.bean.TeamTransactionRecordInfo; +import com.chwl.library.annatation.ActLayoutRes; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/team/view/UpdateTeamNameActivity.java b/app/src/main/java/com/chwl/app/team/view/UpdateTeamNameActivity.java similarity index 82% rename from app/src/main/java/com/yizhuan/habu/team/view/UpdateTeamNameActivity.java rename to app/src/main/java/com/chwl/app/team/view/UpdateTeamNameActivity.java index 4263e85bd..980a31e81 100644 --- a/app/src/main/java/com/yizhuan/habu/team/view/UpdateTeamNameActivity.java +++ b/app/src/main/java/com/chwl/app/team/view/UpdateTeamNameActivity.java @@ -1,6 +1,6 @@ -package com.yizhuan.habu.team.view; +package com.chwl.app.team.view; -import static com.yizhuan.habu.team.view.NimTeamManagementActivity.EXTRA_TEAM_ID; +import static com.chwl.app.team.view.NimTeamManagementActivity.EXTRA_TEAM_ID; import android.content.Context; import android.content.Intent; @@ -9,15 +9,15 @@ import android.view.View; import android.widget.EditText; import com.google.android.material.snackbar.Snackbar; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseBindingActivity; -import com.yizhuan.habu.base.TitleBar; -import com.yizhuan.habu.databinding.ActivityUpdateTeamNameBinding; -import com.yizhuan.habu.team.viewmodel.TeamVM; -import com.yizhuan.xchat_android_core.team.bean.TeamInfo; -import com.yizhuan.xchat_android_core.team.model.TeamModel; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseBindingActivity; +import com.chwl.app.base.TitleBar; +import com.chwl.app.databinding.ActivityUpdateTeamNameBinding; +import com.chwl.app.team.viewmodel.TeamVM; +import com.chwl.core.team.bean.TeamInfo; +import com.chwl.core.team.model.TeamModel; +import com.chwl.library.annatation.ActLayoutRes; +import com.chwl.library.utils.ResUtil; /** * Created by MadisonRong on 28/06/2018. diff --git a/app/src/main/java/com/yizhuan/habu/team/viewmodel/FamilyMemberVM.java b/app/src/main/java/com/chwl/app/team/viewmodel/FamilyMemberVM.java similarity index 68% rename from app/src/main/java/com/yizhuan/habu/team/viewmodel/FamilyMemberVM.java rename to app/src/main/java/com/chwl/app/team/viewmodel/FamilyMemberVM.java index a097f35b2..26a68db0b 100644 --- a/app/src/main/java/com/yizhuan/habu/team/viewmodel/FamilyMemberVM.java +++ b/app/src/main/java/com/chwl/app/team/viewmodel/FamilyMemberVM.java @@ -1,8 +1,8 @@ -package com.yizhuan.habu.team.viewmodel; +package com.chwl.app.team.viewmodel; -import com.yizhuan.habu.base.BaseVM; -import com.yizhuan.xchat_android_core.family.bean.response.memberList.RespFamilymember; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; +import com.chwl.app.base.BaseVM; +import com.chwl.core.family.bean.response.memberList.RespFamilymember; +import com.chwl.core.family.model.FamilyModel; import io.reactivex.Single; diff --git a/app/src/main/java/com/yizhuan/habu/team/viewmodel/TeamVM.java b/app/src/main/java/com/chwl/app/team/viewmodel/TeamVM.java similarity index 92% rename from app/src/main/java/com/yizhuan/habu/team/viewmodel/TeamVM.java rename to app/src/main/java/com/chwl/app/team/viewmodel/TeamVM.java index f417b05cc..8fb5849aa 100644 --- a/app/src/main/java/com/yizhuan/habu/team/viewmodel/TeamVM.java +++ b/app/src/main/java/com/chwl/app/team/viewmodel/TeamVM.java @@ -1,14 +1,14 @@ -package com.yizhuan.habu.team.viewmodel; +package com.chwl.app.team.viewmodel; -import com.yizhuan.habu.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.chwl.app.base.BaseVM; +import com.chwl.core.bean.response.ServiceResult; +import com.chwl.core.luckymoney.LuckyMoneyInfo; +import com.chwl.core.luckymoney.LuckyMoneyRecordsInfo; +import com.chwl.core.team.bean.RespTeamMemberInfo; +import com.chwl.core.team.bean.TeamInfo; +import com.chwl.core.team.bean.TeamMemberInfo; +import com.chwl.core.team.bean.TeamTransactionInfo; +import com.chwl.core.team.model.TeamModel; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/FairyViewModel.kt b/app/src/main/java/com/chwl/app/treasurefairy/FairyViewModel.kt similarity index 93% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/FairyViewModel.kt rename to app/src/main/java/com/chwl/app/treasurefairy/FairyViewModel.kt index 2dc625a56..14853a791 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/FairyViewModel.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/FairyViewModel.kt @@ -1,30 +1,30 @@ -package com.yizhuan.habu.treasurefairy +package com.chwl.app.treasurefairy import android.util.SparseArray import androidx.core.util.forEach import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import com.yizhuan.habu.base.BaseViewModel -import com.yizhuan.habu.base.Event -import com.yizhuan.habu.treasurefairy.event.UpdateDataEvent -import com.yizhuan.habu.treasurefairy.view.MyFairyItemView -import com.yizhuan.xchat_android_core.bean.response.ListResult -import com.yizhuan.xchat_android_core.gift.bean.SimpleUserInfo -import com.yizhuan.xchat_android_core.treasurefairy.Compound -import com.yizhuan.xchat_android_core.treasurefairy.DrawInfo -import com.yizhuan.xchat_android_core.treasurefairy.ExchangeGiftInfo -import com.yizhuan.xchat_android_core.treasurefairy.FairyInfo -import com.yizhuan.xchat_android_core.treasurefairy.FairyResolveParam -import com.yizhuan.xchat_android_core.treasurefairy.FairyTestParam -import com.yizhuan.xchat_android_core.treasurefairy.ForestInfo -import com.yizhuan.xchat_android_core.treasurefairy.MyFairyInfo -import com.yizhuan.xchat_android_core.treasurefairy.PrizeInfo -import com.yizhuan.xchat_android_core.treasurefairy.ResolveInfo -import com.yizhuan.xchat_android_core.treasurefairy.SendFairyInfo -import com.yizhuan.xchat_android_core.treasurefairy.TestFairyRecordInfo -import com.yizhuan.xchat_android_core.treasurefairy.TreasureFairyModel -import com.yizhuan.xchat_android_core.utils.net.ServerException -import com.yizhuan.xchat_android_core.utils.toast +import com.chwl.app.base.BaseViewModel +import com.chwl.app.base.Event +import com.chwl.app.treasurefairy.event.UpdateDataEvent +import com.chwl.app.treasurefairy.view.MyFairyItemView +import com.chwl.core.bean.response.ListResult +import com.chwl.core.gift.bean.SimpleUserInfo +import com.chwl.core.treasurefairy.Compound +import com.chwl.core.treasurefairy.DrawInfo +import com.chwl.core.treasurefairy.ExchangeGiftInfo +import com.chwl.core.treasurefairy.FairyInfo +import com.chwl.core.treasurefairy.FairyResolveParam +import com.chwl.core.treasurefairy.FairyTestParam +import com.chwl.core.treasurefairy.ForestInfo +import com.chwl.core.treasurefairy.MyFairyInfo +import com.chwl.core.treasurefairy.PrizeInfo +import com.chwl.core.treasurefairy.ResolveInfo +import com.chwl.core.treasurefairy.SendFairyInfo +import com.chwl.core.treasurefairy.TestFairyRecordInfo +import com.chwl.core.treasurefairy.TreasureFairyModel +import com.chwl.core.utils.net.ServerException +import com.chwl.core.utils.toast import org.greenrobot.eventbus.EventBus class FairyViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/HomeFairyActivity.kt b/app/src/main/java/com/chwl/app/treasurefairy/HomeFairyActivity.kt similarity index 93% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/HomeFairyActivity.kt rename to app/src/main/java/com/chwl/app/treasurefairy/HomeFairyActivity.kt index 2dad5ccae..90514d259 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/HomeFairyActivity.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/HomeFairyActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.treasurefairy +package com.chwl.app.treasurefairy import android.animation.ObjectAnimator import android.annotation.SuppressLint @@ -21,32 +21,32 @@ import com.alibaba.fastjson.JSON import com.hjq.toast.ToastUtils import com.netease.nim.uikit.common.util.sys.ScreenUtil import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingActivity -import com.yizhuan.habu.common.widget.dialog.DialogManager -import com.yizhuan.habu.databinding.TreasureFairyDialogHomeBinding -import com.yizhuan.habu.treasure_box.activity.TreasureBoxActivity -import com.yizhuan.habu.treasurefairy.dialog.* -import com.yizhuan.habu.treasurefairy.view.CustomDrawable -import com.yizhuan.habu.ui.webview.FairyDialogWebViewActivity -import com.yizhuan.habu.utils.KeyBoardUtils -import com.yizhuan.habu.utils.SpannableBuilder -import com.yizhuan.xchat_android_core.UriProvider -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.bean.BaseProtocol -import com.yizhuan.xchat_android_core.gift.bean.LuckyBagNoticeInfo -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.treasurefairy.DrawInfo -import com.yizhuan.xchat_android_core.treasurefairy.FairyMsgInfoBean -import com.yizhuan.xchat_android_core.treasurefairy.PrizeInfo -import com.yizhuan.xchat_android_library.common.SpConstants -import com.yizhuan.xchat_android_library.common.util.SPUtils -import com.yizhuan.xchat_android_library.utils.FormatUtils -import com.yizhuan.xchat_android_library.utils.SingleToastUtil -import com.yizhuan.xchat_android_library.utils.TimeUtils +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingActivity +import com.chwl.app.common.widget.dialog.DialogManager +import com.chwl.app.databinding.TreasureFairyDialogHomeBinding +import com.chwl.app.treasure_box.activity.TreasureBoxActivity +import com.chwl.app.treasurefairy.dialog.* +import com.chwl.app.treasurefairy.view.CustomDrawable +import com.chwl.app.ui.webview.FairyDialogWebViewActivity +import com.chwl.app.utils.KeyBoardUtils +import com.chwl.app.utils.SpannableBuilder +import com.chwl.core.UriProvider +import com.chwl.core.auth.AuthModel +import com.chwl.core.bean.BaseProtocol +import com.chwl.core.gift.bean.LuckyBagNoticeInfo +import com.chwl.core.im.custom.bean.* +import com.chwl.core.manager.AvRoomDataManager +import com.chwl.core.manager.IMNetEaseManager +import com.chwl.core.manager.RoomEvent +import com.chwl.core.treasurefairy.DrawInfo +import com.chwl.core.treasurefairy.FairyMsgInfoBean +import com.chwl.core.treasurefairy.PrizeInfo +import com.chwl.library.common.SpConstants +import com.chwl.library.common.util.SPUtils +import com.chwl.library.utils.FormatUtils +import com.chwl.library.utils.SingleToastUtil +import com.chwl.library.utils.TimeUtils import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/ExchangeDebrisAdapter.kt b/app/src/main/java/com/chwl/app/treasurefairy/adapter/ExchangeDebrisAdapter.kt similarity index 75% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/ExchangeDebrisAdapter.kt rename to app/src/main/java/com/chwl/app/treasurefairy/adapter/ExchangeDebrisAdapter.kt index 3770f4b27..ba948e1cf 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/ExchangeDebrisAdapter.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/adapter/ExchangeDebrisAdapter.kt @@ -1,10 +1,10 @@ -package com.yizhuan.habu.treasurefairy.adapter +package com.chwl.app.treasurefairy.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.xchat_android_core.treasurefairy.ExchangeGiftInfo +import com.chwl.app.R +import com.chwl.app.ui.utils.ImageLoadUtilsV2 +import com.chwl.core.treasurefairy.ExchangeGiftInfo class ExchangeDebrisAdapter : BaseQuickAdapter(R.layout.treasure_fairy_item_exchange_debris) { diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/ExchangeDebrisRecordAdapter.kt b/app/src/main/java/com/chwl/app/treasurefairy/adapter/ExchangeDebrisRecordAdapter.kt similarity index 85% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/ExchangeDebrisRecordAdapter.kt rename to app/src/main/java/com/chwl/app/treasurefairy/adapter/ExchangeDebrisRecordAdapter.kt index 8d06da283..1acedbece 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/ExchangeDebrisRecordAdapter.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/adapter/ExchangeDebrisRecordAdapter.kt @@ -1,9 +1,9 @@ -package com.yizhuan.habu.treasurefairy.adapter +package com.chwl.app.treasurefairy.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.xchat_android_core.treasurefairy.ExchangeGiftInfo +import com.chwl.app.R +import com.chwl.core.treasurefairy.ExchangeGiftInfo import java.text.SimpleDateFormat import java.util.* diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/ExchangeFairyRecordAdapter.kt b/app/src/main/java/com/chwl/app/treasurefairy/adapter/ExchangeFairyRecordAdapter.kt similarity index 84% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/ExchangeFairyRecordAdapter.kt rename to app/src/main/java/com/chwl/app/treasurefairy/adapter/ExchangeFairyRecordAdapter.kt index 2474821da..52ff3622f 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/ExchangeFairyRecordAdapter.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/adapter/ExchangeFairyRecordAdapter.kt @@ -1,9 +1,9 @@ -package com.yizhuan.habu.treasurefairy.adapter +package com.chwl.app.treasurefairy.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.xchat_android_core.treasurefairy.ExchangeGiftInfo +import com.chwl.app.R +import com.chwl.core.treasurefairy.ExchangeGiftInfo import java.text.SimpleDateFormat import java.util.* diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/ExchangeFairyResultAdapter.kt b/app/src/main/java/com/chwl/app/treasurefairy/adapter/ExchangeFairyResultAdapter.kt similarity index 71% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/ExchangeFairyResultAdapter.kt rename to app/src/main/java/com/chwl/app/treasurefairy/adapter/ExchangeFairyResultAdapter.kt index 253e2fa95..af5aee61e 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/ExchangeFairyResultAdapter.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/adapter/ExchangeFairyResultAdapter.kt @@ -1,10 +1,10 @@ -package com.yizhuan.habu.treasurefairy.adapter +package com.chwl.app.treasurefairy.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.xchat_android_core.treasurefairy.ExchangeGiftInfo +import com.chwl.app.R +import com.chwl.app.ui.utils.ImageLoadUtilsV2 +import com.chwl.core.treasurefairy.ExchangeGiftInfo class ExchangeFairyResultAdapter : BaseQuickAdapter(R.layout.treasure_fairy_item_forest_prize_single) { diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/ExchangeSummonAdapter.kt b/app/src/main/java/com/chwl/app/treasurefairy/adapter/ExchangeSummonAdapter.kt similarity index 82% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/ExchangeSummonAdapter.kt rename to app/src/main/java/com/chwl/app/treasurefairy/adapter/ExchangeSummonAdapter.kt index b2603e4eb..86e6b7275 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/ExchangeSummonAdapter.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/adapter/ExchangeSummonAdapter.kt @@ -1,12 +1,12 @@ -package com.yizhuan.habu.treasurefairy.adapter +package com.chwl.app.treasurefairy.adapter import androidx.recyclerview.widget.RecyclerView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.xchat_android_core.treasurefairy.ExchangeGiftInfo -import com.yizhuan.xchat_android_core.treasurefairy.PropItemInfo +import com.chwl.app.R +import com.chwl.app.ui.utils.ImageLoadUtilsV2 +import com.chwl.core.treasurefairy.ExchangeGiftInfo +import com.chwl.core.treasurefairy.PropItemInfo class ExchangeSummonAdapter : BaseQuickAdapter(R.layout.treasure_fairy_item_exchange_summon) { diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/ForestIndicatorAdapter.java b/app/src/main/java/com/chwl/app/treasurefairy/adapter/ForestIndicatorAdapter.java similarity index 83% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/ForestIndicatorAdapter.java rename to app/src/main/java/com/chwl/app/treasurefairy/adapter/ForestIndicatorAdapter.java index ce85c0fa3..61499b08d 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/ForestIndicatorAdapter.java +++ b/app/src/main/java/com/chwl/app/treasurefairy/adapter/ForestIndicatorAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.treasurefairy.adapter; +package com.chwl.app.treasurefairy.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.habu.R; -import com.yizhuan.habu.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; +import com.chwl.app.R; +import com.chwl.app.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/ForestPrizeAdapter.kt b/app/src/main/java/com/chwl/app/treasurefairy/adapter/ForestPrizeAdapter.kt similarity index 79% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/ForestPrizeAdapter.kt rename to app/src/main/java/com/chwl/app/treasurefairy/adapter/ForestPrizeAdapter.kt index c5f27fd16..5ade4739f 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/ForestPrizeAdapter.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/adapter/ForestPrizeAdapter.kt @@ -1,11 +1,11 @@ -package com.yizhuan.habu.treasurefairy.adapter +package com.chwl.app.treasurefairy.adapter import android.widget.ImageView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.xchat_android_core.treasurefairy.PrizeInfo +import com.chwl.app.R +import com.chwl.app.ui.utils.load +import com.chwl.core.treasurefairy.PrizeInfo class ForestPrizeAdapter(val isSingle: Boolean = false) : BaseQuickAdapter( diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/ForestPrizesChildAdapter.kt b/app/src/main/java/com/chwl/app/treasurefairy/adapter/ForestPrizesChildAdapter.kt similarity index 73% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/ForestPrizesChildAdapter.kt rename to app/src/main/java/com/chwl/app/treasurefairy/adapter/ForestPrizesChildAdapter.kt index bffd2d99a..08b860b5f 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/ForestPrizesChildAdapter.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/adapter/ForestPrizesChildAdapter.kt @@ -1,11 +1,11 @@ -package com.yizhuan.habu.treasurefairy.adapter +package com.chwl.app.treasurefairy.adapter import android.widget.ImageView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.xchat_android_core.treasurefairy.PrizeInfo +import com.chwl.app.R +import com.chwl.app.ui.utils.load +import com.chwl.core.treasurefairy.PrizeInfo class ForestPrizesChildAdapter : BaseQuickAdapter(R.layout.treasure_fairy_item_forest_prizes_child) { diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/ForestPrizesRecordAdapter.kt b/app/src/main/java/com/chwl/app/treasurefairy/adapter/ForestPrizesRecordAdapter.kt similarity index 88% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/ForestPrizesRecordAdapter.kt rename to app/src/main/java/com/chwl/app/treasurefairy/adapter/ForestPrizesRecordAdapter.kt index 6b4f06d9e..a2a181e95 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/ForestPrizesRecordAdapter.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/adapter/ForestPrizesRecordAdapter.kt @@ -1,9 +1,9 @@ -package com.yizhuan.habu.treasurefairy.adapter +package com.chwl.app.treasurefairy.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.xchat_android_core.treasurefairy.PrizeInfo +import com.chwl.app.R +import com.chwl.core.treasurefairy.PrizeInfo import java.text.SimpleDateFormat import java.util.* diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/HomePrizeAdapter.kt b/app/src/main/java/com/chwl/app/treasurefairy/adapter/HomePrizeAdapter.kt similarity index 80% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/HomePrizeAdapter.kt rename to app/src/main/java/com/chwl/app/treasurefairy/adapter/HomePrizeAdapter.kt index 1030acf24..ca955469a 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/HomePrizeAdapter.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/adapter/HomePrizeAdapter.kt @@ -1,11 +1,11 @@ -package com.yizhuan.habu.treasurefairy.adapter +package com.chwl.app.treasurefairy.adapter import android.widget.ImageView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.xchat_android_core.treasurefairy.PrizeInfo +import com.chwl.app.R +import com.chwl.app.ui.utils.load +import com.chwl.core.treasurefairy.PrizeInfo class HomePrizeAdapter(val isSingle: Boolean = false) : BaseQuickAdapter( diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/MyFairyFriendsAdapter.kt b/app/src/main/java/com/chwl/app/treasurefairy/adapter/MyFairyFriendsAdapter.kt similarity index 71% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/MyFairyFriendsAdapter.kt rename to app/src/main/java/com/chwl/app/treasurefairy/adapter/MyFairyFriendsAdapter.kt index 89cc24897..ab47140b8 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/MyFairyFriendsAdapter.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/adapter/MyFairyFriendsAdapter.kt @@ -1,12 +1,12 @@ -package com.yizhuan.habu.treasurefairy.adapter +package com.chwl.app.treasurefairy.adapter import android.widget.ImageView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.xchat_android_core.gift.bean.SimpleUserInfo -import com.yizhuan.xchat_android_core.utils.ifNullOrEmpty +import com.chwl.app.R +import com.chwl.app.ui.utils.load +import com.chwl.core.gift.bean.SimpleUserInfo +import com.chwl.core.utils.ifNullOrEmpty class MyFairyFriendsAdapter : BaseQuickAdapter(R.layout.treasure_fairy_item_my_fairy_friend) { diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/MyFairyRecordAdapter.kt b/app/src/main/java/com/chwl/app/treasurefairy/adapter/MyFairyRecordAdapter.kt similarity index 83% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/MyFairyRecordAdapter.kt rename to app/src/main/java/com/chwl/app/treasurefairy/adapter/MyFairyRecordAdapter.kt index dcdf2651b..b04e3d329 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/MyFairyRecordAdapter.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/adapter/MyFairyRecordAdapter.kt @@ -1,11 +1,11 @@ -package com.yizhuan.habu.treasurefairy.adapter +package com.chwl.app.treasurefairy.adapter import android.widget.ImageView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.xchat_android_core.treasurefairy.SendFairyInfo +import com.chwl.app.R +import com.chwl.app.ui.utils.load +import com.chwl.core.treasurefairy.SendFairyInfo import java.text.SimpleDateFormat import java.util.* diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/ResolveFairyAdapter.kt b/app/src/main/java/com/chwl/app/treasurefairy/adapter/ResolveFairyAdapter.kt similarity index 80% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/ResolveFairyAdapter.kt rename to app/src/main/java/com/chwl/app/treasurefairy/adapter/ResolveFairyAdapter.kt index b2dca70bf..1372f6d01 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/ResolveFairyAdapter.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/adapter/ResolveFairyAdapter.kt @@ -1,11 +1,11 @@ -package com.yizhuan.habu.treasurefairy.adapter +package com.chwl.app.treasurefairy.adapter import android.widget.ImageView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.xchat_android_core.treasurefairy.FairyInfo +import com.chwl.app.R +import com.chwl.app.ui.utils.load +import com.chwl.core.treasurefairy.FairyInfo import java.util.* class ResolveFairyAdapter : diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/ResolveFairyResultAdapter.kt b/app/src/main/java/com/chwl/app/treasurefairy/adapter/ResolveFairyResultAdapter.kt similarity index 74% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/ResolveFairyResultAdapter.kt rename to app/src/main/java/com/chwl/app/treasurefairy/adapter/ResolveFairyResultAdapter.kt index 18d310034..edb046169 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/ResolveFairyResultAdapter.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/adapter/ResolveFairyResultAdapter.kt @@ -1,9 +1,9 @@ -package com.yizhuan.habu.treasurefairy.adapter +package com.chwl.app.treasurefairy.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.xchat_android_core.treasurefairy.ResolveInfo +import com.chwl.app.R +import com.chwl.core.treasurefairy.ResolveInfo class ResolveFairyResultAdapter : BaseQuickAdapter(R.layout.treasure_fairy_item_forest_prize_single_resolve) { diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/TestFairyAdapter.kt b/app/src/main/java/com/chwl/app/treasurefairy/adapter/TestFairyAdapter.kt similarity index 80% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/TestFairyAdapter.kt rename to app/src/main/java/com/chwl/app/treasurefairy/adapter/TestFairyAdapter.kt index 7bb5cadc0..4d642c8ec 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/TestFairyAdapter.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/adapter/TestFairyAdapter.kt @@ -1,11 +1,11 @@ -package com.yizhuan.habu.treasurefairy.adapter +package com.chwl.app.treasurefairy.adapter import android.widget.ImageView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.xchat_android_core.treasurefairy.FairyInfo +import com.chwl.app.R +import com.chwl.app.ui.utils.load +import com.chwl.core.treasurefairy.FairyInfo import java.util.* class TestFairyAdapter : diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/TestFairyRecordAdapter.kt b/app/src/main/java/com/chwl/app/treasurefairy/adapter/TestFairyRecordAdapter.kt similarity index 88% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/TestFairyRecordAdapter.kt rename to app/src/main/java/com/chwl/app/treasurefairy/adapter/TestFairyRecordAdapter.kt index b91c9b837..d11f0df36 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/TestFairyRecordAdapter.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/adapter/TestFairyRecordAdapter.kt @@ -1,9 +1,9 @@ -package com.yizhuan.habu.treasurefairy.adapter +package com.chwl.app.treasurefairy.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.xchat_android_core.treasurefairy.TestFairyRecordInfo +import com.chwl.app.R +import com.chwl.core.treasurefairy.TestFairyRecordInfo import java.text.SimpleDateFormat import java.util.* diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/TestFairyResultAdapter.kt b/app/src/main/java/com/chwl/app/treasurefairy/adapter/TestFairyResultAdapter.kt similarity index 73% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/TestFairyResultAdapter.kt rename to app/src/main/java/com/chwl/app/treasurefairy/adapter/TestFairyResultAdapter.kt index 9d0bd93e9..0f11b4c08 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/adapter/TestFairyResultAdapter.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/adapter/TestFairyResultAdapter.kt @@ -1,11 +1,11 @@ -package com.yizhuan.habu.treasurefairy.adapter +package com.chwl.app.treasurefairy.adapter import android.widget.ImageView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.xchat_android_core.treasurefairy.FairyInfo +import com.chwl.app.R +import com.chwl.app.ui.utils.load +import com.chwl.core.treasurefairy.FairyInfo class TestFairyResultAdapter : BaseQuickAdapter(R.layout.treasure_fairy_item_forest_prize_single) { diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/ExchangeFairyDialog.kt b/app/src/main/java/com/chwl/app/treasurefairy/dialog/ExchangeFairyDialog.kt similarity index 79% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/ExchangeFairyDialog.kt rename to app/src/main/java/com/chwl/app/treasurefairy/dialog/ExchangeFairyDialog.kt index 6e7ab8cbf..6e5b72623 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/ExchangeFairyDialog.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/dialog/ExchangeFairyDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.treasurefairy.dialog +package com.chwl.app.treasurefairy.dialog import android.annotation.SuppressLint import android.os.Bundle @@ -6,14 +6,14 @@ import android.view.Gravity import android.view.WindowManager import androidx.fragment.app.activityViewModels import androidx.viewpager.widget.ViewPager -import com.yizhuan.habu.R -import com.yizhuan.habu.avroom.adapter.RoomVPAdapter -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.databinding.TreasureFairyDialogExchangeBinding -import com.yizhuan.habu.treasurefairy.FairyViewModel -import com.yizhuan.habu.treasurefairy.fragment.ExchangeDebrisFragment -import com.yizhuan.habu.treasurefairy.fragment.ExchangeFairyFragment -import com.yizhuan.habu.treasurefairy.fragment.ExchangeSummonFragment +import com.chwl.app.R +import com.chwl.app.avroom.adapter.RoomVPAdapter +import com.chwl.app.base.BaseDialog +import com.chwl.app.databinding.TreasureFairyDialogExchangeBinding +import com.chwl.app.treasurefairy.FairyViewModel +import com.chwl.app.treasurefairy.fragment.ExchangeDebrisFragment +import com.chwl.app.treasurefairy.fragment.ExchangeFairyFragment +import com.chwl.app.treasurefairy.fragment.ExchangeSummonFragment class ExchangeFairyDialog : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/ExchangeFairyResultDialog.kt b/app/src/main/java/com/chwl/app/treasurefairy/dialog/ExchangeFairyResultDialog.kt similarity index 80% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/ExchangeFairyResultDialog.kt rename to app/src/main/java/com/chwl/app/treasurefairy/dialog/ExchangeFairyResultDialog.kt index 921374e0c..9f5b3ec57 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/ExchangeFairyResultDialog.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/dialog/ExchangeFairyResultDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.treasurefairy.dialog +package com.chwl.app.treasurefairy.dialog import android.annotation.SuppressLint import android.os.Bundle @@ -6,12 +6,12 @@ import android.view.Gravity import android.view.WindowManager import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.databinding.TreasureFairyDialogTestFairyResultBinding -import com.yizhuan.habu.treasurefairy.FairyViewModel -import com.yizhuan.habu.treasurefairy.adapter.ExchangeFairyResultAdapter -import com.yizhuan.habu.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.treasurefairy.ExchangeGiftInfo +import com.chwl.app.base.BaseDialog +import com.chwl.app.databinding.TreasureFairyDialogTestFairyResultBinding +import com.chwl.app.treasurefairy.FairyViewModel +import com.chwl.app.treasurefairy.adapter.ExchangeFairyResultAdapter +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.core.treasurefairy.ExchangeGiftInfo class ExchangeFairyResultDialog : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/ExchangeRecordDialog.kt b/app/src/main/java/com/chwl/app/treasurefairy/dialog/ExchangeRecordDialog.kt similarity index 81% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/ExchangeRecordDialog.kt rename to app/src/main/java/com/chwl/app/treasurefairy/dialog/ExchangeRecordDialog.kt index 3e0ba02f9..abc761598 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/ExchangeRecordDialog.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/dialog/ExchangeRecordDialog.kt @@ -1,16 +1,16 @@ -package com.yizhuan.habu.treasurefairy.dialog +package com.chwl.app.treasurefairy.dialog import android.annotation.SuppressLint import android.os.Bundle import android.view.Gravity import android.view.WindowManager import androidx.viewpager.widget.ViewPager -import com.yizhuan.habu.R -import com.yizhuan.habu.avroom.adapter.RoomVPAdapter -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.databinding.TreasureFairyDialogExchangeRecordBinding -import com.yizhuan.habu.treasurefairy.fragment.ExchangeDebrisRecordFragment -import com.yizhuan.habu.treasurefairy.fragment.ExchangeFairyRecordFragment +import com.chwl.app.R +import com.chwl.app.avroom.adapter.RoomVPAdapter +import com.chwl.app.base.BaseDialog +import com.chwl.app.databinding.TreasureFairyDialogExchangeRecordBinding +import com.chwl.app.treasurefairy.fragment.ExchangeDebrisRecordFragment +import com.chwl.app.treasurefairy.fragment.ExchangeFairyRecordFragment class ExchangeRecordDialog : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/FairyBuyDebrisDialog.kt b/app/src/main/java/com/chwl/app/treasurefairy/dialog/FairyBuyDebrisDialog.kt similarity index 78% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/FairyBuyDebrisDialog.kt rename to app/src/main/java/com/chwl/app/treasurefairy/dialog/FairyBuyDebrisDialog.kt index 5064dcad1..b7cbe3866 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/FairyBuyDebrisDialog.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/dialog/FairyBuyDebrisDialog.kt @@ -1,18 +1,18 @@ -package com.yizhuan.habu.treasurefairy.dialog +package com.chwl.app.treasurefairy.dialog import android.annotation.SuppressLint import android.os.Bundle import android.view.Gravity import android.view.WindowManager import androidx.fragment.app.activityViewModels -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.databinding.TreasureFairyDialogBuyDebrisBinding -import com.yizhuan.habu.treasurefairy.FairyViewModel -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_library.common.SpConstants -import com.yizhuan.xchat_android_library.common.util.SPUtils +import com.chwl.app.R +import com.chwl.app.base.BaseDialog +import com.chwl.app.databinding.TreasureFairyDialogBuyDebrisBinding +import com.chwl.app.treasurefairy.FairyViewModel +import com.chwl.core.auth.AuthModel +import com.chwl.core.manager.AvRoomDataManager +import com.chwl.library.common.SpConstants +import com.chwl.library.common.util.SPUtils /** * 购买碎片 diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/FairyBuyDebrisModifyQuantityDialog.kt b/app/src/main/java/com/chwl/app/treasurefairy/dialog/FairyBuyDebrisModifyQuantityDialog.kt similarity index 84% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/FairyBuyDebrisModifyQuantityDialog.kt rename to app/src/main/java/com/chwl/app/treasurefairy/dialog/FairyBuyDebrisModifyQuantityDialog.kt index 388645311..914defee8 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/FairyBuyDebrisModifyQuantityDialog.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/dialog/FairyBuyDebrisModifyQuantityDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.treasurefairy.dialog +package com.chwl.app.treasurefairy.dialog import android.annotation.SuppressLint import android.os.Bundle @@ -6,15 +6,15 @@ import android.view.Gravity import android.view.WindowManager import androidx.core.widget.doAfterTextChanged import androidx.fragment.app.activityViewModels -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.databinding.TreasureFairyDialogBuyDebrisModifyQuantityBinding -import com.yizhuan.habu.treasure_box.activity.TreasureBoxActivity -import com.yizhuan.habu.treasurefairy.FairyViewModel -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.utils.StringUtils -import com.yizhuan.xchat_android_library.utils.SingleToastUtil +import com.chwl.app.R +import com.chwl.app.base.BaseDialog +import com.chwl.app.databinding.TreasureFairyDialogBuyDebrisModifyQuantityBinding +import com.chwl.app.treasure_box.activity.TreasureBoxActivity +import com.chwl.app.treasurefairy.FairyViewModel +import com.chwl.core.auth.AuthModel +import com.chwl.core.manager.AvRoomDataManager +import com.chwl.core.utils.StringUtils +import com.chwl.library.utils.SingleToastUtil /** * 购买碎片 diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/FairyBuySuccessDialog.kt b/app/src/main/java/com/chwl/app/treasurefairy/dialog/FairyBuySuccessDialog.kt similarity index 79% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/FairyBuySuccessDialog.kt rename to app/src/main/java/com/chwl/app/treasurefairy/dialog/FairyBuySuccessDialog.kt index 1ca317c53..dd331de32 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/FairyBuySuccessDialog.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/dialog/FairyBuySuccessDialog.kt @@ -1,15 +1,15 @@ -package com.yizhuan.habu.treasurefairy.dialog +package com.chwl.app.treasurefairy.dialog import android.annotation.SuppressLint import android.os.Bundle import android.view.Gravity import android.view.WindowManager import androidx.fragment.app.activityViewModels -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.databinding.TreasureFairyDialogBuySuccessBinding -import com.yizhuan.habu.treasurefairy.FairyViewModel -import com.yizhuan.xchat_android_library.common.SpConstants -import com.yizhuan.xchat_android_library.common.util.SPUtils +import com.chwl.app.base.BaseDialog +import com.chwl.app.databinding.TreasureFairyDialogBuySuccessBinding +import com.chwl.app.treasurefairy.FairyViewModel +import com.chwl.library.common.SpConstants +import com.chwl.library.common.util.SPUtils /** * 购买碎片成功 diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/ForestFairyDialog.kt b/app/src/main/java/com/chwl/app/treasurefairy/dialog/ForestFairyDialog.kt similarity index 92% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/ForestFairyDialog.kt rename to app/src/main/java/com/chwl/app/treasurefairy/dialog/ForestFairyDialog.kt index e8bccbf3a..59bbf781f 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/ForestFairyDialog.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/dialog/ForestFairyDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.treasurefairy.dialog +package com.chwl.app.treasurefairy.dialog import android.annotation.SuppressLint import android.os.Bundle @@ -6,14 +6,14 @@ import android.view.Gravity import android.view.WindowManager import androidx.core.view.isInvisible import androidx.fragment.app.activityViewModels -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.databinding.TreasureFairyDialogForestBinding -import com.yizhuan.habu.treasurefairy.FairyViewModel -import com.yizhuan.habu.ui.utils.loadAvatar -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.chwl.app.R +import com.chwl.app.base.BaseDialog +import com.chwl.app.databinding.TreasureFairyDialogForestBinding +import com.chwl.app.treasurefairy.FairyViewModel +import com.chwl.app.ui.utils.loadAvatar +import com.chwl.core.utils.subAndReplaceDot +import com.chwl.core.utils.toIntOrDef +import com.chwl.core.utils.toast class ForestFairyDialog : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/ForestPrizeDialog.kt b/app/src/main/java/com/chwl/app/treasurefairy/dialog/ForestPrizeDialog.kt similarity index 87% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/ForestPrizeDialog.kt rename to app/src/main/java/com/chwl/app/treasurefairy/dialog/ForestPrizeDialog.kt index bc5979c4f..bb60fdc91 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/ForestPrizeDialog.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/dialog/ForestPrizeDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.treasurefairy.dialog +package com.chwl.app.treasurefairy.dialog import android.annotation.SuppressLint import android.os.Bundle @@ -9,13 +9,13 @@ import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import com.netease.nim.uikit.common.util.sys.ScreenUtil -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.databinding.TreasureFairyDialogForestPrizeBinding -import com.yizhuan.habu.treasurefairy.FairyViewModel -import com.yizhuan.habu.treasurefairy.adapter.ForestPrizeAdapter -import com.yizhuan.habu.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.treasurefairy.PrizeInfo +import com.chwl.app.R +import com.chwl.app.base.BaseDialog +import com.chwl.app.databinding.TreasureFairyDialogForestPrizeBinding +import com.chwl.app.treasurefairy.FairyViewModel +import com.chwl.app.treasurefairy.adapter.ForestPrizeAdapter +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.core.treasurefairy.PrizeInfo class ForestPrizeDialog : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/ForestRecordDialog.kt b/app/src/main/java/com/chwl/app/treasurefairy/dialog/ForestRecordDialog.kt similarity index 81% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/ForestRecordDialog.kt rename to app/src/main/java/com/chwl/app/treasurefairy/dialog/ForestRecordDialog.kt index 143c3b6da..3afb96271 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/ForestRecordDialog.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/dialog/ForestRecordDialog.kt @@ -1,16 +1,16 @@ -package com.yizhuan.habu.treasurefairy.dialog +package com.chwl.app.treasurefairy.dialog import android.annotation.SuppressLint import android.os.Bundle import android.view.Gravity import android.view.WindowManager import androidx.viewpager.widget.ViewPager -import com.yizhuan.habu.R -import com.yizhuan.habu.avroom.adapter.RoomVPAdapter -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.databinding.TreasureFairyDialogForestRecordBinding -import com.yizhuan.habu.treasurefairy.fragment.ForestPrizesFragment -import com.yizhuan.habu.treasurefairy.fragment.ForestRecordFragment +import com.chwl.app.R +import com.chwl.app.avroom.adapter.RoomVPAdapter +import com.chwl.app.base.BaseDialog +import com.chwl.app.databinding.TreasureFairyDialogForestRecordBinding +import com.chwl.app.treasurefairy.fragment.ForestPrizesFragment +import com.chwl.app.treasurefairy.fragment.ForestRecordFragment class ForestRecordDialog : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/HomeMorePopupWindow.kt b/app/src/main/java/com/chwl/app/treasurefairy/dialog/HomeMorePopupWindow.kt similarity index 85% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/HomeMorePopupWindow.kt rename to app/src/main/java/com/chwl/app/treasurefairy/dialog/HomeMorePopupWindow.kt index 04fbed8ef..dd84b6e47 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/HomeMorePopupWindow.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/dialog/HomeMorePopupWindow.kt @@ -1,11 +1,11 @@ -package com.yizhuan.habu.treasurefairy.dialog +package com.chwl.app.treasurefairy.dialog import android.content.Context import android.graphics.Color import android.view.View -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.webview.FairyDialogWebViewActivity -import com.yizhuan.xchat_android_core.UriProvider +import com.chwl.app.R +import com.chwl.app.ui.webview.FairyDialogWebViewActivity +import com.chwl.core.UriProvider import razerdp.basepopup.BasePopupWindow class HomeMorePopupWindow(private val context: Context) : BasePopupWindow(context) { diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/HomePrizeDialog.kt b/app/src/main/java/com/chwl/app/treasurefairy/dialog/HomePrizeDialog.kt similarity index 81% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/HomePrizeDialog.kt rename to app/src/main/java/com/chwl/app/treasurefairy/dialog/HomePrizeDialog.kt index 5bf07b91d..dafe1af84 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/HomePrizeDialog.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/dialog/HomePrizeDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.treasurefairy.dialog +package com.chwl.app.treasurefairy.dialog import android.annotation.SuppressLint import android.os.Bundle @@ -7,12 +7,12 @@ import android.view.WindowManager import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.databinding.TreasureFairyDialogHomePrizeBinding -import com.yizhuan.habu.treasurefairy.FairyViewModel -import com.yizhuan.habu.treasurefairy.adapter.HomePrizeAdapter -import com.yizhuan.habu.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.treasurefairy.PrizeInfo +import com.chwl.app.base.BaseDialog +import com.chwl.app.databinding.TreasureFairyDialogHomePrizeBinding +import com.chwl.app.treasurefairy.FairyViewModel +import com.chwl.app.treasurefairy.adapter.HomePrizeAdapter +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.core.treasurefairy.PrizeInfo class HomePrizeDialog : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/MyFairyDialog.kt b/app/src/main/java/com/chwl/app/treasurefairy/dialog/MyFairyDialog.kt similarity index 83% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/MyFairyDialog.kt rename to app/src/main/java/com/chwl/app/treasurefairy/dialog/MyFairyDialog.kt index 0b10e73fb..548d1ba9f 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/MyFairyDialog.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/dialog/MyFairyDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.treasurefairy.dialog +package com.chwl.app.treasurefairy.dialog import android.annotation.SuppressLint import android.os.Bundle @@ -6,15 +6,15 @@ import android.view.Gravity import android.view.WindowManager import androidx.fragment.app.activityViewModels import androidx.viewpager.widget.ViewPager -import com.yizhuan.habu.R -import com.yizhuan.habu.avroom.adapter.RoomVPAdapter -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.databinding.TreasureFairyDialogMyFairyBinding -import com.yizhuan.habu.treasurefairy.FairyViewModel -import com.yizhuan.habu.treasurefairy.event.UpdateDataEvent -import com.yizhuan.habu.treasurefairy.fragment.MyFairyFragment -import com.yizhuan.habu.treasurefairy.view.MyFairyItemView -import com.yizhuan.xchat_android_core.DemoCache +import com.chwl.app.R +import com.chwl.app.avroom.adapter.RoomVPAdapter +import com.chwl.app.base.BaseDialog +import com.chwl.app.databinding.TreasureFairyDialogMyFairyBinding +import com.chwl.app.treasurefairy.FairyViewModel +import com.chwl.app.treasurefairy.event.UpdateDataEvent +import com.chwl.app.treasurefairy.fragment.MyFairyFragment +import com.chwl.app.treasurefairy.view.MyFairyItemView +import com.chwl.core.DemoCache import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/MyFairyRecordDialog.kt b/app/src/main/java/com/chwl/app/treasurefairy/dialog/MyFairyRecordDialog.kt similarity index 79% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/MyFairyRecordDialog.kt rename to app/src/main/java/com/chwl/app/treasurefairy/dialog/MyFairyRecordDialog.kt index 71aaa14f2..6928abd7c 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/MyFairyRecordDialog.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/dialog/MyFairyRecordDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.treasurefairy.dialog +package com.chwl.app.treasurefairy.dialog import android.annotation.SuppressLint import android.os.Bundle @@ -6,14 +6,14 @@ import android.view.Gravity import android.view.WindowManager import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.common.EmptyViewHelper -import com.yizhuan.habu.databinding.TreasureFairyDialogMyFairyRecordBinding -import com.yizhuan.habu.treasurefairy.FairyViewModel -import com.yizhuan.habu.treasurefairy.adapter.MyFairyRecordAdapter -import com.yizhuan.habu.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.treasurefairy.SendFairyInfo +import com.chwl.app.R +import com.chwl.app.base.BaseDialog +import com.chwl.app.common.EmptyViewHelper +import com.chwl.app.databinding.TreasureFairyDialogMyFairyRecordBinding +import com.chwl.app.treasurefairy.FairyViewModel +import com.chwl.app.treasurefairy.adapter.MyFairyRecordAdapter +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.core.treasurefairy.SendFairyInfo class MyFairyRecordDialog : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/MyFairySearchFriendsDialog.kt b/app/src/main/java/com/chwl/app/treasurefairy/dialog/MyFairySearchFriendsDialog.kt similarity index 81% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/MyFairySearchFriendsDialog.kt rename to app/src/main/java/com/chwl/app/treasurefairy/dialog/MyFairySearchFriendsDialog.kt index 4fb7ca04b..f0300e6ea 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/MyFairySearchFriendsDialog.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/dialog/MyFairySearchFriendsDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.treasurefairy.dialog +package com.chwl.app.treasurefairy.dialog import android.annotation.SuppressLint import android.os.Bundle @@ -7,13 +7,13 @@ import android.view.WindowManager import androidx.core.widget.doAfterTextChanged import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.databinding.TreasureFairyDialogMyFairySearchFriendBinding -import com.yizhuan.habu.treasurefairy.FairyViewModel -import com.yizhuan.habu.treasurefairy.adapter.MyFairyFriendsAdapter -import com.yizhuan.habu.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.gift.bean.SimpleUserInfo -import com.yizhuan.xchat_android_core.treasurefairy.FairyInfo +import com.chwl.app.base.BaseDialog +import com.chwl.app.databinding.TreasureFairyDialogMyFairySearchFriendBinding +import com.chwl.app.treasurefairy.FairyViewModel +import com.chwl.app.treasurefairy.adapter.MyFairyFriendsAdapter +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.core.gift.bean.SimpleUserInfo +import com.chwl.core.treasurefairy.FairyInfo class MyFairySearchFriendsDialog : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/MyFairySendDialog.kt b/app/src/main/java/com/chwl/app/treasurefairy/dialog/MyFairySendDialog.kt similarity index 84% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/MyFairySendDialog.kt rename to app/src/main/java/com/chwl/app/treasurefairy/dialog/MyFairySendDialog.kt index cd81e2520..9918951ef 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/MyFairySendDialog.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/dialog/MyFairySendDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.treasurefairy.dialog +package com.chwl.app.treasurefairy.dialog import android.annotation.SuppressLint import android.graphics.Color @@ -8,14 +8,14 @@ import android.view.Gravity import android.view.WindowManager import androidx.core.graphics.toColorInt import androidx.fragment.app.activityViewModels -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.databinding.TreasureFairyDialogMyFairySendBinding -import com.yizhuan.habu.treasurefairy.FairyViewModel -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.habu.utils.SpannableBuilder -import com.yizhuan.xchat_android_core.gift.bean.SimpleUserInfo -import com.yizhuan.xchat_android_core.treasurefairy.FairyInfo -import com.yizhuan.xchat_android_library.common.util.ClickUtils.clickWithTrigger +import com.chwl.app.base.BaseDialog +import com.chwl.app.databinding.TreasureFairyDialogMyFairySendBinding +import com.chwl.app.treasurefairy.FairyViewModel +import com.chwl.app.ui.utils.load +import com.chwl.app.utils.SpannableBuilder +import com.chwl.core.gift.bean.SimpleUserInfo +import com.chwl.core.treasurefairy.FairyInfo +import com.chwl.library.common.util.ClickUtils.clickWithTrigger class MyFairySendDialog : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/ResolveFairyResultDialog.kt b/app/src/main/java/com/chwl/app/treasurefairy/dialog/ResolveFairyResultDialog.kt similarity index 81% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/ResolveFairyResultDialog.kt rename to app/src/main/java/com/chwl/app/treasurefairy/dialog/ResolveFairyResultDialog.kt index 7ea3ac9a9..eb32dbdc0 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/ResolveFairyResultDialog.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/dialog/ResolveFairyResultDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.treasurefairy.dialog +package com.chwl.app.treasurefairy.dialog import android.annotation.SuppressLint import android.os.Bundle @@ -6,12 +6,12 @@ import android.view.Gravity import android.view.WindowManager import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.databinding.TreasureFairyDialogResolveFairyResultBinding -import com.yizhuan.habu.treasurefairy.FairyViewModel -import com.yizhuan.habu.treasurefairy.adapter.ResolveFairyResultAdapter -import com.yizhuan.habu.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.treasurefairy.ResolveInfo +import com.chwl.app.base.BaseDialog +import com.chwl.app.databinding.TreasureFairyDialogResolveFairyResultBinding +import com.chwl.app.treasurefairy.FairyViewModel +import com.chwl.app.treasurefairy.adapter.ResolveFairyResultAdapter +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.core.treasurefairy.ResolveInfo class ResolveFairyResultDialog : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/TestFairyDialog.kt b/app/src/main/java/com/chwl/app/treasurefairy/dialog/TestFairyDialog.kt similarity index 82% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/TestFairyDialog.kt rename to app/src/main/java/com/chwl/app/treasurefairy/dialog/TestFairyDialog.kt index 0061295a8..59fd576af 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/TestFairyDialog.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/dialog/TestFairyDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.treasurefairy.dialog +package com.chwl.app.treasurefairy.dialog import android.annotation.SuppressLint import android.os.Bundle @@ -6,13 +6,13 @@ import android.view.Gravity import android.view.WindowManager import androidx.fragment.app.activityViewModels import androidx.viewpager.widget.ViewPager -import com.yizhuan.habu.R -import com.yizhuan.habu.avroom.adapter.RoomVPAdapter -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.databinding.TreasureFairyDialogTestFairyBinding -import com.yizhuan.habu.treasurefairy.FairyViewModel -import com.yizhuan.habu.treasurefairy.fragment.TestFairyFragment -import com.yizhuan.habu.treasurefairy.view.MyFairyItemView +import com.chwl.app.R +import com.chwl.app.avroom.adapter.RoomVPAdapter +import com.chwl.app.base.BaseDialog +import com.chwl.app.databinding.TreasureFairyDialogTestFairyBinding +import com.chwl.app.treasurefairy.FairyViewModel +import com.chwl.app.treasurefairy.fragment.TestFairyFragment +import com.chwl.app.treasurefairy.view.MyFairyItemView class TestFairyDialog : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/TestFairyRecordDialog.kt b/app/src/main/java/com/chwl/app/treasurefairy/dialog/TestFairyRecordDialog.kt similarity index 80% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/TestFairyRecordDialog.kt rename to app/src/main/java/com/chwl/app/treasurefairy/dialog/TestFairyRecordDialog.kt index f4719f620..800610e41 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/TestFairyRecordDialog.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/dialog/TestFairyRecordDialog.kt @@ -1,18 +1,18 @@ -package com.yizhuan.habu.treasurefairy.dialog +package com.chwl.app.treasurefairy.dialog import android.annotation.SuppressLint import android.os.Bundle import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager import com.netease.nim.uikit.common.util.sys.ScreenUtil -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.common.EmptyViewHelper -import com.yizhuan.habu.databinding.TreasureFairyDialogTestFairyRecordBinding -import com.yizhuan.habu.treasurefairy.FairyViewModel -import com.yizhuan.habu.treasurefairy.adapter.TestFairyRecordAdapter -import com.yizhuan.habu.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.treasurefairy.TestFairyRecordInfo +import com.chwl.app.R +import com.chwl.app.base.BaseDialog +import com.chwl.app.common.EmptyViewHelper +import com.chwl.app.databinding.TreasureFairyDialogTestFairyRecordBinding +import com.chwl.app.treasurefairy.FairyViewModel +import com.chwl.app.treasurefairy.adapter.TestFairyRecordAdapter +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.core.treasurefairy.TestFairyRecordInfo class TestFairyRecordDialog : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/TestFairyResultDialog.kt b/app/src/main/java/com/chwl/app/treasurefairy/dialog/TestFairyResultDialog.kt similarity index 80% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/TestFairyResultDialog.kt rename to app/src/main/java/com/chwl/app/treasurefairy/dialog/TestFairyResultDialog.kt index ed881deb7..fa3bda549 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/dialog/TestFairyResultDialog.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/dialog/TestFairyResultDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.treasurefairy.dialog +package com.chwl.app.treasurefairy.dialog import android.annotation.SuppressLint import android.os.Bundle @@ -6,12 +6,12 @@ import android.view.Gravity import android.view.WindowManager import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.databinding.TreasureFairyDialogTestFairyResultBinding -import com.yizhuan.habu.treasurefairy.FairyViewModel -import com.yizhuan.habu.treasurefairy.adapter.TestFairyResultAdapter -import com.yizhuan.habu.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.treasurefairy.FairyInfo +import com.chwl.app.base.BaseDialog +import com.chwl.app.databinding.TreasureFairyDialogTestFairyResultBinding +import com.chwl.app.treasurefairy.FairyViewModel +import com.chwl.app.treasurefairy.adapter.TestFairyResultAdapter +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.core.treasurefairy.FairyInfo class TestFairyResultDialog : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/event/UpdateDataEvent.java b/app/src/main/java/com/chwl/app/treasurefairy/event/UpdateDataEvent.java similarity index 70% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/event/UpdateDataEvent.java rename to app/src/main/java/com/chwl/app/treasurefairy/event/UpdateDataEvent.java index 1a17fc066..26f341afb 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/event/UpdateDataEvent.java +++ b/app/src/main/java/com/chwl/app/treasurefairy/event/UpdateDataEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.treasurefairy.event; +package com.chwl.app.treasurefairy.event; /** * 更新我的精灵数据 diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/fragment/ExchangeDebrisFragment.kt b/app/src/main/java/com/chwl/app/treasurefairy/fragment/ExchangeDebrisFragment.kt similarity index 78% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/fragment/ExchangeDebrisFragment.kt rename to app/src/main/java/com/chwl/app/treasurefairy/fragment/ExchangeDebrisFragment.kt index e306e1e7a..51bf248e1 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/fragment/ExchangeDebrisFragment.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/fragment/ExchangeDebrisFragment.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.treasurefairy.fragment +package com.chwl.app.treasurefairy.fragment import android.annotation.SuppressLint import android.os.Bundle @@ -6,18 +6,18 @@ import android.view.View import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingFragment -import com.yizhuan.habu.common.EmptyViewHelper -import com.yizhuan.habu.databinding.TreasureFairyFragmentExchangeDebrisBinding -import com.yizhuan.habu.treasurefairy.FairyViewModel -import com.yizhuan.habu.treasurefairy.adapter.ExchangeDebrisAdapter -import com.yizhuan.habu.ui.utils.RVDelegate -import com.yizhuan.habu.ui.utils.loadAvatar -import com.yizhuan.xchat_android_core.treasurefairy.ExchangeGiftInfo -import com.yizhuan.xchat_android_core.user.UserModel -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot -import com.yizhuan.xchat_android_core.utils.toast +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingFragment +import com.chwl.app.common.EmptyViewHelper +import com.chwl.app.databinding.TreasureFairyFragmentExchangeDebrisBinding +import com.chwl.app.treasurefairy.FairyViewModel +import com.chwl.app.treasurefairy.adapter.ExchangeDebrisAdapter +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.app.ui.utils.loadAvatar +import com.chwl.core.treasurefairy.ExchangeGiftInfo +import com.chwl.core.user.UserModel +import com.chwl.core.utils.subAndReplaceDot +import com.chwl.core.utils.toast class ExchangeDebrisFragment : BaseViewBindingFragment() { diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/fragment/ExchangeDebrisRecordFragment.kt b/app/src/main/java/com/chwl/app/treasurefairy/fragment/ExchangeDebrisRecordFragment.kt similarity index 77% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/fragment/ExchangeDebrisRecordFragment.kt rename to app/src/main/java/com/chwl/app/treasurefairy/fragment/ExchangeDebrisRecordFragment.kt index 5eb653bbf..ea01a8e00 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/fragment/ExchangeDebrisRecordFragment.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/fragment/ExchangeDebrisRecordFragment.kt @@ -1,17 +1,17 @@ -package com.yizhuan.habu.treasurefairy.fragment +package com.chwl.app.treasurefairy.fragment import android.annotation.SuppressLint import android.os.Bundle import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingFragment -import com.yizhuan.habu.common.EmptyViewHelper -import com.yizhuan.habu.databinding.TreasureFairyFragmentExchangeRecordDebrisBinding -import com.yizhuan.habu.treasurefairy.FairyViewModel -import com.yizhuan.habu.treasurefairy.adapter.ExchangeDebrisRecordAdapter -import com.yizhuan.habu.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.treasurefairy.ExchangeGiftInfo +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingFragment +import com.chwl.app.common.EmptyViewHelper +import com.chwl.app.databinding.TreasureFairyFragmentExchangeRecordDebrisBinding +import com.chwl.app.treasurefairy.FairyViewModel +import com.chwl.app.treasurefairy.adapter.ExchangeDebrisRecordAdapter +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.core.treasurefairy.ExchangeGiftInfo class ExchangeDebrisRecordFragment : BaseViewBindingFragment() { diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/fragment/ExchangeFairyFragment.kt b/app/src/main/java/com/chwl/app/treasurefairy/fragment/ExchangeFairyFragment.kt similarity index 87% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/fragment/ExchangeFairyFragment.kt rename to app/src/main/java/com/chwl/app/treasurefairy/fragment/ExchangeFairyFragment.kt index a0f9b5517..402ab3981 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/fragment/ExchangeFairyFragment.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/fragment/ExchangeFairyFragment.kt @@ -1,18 +1,18 @@ -package com.yizhuan.habu.treasurefairy.fragment +package com.chwl.app.treasurefairy.fragment import android.annotation.SuppressLint import android.os.Bundle import androidx.core.view.isInvisible import androidx.fragment.app.activityViewModels -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingFragment -import com.yizhuan.habu.databinding.TreasureFairyFragmentExchangeFairyBinding -import com.yizhuan.habu.treasurefairy.FairyViewModel -import com.yizhuan.habu.treasurefairy.dialog.ExchangeFairyResultDialog -import com.yizhuan.habu.treasurefairy.view.MyFairyItemView -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.xchat_android_core.treasurefairy.ExchangeGiftInfo -import com.yizhuan.xchat_android_core.treasurefairy.MyFairyInfo +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingFragment +import com.chwl.app.databinding.TreasureFairyFragmentExchangeFairyBinding +import com.chwl.app.treasurefairy.FairyViewModel +import com.chwl.app.treasurefairy.dialog.ExchangeFairyResultDialog +import com.chwl.app.treasurefairy.view.MyFairyItemView +import com.chwl.app.ui.utils.load +import com.chwl.core.treasurefairy.ExchangeGiftInfo +import com.chwl.core.treasurefairy.MyFairyInfo class ExchangeFairyFragment : BaseViewBindingFragment() { diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/fragment/ExchangeFairyRecordFragment.kt b/app/src/main/java/com/chwl/app/treasurefairy/fragment/ExchangeFairyRecordFragment.kt similarity index 78% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/fragment/ExchangeFairyRecordFragment.kt rename to app/src/main/java/com/chwl/app/treasurefairy/fragment/ExchangeFairyRecordFragment.kt index 5d6613f99..13562723f 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/fragment/ExchangeFairyRecordFragment.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/fragment/ExchangeFairyRecordFragment.kt @@ -1,17 +1,17 @@ -package com.yizhuan.habu.treasurefairy.fragment +package com.chwl.app.treasurefairy.fragment import android.annotation.SuppressLint import android.os.Bundle import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingFragment -import com.yizhuan.habu.common.EmptyViewHelper -import com.yizhuan.habu.databinding.TreasureFairyFragmentExchangeRecordFairyBinding -import com.yizhuan.habu.treasurefairy.FairyViewModel -import com.yizhuan.habu.treasurefairy.adapter.ExchangeFairyRecordAdapter -import com.yizhuan.habu.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.treasurefairy.ExchangeGiftInfo +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingFragment +import com.chwl.app.common.EmptyViewHelper +import com.chwl.app.databinding.TreasureFairyFragmentExchangeRecordFairyBinding +import com.chwl.app.treasurefairy.FairyViewModel +import com.chwl.app.treasurefairy.adapter.ExchangeFairyRecordAdapter +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.core.treasurefairy.ExchangeGiftInfo class ExchangeFairyRecordFragment : BaseViewBindingFragment() { diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/fragment/ExchangeSummonFragment.kt b/app/src/main/java/com/chwl/app/treasurefairy/fragment/ExchangeSummonFragment.kt similarity index 79% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/fragment/ExchangeSummonFragment.kt rename to app/src/main/java/com/chwl/app/treasurefairy/fragment/ExchangeSummonFragment.kt index 510177601..f506f41e8 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/fragment/ExchangeSummonFragment.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/fragment/ExchangeSummonFragment.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.treasurefairy.fragment +package com.chwl.app.treasurefairy.fragment import android.annotation.SuppressLint import android.os.Bundle @@ -7,20 +7,20 @@ import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingFragment -import com.yizhuan.habu.common.EmptyViewHelper -import com.yizhuan.habu.databinding.TreasureFairyFragmentExchangeDebrisBinding -import com.yizhuan.habu.treasurefairy.FairyViewModel -import com.yizhuan.habu.treasurefairy.adapter.ExchangeSummonAdapter -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.habu.ui.utils.RVDelegate -import com.yizhuan.habu.ui.utils.loadAvatar -import com.yizhuan.xchat_android_core.treasurefairy.ExchangeGiftInfo -import com.yizhuan.xchat_android_core.treasurefairy.FairyInfo -import com.yizhuan.xchat_android_core.user.UserModel -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot -import com.yizhuan.xchat_android_core.utils.toast +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingFragment +import com.chwl.app.common.EmptyViewHelper +import com.chwl.app.databinding.TreasureFairyFragmentExchangeDebrisBinding +import com.chwl.app.treasurefairy.FairyViewModel +import com.chwl.app.treasurefairy.adapter.ExchangeSummonAdapter +import com.chwl.app.ui.utils.ImageLoadUtilsV2 +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.app.ui.utils.loadAvatar +import com.chwl.core.treasurefairy.ExchangeGiftInfo +import com.chwl.core.treasurefairy.FairyInfo +import com.chwl.core.user.UserModel +import com.chwl.core.utils.subAndReplaceDot +import com.chwl.core.utils.toast class ExchangeSummonFragment : BaseViewBindingFragment() { diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/fragment/ForestPrizesChildFragment.kt b/app/src/main/java/com/chwl/app/treasurefairy/fragment/ForestPrizesChildFragment.kt similarity index 78% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/fragment/ForestPrizesChildFragment.kt rename to app/src/main/java/com/chwl/app/treasurefairy/fragment/ForestPrizesChildFragment.kt index bde38139d..95d47d327 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/fragment/ForestPrizesChildFragment.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/fragment/ForestPrizesChildFragment.kt @@ -1,18 +1,18 @@ -package com.yizhuan.habu.treasurefairy.fragment +package com.chwl.app.treasurefairy.fragment import android.annotation.SuppressLint import android.os.Bundle import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingFragment -import com.yizhuan.habu.common.EmptyViewHelper -import com.yizhuan.habu.databinding.TreasureFairyFragmentForestPrizesChildBinding -import com.yizhuan.habu.treasurefairy.FairyViewModel -import com.yizhuan.habu.treasurefairy.adapter.ForestPrizesChildAdapter -import com.yizhuan.habu.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.treasurefairy.PrizeInfo +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingFragment +import com.chwl.app.common.EmptyViewHelper +import com.chwl.app.databinding.TreasureFairyFragmentForestPrizesChildBinding +import com.chwl.app.treasurefairy.FairyViewModel +import com.chwl.app.treasurefairy.adapter.ForestPrizesChildAdapter +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.core.treasurefairy.PrizeInfo class ForestPrizesChildFragment : BaseViewBindingFragment() { diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/fragment/ForestPrizesFragment.kt b/app/src/main/java/com/chwl/app/treasurefairy/fragment/ForestPrizesFragment.kt similarity index 78% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/fragment/ForestPrizesFragment.kt rename to app/src/main/java/com/chwl/app/treasurefairy/fragment/ForestPrizesFragment.kt index d0bdd66e9..8f5665d9f 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/fragment/ForestPrizesFragment.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/fragment/ForestPrizesFragment.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.treasurefairy.fragment +package com.chwl.app.treasurefairy.fragment import android.annotation.SuppressLint import android.os.Bundle @@ -6,13 +6,13 @@ import android.widget.LinearLayout import android.widget.TextView import androidx.fragment.app.Fragment import androidx.viewpager.widget.ViewPager -import com.yizhuan.habu.base.BaseViewBindingFragment -import com.yizhuan.habu.databinding.TreasureFairyFragmentForestPrizesBinding -import com.yizhuan.habu.treasurefairy.adapter.ForestIndicatorAdapter -import com.yizhuan.habu.ui.user.adapter.UserInfoPagerAdapter -import com.yizhuan.habu.ui.widget.magicindicator.MagicIndicator -import com.yizhuan.habu.ui.widget.magicindicator.ViewPagerHelper -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator +import com.chwl.app.base.BaseViewBindingFragment +import com.chwl.app.databinding.TreasureFairyFragmentForestPrizesBinding +import com.chwl.app.treasurefairy.adapter.ForestIndicatorAdapter +import com.chwl.app.ui.user.adapter.UserInfoPagerAdapter +import com.chwl.app.ui.widget.magicindicator.MagicIndicator +import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator class ForestPrizesFragment : BaseViewBindingFragment() { diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/fragment/ForestRecordFragment.kt b/app/src/main/java/com/chwl/app/treasurefairy/fragment/ForestRecordFragment.kt similarity index 78% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/fragment/ForestRecordFragment.kt rename to app/src/main/java/com/chwl/app/treasurefairy/fragment/ForestRecordFragment.kt index 52d682137..444e82e3f 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/fragment/ForestRecordFragment.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/fragment/ForestRecordFragment.kt @@ -1,17 +1,17 @@ -package com.yizhuan.habu.treasurefairy.fragment +package com.chwl.app.treasurefairy.fragment import android.annotation.SuppressLint import android.os.Bundle import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingFragment -import com.yizhuan.habu.common.EmptyViewHelper -import com.yizhuan.habu.databinding.TreasureFairyFragmentForestRecordBinding -import com.yizhuan.habu.treasurefairy.FairyViewModel -import com.yizhuan.habu.treasurefairy.adapter.ForestPrizesRecordAdapter -import com.yizhuan.habu.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.treasurefairy.PrizeInfo +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingFragment +import com.chwl.app.common.EmptyViewHelper +import com.chwl.app.databinding.TreasureFairyFragmentForestRecordBinding +import com.chwl.app.treasurefairy.FairyViewModel +import com.chwl.app.treasurefairy.adapter.ForestPrizesRecordAdapter +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.core.treasurefairy.PrizeInfo class ForestRecordFragment : BaseViewBindingFragment() { diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/fragment/MyFairyFragment.kt b/app/src/main/java/com/chwl/app/treasurefairy/fragment/MyFairyFragment.kt similarity index 84% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/fragment/MyFairyFragment.kt rename to app/src/main/java/com/chwl/app/treasurefairy/fragment/MyFairyFragment.kt index 3614a497d..7b9ea299d 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/fragment/MyFairyFragment.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/fragment/MyFairyFragment.kt @@ -1,14 +1,14 @@ -package com.yizhuan.habu.treasurefairy.fragment +package com.chwl.app.treasurefairy.fragment import android.annotation.SuppressLint import android.os.Bundle import androidx.fragment.app.activityViewModels -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingFragment -import com.yizhuan.habu.databinding.TreasureFairyFragmentMyFairyBinding -import com.yizhuan.habu.treasurefairy.FairyViewModel -import com.yizhuan.habu.treasurefairy.dialog.MyFairySearchFriendsDialog -import com.yizhuan.habu.treasurefairy.view.MyFairyItemView +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingFragment +import com.chwl.app.databinding.TreasureFairyFragmentMyFairyBinding +import com.chwl.app.treasurefairy.FairyViewModel +import com.chwl.app.treasurefairy.dialog.MyFairySearchFriendsDialog +import com.chwl.app.treasurefairy.view.MyFairyItemView class MyFairyFragment : BaseViewBindingFragment() { diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/fragment/TestFairyFragment.kt b/app/src/main/java/com/chwl/app/treasurefairy/fragment/TestFairyFragment.kt similarity index 92% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/fragment/TestFairyFragment.kt rename to app/src/main/java/com/chwl/app/treasurefairy/fragment/TestFairyFragment.kt index 58738e09d..be73a4d57 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/fragment/TestFairyFragment.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/fragment/TestFairyFragment.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.treasurefairy.fragment +package com.chwl.app.treasurefairy.fragment import android.annotation.SuppressLint import android.os.Bundle @@ -7,19 +7,19 @@ import androidx.constraintlayout.widget.ConstraintLayout import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingFragment -import com.yizhuan.habu.common.EmptyViewHelper -import com.yizhuan.habu.databinding.TreasureFairyFragmentTestFairyBinding -import com.yizhuan.habu.treasurefairy.FairyViewModel -import com.yizhuan.habu.treasurefairy.adapter.ResolveFairyAdapter -import com.yizhuan.habu.treasurefairy.adapter.TestFairyAdapter -import com.yizhuan.habu.treasurefairy.dialog.ResolveFairyResultDialog -import com.yizhuan.habu.treasurefairy.dialog.TestFairyResultDialog -import com.yizhuan.habu.treasurefairy.view.MyFairyItemView -import com.yizhuan.habu.ui.utils.RVDelegate -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.xchat_android_core.treasurefairy.FairyInfo +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingFragment +import com.chwl.app.common.EmptyViewHelper +import com.chwl.app.databinding.TreasureFairyFragmentTestFairyBinding +import com.chwl.app.treasurefairy.FairyViewModel +import com.chwl.app.treasurefairy.adapter.ResolveFairyAdapter +import com.chwl.app.treasurefairy.adapter.TestFairyAdapter +import com.chwl.app.treasurefairy.dialog.ResolveFairyResultDialog +import com.chwl.app.treasurefairy.dialog.TestFairyResultDialog +import com.chwl.app.treasurefairy.view.MyFairyItemView +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.app.ui.utils.load +import com.chwl.core.treasurefairy.FairyInfo class TestFairyFragment : BaseViewBindingFragment() { diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/view/CustomDrawable.kt b/app/src/main/java/com/chwl/app/treasurefairy/view/CustomDrawable.kt similarity index 97% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/view/CustomDrawable.kt rename to app/src/main/java/com/chwl/app/treasurefairy/view/CustomDrawable.kt index 1231b2c43..f0d28a751 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/view/CustomDrawable.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/view/CustomDrawable.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.treasurefairy.view +package com.chwl.app.treasurefairy.view import android.graphics.* import android.graphics.drawable.Drawable diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/view/ExchangeItemView.kt b/app/src/main/java/com/chwl/app/treasurefairy/view/ExchangeItemView.kt similarity index 78% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/view/ExchangeItemView.kt rename to app/src/main/java/com/chwl/app/treasurefairy/view/ExchangeItemView.kt index ace155970..109991488 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/view/ExchangeItemView.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/view/ExchangeItemView.kt @@ -1,14 +1,14 @@ -package com.yizhuan.habu.treasurefairy.view +package com.chwl.app.treasurefairy.view import android.annotation.SuppressLint import android.content.Context import android.util.AttributeSet import androidx.annotation.Nullable import androidx.constraintlayout.widget.ConstraintLayout -import com.yizhuan.habu.R -import com.yizhuan.habu.databinding.TreasureFairyItemExchangeBinding -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.xchat_android_core.treasurefairy.FairyInfo +import com.chwl.app.R +import com.chwl.app.databinding.TreasureFairyItemExchangeBinding +import com.chwl.app.ui.utils.load +import com.chwl.core.treasurefairy.FairyInfo class ExchangeItemView @JvmOverloads constructor( context: Context, diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/view/HomeItemView.kt b/app/src/main/java/com/chwl/app/treasurefairy/view/HomeItemView.kt similarity index 74% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/view/HomeItemView.kt rename to app/src/main/java/com/chwl/app/treasurefairy/view/HomeItemView.kt index 51b97d930..9ac4345f0 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/view/HomeItemView.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/view/HomeItemView.kt @@ -1,13 +1,13 @@ -package com.yizhuan.habu.treasurefairy.view +package com.chwl.app.treasurefairy.view import android.content.Context import android.util.AttributeSet import android.widget.FrameLayout import androidx.annotation.Nullable -import com.yizhuan.habu.R -import com.yizhuan.habu.databinding.TreasureFairyItemHomeBinding -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.xchat_android_core.treasurefairy.PrizeInfo +import com.chwl.app.R +import com.chwl.app.databinding.TreasureFairyItemHomeBinding +import com.chwl.app.ui.utils.load +import com.chwl.core.treasurefairy.PrizeInfo class HomeItemView @JvmOverloads constructor( context: Context, diff --git a/app/src/main/java/com/yizhuan/habu/treasurefairy/view/MyFairyItemView.kt b/app/src/main/java/com/chwl/app/treasurefairy/view/MyFairyItemView.kt similarity index 95% rename from app/src/main/java/com/yizhuan/habu/treasurefairy/view/MyFairyItemView.kt rename to app/src/main/java/com/chwl/app/treasurefairy/view/MyFairyItemView.kt index 2774d8fa9..2083ec878 100644 --- a/app/src/main/java/com/yizhuan/habu/treasurefairy/view/MyFairyItemView.kt +++ b/app/src/main/java/com/chwl/app/treasurefairy/view/MyFairyItemView.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.treasurefairy.view +package com.chwl.app.treasurefairy.view import android.annotation.SuppressLint import android.content.Context @@ -9,10 +9,10 @@ import android.widget.FrameLayout import androidx.annotation.Nullable import androidx.core.graphics.toColorInt import androidx.core.view.isVisible -import com.yizhuan.habu.R -import com.yizhuan.habu.databinding.TreasureFairyItemMyFairyBaseBinding -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.xchat_android_core.treasurefairy.FairyInfo +import com.chwl.app.R +import com.chwl.app.databinding.TreasureFairyItemMyFairyBaseBinding +import com.chwl.app.ui.utils.load +import com.chwl.core.treasurefairy.FairyInfo class MyFairyItemView @JvmOverloads constructor( context: Context, diff --git a/app/src/main/java/com/yizhuan/habu/ui/adapter/StarWeekAdapter.java b/app/src/main/java/com/chwl/app/ui/adapter/StarWeekAdapter.java similarity index 77% rename from app/src/main/java/com/yizhuan/habu/ui/adapter/StarWeekAdapter.java rename to app/src/main/java/com/chwl/app/ui/adapter/StarWeekAdapter.java index d931088a0..936cb148f 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/adapter/StarWeekAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/adapter/StarWeekAdapter.java @@ -1,17 +1,17 @@ -package com.yizhuan.habu.ui.adapter; +package com.chwl.app.ui.adapter; import androidx.appcompat.widget.AppCompatImageView; import androidx.appcompat.widget.AppCompatTextView; import androidx.constraintlayout.widget.ConstraintLayout; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.gift.bean.SimpleUserInfo; -import com.yizhuan.xchat_android_core.room.anotherroompk.ShowUserInfoDialogEvent; -import com.yizhuan.xchat_android_core.utils.StringExtensionKt; -import com.yizhuan.xchat_android_core.utils.TextUtils; -import com.yizhuan.xchat_android_library.common.application.BaseApp; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.core.gift.bean.SimpleUserInfo; +import com.chwl.core.room.anotherroompk.ShowUserInfoDialogEvent; +import com.chwl.core.utils.StringExtensionKt; +import com.chwl.core.utils.TextUtils; +import com.chwl.library.common.application.BaseApp; +import com.chwl.library.utils.ResUtil; import com.zhpan.bannerview.BaseBannerAdapter; import com.zhpan.bannerview.BaseViewHolder; diff --git a/app/src/main/java/com/yizhuan/habu/ui/anim/AnimFactory.java b/app/src/main/java/com/chwl/app/ui/anim/AnimFactory.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/ui/anim/AnimFactory.java rename to app/src/main/java/com/chwl/app/ui/anim/AnimFactory.java index 3034c4548..12adbef75 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/anim/AnimFactory.java +++ b/app/src/main/java/com/chwl/app/ui/anim/AnimFactory.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.anim; +package com.chwl.app.ui.anim; import android.content.Context; import android.graphics.Color; @@ -7,12 +7,12 @@ import android.graphics.drawable.ColorDrawable; import android.util.Log; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.yizhuan.habu.R; -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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.core.room.face.DynamicFaceModel; +import com.chwl.core.room.face.FaceInfo; +import com.chwl.core.room.face.FaceReceiveInfo; +import com.chwl.library.threadmgr.ThreadPoolManager; +import com.chwl.library.utils.ResUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/anim/FlowFaceDrawable.java b/app/src/main/java/com/chwl/app/ui/anim/FlowFaceDrawable.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/anim/FlowFaceDrawable.java rename to app/src/main/java/com/chwl/app/ui/anim/FlowFaceDrawable.java index ad9eb3599..08958b367 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/anim/FlowFaceDrawable.java +++ b/app/src/main/java/com/chwl/app/ui/anim/FlowFaceDrawable.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.anim; +package com.chwl.app.ui.anim; import android.content.Context; import android.graphics.Bitmap; @@ -15,7 +15,7 @@ import androidx.annotation.Nullable; import com.bumptech.glide.request.FutureTarget; import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.habu.common.util.Utils; +import com.chwl.app.common.util.Utils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/anim/FrameAnimation.java b/app/src/main/java/com/chwl/app/ui/anim/FrameAnimation.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/ui/anim/FrameAnimation.java rename to app/src/main/java/com/chwl/app/ui/anim/FrameAnimation.java index 133552d7b..861949ba6 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/anim/FrameAnimation.java +++ b/app/src/main/java/com/chwl/app/ui/anim/FrameAnimation.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.anim; +package com.chwl.app.ui.anim; import android.graphics.drawable.Drawable; import android.widget.ImageView; diff --git a/app/src/main/java/com/yizhuan/habu/ui/anim/OneFaceDrawable.java b/app/src/main/java/com/chwl/app/ui/anim/OneFaceDrawable.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/ui/anim/OneFaceDrawable.java rename to app/src/main/java/com/chwl/app/ui/anim/OneFaceDrawable.java index 2f0b0d6b3..74bd18f1f 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/anim/OneFaceDrawable.java +++ b/app/src/main/java/com/chwl/app/ui/anim/OneFaceDrawable.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.anim; +package com.chwl.app.ui.anim; import android.content.Context; import android.graphics.Bitmap; diff --git a/app/src/main/java/com/yizhuan/habu/ui/anim/OverlayFaceDrawable.java b/app/src/main/java/com/chwl/app/ui/anim/OverlayFaceDrawable.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/anim/OverlayFaceDrawable.java rename to app/src/main/java/com/chwl/app/ui/anim/OverlayFaceDrawable.java index 73bb12864..11a726e42 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/anim/OverlayFaceDrawable.java +++ b/app/src/main/java/com/chwl/app/ui/anim/OverlayFaceDrawable.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.anim; +package com.chwl.app.ui.anim; import android.content.Context; import android.graphics.Bitmap; @@ -15,7 +15,7 @@ import androidx.annotation.Nullable; import com.bumptech.glide.request.FutureTarget; import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.habu.common.util.Utils; +import com.chwl.app.common.util.Utils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/anim/WavingDrawable.java b/app/src/main/java/com/chwl/app/ui/anim/WavingDrawable.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/anim/WavingDrawable.java rename to app/src/main/java/com/chwl/app/ui/anim/WavingDrawable.java index 261fbed78..a168f94cd 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/anim/WavingDrawable.java +++ b/app/src/main/java/com/chwl/app/ui/anim/WavingDrawable.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.anim; +package com.chwl.app.ui.anim; import android.graphics.Canvas; import android.graphics.Color; diff --git a/app/src/main/java/com/yizhuan/habu/ui/bean/BaseResponse.java b/app/src/main/java/com/chwl/app/ui/bean/BaseResponse.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/ui/bean/BaseResponse.java rename to app/src/main/java/com/chwl/app/ui/bean/BaseResponse.java index ce7a77a88..ef21b7e4d 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/bean/BaseResponse.java +++ b/app/src/main/java/com/chwl/app/ui/bean/BaseResponse.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.bean; +package com.chwl.app.ui.bean; /** diff --git a/app/src/main/java/com/yizhuan/habu/ui/bean/Footer.java b/app/src/main/java/com/chwl/app/ui/bean/Footer.java similarity index 69% rename from app/src/main/java/com/yizhuan/habu/ui/bean/Footer.java rename to app/src/main/java/com/chwl/app/ui/bean/Footer.java index de5c6b005..3750f738d 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/bean/Footer.java +++ b/app/src/main/java/com/chwl/app/ui/bean/Footer.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.bean; +package com.chwl.app.ui.bean; /** * Created by zhouxiangfeng on 2017/4/30. diff --git a/app/src/main/java/com/yizhuan/habu/ui/bean/FooterLoadMoreBean.java b/app/src/main/java/com/chwl/app/ui/bean/FooterLoadMoreBean.java similarity index 83% rename from app/src/main/java/com/yizhuan/habu/ui/bean/FooterLoadMoreBean.java rename to app/src/main/java/com/chwl/app/ui/bean/FooterLoadMoreBean.java index c9c1a1e8b..1976f8c9c 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/bean/FooterLoadMoreBean.java +++ b/app/src/main/java/com/chwl/app/ui/bean/FooterLoadMoreBean.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.bean; +package com.chwl.app.ui.bean; diff --git a/app/src/main/java/com/yizhuan/habu/ui/bean/header.java b/app/src/main/java/com/chwl/app/ui/bean/header.java similarity index 69% rename from app/src/main/java/com/yizhuan/habu/ui/bean/header.java rename to app/src/main/java/com/chwl/app/ui/bean/header.java index 1466df381..2133033b3 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/bean/header.java +++ b/app/src/main/java/com/chwl/app/ui/bean/header.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.bean; +package com.chwl.app.ui.bean; /** * Created by zhouxiangfeng on 2017/4/30. diff --git a/app/src/main/java/com/yizhuan/habu/ui/behavior/FixAppBarBehavior.java b/app/src/main/java/com/chwl/app/ui/behavior/FixAppBarBehavior.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/ui/behavior/FixAppBarBehavior.java rename to app/src/main/java/com/chwl/app/ui/behavior/FixAppBarBehavior.java index ba664db77..79f075b69 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/behavior/FixAppBarBehavior.java +++ b/app/src/main/java/com/chwl/app/ui/behavior/FixAppBarBehavior.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.behavior; +package com.chwl.app.ui.behavior; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yizhuan/habu/ui/gift/adapter/FaceGVAdapter.java b/app/src/main/java/com/chwl/app/ui/gift/adapter/FaceGVAdapter.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/ui/gift/adapter/FaceGVAdapter.java rename to app/src/main/java/com/chwl/app/ui/gift/adapter/FaceGVAdapter.java index b8f36c5b5..7e579551c 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/gift/adapter/FaceGVAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/gift/adapter/FaceGVAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.gift.adapter; +package com.chwl.app.ui.gift.adapter; import android.content.Context; import android.graphics.Bitmap; @@ -12,10 +12,10 @@ import android.widget.TextView; import androidx.recyclerview.widget.RecyclerView; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.gift.util.RecyclerViewUtil; -import com.yizhuan.habu.ui.gift.widget.GiftDataInfo; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; +import com.chwl.app.R; +import com.chwl.app.ui.gift.util.RecyclerViewUtil; +import com.chwl.app.ui.gift.widget.GiftDataInfo; +import com.chwl.app.ui.utils.ImageLoadUtils; import java.io.IOException; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/gift/adapter/FaceVPAdapter.java b/app/src/main/java/com/chwl/app/ui/gift/adapter/FaceVPAdapter.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/ui/gift/adapter/FaceVPAdapter.java rename to app/src/main/java/com/chwl/app/ui/gift/adapter/FaceVPAdapter.java index 64f82fce1..f99ebbbf9 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/gift/adapter/FaceVPAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/gift/adapter/FaceVPAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.gift.adapter; +package com.chwl.app.ui.gift.adapter; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/yizhuan/habu/ui/gift/callback/OnGiftDialogBtnClickListenerWrapper.java b/app/src/main/java/com/chwl/app/ui/gift/callback/OnGiftDialogBtnClickListenerWrapper.java similarity index 65% rename from app/src/main/java/com/yizhuan/habu/ui/gift/callback/OnGiftDialogBtnClickListenerWrapper.java rename to app/src/main/java/com/chwl/app/ui/gift/callback/OnGiftDialogBtnClickListenerWrapper.java index f0246a87d..052a4fc38 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/gift/callback/OnGiftDialogBtnClickListenerWrapper.java +++ b/app/src/main/java/com/chwl/app/ui/gift/callback/OnGiftDialogBtnClickListenerWrapper.java @@ -1,8 +1,8 @@ -package com.yizhuan.habu.ui.gift.callback; +package com.chwl.app.ui.gift.callback; -import com.yizhuan.habu.ui.widget.GiftDialog; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; +import com.chwl.app.ui.widget.GiftDialog; +import com.chwl.core.gift.bean.GiftInfo; +import com.chwl.core.room.queue.bean.MicMemberInfo; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/gift/dialog/GiftGridView.java b/app/src/main/java/com/chwl/app/ui/gift/dialog/GiftGridView.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/ui/gift/dialog/GiftGridView.java rename to app/src/main/java/com/chwl/app/ui/gift/dialog/GiftGridView.java index 24f6750b4..20364ce51 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/gift/dialog/GiftGridView.java +++ b/app/src/main/java/com/chwl/app/ui/gift/dialog/GiftGridView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.gift.dialog; +package com.chwl.app.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.habu.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.chwl.app.BR; +import com.chwl.core.gift.bean.GiftInfo; +import com.chwl.core.magic.bean.MagicInfo; +import com.chwl.library.bindinglist.IItem; +import com.chwl.library.bindinglist.MultiTypeAdapter; +import com.chwl.library.utils.ListUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/gift/dialog/GiftInfoVm.java b/app/src/main/java/com/chwl/app/ui/gift/dialog/GiftInfoVm.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/ui/gift/dialog/GiftInfoVm.java rename to app/src/main/java/com/chwl/app/ui/gift/dialog/GiftInfoVm.java index 038454c8e..8e7f08e82 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/gift/dialog/GiftInfoVm.java +++ b/app/src/main/java/com/chwl/app/ui/gift/dialog/GiftInfoVm.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.gift.dialog; +package com.chwl.app.ui.gift.dialog; import android.content.Context; import android.graphics.drawable.Drawable; @@ -6,12 +6,12 @@ import android.graphics.drawable.Drawable; import androidx.databinding.ObservableBoolean; import androidx.databinding.ObservableField; -import com.yizhuan.habu.R; -import com.yizhuan.habu.vip.util.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.yizhuan.xchat_android_library.utils.TimeUtils; +import com.chwl.app.R; +import com.chwl.app.vip.util.VipHelper; +import com.chwl.core.gift.bean.GiftInfo; +import com.chwl.core.gift.bean.SimpleVipInfo; +import com.chwl.library.bindinglist.BaseItem; +import com.chwl.library.utils.TimeUtils; /** * 礼物item diff --git a/app/src/main/java/com/yizhuan/habu/ui/gift/dialog/PageIndicatorView.java b/app/src/main/java/com/chwl/app/ui/gift/dialog/PageIndicatorView.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/ui/gift/dialog/PageIndicatorView.java rename to app/src/main/java/com/chwl/app/ui/gift/dialog/PageIndicatorView.java index 78ee2236f..2ef286bd5 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/gift/dialog/PageIndicatorView.java +++ b/app/src/main/java/com/chwl/app/ui/gift/dialog/PageIndicatorView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.gift.dialog; +package com.chwl.app.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.habu.R; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.R; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/gift/gif/AnimatedGifDrawable.java b/app/src/main/java/com/chwl/app/ui/gift/gif/AnimatedGifDrawable.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/ui/gift/gif/AnimatedGifDrawable.java rename to app/src/main/java/com/chwl/app/ui/gift/gif/AnimatedGifDrawable.java index 9aa735261..108d3f1f5 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/gift/gif/AnimatedGifDrawable.java +++ b/app/src/main/java/com/chwl/app/ui/gift/gif/AnimatedGifDrawable.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.gift.gif; +package com.chwl.app.ui.gift.gif; import android.graphics.Bitmap; import android.graphics.drawable.AnimationDrawable; diff --git a/app/src/main/java/com/yizhuan/habu/ui/gift/gif/AnimatedImageSpan.java b/app/src/main/java/com/chwl/app/ui/gift/gif/AnimatedImageSpan.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/gift/gif/AnimatedImageSpan.java rename to app/src/main/java/com/chwl/app/ui/gift/gif/AnimatedImageSpan.java index 6fc4856d8..fe93b185a 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/gift/gif/AnimatedImageSpan.java +++ b/app/src/main/java/com/chwl/app/ui/gift/gif/AnimatedImageSpan.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.gift.gif; +package com.chwl.app.ui.gift.gif; import android.graphics.Canvas; import android.graphics.Paint; diff --git a/app/src/main/java/com/yizhuan/habu/ui/gift/gif/GifDecoder.java b/app/src/main/java/com/chwl/app/ui/gift/gif/GifDecoder.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/ui/gift/gif/GifDecoder.java rename to app/src/main/java/com/chwl/app/ui/gift/gif/GifDecoder.java index 6b01decf5..fa08a4d05 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/gift/gif/GifDecoder.java +++ b/app/src/main/java/com/chwl/app/ui/gift/gif/GifDecoder.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.gift.gif; +package com.chwl.app.ui.gift.gif; import android.graphics.Bitmap; import android.graphics.Bitmap.Config; diff --git a/app/src/main/java/com/yizhuan/habu/ui/gift/util/ExpressionUtil.java b/app/src/main/java/com/chwl/app/ui/gift/util/ExpressionUtil.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/ui/gift/util/ExpressionUtil.java rename to app/src/main/java/com/chwl/app/ui/gift/util/ExpressionUtil.java index 3c725cd23..a88975b80 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/gift/util/ExpressionUtil.java +++ b/app/src/main/java/com/chwl/app/ui/gift/util/ExpressionUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.gift.util; +package com.chwl.app.ui.gift.util; import android.content.Context; import android.graphics.Bitmap; @@ -15,11 +15,11 @@ import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.gift.adapter.FaceGVAdapter; -import com.yizhuan.habu.ui.gift.gif.AnimatedGifDrawable; -import com.yizhuan.habu.ui.gift.gif.AnimatedImageSpan; -import com.yizhuan.habu.ui.gift.widget.GiftDataInfo; +import com.chwl.app.R; +import com.chwl.app.ui.gift.adapter.FaceGVAdapter; +import com.chwl.app.ui.gift.gif.AnimatedGifDrawable; +import com.chwl.app.ui.gift.gif.AnimatedImageSpan; +import com.chwl.app.ui.gift.widget.GiftDataInfo; import java.io.IOException; import java.io.InputStream; diff --git a/app/src/main/java/com/yizhuan/habu/ui/gift/util/GiftPanelControl.java b/app/src/main/java/com/chwl/app/ui/gift/util/GiftPanelControl.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/ui/gift/util/GiftPanelControl.java rename to app/src/main/java/com/chwl/app/ui/gift/util/GiftPanelControl.java index 77206b7a2..b77141656 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/gift/util/GiftPanelControl.java +++ b/app/src/main/java/com/chwl/app/ui/gift/util/GiftPanelControl.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.gift.util; +package com.chwl.app.ui.gift.util; import static android.content.Context.LAYOUT_INFLATER_SERVICE; @@ -11,10 +11,10 @@ import android.widget.LinearLayout; import androidx.recyclerview.widget.RecyclerView; import androidx.viewpager.widget.ViewPager; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.gift.adapter.FaceGVAdapter; -import com.yizhuan.habu.ui.gift.adapter.FaceVPAdapter; -import com.yizhuan.habu.ui.gift.widget.GiftDataInfo; +import com.chwl.app.R; +import com.chwl.app.ui.gift.adapter.FaceGVAdapter; +import com.chwl.app.ui.gift.adapter.FaceVPAdapter; +import com.chwl.app.ui.gift.widget.GiftDataInfo; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/utils/GlideCacheUtil.java b/app/src/main/java/com/chwl/app/ui/gift/util/GlideCacheUtil.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/ui/utils/GlideCacheUtil.java rename to app/src/main/java/com/chwl/app/ui/gift/util/GlideCacheUtil.java index 7a7b18bd2..3ab6a0d2c 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/utils/GlideCacheUtil.java +++ b/app/src/main/java/com/chwl/app/ui/gift/util/GlideCacheUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.utils; +package com.chwl.app.ui.gift.util; import android.content.Context; import android.os.Looper; diff --git a/app/src/main/java/com/yizhuan/habu/ui/gift/util/RecyclerViewUtil.java b/app/src/main/java/com/chwl/app/ui/gift/util/RecyclerViewUtil.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/gift/util/RecyclerViewUtil.java rename to app/src/main/java/com/chwl/app/ui/gift/util/RecyclerViewUtil.java index de0ec8fb4..4549cbde0 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/gift/util/RecyclerViewUtil.java +++ b/app/src/main/java/com/chwl/app/ui/gift/util/RecyclerViewUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.gift.util; +package com.chwl.app.ui.gift.util; import android.content.Context; import android.view.GestureDetector; diff --git a/app/src/main/java/com/yizhuan/habu/ui/gift/widget/CustormAnim.java b/app/src/main/java/com/chwl/app/ui/gift/widget/CustormAnim.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/ui/gift/widget/CustormAnim.java rename to app/src/main/java/com/chwl/app/ui/gift/widget/CustormAnim.java index 24738dfd7..1b74594e3 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/gift/widget/CustormAnim.java +++ b/app/src/main/java/com/chwl/app/ui/gift/widget/CustormAnim.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.gift.widget; +package com.chwl.app.ui.gift.widget; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -10,7 +10,7 @@ import android.view.animation.DecelerateInterpolator; import androidx.annotation.NonNull; -import com.yizhuan.habu.R; +import com.chwl.app.R; /** * @author KathLine diff --git a/app/src/main/java/com/yizhuan/habu/ui/gift/widget/GiftAnimationUtil.java b/app/src/main/java/com/chwl/app/ui/gift/widget/GiftAnimationUtil.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/ui/gift/widget/GiftAnimationUtil.java rename to app/src/main/java/com/chwl/app/ui/gift/widget/GiftAnimationUtil.java index a05282143..ff69ed3f1 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/gift/widget/GiftAnimationUtil.java +++ b/app/src/main/java/com/chwl/app/ui/gift/widget/GiftAnimationUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.gift.widget; +package com.chwl.app.ui.gift.widget; import android.animation.AnimatorSet; import android.animation.ObjectAnimator; diff --git a/app/src/main/java/com/yizhuan/habu/ui/gift/widget/GiftControl.java b/app/src/main/java/com/chwl/app/ui/gift/widget/GiftControl.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/gift/widget/GiftControl.java rename to app/src/main/java/com/chwl/app/ui/gift/widget/GiftControl.java index 879c5d073..4c693d211 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/gift/widget/GiftControl.java +++ b/app/src/main/java/com/chwl/app/ui/gift/widget/GiftControl.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.gift.widget; +package com.chwl.app.ui.gift.widget; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -8,8 +8,8 @@ import android.util.SparseArray; import androidx.annotation.NonNull; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.library.utils.ResUtil; import java.util.ArrayList; import java.util.Iterator; diff --git a/app/src/main/java/com/yizhuan/habu/ui/gift/widget/GiftDataInfo.java b/app/src/main/java/com/chwl/app/ui/gift/widget/GiftDataInfo.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/gift/widget/GiftDataInfo.java rename to app/src/main/java/com/chwl/app/ui/gift/widget/GiftDataInfo.java index b6d5f0e13..dff9f77ae 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/gift/widget/GiftDataInfo.java +++ b/app/src/main/java/com/chwl/app/ui/gift/widget/GiftDataInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.gift.widget; +package com.chwl.app.ui.gift.widget; /** * Created by KathLine on 2017/1/8. diff --git a/app/src/main/java/com/yizhuan/habu/ui/gift/widget/GiftFrameLayout.java b/app/src/main/java/com/chwl/app/ui/gift/widget/GiftFrameLayout.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/ui/gift/widget/GiftFrameLayout.java rename to app/src/main/java/com/chwl/app/ui/gift/widget/GiftFrameLayout.java index d09c78ed5..57299638b 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/gift/widget/GiftFrameLayout.java +++ b/app/src/main/java/com/chwl/app/ui/gift/widget/GiftFrameLayout.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.gift.widget; +package com.chwl.app.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.habu.R; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.chwl.app.R; +import com.chwl.library.utils.config.BasicConfig; import java.io.IOException; diff --git a/app/src/main/java/com/yizhuan/habu/ui/gift/widget/GlideCircleTransform.java b/app/src/main/java/com/chwl/app/ui/gift/widget/GlideCircleTransform.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/ui/gift/widget/GlideCircleTransform.java rename to app/src/main/java/com/chwl/app/ui/gift/widget/GlideCircleTransform.java index 1a6e0ab6e..9b6ff10af 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/gift/widget/GlideCircleTransform.java +++ b/app/src/main/java/com/chwl/app/ui/gift/widget/GlideCircleTransform.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.gift.widget; +package com.chwl.app.ui.gift.widget; import android.graphics.Bitmap; import android.graphics.BitmapShader; diff --git a/app/src/main/java/com/yizhuan/habu/ui/gift/widget/ICustormAnim.java b/app/src/main/java/com/chwl/app/ui/gift/widget/ICustormAnim.java similarity index 89% rename from app/src/main/java/com/yizhuan/habu/ui/gift/widget/ICustormAnim.java rename to app/src/main/java/com/chwl/app/ui/gift/widget/ICustormAnim.java index cb0721f90..9eecb11b5 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/gift/widget/ICustormAnim.java +++ b/app/src/main/java/com/chwl/app/ui/gift/widget/ICustormAnim.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.gift.widget; +package com.chwl.app.ui.gift.widget; import android.animation.AnimatorSet; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/habu/ui/gift/widget/NumberTextView.java b/app/src/main/java/com/chwl/app/ui/gift/widget/NumberTextView.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/ui/gift/widget/NumberTextView.java rename to app/src/main/java/com/chwl/app/ui/gift/widget/NumberTextView.java index 9e76ce727..cf762ecd7 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/gift/widget/NumberTextView.java +++ b/app/src/main/java/com/chwl/app/ui/gift/widget/NumberTextView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.gift.widget; +package com.chwl.app.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.habu.R; +import com.chwl.app.R; /** diff --git a/app/src/main/java/com/yizhuan/habu/ui/gift/widget/StrokeTextView.java b/app/src/main/java/com/chwl/app/ui/gift/widget/StrokeTextView.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/ui/gift/widget/StrokeTextView.java rename to app/src/main/java/com/chwl/app/ui/gift/widget/StrokeTextView.java index f7a33abe9..ee84e4c79 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/gift/widget/StrokeTextView.java +++ b/app/src/main/java/com/chwl/app/ui/gift/widget/StrokeTextView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.gift.widget; +package com.chwl.app.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.habu.R; +import com.chwl.app.R; import java.lang.reflect.Field; diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/GreetPresenter.java b/app/src/main/java/com/chwl/app/ui/im/GreetPresenter.java similarity index 85% rename from app/src/main/java/com/yizhuan/habu/ui/im/GreetPresenter.java rename to app/src/main/java/com/chwl/app/ui/im/GreetPresenter.java index cec2f13a1..bdb16630f 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/GreetPresenter.java +++ b/app/src/main/java/com/chwl/app/ui/im/GreetPresenter.java @@ -1,8 +1,8 @@ -package com.yizhuan.habu.ui.im; +package com.chwl.app.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.chwl.core.bean.response.ServiceResult; +import com.chwl.core.im.GreetModel; +import com.chwl.core.utils.SharedPreferenceUtils; import io.reactivex.Single; import io.reactivex.SingleSource; diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/ImInitHelper.java b/app/src/main/java/com/chwl/app/ui/im/ImInitHelper.java similarity index 63% rename from app/src/main/java/com/yizhuan/habu/ui/im/ImInitHelper.java rename to app/src/main/java/com/chwl/app/ui/im/ImInitHelper.java index 8827af051..de9d10578 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/ImInitHelper.java +++ b/app/src/main/java/com/chwl/app/ui/im/ImInitHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.im; +package com.chwl.app.ui.im; import android.content.Context; @@ -9,65 +9,65 @@ 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.habu.community.holder.DynamicSysHolder; -import com.yizhuan.habu.community.im.WorldDynamicShareViewHolder; -import com.yizhuan.habu.luckymoney.viewholder.LuckyMoneyMsgViewHolder; -import com.yizhuan.habu.luckymoney.viewholder.LuckyMoneyTipsViewHolder; -import com.yizhuan.habu.module_hall.HallDataManager; -import com.yizhuan.habu.module_hall.im.msgholder.ClanMsgViewHolder; -import com.yizhuan.habu.public_chat_hall.msg.viewholder.MsgViewHolderAitMe; -import com.yizhuan.habu.share.viewholder.InAppSharingMsgViewHolder; -import com.yizhuan.habu.ui.im.actions.GiftAction; -import com.yizhuan.habu.ui.im.avtivity.NimP2PMessageActivity; -import com.yizhuan.habu.ui.im.chat.MsgViewHolderAudioParty; -import com.yizhuan.habu.ui.im.chat.MsgViewHolderChatHint; -import com.yizhuan.habu.ui.im.chat.MsgViewHolderContent; -import com.yizhuan.habu.ui.im.chat.MsgViewHolderFairy; -import com.yizhuan.habu.ui.im.chat.MsgViewHolderGift; -import com.yizhuan.habu.ui.im.chat.MsgViewHolderHello; -import com.yizhuan.habu.ui.im.chat.MsgViewHolderLevel; -import com.yizhuan.habu.ui.im.chat.MsgViewHolderLottery; -import com.yizhuan.habu.ui.im.chat.MsgViewHolderOnline; -import com.yizhuan.habu.ui.im.chat.MsgViewHolderP2PContactRecharge; -import com.yizhuan.habu.ui.im.chat.MsgViewHolderRedPackage; -import com.yizhuan.habu.ui.im.chat.MsgViewHolderRedPacket; -import com.yizhuan.habu.ui.im.chat.MsgViewHolderSkill; -import com.yizhuan.habu.ui.im.chat.MsgViewHolderText; -import com.yizhuan.habu.ui.im.chat.SignInNoticeMsgViewHolder; -import com.yizhuan.habu.ui.im.chat.SysMsgV2ViewHolder; -import com.yizhuan.habu.ui.im.chat.SysMsgViewHolder; -import com.yizhuan.habu.ui.user.activity.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.FairySendAttachment; -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.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.P2PContactRechargeAttachment; -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.module_hall.im.ClanAttachment; -import com.yizhuan.xchat_android_core.public_chat_hall.attachment.AitMeAttachment; +import com.chwl.app.community.holder.DynamicSysHolder; +import com.chwl.app.community.im.WorldDynamicShareViewHolder; +import com.chwl.app.luckymoney.viewholder.LuckyMoneyMsgViewHolder; +import com.chwl.app.luckymoney.viewholder.LuckyMoneyTipsViewHolder; +import com.chwl.app.module_hall.HallDataManager; +import com.chwl.app.module_hall.im.msgholder.ClanMsgViewHolder; +import com.chwl.app.public_chat_hall.msg.viewholder.MsgViewHolderAitMe; +import com.chwl.app.share.viewholder.InAppSharingMsgViewHolder; +import com.chwl.app.ui.im.actions.GiftAction; +import com.chwl.app.ui.im.avtivity.NimP2PMessageActivity; +import com.chwl.app.ui.im.chat.MsgViewHolderAudioParty; +import com.chwl.app.ui.im.chat.MsgViewHolderChatHint; +import com.chwl.app.ui.im.chat.MsgViewHolderContent; +import com.chwl.app.ui.im.chat.MsgViewHolderFairy; +import com.chwl.app.ui.im.chat.MsgViewHolderGift; +import com.chwl.app.ui.im.chat.MsgViewHolderHello; +import com.chwl.app.ui.im.chat.MsgViewHolderLevel; +import com.chwl.app.ui.im.chat.MsgViewHolderLottery; +import com.chwl.app.ui.im.chat.MsgViewHolderOnline; +import com.chwl.app.ui.im.chat.MsgViewHolderP2PContactRecharge; +import com.chwl.app.ui.im.chat.MsgViewHolderRedPackage; +import com.chwl.app.ui.im.chat.MsgViewHolderRedPacket; +import com.chwl.app.ui.im.chat.MsgViewHolderSkill; +import com.chwl.app.ui.im.chat.MsgViewHolderText; +import com.chwl.app.ui.im.chat.SignInNoticeMsgViewHolder; +import com.chwl.app.ui.im.chat.SysMsgV2ViewHolder; +import com.chwl.app.ui.im.chat.SysMsgViewHolder; +import com.chwl.app.ui.user.activity.UserInfoActivity; +import com.chwl.core.community.attachment.DynamicSysAttachment; +import com.chwl.core.community.im.WorldDynamicAttachment; +import com.chwl.core.im.custom.bean.AssistantAttachment; +import com.chwl.core.im.custom.bean.CarAttachment; +import com.chwl.core.im.custom.bean.CarveUpGoldThirdLevelAttachment; +import com.chwl.core.im.custom.bean.ChatHintAttachment; +import com.chwl.core.im.custom.bean.CpInviteAttachment; +import com.chwl.core.im.custom.bean.FairySendAttachment; +import com.chwl.core.im.custom.bean.GiftAttachment; +import com.chwl.core.im.custom.bean.InAppSharingFamilyAttachment; +import com.chwl.core.im.custom.bean.InAppSharingMiniWorldAttachment; +import com.chwl.core.im.custom.bean.InAppSharingRoomAttachment; +import com.chwl.core.im.custom.bean.InAppSharingTeamAttachment; +import com.chwl.core.im.custom.bean.LevelUpAttachment; +import com.chwl.core.im.custom.bean.LotteryAttachment; +import com.chwl.core.im.custom.bean.LuckyMoneyAttachment; +import com.chwl.core.im.custom.bean.LuckyMoneyTipsAttachment; +import com.chwl.core.im.custom.bean.NewbieHelloAttachment; +import com.chwl.core.im.custom.bean.NobleAttachment; +import com.chwl.core.im.custom.bean.NoticeAttachment; +import com.chwl.core.im.custom.bean.OpenRoomNotiAttachment; +import com.chwl.core.im.custom.bean.OpenSignInAttachment; +import com.chwl.core.im.custom.bean.P2PContactRechargeAttachment; +import com.chwl.core.im.custom.bean.RedPackageAttachment; +import com.chwl.core.im.custom.bean.RedPacketAttachment; +import com.chwl.core.im.custom.bean.SkillMsgAttachment; +import com.chwl.core.im.custom.bean.SysMsgAttachment; +import com.chwl.core.im.custom.bean.SysMsgV2Attachment; +import com.chwl.core.miniworld.bean.OpenAudioPartyAttachment; +import com.chwl.core.module_hall.im.ClanAttachment; +import com.chwl.core.public_chat_hall.attachment.AitMeAttachment; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/MessageListPanelEx.java b/app/src/main/java/com/chwl/app/ui/im/MessageListPanelEx.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/ui/im/MessageListPanelEx.java rename to app/src/main/java/com/chwl/app/ui/im/MessageListPanelEx.java index 7d79336a6..7d93ca3e1 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/MessageListPanelEx.java +++ b/app/src/main/java/com/chwl/app/ui/im/MessageListPanelEx.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.im; +package com.chwl.app.ui.im; import android.animation.ObjectAnimator; import android.animation.ValueAnimator; @@ -68,13 +68,13 @@ 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.habu.R; -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.room.event.MessageSizeEvent; -import com.yizhuan.xchat_android_core.utils.Logger; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.core.module_hall.im.HallAttachment; +import com.chwl.core.module_hall.im.HallImMsgInfo; +import com.chwl.core.room.event.MessageSizeEvent; +import com.chwl.core.utils.Logger; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/RouterHandler.java b/app/src/main/java/com/chwl/app/ui/im/RouterHandler.java similarity index 77% rename from app/src/main/java/com/yizhuan/habu/ui/im/RouterHandler.java rename to app/src/main/java/com/chwl/app/ui/im/RouterHandler.java index 7b7ae834c..668951857 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/RouterHandler.java +++ b/app/src/main/java/com/chwl/app/ui/im/RouterHandler.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.im; +package com.chwl.app.ui.im; import android.annotation.SuppressLint; import android.content.Context; @@ -6,64 +6,64 @@ import android.content.Intent; import android.os.Bundle; import com.trello.rxlifecycle3.components.support.RxAppCompatActivity; -import com.yizhuan.habu.R; -import com.yizhuan.habu.UIHelper; -import com.yizhuan.habu.audio.VoiceMatchActivity; -import com.yizhuan.habu.avroom.activity.AVRoomActivity; -import com.yizhuan.habu.avroom.recommendcard.MyRecommendCardActivity; -import com.yizhuan.habu.base.BaseActivity; -import com.yizhuan.habu.base.DialogManagerInterface; -import com.yizhuan.habu.common.widget.dialog.DialogManager; -import com.yizhuan.habu.decoration.view.DecorationStoreActivity; -import com.yizhuan.habu.decoration.view.MyDecorationActivity; -import com.yizhuan.habu.family.view.activity.FamilyHomeActivity; -import com.yizhuan.habu.fansteam.FansTeamListActivity; -import com.yizhuan.habu.home.activity.CollectionRoomActivity; -import com.yizhuan.habu.home.activity.VisitorListActivity; -import com.yizhuan.habu.home.helper.OpenRoomHelper; -import com.yizhuan.habu.miniworld.activity.MiniWorldGuestPageActivity; -import com.yizhuan.habu.miniworld.activity.MiniWorldMainActivity; -import com.yizhuan.habu.miniworld.activity.TopicMainActivity; -import com.yizhuan.habu.module_hall.HallDataManager; -import com.yizhuan.habu.module_hall.hall.activity.ModuleClanActivity; -import com.yizhuan.habu.module_hall.hall.activity.ModuleHallActivity; -import com.yizhuan.habu.public_chat_hall.activity.PublicChatHallHomeActivity; -import com.yizhuan.habu.radish.signin.SignInActivity; -import com.yizhuan.habu.radish.task.activity.TaskCenterActivity; -import com.yizhuan.habu.relation.cp.activity.CpHomeActivity; -import com.yizhuan.habu.relation.cp.activity.CpInviteRecordActivity; -import com.yizhuan.habu.relation.cp.activity.CpTaskActivity; -import com.yizhuan.habu.team.view.NimTeamMessageActivity; -import com.yizhuan.habu.ui.login.BindPhoneActivity; -import com.yizhuan.habu.ui.login.ShowBindPhoneActivity; -import com.yizhuan.habu.ui.pay.ChargeActivity; -import com.yizhuan.habu.ui.setting.FeedbackActivity; -import com.yizhuan.habu.ui.setting.ModifyPwdActivity; -import com.yizhuan.habu.ui.user.activity.UserInfoActivity; -import com.yizhuan.habu.ui.webview.CommonWebViewActivity; -import com.yizhuan.habu.ui.withdraw.BinderAlipayActivity; -import com.yizhuan.habu.vip.VipMainActivity; -import com.yizhuan.habu.mentoring_relationship.activity.MentoringRelationshipActivity; -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.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.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.common.util.DeviceUtil; -import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack; -import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil; -import com.yizhuan.xchat_android_library.utils.JavaUtil; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.app.UIHelper; +import com.chwl.app.audio.VoiceMatchActivity; +import com.chwl.app.avroom.activity.AVRoomActivity; +import com.chwl.app.avroom.recommendcard.MyRecommendCardActivity; +import com.chwl.app.base.BaseActivity; +import com.chwl.app.base.DialogManagerInterface; +import com.chwl.app.common.widget.dialog.DialogManager; +import com.chwl.app.decoration.view.DecorationStoreActivity; +import com.chwl.app.decoration.view.MyDecorationActivity; +import com.chwl.app.family.view.activity.FamilyHomeActivity; +import com.chwl.app.fansteam.FansTeamListActivity; +import com.chwl.app.home.activity.CollectionRoomActivity; +import com.chwl.app.home.activity.VisitorListActivity; +import com.chwl.app.home.helper.OpenRoomHelper; +import com.chwl.app.miniworld.activity.MiniWorldGuestPageActivity; +import com.chwl.app.miniworld.activity.MiniWorldMainActivity; +import com.chwl.app.miniworld.activity.TopicMainActivity; +import com.chwl.app.module_hall.HallDataManager; +import com.chwl.app.module_hall.hall.activity.ModuleClanActivity; +import com.chwl.app.module_hall.hall.activity.ModuleHallActivity; +import com.chwl.app.public_chat_hall.activity.PublicChatHallHomeActivity; +import com.chwl.app.radish.signin.SignInActivity; +import com.chwl.app.radish.task.activity.TaskCenterActivity; +import com.chwl.app.relation.cp.activity.CpHomeActivity; +import com.chwl.app.relation.cp.activity.CpInviteRecordActivity; +import com.chwl.app.relation.cp.activity.CpTaskActivity; +import com.chwl.app.team.view.NimTeamMessageActivity; +import com.chwl.app.ui.login.BindPhoneActivity; +import com.chwl.app.ui.login.ShowBindPhoneActivity; +import com.chwl.app.ui.pay.ChargeActivity; +import com.chwl.app.ui.setting.FeedbackActivity; +import com.chwl.app.ui.setting.ModifyPwdActivity; +import com.chwl.app.ui.user.activity.UserInfoActivity; +import com.chwl.app.ui.webview.CommonWebViewActivity; +import com.chwl.app.ui.withdraw.BinderAlipayActivity; +import com.chwl.app.vip.VipMainActivity; +import com.chwl.app.mentoring_relationship.activity.MentoringRelationshipActivity; +import com.chwl.core.Constants; +import com.chwl.core.DemoCache; +import com.chwl.core.UriProvider; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.community.event.SquareTaskEvent; +import com.chwl.core.im.custom.bean.RouterType; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.module_hall.hall.HallModel; +import com.chwl.core.module_hall.hall.bean.HallInfo; +import com.chwl.core.room.bean.RoomInfo; +import com.chwl.core.room.model.AvRoomModel; +import com.chwl.core.utils.net.BeanObserver; +import com.chwl.core.utils.net.RxHelper; +import com.chwl.core.withdraw.WithdrawModel; +import com.chwl.library.common.util.DeviceUtil; +import com.chwl.library.net.rxnet.callback.CallBack; +import com.chwl.library.utils.AppMetaDataUtil; +import com.chwl.library.utils.JavaUtil; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/actions/ChatterBoxAction.java b/app/src/main/java/com/chwl/app/ui/im/actions/ChatterBoxAction.java similarity index 80% rename from app/src/main/java/com/yizhuan/habu/ui/im/actions/ChatterBoxAction.java rename to app/src/main/java/com/chwl/app/ui/im/actions/ChatterBoxAction.java index 4e3ddb4cc..afb2c6f01 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/actions/ChatterBoxAction.java +++ b/app/src/main/java/com/chwl/app/ui/im/actions/ChatterBoxAction.java @@ -1,12 +1,12 @@ -package com.yizhuan.habu.ui.im.actions; +package com.chwl.app.ui.im.actions; import android.os.Handler; import com.netease.nim.uikit.business.session.actions.BaseAction; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.widget.higuide.TuTuGuideHelper; -import com.yizhuan.xchat_android_core.im.chatterbox.ChatterBoxHelper; -import com.yizhuan.xchat_android_core.im.chatterbox.HideInputEvent; +import com.chwl.app.R; +import com.chwl.app.ui.widget.higuide.TuTuGuideHelper; +import com.chwl.core.im.chatterbox.ChatterBoxHelper; +import com.chwl.core.im.chatterbox.HideInputEvent; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/actions/DecorationAction.java b/app/src/main/java/com/chwl/app/ui/im/actions/DecorationAction.java similarity index 70% rename from app/src/main/java/com/yizhuan/habu/ui/im/actions/DecorationAction.java rename to app/src/main/java/com/chwl/app/ui/im/actions/DecorationAction.java index ab4881a9b..cbd123f76 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/actions/DecorationAction.java +++ b/app/src/main/java/com/chwl/app/ui/im/actions/DecorationAction.java @@ -1,9 +1,9 @@ -package com.yizhuan.habu.ui.im.actions; +package com.chwl.app.ui.im.actions; import com.netease.nim.uikit.business.session.actions.BaseAction; -import com.yizhuan.habu.R; -import com.yizhuan.habu.decoration.view.DecorationStoreActivity; -import com.yizhuan.xchat_android_library.utils.JavaUtil; +import com.chwl.app.R; +import com.chwl.app.decoration.view.DecorationStoreActivity; +import com.chwl.library.utils.JavaUtil; /** * Created by huangmeng1 on 2018/5/10. diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/actions/FamilyGameAction.java b/app/src/main/java/com/chwl/app/ui/im/actions/FamilyGameAction.java similarity index 82% rename from app/src/main/java/com/yizhuan/habu/ui/im/actions/FamilyGameAction.java rename to app/src/main/java/com/chwl/app/ui/im/actions/FamilyGameAction.java index 21d137ec8..7e19865a0 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/actions/FamilyGameAction.java +++ b/app/src/main/java/com/chwl/app/ui/im/actions/FamilyGameAction.java @@ -1,8 +1,8 @@ -package com.yizhuan.habu.ui.im.actions; +package com.chwl.app.ui.im.actions; import com.netease.nim.uikit.business.session.actions.BaseAction; -import com.yizhuan.habu.R; -import com.yizhuan.habu.family.view.activity.FamilyGameListActivity; +import com.chwl.app.R; +import com.chwl.app.family.view.activity.FamilyGameListActivity; /** * Created by MadisonRong on 29/05/2018. diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/actions/GiftAction.java b/app/src/main/java/com/chwl/app/ui/im/actions/GiftAction.java similarity index 82% rename from app/src/main/java/com/yizhuan/habu/ui/im/actions/GiftAction.java rename to app/src/main/java/com/chwl/app/ui/im/actions/GiftAction.java index d8354822a..3dfecc3fc 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/actions/GiftAction.java +++ b/app/src/main/java/com/chwl/app/ui/im/actions/GiftAction.java @@ -1,18 +1,18 @@ -package com.yizhuan.habu.ui.im.actions; +package com.chwl.app.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.habu.R; -import com.yizhuan.habu.common.widget.dialog.DialogManager; -import com.yizhuan.habu.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.room.queue.bean.MicMemberInfo; -import com.yizhuan.xchat_android_core.utils.net.VipLevelNotEnoughException; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.common.widget.dialog.DialogManager; +import com.chwl.app.ui.widget.GiftDialog; +import com.chwl.core.gift.GiftModel; +import com.chwl.core.gift.bean.GiftInfo; +import com.chwl.core.gift.toolbox.GiftToolbox; +import com.chwl.core.room.queue.bean.MicMemberInfo; +import com.chwl.core.utils.net.VipLevelNotEnoughException; +import com.chwl.library.utils.ResUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/actions/GiftActionEvent.java b/app/src/main/java/com/chwl/app/ui/im/actions/GiftActionEvent.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/ui/im/actions/GiftActionEvent.java rename to app/src/main/java/com/chwl/app/ui/im/actions/GiftActionEvent.java index 9a63f8f59..afb0a28c1 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/actions/GiftActionEvent.java +++ b/app/src/main/java/com/chwl/app/ui/im/actions/GiftActionEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.im.actions; +package com.chwl.app.ui.im.actions; import java.io.Serializable; diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/actions/LuckyMoneyAction.java b/app/src/main/java/com/chwl/app/ui/im/actions/LuckyMoneyAction.java similarity index 82% rename from app/src/main/java/com/yizhuan/habu/ui/im/actions/LuckyMoneyAction.java rename to app/src/main/java/com/chwl/app/ui/im/actions/LuckyMoneyAction.java index 86ba5ce7f..943eb2a4f 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/actions/LuckyMoneyAction.java +++ b/app/src/main/java/com/chwl/app/ui/im/actions/LuckyMoneyAction.java @@ -1,8 +1,8 @@ -package com.yizhuan.habu.ui.im.actions; +package com.chwl.app.ui.im.actions; import com.netease.nim.uikit.business.session.actions.BaseAction; -import com.yizhuan.habu.R; -import com.yizhuan.habu.luckymoney.view.LuckyMoneyCreationActivity; +import com.chwl.app.R; +import com.chwl.app.luckymoney.view.LuckyMoneyCreationActivity; /** * Created by MadisonRong on 29/05/2018. diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/audio/ShakeHeartDialogFragment.java b/app/src/main/java/com/chwl/app/ui/im/audio/ShakeHeartDialogFragment.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/ui/im/audio/ShakeHeartDialogFragment.java rename to app/src/main/java/com/chwl/app/ui/im/audio/ShakeHeartDialogFragment.java index fa429cb4b..db47dabfa 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/audio/ShakeHeartDialogFragment.java +++ b/app/src/main/java/com/chwl/app/ui/im/audio/ShakeHeartDialogFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.im.audio; +package com.chwl.app.ui.im.audio; import android.app.Dialog; import android.content.Context; @@ -24,7 +24,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.DialogFragment; -import com.yizhuan.habu.R; +import com.chwl.app.R; public class ShakeHeartDialogFragment extends DialogFragment { diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/avtivity/AddBlackListActivity.java b/app/src/main/java/com/chwl/app/ui/im/avtivity/AddBlackListActivity.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/ui/im/avtivity/AddBlackListActivity.java rename to app/src/main/java/com/chwl/app/ui/im/avtivity/AddBlackListActivity.java index de77a5d6c..d4d9aca46 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/avtivity/AddBlackListActivity.java +++ b/app/src/main/java/com/chwl/app/ui/im/avtivity/AddBlackListActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.im.avtivity; +package com.chwl.app.ui.im.avtivity; import android.annotation.SuppressLint; import android.content.Context; @@ -12,18 +12,18 @@ import android.widget.TextView; import com.netease.nim.uikit.StatusBarUtil; import com.netease.nim.uikit.business.session.constant.Extras; -import com.yizhuan.habu.R; -import com.yizhuan.habu.UIHelper; -import com.yizhuan.habu.base.BaseMvpActivity; -import com.yizhuan.habu.common.widget.dialog.DialogManager; -import com.yizhuan.habu.ui.user.activity.UserInfoActivity; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.habu.utils.RegexUtil; +import com.chwl.app.R; +import com.chwl.app.UIHelper; +import com.chwl.app.base.BaseMvpActivity; +import com.chwl.app.common.widget.dialog.DialogManager; +import com.chwl.app.ui.user.activity.UserInfoActivity; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.app.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.core.user.UserModel; +import com.chwl.library.base.factory.CreatePresenter; +import com.chwl.library.utils.JavaUtil; +import com.chwl.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/avtivity/AddBlackListPresenter.java b/app/src/main/java/com/chwl/app/ui/im/avtivity/AddBlackListPresenter.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/ui/im/avtivity/AddBlackListPresenter.java rename to app/src/main/java/com/chwl/app/ui/im/avtivity/AddBlackListPresenter.java index 6f2c81fce..df20d71e1 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/avtivity/AddBlackListPresenter.java +++ b/app/src/main/java/com/chwl/app/ui/im/avtivity/AddBlackListPresenter.java @@ -1,7 +1,7 @@ -package com.yizhuan.habu.ui.im.avtivity; +package com.chwl.app.ui.im.avtivity; -import com.yizhuan.habu.base.BaseMvpPresenter; +import com.chwl.app.base.BaseMvpPresenter; /** * @author Administrator diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/avtivity/BaseMessageActivity.java b/app/src/main/java/com/chwl/app/ui/im/avtivity/BaseMessageActivity.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/im/avtivity/BaseMessageActivity.java rename to app/src/main/java/com/chwl/app/ui/im/avtivity/BaseMessageActivity.java index 4c584818b..e6579a610 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/avtivity/BaseMessageActivity.java +++ b/app/src/main/java/com/chwl/app/ui/im/avtivity/BaseMessageActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.im.avtivity; +package com.chwl.app.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.habu.base.BaseActivity; +import com.chwl.app.base.BaseActivity; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/avtivity/BlackListAdapter.java b/app/src/main/java/com/chwl/app/ui/im/avtivity/BlackListAdapter.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/ui/im/avtivity/BlackListAdapter.java rename to app/src/main/java/com/chwl/app/ui/im/avtivity/BlackListAdapter.java index 84cff81f2..6758cbf32 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/avtivity/BlackListAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/im/avtivity/BlackListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.im.avtivity; +package com.chwl.app.ui.im.avtivity; import android.view.MotionEvent; import android.view.View; @@ -10,11 +10,11 @@ import android.widget.TextView; import androidx.recyclerview.widget.RecyclerView; import com.netease.nimlib.sdk.uinfo.model.NimUserInfo; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/avtivity/BlackListManageActivity.java b/app/src/main/java/com/chwl/app/ui/im/avtivity/BlackListManageActivity.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/ui/im/avtivity/BlackListManageActivity.java rename to app/src/main/java/com/chwl/app/ui/im/avtivity/BlackListManageActivity.java index cc1c460d6..3f6ba3c27 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/avtivity/BlackListManageActivity.java +++ b/app/src/main/java/com/chwl/app/ui/im/avtivity/BlackListManageActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.im.avtivity; +package com.chwl.app.ui.im.avtivity; import android.content.Context; import android.content.Intent; @@ -10,12 +10,12 @@ import androidx.recyclerview.widget.RecyclerView; import com.netease.nim.uikit.StatusBarUtil; import com.netease.nimlib.sdk.uinfo.model.NimUserInfo; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseMvpActivity; -import com.yizhuan.habu.common.NoDataFragment; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseMvpActivity; +import com.chwl.app.common.NoDataFragment; +import com.chwl.library.base.factory.CreatePresenter; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/avtivity/BlackListManagePresenter.java b/app/src/main/java/com/chwl/app/ui/im/avtivity/BlackListManagePresenter.java similarity index 87% rename from app/src/main/java/com/yizhuan/habu/ui/im/avtivity/BlackListManagePresenter.java rename to app/src/main/java/com/chwl/app/ui/im/avtivity/BlackListManagePresenter.java index ef5338dac..6fc342349 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/avtivity/BlackListManagePresenter.java +++ b/app/src/main/java/com/chwl/app/ui/im/avtivity/BlackListManagePresenter.java @@ -1,6 +1,6 @@ -package com.yizhuan.habu.ui.im.avtivity; +package com.chwl.app.ui.im.avtivity; -import com.yizhuan.habu.base.BaseMvpPresenter; +import com.chwl.app.base.BaseMvpPresenter; /** * @author Administrator diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/avtivity/IAddBlackListView.java b/app/src/main/java/com/chwl/app/ui/im/avtivity/IAddBlackListView.java similarity index 80% rename from app/src/main/java/com/yizhuan/habu/ui/im/avtivity/IAddBlackListView.java rename to app/src/main/java/com/chwl/app/ui/im/avtivity/IAddBlackListView.java index 716cc855c..f357ddb1f 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/avtivity/IAddBlackListView.java +++ b/app/src/main/java/com/chwl/app/ui/im/avtivity/IAddBlackListView.java @@ -1,6 +1,6 @@ -package com.yizhuan.habu.ui.im.avtivity; +package com.chwl.app.ui.im.avtivity; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.chwl.library.base.IMvpBaseView; /** *

diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/avtivity/IBlackListManageView.java b/app/src/main/java/com/chwl/app/ui/im/avtivity/IBlackListManageView.java similarity index 83% rename from app/src/main/java/com/yizhuan/habu/ui/im/avtivity/IBlackListManageView.java rename to app/src/main/java/com/chwl/app/ui/im/avtivity/IBlackListManageView.java index f1178b4af..83503309c 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/avtivity/IBlackListManageView.java +++ b/app/src/main/java/com/chwl/app/ui/im/avtivity/IBlackListManageView.java @@ -1,7 +1,7 @@ -package com.yizhuan.habu.ui.im.avtivity; +package com.chwl.app.ui.im.avtivity; import com.netease.nimlib.sdk.uinfo.model.NimUserInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.chwl.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/avtivity/NewBaseMessageActivity.java b/app/src/main/java/com/chwl/app/ui/im/avtivity/NewBaseMessageActivity.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/ui/im/avtivity/NewBaseMessageActivity.java rename to app/src/main/java/com/chwl/app/ui/im/avtivity/NewBaseMessageActivity.java index 86bf919e0..e72b9bf1a 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/avtivity/NewBaseMessageActivity.java +++ b/app/src/main/java/com/chwl/app/ui/im/avtivity/NewBaseMessageActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.im.avtivity; +package com.chwl.app.ui.im.avtivity; import android.app.Activity; import android.content.Intent; @@ -21,8 +21,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.habu.base.BaseActivity; -import com.yizhuan.habu.ui.im.fragment.MessageFragment; +import com.chwl.app.base.BaseActivity; +import com.chwl.app.ui.im.fragment.MessageFragment; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/avtivity/NimFriendModel.java b/app/src/main/java/com/chwl/app/ui/im/avtivity/NimFriendModel.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/ui/im/avtivity/NimFriendModel.java rename to app/src/main/java/com/chwl/app/ui/im/avtivity/NimFriendModel.java index cbfc1a0c1..d472a8245 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/avtivity/NimFriendModel.java +++ b/app/src/main/java/com/chwl/app/ui/im/avtivity/NimFriendModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.im.avtivity; +package com.chwl.app.ui.im.avtivity; import com.netease.nimlib.sdk.InvocationFuture; import com.netease.nimlib.sdk.NIMClient; @@ -6,9 +6,9 @@ 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.habu.R; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/avtivity/NimP2PMessageActivity.java b/app/src/main/java/com/chwl/app/ui/im/avtivity/NimP2PMessageActivity.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/ui/im/avtivity/NimP2PMessageActivity.java rename to app/src/main/java/com/chwl/app/ui/im/avtivity/NimP2PMessageActivity.java index bf64bd995..c1ae93fdf 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/avtivity/NimP2PMessageActivity.java +++ b/app/src/main/java/com/chwl/app/ui/im/avtivity/NimP2PMessageActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.im.avtivity; +package com.chwl.app.ui.im.avtivity; import static com.netease.nim.uikit.business.session.constant.Extras.EXTRA_RECORDID; @@ -33,34 +33,34 @@ 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.habu.R; -import com.yizhuan.habu.avroom.activity.AVRoomActivity; -import com.yizhuan.habu.common.widget.CustomImageSpan; -import com.yizhuan.habu.ui.im.audio.ShakeHeartDialogFragment; -import com.yizhuan.habu.ui.im.fragment.MessageFragment; -import com.yizhuan.habu.ui.user.activity.UserInfoActivity; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.habu.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.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.app.avroom.activity.AVRoomActivity; +import com.chwl.app.common.widget.CustomImageSpan; +import com.chwl.app.ui.im.audio.ShakeHeartDialogFragment; +import com.chwl.app.ui.im.fragment.MessageFragment; +import com.chwl.app.ui.user.activity.UserInfoActivity; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.app.mentoring_relationship.dialog.BuildMentoringRelationshipSuccessDialog; +import com.chwl.core.audio.event.VoiceShakeHeartEvent; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.im.friend.IMFriendModel; +import com.chwl.core.initial.InitialModel; +import com.chwl.core.initial.bean.InitInfo; +import com.chwl.core.level.UserLevelVo; +import com.chwl.core.mentoring_relationship.event.MentoringSuccessEvent; +import com.chwl.core.noble.NobleUtil; +import com.chwl.core.praise.PraiseModel; +import com.chwl.core.praise.event.IsLikedEvent; +import com.chwl.core.praise.event.PraiseEvent; +import com.chwl.core.user.UserModel; +import com.chwl.core.user.bean.UserDetailInfo; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.core.utils.StringExtensionKt; +import com.chwl.core.utils.SystemUidUtil; +import com.chwl.core.utils.net.BeanObserver; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -295,7 +295,7 @@ public class NimP2PMessageActivity extends NewBaseMessageActivity { setTitle(""); // 显示是否 已经加入黑名单 - TextView tvAddBlackTip = getToolBar().findViewById(com.yizhuan.habu.R.id.tv_add_black_tip); + TextView tvAddBlackTip = getToolBar().findViewById(com.chwl.app.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/habu/ui/im/avtivity/SwipeRecyclerViewItem.java b/app/src/main/java/com/chwl/app/ui/im/avtivity/SwipeRecyclerViewItem.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/im/avtivity/SwipeRecyclerViewItem.java rename to app/src/main/java/com/chwl/app/ui/im/avtivity/SwipeRecyclerViewItem.java index f615676f9..f0ab9e74f 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/avtivity/SwipeRecyclerViewItem.java +++ b/app/src/main/java/com/chwl/app/ui/im/avtivity/SwipeRecyclerViewItem.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.im.avtivity; +package com.chwl.app.ui.im.avtivity; import android.content.Context; import android.util.AttributeSet; @@ -15,7 +15,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.interpolator.view.animation.LinearOutSlowInInterpolator; -import com.yizhuan.habu.R; +import com.chwl.app.R; /** * 一个支持侧滑删除的item diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/chat/MVHChatterBoxStart.java b/app/src/main/java/com/chwl/app/ui/im/chat/MVHChatterBoxStart.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/ui/im/chat/MVHChatterBoxStart.java rename to app/src/main/java/com/chwl/app/ui/im/chat/MVHChatterBoxStart.java index c74c066ae..99d75c023 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/chat/MVHChatterBoxStart.java +++ b/app/src/main/java/com/chwl/app/ui/im/chat/MVHChatterBoxStart.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.im.chat; +package com.chwl.app.ui.im.chat; import android.util.Log; import android.view.LayoutInflater; @@ -13,14 +13,14 @@ 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.habu.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_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.im.chatterbox.ChatterBoxModel; +import com.chwl.core.im.chatterbox.TopicBoxItemInfo; +import com.chwl.core.im.custom.bean.ChatterBoxAttachment; +import com.chwl.core.im.custom.bean.DiceThrowAttachment; +import com.chwl.core.manager.IMNetEaseManager; +import com.chwl.library.utils.ResUtil; import java.util.HashMap; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderAudioParty.java b/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderAudioParty.java similarity index 87% rename from app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderAudioParty.java rename to app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderAudioParty.java index f79292ecb..b658ed5e8 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderAudioParty.java +++ b/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderAudioParty.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.im.chat; +package com.chwl.app.ui.im.chat; import android.view.View; import android.widget.ImageView; @@ -8,13 +8,13 @@ import androidx.core.content.ContextCompat; import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; -import com.yizhuan.habu.R; -import com.yizhuan.habu.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_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.app.avroom.activity.AVRoomActivity; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.miniworld.bean.OpenAudioPartyAttachment; +import com.chwl.core.miniworld.model.MiniWorldHelper; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; public class MsgViewHolderAudioParty extends MsgViewHolderBase implements View.OnClickListener { private ImageView ivIcAudioParty; diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderChatHint.java b/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderChatHint.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderChatHint.java rename to app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderChatHint.java index b9dbbc5e4..13fc1938e 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderChatHint.java +++ b/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderChatHint.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.im.chat; +package com.chwl.app.ui.im.chat; import android.graphics.Color; import android.text.SpannableString; @@ -13,12 +13,12 @@ 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.habu.R; -import com.yizhuan.habu.common.widget.OriginalDrawStatusClickSpan; -import com.yizhuan.habu.ui.webview.SimpleWebViewActivity; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.im.custom.bean.ChatHintAttachment; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.common.widget.OriginalDrawStatusClickSpan; +import com.chwl.app.ui.webview.SimpleWebViewActivity; +import com.chwl.core.UriProvider; +import com.chwl.core.im.custom.bean.ChatHintAttachment; +import com.chwl.library.utils.ResUtil; public class MsgViewHolderChatHint extends MsgViewHolderBase { diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderContent.java b/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderContent.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderContent.java rename to app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderContent.java index 93aca195d..4526c0457 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderContent.java +++ b/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderContent.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.im.chat; +package com.chwl.app.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.habu.R; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.habu.ui.webview.CommonWebViewActivity; -import com.yizhuan.xchat_android_core.im.custom.bean.NoticeAttachment; +import com.chwl.app.R; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.app.ui.webview.CommonWebViewActivity; +import com.chwl.core.im.custom.bean.NoticeAttachment; /** * Created by chenran on 2017/9/21. diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderFairy.java b/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderFairy.java similarity index 86% rename from app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderFairy.java rename to app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderFairy.java index e353e12b5..a06849927 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderFairy.java +++ b/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderFairy.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.im.chat; +package com.chwl.app.ui.im.chat; import android.annotation.SuppressLint; import android.os.Bundle; @@ -7,15 +7,15 @@ 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.habu.R; -import com.yizhuan.habu.treasurefairy.dialog.MyFairySendDialog; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.gift.bean.SimpleUserInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.FairySendAttachment; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.treasurefairy.FairyInfo; +import com.chwl.app.R; +import com.chwl.app.treasurefairy.dialog.MyFairySendDialog; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.gift.bean.SimpleUserInfo; +import com.chwl.core.im.custom.bean.CustomAttachment; +import com.chwl.core.im.custom.bean.FairySendAttachment; +import com.chwl.core.manager.IMNetEaseManager; +import com.chwl.core.treasurefairy.FairyInfo; import java.util.HashMap; import java.util.Map; diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderGift.java b/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderGift.java similarity index 85% rename from app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderGift.java rename to app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderGift.java index b6e2e4176..cc7fc8e09 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderGift.java +++ b/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderGift.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.im.chat; +package com.chwl.app.ui.im.chat; import android.text.TextUtils; import android.widget.FrameLayout; @@ -8,13 +8,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.habu.R; -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.gift.GiftModel; +import com.chwl.core.gift.bean.GiftInfo; +import com.chwl.core.im.custom.bean.GiftAttachment; +import com.chwl.library.utils.ResUtil; /** * Created by chenran on 2017/10/3. diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderHello.java b/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderHello.java similarity index 82% rename from app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderHello.java rename to app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderHello.java index e2107a62f..65632c909 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderHello.java +++ b/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderHello.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.im.chat; +package com.chwl.app.ui.im.chat; import android.annotation.SuppressLint; import android.view.View; @@ -6,14 +6,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.habu.R; -import com.yizhuan.habu.avroom.activity.AVRoomActivity; -import com.yizhuan.xchat_android_core.im.custom.bean.NewbieHelloAttachment; -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.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.app.avroom.activity.AVRoomActivity; +import com.chwl.core.im.custom.bean.NewbieHelloAttachment; +import com.chwl.core.room.bean.RoomInfo; +import com.chwl.core.room.model.AvRoomModel; +import com.chwl.core.utils.net.RxHelper; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; import io.reactivex.functions.BiConsumer; diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderLevel.java b/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderLevel.java similarity index 83% rename from app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderLevel.java rename to app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderLevel.java index c051210c4..19a427412 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderLevel.java +++ b/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderLevel.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.im.chat; +package com.chwl.app.ui.im.chat; import android.widget.ImageView; import android.widget.LinearLayout; @@ -6,12 +6,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.habu.R; -import com.yizhuan.habu.ui.webview.CommonWebViewActivity; -import com.yizhuan.xchat_android_core.UriProvider; -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_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.ui.webview.CommonWebViewActivity; +import com.chwl.core.UriProvider; +import com.chwl.core.im.custom.bean.CustomAttachment; +import com.chwl.core.im.custom.bean.LevelUpAttachment; +import com.chwl.library.utils.ResUtil; /** * Created by chenran on 2017/10/3. diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderLottery.java b/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderLottery.java similarity index 84% rename from app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderLottery.java rename to app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderLottery.java index 3b2cd6d1d..086fcfa79 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderLottery.java +++ b/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderLottery.java @@ -1,13 +1,13 @@ -package com.yizhuan.habu.ui.im.chat; +package com.chwl.app.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.habu.R; -import com.yizhuan.habu.ui.webview.CommonWebViewActivity; -import com.yizhuan.xchat_android_core.UriProvider; +import com.chwl.app.R; +import com.chwl.app.ui.webview.CommonWebViewActivity; +import com.chwl.core.UriProvider; /** * Created by chenran on 2018/1/2. diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderOnline.java b/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderOnline.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderOnline.java rename to app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderOnline.java index 0e70803ec..a00a7adb2 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderOnline.java +++ b/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderOnline.java @@ -1,5 +1,5 @@ -package com.yizhuan.habu.ui.im.chat; +package com.chwl.app.ui.im.chat; import android.view.View; import android.widget.ImageView; @@ -12,11 +12,11 @@ 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.habu.R; -import com.yizhuan.habu.avroom.activity.AVRoomActivity; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.im.custom.bean.OpenRoomNotiAttachment; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.avroom.activity.AVRoomActivity; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.core.im.custom.bean.OpenRoomNotiAttachment; +import com.chwl.library.utils.ResUtil; /** * Created by chenran on 2017/9/21. diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderP2PContactRecharge.java b/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderP2PContactRecharge.java similarity index 86% rename from app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderP2PContactRecharge.java rename to app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderP2PContactRecharge.java index 605af1de8..095344095 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderP2PContactRecharge.java +++ b/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderP2PContactRecharge.java @@ -1,5 +1,5 @@ -package com.yizhuan.habu.ui.im.chat; +package com.chwl.app.ui.im.chat; import android.text.SpannableString; import android.text.method.LinkMovementMethod; @@ -11,12 +11,12 @@ import androidx.core.content.ContextCompat; import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; -import com.yizhuan.habu.R; -import com.yizhuan.habu.common.widget.OriginalDrawStatusClickSpan; -import com.yizhuan.habu.utils.ClipboardUtils; -import com.yizhuan.xchat_android_core.im.custom.bean.OpenRoomNotiAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.P2PContactRechargeAttachment; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.app.common.widget.OriginalDrawStatusClickSpan; +import com.chwl.app.utils.ClipboardUtils; +import com.chwl.core.im.custom.bean.OpenRoomNotiAttachment; +import com.chwl.core.im.custom.bean.P2PContactRechargeAttachment; +import com.chwl.library.utils.SingleToastUtil; /** * Created by chenran on 2017/9/21. diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderRedPackage.java b/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderRedPackage.java similarity index 87% rename from app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderRedPackage.java rename to app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderRedPackage.java index cf974ec6f..8905f4e21 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderRedPackage.java +++ b/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderRedPackage.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.im.chat; +package com.chwl.app.ui.im.chat; import android.view.View; import android.widget.TextView; @@ -6,15 +6,15 @@ import android.widget.TextView; 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.habu.R; -import com.yizhuan.habu.avroom.activity.AVRoomActivity; -import com.yizhuan.habu.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.redpackage.RedPackageNotifyInfo; -import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.avroom.activity.AVRoomActivity; +import com.chwl.app.common.widget.dialog.DialogManager; +import com.chwl.core.DemoCache; +import com.chwl.core.im.custom.bean.RedPackageAttachment; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.redpackage.RedPackageNotifyInfo; +import com.chwl.core.utils.CurrentTimeUtils; +import com.chwl.library.utils.ResUtil; import java.util.Map; diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderRedPacket.java b/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderRedPacket.java similarity index 87% rename from app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderRedPacket.java rename to app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderRedPacket.java index eccd07180..38e96049c 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderRedPacket.java +++ b/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderRedPacket.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.im.chat; +package com.chwl.app.ui.im.chat; import android.view.View; import android.widget.LinearLayout; @@ -6,9 +6,9 @@ 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.habu.R; -import com.yizhuan.xchat_android_core.im.custom.bean.RedPacketAttachment; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.core.im.custom.bean.RedPacketAttachment; +import com.chwl.library.utils.ResUtil; /** * Created by chenran on 2017/9/21. diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderSkill.java b/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderSkill.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderSkill.java rename to app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderSkill.java index ac72f47f4..8a5d05fa1 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderSkill.java +++ b/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderSkill.java @@ -1,12 +1,12 @@ -package com.yizhuan.habu.ui.im.chat; +package com.chwl.app.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.habu.R; -import com.yizhuan.xchat_android_core.im.custom.bean.SkillMsgAttachment; -import com.yizhuan.xchat_android_core.skill.entity.SkillNotifyEntity; +import com.chwl.app.R; +import com.chwl.core.im.custom.bean.SkillMsgAttachment; +import com.chwl.core.skill.entity.SkillNotifyEntity; /** *

文字消息holder

diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderText.java b/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderText.java similarity index 82% rename from app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderText.java rename to app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderText.java index 3168185da..c3815769d 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/chat/MsgViewHolderText.java +++ b/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderText.java @@ -1,7 +1,7 @@ -package com.yizhuan.habu.ui.im.chat; +package com.chwl.app.ui.im.chat; -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.chwl.core.UriProvider.IM_SERVER_URL; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MESS_SUB_CAR_EXPIRE; import android.text.style.ForegroundColorSpan; import android.view.View; @@ -10,24 +10,24 @@ 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.habu.R; -import com.yizhuan.habu.decoration.view.MyDecorationActivity; -import com.yizhuan.habu.ui.im.RouterHandler; -import com.yizhuan.habu.ui.webview.CommonWebViewActivity; -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.decoration.view.MyDecorationActivity; +import com.chwl.app.ui.im.RouterHandler; +import com.chwl.app.ui.webview.CommonWebViewActivity; +import com.chwl.app.utils.SpannableBuilder; +import com.chwl.core.UriProvider; +import com.chwl.core.audio.bean.VoiceBottleSayHiInfo; +import com.chwl.core.audio.event.VoiceShakeHeartEvent; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.im.custom.bean.AssistantAttachment; +import com.chwl.core.im.custom.bean.CarAttachment; +import com.chwl.core.im.custom.bean.CarveUpGoldThirdLevelAttachment; +import com.chwl.core.im.custom.bean.CpInviteAttachment; +import com.chwl.core.im.custom.bean.CustomAttachment; +import com.chwl.core.im.custom.bean.NobleAttachment; +import com.chwl.core.im.custom.bean.VoiceBottleShakeHeartAttachment; +import com.chwl.core.manager.IMNetEaseManager; +import com.chwl.library.utils.ResUtil; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/chat/SignInNoticeMsgViewHolder.java b/app/src/main/java/com/chwl/app/ui/im/chat/SignInNoticeMsgViewHolder.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/ui/im/chat/SignInNoticeMsgViewHolder.java rename to app/src/main/java/com/chwl/app/ui/im/chat/SignInNoticeMsgViewHolder.java index 271d2ef26..402e65e75 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/chat/SignInNoticeMsgViewHolder.java +++ b/app/src/main/java/com/chwl/app/ui/im/chat/SignInNoticeMsgViewHolder.java @@ -1,13 +1,13 @@ -package com.yizhuan.habu.ui.im.chat; +package com.chwl.app.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.habu.R; -import com.yizhuan.habu.radish.signin.SignInActivity; -import com.yizhuan.xchat_android_core.im.custom.bean.OpenSignInAttachment; +import com.chwl.app.R; +import com.chwl.app.radish.signin.SignInActivity; +import com.chwl.core.im.custom.bean.OpenSignInAttachment; /** * 签到提醒 diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/chat/SysMsgV2ViewHolder.java b/app/src/main/java/com/chwl/app/ui/im/chat/SysMsgV2ViewHolder.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/ui/im/chat/SysMsgV2ViewHolder.java rename to app/src/main/java/com/chwl/app/ui/im/chat/SysMsgV2ViewHolder.java index 345db6610..ede1c5a56 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/chat/SysMsgV2ViewHolder.java +++ b/app/src/main/java/com/chwl/app/ui/im/chat/SysMsgV2ViewHolder.java @@ -1,8 +1,8 @@ -package com.yizhuan.habu.ui.im.chat; +package com.chwl.app.ui.im.chat; -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.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_COMMON_SYSTEM_MSG_V2; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_COMMON_SYSTEM_MSG_V2_APPROVAL; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_COMMON_SYSTEM_MSG_V2_TEXT; import android.graphics.Color; import android.text.SpannableStringBuilder; @@ -24,18 +24,18 @@ 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.habu.R; -import com.yizhuan.habu.sys.ErbanSysMsgViewModel; -import com.yizhuan.habu.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.chwl.app.R; +import com.chwl.app.sys.ErbanSysMsgViewModel; +import com.chwl.app.ui.im.RouterHandler; +import com.chwl.core.im.custom.bean.SysMsgV2Attachment; +import com.chwl.core.manager.IMNetEaseManager; +import com.chwl.core.msg.sys.ApproveMsgInfo; +import com.chwl.core.msg.sysv2.ErbanSysMsgV2Component; +import com.chwl.core.msg.sysv2.ErbanSysMsgV2Info; +import com.chwl.core.msg.sysv2.ErbanSysMsgV2Layout; +import com.chwl.core.utils.net.RxHelper; +import com.chwl.library.utils.SingleToastUtil; +import com.chwl.library.utils.SizeUtils; import java.util.List; import java.util.Objects; diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/chat/SysMsgViewHolder.java b/app/src/main/java/com/chwl/app/ui/im/chat/SysMsgViewHolder.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/ui/im/chat/SysMsgViewHolder.java rename to app/src/main/java/com/chwl/app/ui/im/chat/SysMsgViewHolder.java index 5a184effe..1499248a6 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/chat/SysMsgViewHolder.java +++ b/app/src/main/java/com/chwl/app/ui/im/chat/SysMsgViewHolder.java @@ -1,10 +1,10 @@ -package com.yizhuan.habu.ui.im.chat; +package com.chwl.app.ui.im.chat; -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.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_COMMON_SYSTEM_MSG; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEAD_SHIFT_OUT; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHIFT_OUT; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_COMMON_SYSTEM_MSG_APPROVAL; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_COMMON_SYSTEM_MSG_TEXT; import android.graphics.Color; import android.text.SpannableStringBuilder; @@ -26,19 +26,19 @@ 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.habu.R; -import com.yizhuan.habu.miniworld.activity.MiniWorldGuestPageActivity; -import com.yizhuan.habu.sys.ErbanSysMsgViewModel; -import com.yizhuan.habu.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.chwl.app.R; +import com.chwl.app.miniworld.activity.MiniWorldGuestPageActivity; +import com.chwl.app.sys.ErbanSysMsgViewModel; +import com.chwl.app.ui.im.RouterHandler; +import com.chwl.core.im.custom.bean.SysMsgAttachment; +import com.chwl.core.manager.IMNetEaseManager; +import com.chwl.core.msg.sys.ApproveMsgInfo; +import com.chwl.core.msg.sys.ErbanSysMsgComponent; +import com.chwl.core.msg.sys.ErbanSysMsgInfo; +import com.chwl.core.msg.sys.ErbanSysMsgLayout; +import com.chwl.core.utils.net.RxHelper; +import com.chwl.library.utils.SingleToastUtil; +import com.chwl.library.utils.SizeUtils; import java.util.List; import java.util.Map; diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/fragment/MessageFragment.java b/app/src/main/java/com/chwl/app/ui/im/fragment/MessageFragment.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/ui/im/fragment/MessageFragment.java rename to app/src/main/java/com/chwl/app/ui/im/fragment/MessageFragment.java index 80e741bb6..b137afe0f 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/fragment/MessageFragment.java +++ b/app/src/main/java/com/chwl/app/ui/im/fragment/MessageFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.im.fragment; +package com.chwl.app.ui.im.fragment; import android.Manifest; import android.annotation.SuppressLint; @@ -51,24 +51,24 @@ 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.habu.R; -import com.yizhuan.habu.common.widget.OriginalDrawStatusClickSpan; -import com.yizhuan.habu.ui.im.GreetPresenter; -import com.yizhuan.habu.ui.im.MessageListPanelEx; -import com.yizhuan.habu.ui.im.chat.MVHChatterBoxStart; -import com.yizhuan.habu.ui.im.model.IMCustomModel; -import com.yizhuan.habu.ui.webview.CommonWebViewActivity; -import com.yizhuan.habu.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_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.chwl.app.R; +import com.chwl.app.common.widget.OriginalDrawStatusClickSpan; +import com.chwl.app.ui.im.GreetPresenter; +import com.chwl.app.ui.im.MessageListPanelEx; +import com.chwl.app.ui.im.chat.MVHChatterBoxStart; +import com.chwl.app.ui.im.model.IMCustomModel; +import com.chwl.app.ui.webview.CommonWebViewActivity; +import com.chwl.app.utils.PushMessageHandler; +import com.chwl.core.UriProvider; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.im.chatterbox.ChatterBoxHelper; +import com.chwl.core.im.chatterbox.HideInputEvent; +import com.chwl.core.im.custom.bean.CustomAttachment; +import com.chwl.core.im.custom.bean.ImTipAttachment; +import com.chwl.core.room.event.MessageSizeEvent; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; +import com.chwl.library.utils.config.BasicConfig; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/friend/ActFriendList.java b/app/src/main/java/com/chwl/app/ui/im/friend/ActFriendList.java similarity index 72% rename from app/src/main/java/com/yizhuan/habu/ui/im/friend/ActFriendList.java rename to app/src/main/java/com/chwl/app/ui/im/friend/ActFriendList.java index 0c9ade12e..4a33f6450 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/friend/ActFriendList.java +++ b/app/src/main/java/com/chwl/app/ui/im/friend/ActFriendList.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.im.friend; +package com.chwl.app.ui.im.friend; import android.content.Context; import android.content.Intent; @@ -7,12 +7,12 @@ import android.os.Bundle; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseMvpActivity; -import com.yizhuan.habu.base.BaseMvpPresenter; -import com.yizhuan.habu.home.fragment.ContactsListFragment; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; +import com.chwl.app.R; +import com.chwl.app.base.BaseMvpActivity; +import com.chwl.app.base.BaseMvpPresenter; +import com.chwl.app.home.fragment.ContactsListFragment; +import com.chwl.library.base.IMvpBaseView; +import com.chwl.library.base.factory.CreatePresenter; @CreatePresenter(BaseMvpPresenter.class) public class ActFriendList extends BaseMvpActivity> implements IMvpBaseView{ diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/friend/FriendFragmentCpDelegate.kt b/app/src/main/java/com/chwl/app/ui/im/friend/FriendFragmentCpDelegate.kt similarity index 79% rename from app/src/main/java/com/yizhuan/habu/ui/im/friend/FriendFragmentCpDelegate.kt rename to app/src/main/java/com/chwl/app/ui/im/friend/FriendFragmentCpDelegate.kt index f657b7a63..76b308c2c 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/friend/FriendFragmentCpDelegate.kt +++ b/app/src/main/java/com/chwl/app/ui/im/friend/FriendFragmentCpDelegate.kt @@ -1,21 +1,21 @@ -package com.yizhuan.habu.ui.im.friend +package com.chwl.app.ui.im.friend import android.text.TextUtils import androidx.fragment.app.viewModels -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseFragment -import com.yizhuan.habu.common.widget.dialog.DialogManager -import com.yizhuan.habu.relation.cp.CpViewHelper -import com.yizhuan.habu.relation.cp.dialog.CpInvitePageDialog -import com.yizhuan.habu.relation.cp.viewmodel.CpViewModel -import com.yizhuan.habu.ui.pay.ChargeActivity -import com.yizhuan.habu.ui.webview.CommonWebViewActivity -import com.yizhuan.xchat_android_core.Constants -import com.yizhuan.xchat_android_core.UriProvider -import com.yizhuan.xchat_android_core.relation.cp.CpInvitePageEntity -import com.yizhuan.xchat_android_core.utils.toast -import com.yizhuan.xchat_android_library.common.util.DeviceUtil -import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil +import com.chwl.app.R +import com.chwl.app.base.BaseFragment +import com.chwl.app.common.widget.dialog.DialogManager +import com.chwl.app.relation.cp.CpViewHelper +import com.chwl.app.relation.cp.dialog.CpInvitePageDialog +import com.chwl.app.relation.cp.viewmodel.CpViewModel +import com.chwl.app.ui.pay.ChargeActivity +import com.chwl.app.ui.webview.CommonWebViewActivity +import com.chwl.core.Constants +import com.chwl.core.UriProvider +import com.chwl.core.relation.cp.CpInvitePageEntity +import com.chwl.core.utils.toast +import com.chwl.library.common.util.DeviceUtil +import com.chwl.library.utils.AppMetaDataUtil class FriendFragmentCpDelegate(private val fragment: BaseFragment) { private val cpViewModel: CpViewModel by fragment.viewModels() diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/friend/FriendListAdapter.java b/app/src/main/java/com/chwl/app/ui/im/friend/FriendListAdapter.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/ui/im/friend/FriendListAdapter.java rename to app/src/main/java/com/chwl/app/ui/im/friend/FriendListAdapter.java index c35dd77a8..43d200cc3 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/friend/FriendListAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/im/friend/FriendListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.im.friend; +package com.chwl.app.ui.im.friend; import android.app.Activity; import android.text.TextUtils; @@ -10,19 +10,19 @@ import androidx.core.content.ContextCompat; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.R; -import com.yizhuan.habu.friend.action.AbstractSelectFriendAction; -import com.yizhuan.habu.ui.im.avtivity.NimP2PMessageActivity; -import com.yizhuan.habu.ui.user.activity.UserInfoActivity; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.habu.ui.widget.NobleAvatarView; -import com.yizhuan.habu.view.GenderAgeTextView; -import com.yizhuan.habu.vip.util.VipHelper; -import com.yizhuan.habu.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 com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.friend.action.AbstractSelectFriendAction; +import com.chwl.app.ui.im.avtivity.NimP2PMessageActivity; +import com.chwl.app.ui.user.activity.UserInfoActivity; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.app.ui.widget.NobleAvatarView; +import com.chwl.app.view.GenderAgeTextView; +import com.chwl.app.vip.util.VipHelper; +import com.chwl.app.room_chat.activity.NimRoomP2PMessageActivity; +import com.chwl.core.noble.NobleUtil; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.core.utils.StringExtensionKt; +import com.chwl.library.utils.ResUtil; /** * @author chenran diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/friend/FriendListFragment.java b/app/src/main/java/com/chwl/app/ui/im/friend/FriendListFragment.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/ui/im/friend/FriendListFragment.java rename to app/src/main/java/com/chwl/app/ui/im/friend/FriendListFragment.java index dbddb8d6e..8bcdb4dba 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/friend/FriendListFragment.java +++ b/app/src/main/java/com/chwl/app/ui/im/friend/FriendListFragment.java @@ -1,6 +1,6 @@ -package com.yizhuan.habu.ui.im.friend; +package com.chwl.app.ui.im.friend; -import static com.yizhuan.xchat_android_core.Constants.IS_SEND; +import static com.chwl.core.Constants.IS_SEND; import android.annotation.SuppressLint; import android.app.Activity; @@ -13,21 +13,21 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.orhanobut.logger.Logger; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseFragment; -import com.yizhuan.habu.common.NoDataFragment; -import com.yizhuan.habu.decoration.helper.DecorationHelper; -import com.yizhuan.habu.friend.action.AbstractSelectFriendAction; -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseFragment; +import com.chwl.app.common.NoDataFragment; +import com.chwl.app.decoration.helper.DecorationHelper; +import com.chwl.app.friend.action.AbstractSelectFriendAction; +import com.chwl.app.friend.view.SelectFriendActivity; +import com.chwl.core.im.friend.IMFriendModel; +import com.chwl.core.manager.IMNetEaseManager; +import com.chwl.core.manager.RelationShipEvent; +import com.chwl.core.relation.cp.CpBindUnbindEvent; +import com.chwl.core.user.UserModel; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.core.user.event.LoginUserInfoUpdateEvent; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/friend/FriendListFragmentKotlin.kt b/app/src/main/java/com/chwl/app/ui/im/friend/FriendListFragmentKotlin.kt similarity index 88% rename from app/src/main/java/com/yizhuan/habu/ui/im/friend/FriendListFragmentKotlin.kt rename to app/src/main/java/com/chwl/app/ui/im/friend/FriendListFragmentKotlin.kt index 7f14918d9..93454b5e6 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/friend/FriendListFragmentKotlin.kt +++ b/app/src/main/java/com/chwl/app/ui/im/friend/FriendListFragmentKotlin.kt @@ -1,19 +1,19 @@ -//package com.yizhuan.habu.ui.im.friend +//package com.chwl.app.ui.im.friend // //import android.app.Activity //import android.os.Bundle //import android.support.v7.widget.LinearLayoutManager -//import com.yizhuan.habu.R -//import com.yizhuan.habu.base.BaseFragment -//import com.yizhuan.habu.friend.action.AbstractSelectFriendAction -//import com.yizhuan.habu.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.chwl.app.R +//import com.chwl.app.base.BaseFragment +//import com.chwl.app.friend.action.AbstractSelectFriendAction +//import com.chwl.app.friend.view.SelectFriendActivity +//import com.chwl.core.Constants.IS_SEND +//import com.chwl.core.im.friend.IMFriendModel +//import com.chwl.core.manager.IMNetEaseManager +//import com.chwl.core.manager.RelationShipEvent +//import com.chwl.core.user.UserModel +//import com.chwl.core.user.bean.UserInfo +//import com.chwl.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/habu/ui/im/model/IMCustomModel.java b/app/src/main/java/com/chwl/app/ui/im/model/IMCustomModel.java similarity index 75% rename from app/src/main/java/com/yizhuan/habu/ui/im/model/IMCustomModel.java rename to app/src/main/java/com/chwl/app/ui/im/model/IMCustomModel.java index 539f14893..0d7346017 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/model/IMCustomModel.java +++ b/app/src/main/java/com/chwl/app/ui/im/model/IMCustomModel.java @@ -1,10 +1,10 @@ -package com.yizhuan.habu.ui.im.model; +package com.chwl.app.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.chwl.core.bean.PrivateChatLimitInfo; +import com.chwl.core.bean.response.ServiceResult; +import com.chwl.core.manager.BaseMvpModel; +import com.chwl.core.utils.net.RxHelper; +import com.chwl.library.net.rxnet.RxNet; import io.reactivex.Single; import retrofit2.http.GET; diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/recent/RecentContactsFragment.java b/app/src/main/java/com/chwl/app/ui/im/recent/RecentContactsFragment.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/im/recent/RecentContactsFragment.java rename to app/src/main/java/com/chwl/app/ui/im/recent/RecentContactsFragment.java index c0d4494b9..8ebcad026 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/recent/RecentContactsFragment.java +++ b/app/src/main/java/com/chwl/app/ui/im/recent/RecentContactsFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.im.recent; +package com.chwl.app.ui.im.recent; import static com.netease.nim.uikit.common.ui.dialog.CustomAlertDialog.onSeparateItemClickListener; @@ -42,13 +42,13 @@ 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.habu.R; -import com.yizhuan.habu.home.event.ContactTrashEvent; -import com.yizhuan.habu.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.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.app.home.event.ContactTrashEvent; +import com.chwl.app.ui.im.recent.adapter.RecentContactAdapter; +import com.chwl.core.utils.CheckUtils; +import com.chwl.core.utils.SystemUidUtil; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/recent/RecentListFragment.java b/app/src/main/java/com/chwl/app/ui/im/recent/RecentListFragment.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/ui/im/recent/RecentListFragment.java rename to app/src/main/java/com/chwl/app/ui/im/recent/RecentListFragment.java index 5a83aa352..25b3047a2 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/recent/RecentListFragment.java +++ b/app/src/main/java/com/chwl/app/ui/im/recent/RecentListFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.im.recent; +package com.chwl.app.ui.im.recent; import android.annotation.SuppressLint; import android.os.Bundle; @@ -22,40 +22,40 @@ 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.habu.R; -import com.yizhuan.habu.avroom.activity.AVRoomActivity; -import com.yizhuan.habu.base.BaseFragment; -import com.yizhuan.habu.miniworld.activity.MWTeamRoomMessageAct; -import com.yizhuan.habu.miniworld.activity.MiniWorldTeamMessageActivity; -import com.yizhuan.habu.module_hall.im.NimHelper; -import com.yizhuan.habu.module_hall.team.activity.HallTeamMessageActivity; -import com.yizhuan.habu.team.view.NimTeamMessageActivity; -import com.yizhuan.habu.ui.im.avtivity.NimP2PMessageActivity; -import com.yizhuan.habu.ui.im.recent.adapter.AttentionInRoomAdapter; -import com.yizhuan.habu.ui.relation.AttentionListActivity; -import com.yizhuan.habu.mentoring_relationship.adapter.GrabApprenticesAdapter; -import com.yizhuan.habu.room_chat.activity.NimHallTeamRoomMessageActivity; -import com.yizhuan.habu.room_chat.activity.NimRoomP2PMessageActivity; -import com.yizhuan.habu.room_chat.activity.NimTeamRoomMessageActivity; -import com.yizhuan.habu.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.RefreshInRoomListEvent; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -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.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.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.avroom.activity.AVRoomActivity; +import com.chwl.app.base.BaseFragment; +import com.chwl.app.miniworld.activity.MWTeamRoomMessageAct; +import com.chwl.app.miniworld.activity.MiniWorldTeamMessageActivity; +import com.chwl.app.module_hall.im.NimHelper; +import com.chwl.app.module_hall.team.activity.HallTeamMessageActivity; +import com.chwl.app.team.view.NimTeamMessageActivity; +import com.chwl.app.ui.im.avtivity.NimP2PMessageActivity; +import com.chwl.app.ui.im.recent.adapter.AttentionInRoomAdapter; +import com.chwl.app.ui.relation.AttentionListActivity; +import com.chwl.app.mentoring_relationship.adapter.GrabApprenticesAdapter; +import com.chwl.app.room_chat.activity.NimHallTeamRoomMessageActivity; +import com.chwl.app.room_chat.activity.NimRoomP2PMessageActivity; +import com.chwl.app.room_chat.activity.NimTeamRoomMessageActivity; +import com.chwl.app.room_chat.activity.RoomNewbieActivity; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.auth.event.LoginEvent; +import com.chwl.core.im.RefreshInRoomListEvent; +import com.chwl.core.initial.InitialModel; +import com.chwl.core.level.UserLevelVo; +import com.chwl.core.mentoring_relationship.bean.GrabApprenticesInfo; +import com.chwl.core.mentoring_relationship.event.GrabApprenticesDataEvent; +import com.chwl.core.mentoring_relationship.model.MentoringRelationshipModel; +import com.chwl.core.user.AttentionModel; +import com.chwl.core.user.UserModel; +import com.chwl.core.user.bean.AttentionInfo; +import com.chwl.core.user.bean.AttentionItem; +import com.chwl.core.user.event.LoadLoginUserInfoEvent; +import com.chwl.core.utils.SharedPreferenceUtils; +import com.chwl.core.utils.net.BeanObserver; +import com.chwl.library.utils.CommonUtils; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/recent/TeamExt.java b/app/src/main/java/com/chwl/app/ui/im/recent/TeamExt.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/ui/im/recent/TeamExt.java rename to app/src/main/java/com/chwl/app/ui/im/recent/TeamExt.java index 5a364854d..16b5c061d 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/recent/TeamExt.java +++ b/app/src/main/java/com/chwl/app/ui/im/recent/TeamExt.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.im.recent; +package com.chwl.app.ui.im.recent; import java.io.Serializable; diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/recent/adapter/AttentionInRoomAdapter.java b/app/src/main/java/com/chwl/app/ui/im/recent/adapter/AttentionInRoomAdapter.java similarity index 84% rename from app/src/main/java/com/yizhuan/habu/ui/im/recent/adapter/AttentionInRoomAdapter.java rename to app/src/main/java/com/chwl/app/ui/im/recent/adapter/AttentionInRoomAdapter.java index 88bf01a07..4f7e6f839 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/recent/adapter/AttentionInRoomAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/im/recent/adapter/AttentionInRoomAdapter.java @@ -1,13 +1,13 @@ -package com.yizhuan.habu.ui.im.recent.adapter; +package com.chwl.app.ui.im.recent.adapter; import com.chad.library.adapter.base.BaseMultiItemQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.R; -import com.yizhuan.habu.common.widget.CircleImageView; -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2; -import com.yizhuan.habu.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.chwl.app.R; +import com.chwl.app.common.widget.CircleImageView; +import com.chwl.app.ui.utils.ImageLoadUtilsV2; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.core.user.bean.AttentionInfo; +import com.chwl.core.user.bean.AttentionItem; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/recent/adapter/RecentContactAdapter.java b/app/src/main/java/com/chwl/app/ui/im/recent/adapter/RecentContactAdapter.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/ui/im/recent/adapter/RecentContactAdapter.java rename to app/src/main/java/com/chwl/app/ui/im/recent/adapter/RecentContactAdapter.java index e3d8eb3a3..fb01b83a6 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/recent/adapter/RecentContactAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/im/recent/adapter/RecentContactAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.im.recent.adapter; +package com.chwl.app.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.habu.R; -import com.yizhuan.habu.ui.im.recent.holder.CommonRecentViewHolder; -import com.yizhuan.habu.ui.im.recent.holder.TeamRecentViewHolder; +import com.chwl.app.R; +import com.chwl.app.ui.im.recent.holder.CommonRecentViewHolder; +import com.chwl.app.ui.im.recent.holder.TeamRecentViewHolder; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/recent/holder/CommonRecentViewHolder.java b/app/src/main/java/com/chwl/app/ui/im/recent/holder/CommonRecentViewHolder.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/ui/im/recent/holder/CommonRecentViewHolder.java rename to app/src/main/java/com/chwl/app/ui/im/recent/holder/CommonRecentViewHolder.java index 31898bb46..14223334e 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/recent/holder/CommonRecentViewHolder.java +++ b/app/src/main/java/com/chwl/app/ui/im/recent/holder/CommonRecentViewHolder.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.im.recent.holder; +package com.chwl.app.ui.im.recent.holder; import static android.view.View.GONE; import static android.view.View.INVISIBLE; @@ -18,12 +18,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.habu.R; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.habu.vip.util.VipHelper; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.utils.SystemUidUtil; +import com.chwl.app.R; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.app.vip.util.VipHelper; +import com.chwl.core.level.UserLevelVo; +import com.chwl.core.user.UserModel; +import com.chwl.core.utils.SystemUidUtil; /** * @author Administrator diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/recent/holder/RecentViewHolder.java b/app/src/main/java/com/chwl/app/ui/im/recent/holder/RecentViewHolder.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/ui/im/recent/holder/RecentViewHolder.java rename to app/src/main/java/com/chwl/app/ui/im/recent/holder/RecentViewHolder.java index d5cc6d357..ff8ac4205 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/recent/holder/RecentViewHolder.java +++ b/app/src/main/java/com/chwl/app/ui/im/recent/holder/RecentViewHolder.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.im.recent.holder; +package com.chwl.app.ui.im.recent.holder; import static android.view.View.GONE; import static android.view.View.VISIBLE; @@ -23,11 +23,11 @@ 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.habu.R; -import com.yizhuan.habu.ui.im.recent.RecentContactsFragment; -import com.yizhuan.habu.ui.im.recent.adapter.RecentContactAdapter; -import com.yizhuan.habu.view.GenderAgeTextView; -import com.yizhuan.xchat_android_core.helper.ImHelperUtils; +import com.chwl.app.R; +import com.chwl.app.ui.im.recent.RecentContactsFragment; +import com.chwl.app.ui.im.recent.adapter.RecentContactAdapter; +import com.chwl.app.view.GenderAgeTextView; +import com.chwl.core.helper.ImHelperUtils; public abstract class RecentViewHolder extends RecyclerViewHolder { diff --git a/app/src/main/java/com/yizhuan/habu/ui/im/recent/holder/TeamRecentViewHolder.java b/app/src/main/java/com/chwl/app/ui/im/recent/holder/TeamRecentViewHolder.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/ui/im/recent/holder/TeamRecentViewHolder.java rename to app/src/main/java/com/chwl/app/ui/im/recent/holder/TeamRecentViewHolder.java index 76b7d5ac8..b021fa512 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/im/recent/holder/TeamRecentViewHolder.java +++ b/app/src/main/java/com/chwl/app/ui/im/recent/holder/TeamRecentViewHolder.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.im.recent.holder; +package com.chwl.app.ui.im.recent.holder; import static android.view.View.GONE; import static android.view.View.VISIBLE; @@ -26,10 +26,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.habu.R; -import com.yizhuan.habu.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.chwl.app.R; +import com.chwl.app.ui.im.recent.TeamExt; +import com.chwl.core.im.custom.bean.LuckyMoneyAttachment; +import com.chwl.core.im.custom.bean.LuckyMoneyTipsAttachment; public class TeamRecentViewHolder extends RecentViewHolder { diff --git a/app/src/main/java/com/yizhuan/habu/ui/indicator_impl/IndicatorHelper.java b/app/src/main/java/com/chwl/app/ui/indicator_impl/IndicatorHelper.java similarity index 82% rename from app/src/main/java/com/yizhuan/habu/ui/indicator_impl/IndicatorHelper.java rename to app/src/main/java/com/chwl/app/ui/indicator_impl/IndicatorHelper.java index 2eee8a722..a31560ee5 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/indicator_impl/IndicatorHelper.java +++ b/app/src/main/java/com/chwl/app/ui/indicator_impl/IndicatorHelper.java @@ -1,13 +1,13 @@ -package com.yizhuan.habu.ui.indicator_impl; +package com.chwl.app.ui.indicator_impl; import android.content.Context; import android.widget.LinearLayout; import androidx.viewpager.widget.ViewPager; -import com.yizhuan.habu.ui.widget.magicindicator.MagicIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.ViewPagerHelper; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.chwl.app.ui.widget.magicindicator.MagicIndicator; +import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/indicator_impl/JustColorIndicatorAdapter.java b/app/src/main/java/com/chwl/app/ui/indicator_impl/JustColorIndicatorAdapter.java similarity index 81% rename from app/src/main/java/com/yizhuan/habu/ui/indicator_impl/JustColorIndicatorAdapter.java rename to app/src/main/java/com/chwl/app/ui/indicator_impl/JustColorIndicatorAdapter.java index 0dc52e334..2ebfa0a9c 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/indicator_impl/JustColorIndicatorAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/indicator_impl/JustColorIndicatorAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.indicator_impl; +package com.chwl.app.ui.indicator_impl; import android.content.Context; import android.view.ViewGroup; @@ -6,13 +6,13 @@ import android.widget.FrameLayout; import androidx.core.content.ContextCompat; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; +import com.chwl.app.R; +import com.chwl.app.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/indicator_impl/OnItemSelectListener.java b/app/src/main/java/com/chwl/app/ui/indicator_impl/OnItemSelectListener.java similarity index 79% rename from app/src/main/java/com/yizhuan/habu/ui/indicator_impl/OnItemSelectListener.java rename to app/src/main/java/com/chwl/app/ui/indicator_impl/OnItemSelectListener.java index 6a0190720..0314a861a 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/indicator_impl/OnItemSelectListener.java +++ b/app/src/main/java/com/chwl/app/ui/indicator_impl/OnItemSelectListener.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.indicator_impl; +package com.chwl.app.ui.indicator_impl; import android.widget.TextView; diff --git a/app/src/main/java/com/yizhuan/habu/ui/keepalive/OnePiexlActivity.java b/app/src/main/java/com/chwl/app/ui/keepalive/OnePiexlActivity.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/ui/keepalive/OnePiexlActivity.java rename to app/src/main/java/com/chwl/app/ui/keepalive/OnePiexlActivity.java index 7444a963b..a3da40b43 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/keepalive/OnePiexlActivity.java +++ b/app/src/main/java/com/chwl/app/ui/keepalive/OnePiexlActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.keepalive; +package com.chwl.app.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.habu.base.BaseActivity; +import com.chwl.app.base.BaseActivity; /** * Created by chenran on 2017/11/16. diff --git a/app/src/main/java/com/yizhuan/habu/ui/list/BaseListAdapter.java b/app/src/main/java/com/chwl/app/ui/list/BaseListAdapter.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/list/BaseListAdapter.java rename to app/src/main/java/com/chwl/app/ui/list/BaseListAdapter.java index a3554da40..c054769a7 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/list/BaseListAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/list/BaseListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.list; +package com.chwl.app.ui.list; import android.content.Context; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/yizhuan/habu/ui/login/AccountValidator.java b/app/src/main/java/com/chwl/app/ui/login/AccountValidator.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/ui/login/AccountValidator.java rename to app/src/main/java/com/chwl/app/ui/login/AccountValidator.java index 4dfdf6b81..5c68b896a 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/login/AccountValidator.java +++ b/app/src/main/java/com/chwl/app/ui/login/AccountValidator.java @@ -1,12 +1,12 @@ -package com.yizhuan.habu.ui.login; +package com.chwl.app.ui.login; import android.text.TextUtils; import androidx.annotation.NonNull; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.StringUtils; +import com.chwl.app.R; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.StringUtils; import java.util.regex.Pattern; diff --git a/app/src/main/java/com/yizhuan/habu/ui/login/AddUserInfoActivity.java b/app/src/main/java/com/chwl/app/ui/login/AddUserInfoActivity.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/ui/login/AddUserInfoActivity.java rename to app/src/main/java/com/chwl/app/ui/login/AddUserInfoActivity.java index f4dcb2328..4a5b98bc1 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/login/AddUserInfoActivity.java +++ b/app/src/main/java/com/chwl/app/ui/login/AddUserInfoActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.login; +package com.chwl.app.ui.login; import android.os.Bundle; import android.view.KeyEvent; @@ -7,9 +7,9 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentTransaction; import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseActivity; -import com.yizhuan.habu.ui.login.fragment.AddUserInfoFragment; +import com.chwl.app.R; +import com.chwl.app.base.BaseActivity; +import com.chwl.app.ui.login.fragment.AddUserInfoFragment; /** * @author zhouxiangfeng diff --git a/app/src/main/java/com/yizhuan/habu/ui/login/AreaCodeActivity.kt b/app/src/main/java/com/chwl/app/ui/login/AreaCodeActivity.kt similarity index 88% rename from app/src/main/java/com/yizhuan/habu/ui/login/AreaCodeActivity.kt rename to app/src/main/java/com/chwl/app/ui/login/AreaCodeActivity.kt index a37178bcd..a2ab8839f 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/login/AreaCodeActivity.kt +++ b/app/src/main/java/com/chwl/app/ui/login/AreaCodeActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.login +package com.chwl.app.ui.login import android.app.Activity import android.content.Intent @@ -7,13 +7,13 @@ import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.netease.nim.uikit.StatusBarUtil import com.trello.rxlifecycle3.android.ActivityEvent -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingActivity -import com.yizhuan.habu.databinding.ActivityAreaCodeBinding -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.auth.bean.AreaInfoBean -import com.yizhuan.xchat_android_core.utils.Logger -import com.yizhuan.xchat_android_core.utils.net.BeanObserver +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingActivity +import com.chwl.app.databinding.ActivityAreaCodeBinding +import com.chwl.core.auth.AuthModel +import com.chwl.core.auth.bean.AreaInfoBean +import com.chwl.core.utils.Logger +import com.chwl.core.utils.net.BeanObserver /** * 区号 diff --git a/app/src/main/java/com/yizhuan/habu/ui/login/BindCodeActivity.java b/app/src/main/java/com/chwl/app/ui/login/BindCodeActivity.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/ui/login/BindCodeActivity.java rename to app/src/main/java/com/chwl/app/ui/login/BindCodeActivity.java index 9a656c0ee..147e0f361 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/login/BindCodeActivity.java +++ b/app/src/main/java/com/chwl/app/ui/login/BindCodeActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.login; +package com.chwl.app.ui.login; import android.annotation.SuppressLint; import android.app.Activity; @@ -14,14 +14,14 @@ import android.widget.TextView; import com.coorchice.library.utils.LogUtils; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseActivity; -import com.yizhuan.habu.ui.login.ui.CodeEditText; -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.event.NeedCompleteInfoEvent; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseActivity; +import com.chwl.app.ui.login.ui.CodeEditText; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.code.CodeType; +import com.chwl.core.user.UserModel; +import com.chwl.core.user.event.NeedCompleteInfoEvent; +import com.chwl.library.utils.ResUtil; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/habu/ui/login/BindPhoneActivity.kt b/app/src/main/java/com/chwl/app/ui/login/BindPhoneActivity.kt similarity index 92% rename from app/src/main/java/com/yizhuan/habu/ui/login/BindPhoneActivity.kt rename to app/src/main/java/com/chwl/app/ui/login/BindPhoneActivity.kt index 49ce51c75..e920df404 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/login/BindPhoneActivity.kt +++ b/app/src/main/java/com/chwl/app/ui/login/BindPhoneActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.login +package com.chwl.app.ui.login import android.content.Context import android.content.Intent @@ -13,16 +13,16 @@ 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.habu.R -import com.yizhuan.habu.base.BaseViewBindingActivity -import com.yizhuan.habu.databinding.ActivityBindPhoneBinding -import com.yizhuan.habu.ui.login.BindPhoneActivity -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_library.utils.NetworkUtils -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingActivity +import com.chwl.app.databinding.ActivityBindPhoneBinding +import com.chwl.app.ui.login.BindPhoneActivity +import com.chwl.core.auth.AuthModel +import com.chwl.core.code.CodeType +import com.chwl.core.user.UserModel +import com.chwl.core.user.bean.UserInfo +import com.chwl.library.utils.NetworkUtils +import com.chwl.library.utils.ResUtil import io.reactivex.SingleObserver import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable diff --git a/app/src/main/java/com/yizhuan/habu/ui/login/BindSuccessDialog.java b/app/src/main/java/com/chwl/app/ui/login/BindSuccessDialog.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/ui/login/BindSuccessDialog.java rename to app/src/main/java/com/chwl/app/ui/login/BindSuccessDialog.java index 56e79fde0..802b6bb90 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/login/BindSuccessDialog.java +++ b/app/src/main/java/com/chwl/app/ui/login/BindSuccessDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.login; +package com.chwl.app.ui.login; import android.os.Bundle; import android.view.LayoutInflater; @@ -10,8 +10,8 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.DialogFragment; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_library.utils.SizeUtils; +import com.chwl.app.R; +import com.chwl.library.utils.SizeUtils; public class BindSuccessDialog extends DialogFragment implements View.OnClickListener { diff --git a/app/src/main/java/com/yizhuan/habu/ui/login/CodeDownDescTimer.java b/app/src/main/java/com/chwl/app/ui/login/CodeDownDescTimer.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/ui/login/CodeDownDescTimer.java rename to app/src/main/java/com/chwl/app/ui/login/CodeDownDescTimer.java index e2fa2c4e2..7f39848f3 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/login/CodeDownDescTimer.java +++ b/app/src/main/java/com/chwl/app/ui/login/CodeDownDescTimer.java @@ -1,11 +1,11 @@ -package com.yizhuan.habu.ui.login; +package com.chwl.app.ui.login; import android.os.CountDownTimer; import android.view.View; import android.widget.TextView; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.library.utils.ResUtil; /** diff --git a/app/src/main/java/com/yizhuan/habu/ui/login/CodeDownTimer.java b/app/src/main/java/com/chwl/app/ui/login/CodeDownTimer.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/ui/login/CodeDownTimer.java rename to app/src/main/java/com/chwl/app/ui/login/CodeDownTimer.java index e9b1cc0a5..1d58c240e 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/login/CodeDownTimer.java +++ b/app/src/main/java/com/chwl/app/ui/login/CodeDownTimer.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.login; +package com.chwl.app.ui.login; import android.graphics.Color; import android.os.CountDownTimer; @@ -7,8 +7,8 @@ import android.text.SpannableString; import android.text.style.ForegroundColorSpan; import android.widget.TextView; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.library.utils.ResUtil; /** diff --git a/app/src/main/java/com/yizhuan/habu/ui/login/LoginActivity.java b/app/src/main/java/com/chwl/app/ui/login/LoginActivity.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/ui/login/LoginActivity.java rename to app/src/main/java/com/chwl/app/ui/login/LoginActivity.java index 2ea3f572b..c1d0b8d50 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/login/LoginActivity.java +++ b/app/src/main/java/com/chwl/app/ui/login/LoginActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.login; +package com.chwl.app.ui.login; import android.content.Context; import android.content.Intent; @@ -19,26 +19,26 @@ import androidx.core.content.ContextCompat; import com.example.module_base.support.google.IGoogleService; import com.example.module_base.support.login.ILoginService; import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.habu.upgrade.AppUpgradeHelper; +import com.chwl.app.upgrade.AppUpgradeHelper; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.habu.MainActivity; -import com.yizhuan.habu.NimMiddleActivity; -import com.yizhuan.habu.R; -import com.yizhuan.habu.application.IReportConstants; -import com.yizhuan.habu.application.ReportManager; -import com.yizhuan.habu.base.BaseActivity; -import com.yizhuan.habu.common.widget.OriginalDrawStatusClickSpan; -import com.yizhuan.habu.ui.login.helper.LogoutHelper; -import com.yizhuan.habu.ui.webview.CommonWebViewActivity; -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.LoginEvent; -import com.yizhuan.xchat_android_core.auth.event.LoginReportEvent; -import com.yizhuan.xchat_android_library.common.SpConstants; -import com.yizhuan.xchat_android_library.common.util.SPUtils; -import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil; +import com.chwl.app.MainActivity; +import com.chwl.app.NimMiddleActivity; +import com.chwl.app.R; +import com.chwl.app.application.IReportConstants; +import com.chwl.app.application.ReportManager; +import com.chwl.app.base.BaseActivity; +import com.chwl.app.common.widget.OriginalDrawStatusClickSpan; +import com.chwl.app.ui.login.helper.LogoutHelper; +import com.chwl.app.ui.webview.CommonWebViewActivity; +import com.chwl.core.Constants; +import com.chwl.core.DemoCache; +import com.chwl.core.UriProvider; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.auth.event.LoginEvent; +import com.chwl.core.auth.event.LoginReportEvent; +import com.chwl.library.common.SpConstants; +import com.chwl.library.common.util.SPUtils; +import com.chwl.library.utils.AppMetaDataUtil; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -243,7 +243,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener // case R.id.cs_facebook: // //是否安装客户端 // if (!DeviceUtils.isAppInstalled(this, PackageNameConstants.FACEBOOK_NAME)) { -// SingleToastUtil.showToast(ResUtil.getString(com.yizhuan.xchat_android_core.R.string.xchat_android_core_auth_authmodel_03)); +// SingleToastUtil.showToast(ResUtil.getString(com.chwl.core.R.string.xchat_android_core_auth_authmodel_03)); // return; // } // LoginManager.getInstance().logOut(); diff --git a/app/src/main/java/com/yizhuan/habu/ui/login/LoginCodeActivity.kt b/app/src/main/java/com/chwl/app/ui/login/LoginCodeActivity.kt similarity index 92% rename from app/src/main/java/com/yizhuan/habu/ui/login/LoginCodeActivity.kt rename to app/src/main/java/com/chwl/app/ui/login/LoginCodeActivity.kt index 94ae62d39..581c4fcdb 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/login/LoginCodeActivity.kt +++ b/app/src/main/java/com/chwl/app/ui/login/LoginCodeActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.login +package com.chwl.app.ui.login import android.annotation.SuppressLint import android.app.Activity @@ -13,19 +13,19 @@ 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.habu.MainActivity -import com.yizhuan.habu.NimMiddleActivity -import com.yizhuan.habu.R -import com.yizhuan.habu.application.IReportConstants -import com.yizhuan.habu.application.ReportManager -import com.yizhuan.habu.base.BaseViewBindingActivity -import com.yizhuan.habu.databinding.ActivityLoginCodeBinding -import com.yizhuan.habu.ui.login.helper.LogoutHelper -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.code.CodeType -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.MainActivity +import com.chwl.app.NimMiddleActivity +import com.chwl.app.R +import com.chwl.app.application.IReportConstants +import com.chwl.app.application.ReportManager +import com.chwl.app.base.BaseViewBindingActivity +import com.chwl.app.databinding.ActivityLoginCodeBinding +import com.chwl.app.ui.login.helper.LogoutHelper +import com.chwl.core.DemoCache +import com.chwl.core.auth.AuthModel +import com.chwl.core.auth.event.LoginEvent +import com.chwl.core.code.CodeType +import com.chwl.library.utils.ResUtil import io.reactivex.SingleObserver import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable diff --git a/app/src/main/java/com/yizhuan/habu/ui/login/LoginPasswordActivity.java b/app/src/main/java/com/chwl/app/ui/login/LoginPasswordActivity.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/ui/login/LoginPasswordActivity.java rename to app/src/main/java/com/chwl/app/ui/login/LoginPasswordActivity.java index 2af3d5302..0b8ef2e96 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/login/LoginPasswordActivity.java +++ b/app/src/main/java/com/chwl/app/ui/login/LoginPasswordActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.login; +package com.chwl.app.ui.login; import android.content.Context; import android.content.Intent; @@ -19,21 +19,21 @@ import androidx.core.content.ContextCompat; import com.coorchice.library.SuperTextView; import com.netease.nim.uikit.StatusBarUtil; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.habu.MainActivity; -import com.yizhuan.habu.NimMiddleActivity; -import com.yizhuan.habu.R; -import com.yizhuan.habu.application.IReportConstants; -import com.yizhuan.habu.application.ReportManager; -import com.yizhuan.habu.base.BaseActivity; -import com.yizhuan.habu.ui.login.helper.LogoutHelper; -import com.yizhuan.habu.ui.setting.ResetPasswordActivity; -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.code.CodeType; -import com.yizhuan.xchat_android_library.common.SpConstants; -import com.yizhuan.xchat_android_library.common.util.SPUtils; -import com.yizhuan.xchat_android_library.utils.TextWatcherWrapper; +import com.chwl.app.MainActivity; +import com.chwl.app.NimMiddleActivity; +import com.chwl.app.R; +import com.chwl.app.application.IReportConstants; +import com.chwl.app.application.ReportManager; +import com.chwl.app.base.BaseActivity; +import com.chwl.app.ui.login.helper.LogoutHelper; +import com.chwl.app.ui.setting.ResetPasswordActivity; +import com.chwl.core.DemoCache; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.auth.event.LoginEvent; +import com.chwl.core.code.CodeType; +import com.chwl.library.common.SpConstants; +import com.chwl.library.common.util.SPUtils; +import com.chwl.library.utils.TextWatcherWrapper; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/habu/ui/login/LoginPhoneActivity.kt b/app/src/main/java/com/chwl/app/ui/login/LoginPhoneActivity.kt similarity index 91% rename from app/src/main/java/com/yizhuan/habu/ui/login/LoginPhoneActivity.kt rename to app/src/main/java/com/chwl/app/ui/login/LoginPhoneActivity.kt index fb8e8cdc5..7a1392dea 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/login/LoginPhoneActivity.kt +++ b/app/src/main/java/com/chwl/app/ui/login/LoginPhoneActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.login +package com.chwl.app.ui.login import android.content.Context import android.content.Intent @@ -8,14 +8,14 @@ import android.view.View import android.widget.EditText import com.netease.nim.uikit.StatusBarUtil import com.trello.rxlifecycle3.android.ActivityEvent -import com.yizhuan.habu.MainActivity -import com.yizhuan.habu.NimMiddleActivity -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingActivity -import com.yizhuan.habu.databinding.ActivityLoginPhoneBinding -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.auth.event.LoginEvent -import com.yizhuan.xchat_android_core.code.CodeType +import com.chwl.app.MainActivity +import com.chwl.app.NimMiddleActivity +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingActivity +import com.chwl.app.databinding.ActivityLoginPhoneBinding +import com.chwl.core.auth.AuthModel +import com.chwl.core.auth.event.LoginEvent +import com.chwl.core.code.CodeType import io.reactivex.SingleObserver import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable diff --git a/app/src/main/java/com/yizhuan/habu/ui/login/ModifyInfoActivity.java b/app/src/main/java/com/chwl/app/ui/login/ModifyInfoActivity.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/ui/login/ModifyInfoActivity.java rename to app/src/main/java/com/chwl/app/ui/login/ModifyInfoActivity.java index 34143b6a6..c262a7e0a 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/login/ModifyInfoActivity.java +++ b/app/src/main/java/com/chwl/app/ui/login/ModifyInfoActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.login; +package com.chwl.app.ui.login; import android.content.Intent; import android.os.Bundle; @@ -15,12 +15,12 @@ import androidx.core.content.ContextCompat; import com.google.android.material.snackbar.Snackbar; import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseActivity; -import com.yizhuan.habu.base.TitleBar; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseActivity; +import com.chwl.app.base.TitleBar; +import com.chwl.core.user.UserModel; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.library.utils.ResUtil; /** * Created by zhouxiangfeng on 2017/5/13. diff --git a/app/src/main/java/com/yizhuan/habu/ui/login/PasswordValidator.java b/app/src/main/java/com/chwl/app/ui/login/PasswordValidator.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/ui/login/PasswordValidator.java rename to app/src/main/java/com/chwl/app/ui/login/PasswordValidator.java index a8454ea9a..6cbdb4e96 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/login/PasswordValidator.java +++ b/app/src/main/java/com/chwl/app/ui/login/PasswordValidator.java @@ -1,11 +1,11 @@ -package com.yizhuan.habu.ui.login; +package com.chwl.app.ui.login; import android.text.TextUtils; import androidx.annotation.NonNull; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.library.utils.ResUtil; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/app/src/main/java/com/yizhuan/habu/ui/login/ShowBindPhoneActivity.kt b/app/src/main/java/com/chwl/app/ui/login/ShowBindPhoneActivity.kt similarity index 79% rename from app/src/main/java/com/yizhuan/habu/ui/login/ShowBindPhoneActivity.kt rename to app/src/main/java/com/chwl/app/ui/login/ShowBindPhoneActivity.kt index 27b7c5b15..08173d75b 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/login/ShowBindPhoneActivity.kt +++ b/app/src/main/java/com/chwl/app/ui/login/ShowBindPhoneActivity.kt @@ -1,17 +1,17 @@ -package com.yizhuan.habu.ui.login +package com.chwl.app.ui.login import android.annotation.SuppressLint import android.content.Context -import com.yizhuan.habu.R -import com.yizhuan.xchat_android_library.utils.ResUtil -import com.yizhuan.xchat_android_core.user.UserModel -import com.yizhuan.habu.ui.setting.VerifyPhoneActivity +import com.chwl.app.R +import com.chwl.library.utils.ResUtil +import com.chwl.core.user.UserModel +import com.chwl.app.ui.setting.VerifyPhoneActivity import com.netease.nim.uikit.StatusBarUtil import android.content.Intent import android.text.TextUtils import android.view.View -import com.yizhuan.habu.base.BaseViewBindingActivity -import com.yizhuan.habu.databinding.ActivityShowBindPhoneBinding +import com.chwl.app.base.BaseViewBindingActivity +import com.chwl.app.databinding.ActivityShowBindPhoneBinding /** * 已綁定手機號頁面 diff --git a/app/src/main/java/com/yizhuan/habu/ui/login/fragment/AddUserInfoFragment.java b/app/src/main/java/com/chwl/app/ui/login/fragment/AddUserInfoFragment.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/ui/login/fragment/AddUserInfoFragment.java rename to app/src/main/java/com/chwl/app/ui/login/fragment/AddUserInfoFragment.java index 6cc67c419..b64dd67a6 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/login/fragment/AddUserInfoFragment.java +++ b/app/src/main/java/com/chwl/app/ui/login/fragment/AddUserInfoFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.login.fragment; +package com.chwl.app.ui.login.fragment; import android.annotation.SuppressLint; import android.os.Bundle; @@ -16,20 +16,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.habu.R; -import com.yizhuan.habu.application.IReportConstants; -import com.yizhuan.habu.application.ReportManager; -import com.yizhuan.habu.base.BaseFragment; -import com.yizhuan.habu.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.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.application.IReportConstants; +import com.chwl.app.application.ReportManager; +import com.chwl.app.base.BaseFragment; +import com.chwl.app.common.widget.dialog.DialogManager; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.auth.entity.ThirdUserInfo; +import com.chwl.core.initial.InitialModel; +import com.chwl.core.initial.bean.InitInfo; +import com.chwl.core.linked.LinkedModel; +import com.chwl.core.linked.bean.LinkedInfo; +import com.chwl.core.user.UserModel; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.library.utils.ResUtil; import java.util.HashMap; diff --git a/app/src/main/java/com/yizhuan/habu/ui/login/helper/LogoutHelper.java b/app/src/main/java/com/chwl/app/ui/login/helper/LogoutHelper.java similarity index 87% rename from app/src/main/java/com/yizhuan/habu/ui/login/helper/LogoutHelper.java rename to app/src/main/java/com/chwl/app/ui/login/helper/LogoutHelper.java index 8f857c075..ec1ab548c 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/login/helper/LogoutHelper.java +++ b/app/src/main/java/com/chwl/app/ui/login/helper/LogoutHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.login.helper; +package com.chwl.app.ui.login.helper; import android.text.Spannable; import android.text.SpannableString; @@ -8,14 +8,14 @@ import android.text.style.ForegroundColorSpan; import androidx.core.content.ContextCompat; import com.appsflyer.internal.components.network.http.exceptions.HttpException; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseActivity; -import com.yizhuan.xchat_android_core.auth.AuthModel; -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_library.net.rxnet.exception.ExceptionHandle; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseActivity; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.auth.exception.AccountCancelException; +import com.chwl.core.auth.exception.BanAccountException; +import com.chwl.core.auth.exception.IsSuperAdminException; +import com.chwl.library.net.rxnet.exception.ExceptionHandle; +import com.chwl.library.utils.ResUtil; import java.io.IOException; import java.net.SocketException; diff --git a/app/src/main/java/com/yizhuan/habu/ui/login/ui/CodeEditText.java b/app/src/main/java/com/chwl/app/ui/login/ui/CodeEditText.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/ui/login/ui/CodeEditText.java rename to app/src/main/java/com/chwl/app/ui/login/ui/CodeEditText.java index 11969f48b..813b7d0aa 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/login/ui/CodeEditText.java +++ b/app/src/main/java/com/chwl/app/ui/login/ui/CodeEditText.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.login.ui; +package com.chwl.app.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.habu.R; +import com.chwl.app.R; /** * 验证码输入框,重写EditText的绘制方法实现。 diff --git a/app/src/main/java/com/yizhuan/habu/ui/patriarch/PatriarchModeActivity.java b/app/src/main/java/com/chwl/app/ui/patriarch/PatriarchModeActivity.java similarity index 76% rename from app/src/main/java/com/yizhuan/habu/ui/patriarch/PatriarchModeActivity.java rename to app/src/main/java/com/chwl/app/ui/patriarch/PatriarchModeActivity.java index 99ae5b0f4..b0936d763 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/patriarch/PatriarchModeActivity.java +++ b/app/src/main/java/com/chwl/app/ui/patriarch/PatriarchModeActivity.java @@ -1,19 +1,19 @@ -package com.yizhuan.habu.ui.patriarch; +package com.chwl.app.ui.patriarch; import android.content.Context; import android.content.Intent; import android.graphics.Paint; import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseBindingActivity; -import com.yizhuan.habu.databinding.ActivityPatriarchModeBinding; -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseBindingActivity; +import com.chwl.app.databinding.ActivityPatriarchModeBinding; +import com.chwl.app.ui.webview.CommonWebViewActivity; +import com.chwl.core.UriProvider; +import com.chwl.core.user.UserModel; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.library.annatation.ActLayoutRes; +import com.chwl.library.utils.ResUtil; @ActLayoutRes(R.layout.activity_patriarch_mode) public class PatriarchModeActivity extends BaseBindingActivity { diff --git a/app/src/main/java/com/yizhuan/habu/ui/patriarch/PatriarchPwdActivity.java b/app/src/main/java/com/chwl/app/ui/patriarch/PatriarchPwdActivity.java similarity index 92% rename from app/src/main/java/com/yizhuan/habu/ui/patriarch/PatriarchPwdActivity.java rename to app/src/main/java/com/chwl/app/ui/patriarch/PatriarchPwdActivity.java index c0470b123..5dd1d967e 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/patriarch/PatriarchPwdActivity.java +++ b/app/src/main/java/com/chwl/app/ui/patriarch/PatriarchPwdActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.patriarch; +package com.chwl.app.ui.patriarch; import android.annotation.SuppressLint; import android.text.Editable; @@ -9,13 +9,13 @@ import android.view.ViewGroup; import android.widget.LinearLayout; import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseBindingActivity; -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseBindingActivity; +import com.chwl.app.databinding.ActivityPatriarchPwdBinding; +import com.chwl.core.user.UserModel; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.library.annatation.ActLayoutRes; +import com.chwl.library.utils.ResUtil; @ActLayoutRes(R.layout.activity_patriarch_pwd) diff --git a/app/src/main/java/com/yizhuan/habu/ui/patriarch/help/LimitEnterRoomHelper.java b/app/src/main/java/com/chwl/app/ui/patriarch/help/LimitEnterRoomHelper.java similarity index 87% rename from app/src/main/java/com/yizhuan/habu/ui/patriarch/help/LimitEnterRoomHelper.java rename to app/src/main/java/com/chwl/app/ui/patriarch/help/LimitEnterRoomHelper.java index 7e6055b84..892fa6b34 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/patriarch/help/LimitEnterRoomHelper.java +++ b/app/src/main/java/com/chwl/app/ui/patriarch/help/LimitEnterRoomHelper.java @@ -1,14 +1,14 @@ -package com.yizhuan.habu.ui.patriarch.help; +package com.chwl.app.ui.patriarch.help; import android.app.Dialog; import android.content.Context; import android.text.TextUtils; -import com.yizhuan.habu.R; -import com.yizhuan.habu.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_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.common.widget.dialog.DialogManager; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.utils.ActivityUtil; +import com.chwl.library.utils.ResUtil; /** * 进房限制的一些处理，因为main和avroom 基本一样，所以写一起减少冗余 diff --git a/app/src/main/java/com/yizhuan/habu/ui/patriarch/help/PmDialogShowMrg.java b/app/src/main/java/com/chwl/app/ui/patriarch/help/PmDialogShowMrg.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/ui/patriarch/help/PmDialogShowMrg.java rename to app/src/main/java/com/chwl/app/ui/patriarch/help/PmDialogShowMrg.java index 02256bbf8..af0724560 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/patriarch/help/PmDialogShowMrg.java +++ b/app/src/main/java/com/chwl/app/ui/patriarch/help/PmDialogShowMrg.java @@ -1,19 +1,19 @@ -package com.yizhuan.habu.ui.patriarch.help; +package com.chwl.app.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.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.chwl.core.auth.AuthModel; +import com.chwl.core.initial.InitialModel; +import com.chwl.core.user.UserModel; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.core.utils.ActivityUtil; +import com.chwl.core.utils.SharedPreferenceUtils; +import com.chwl.core.utils.net.DontWarnObserver; +import com.chwl.core.utils.net.RxHelper; +import com.chwl.library.utils.TimeUtils; import java.lang.ref.WeakReference; import java.util.HashMap; diff --git a/app/src/main/java/com/yizhuan/habu/ui/pay/ChargeActivity.java b/app/src/main/java/com/chwl/app/ui/pay/ChargeActivity.java similarity index 92% rename from app/src/main/java/com/yizhuan/habu/ui/pay/ChargeActivity.java rename to app/src/main/java/com/chwl/app/ui/pay/ChargeActivity.java index 532a90551..805fd298d 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/pay/ChargeActivity.java +++ b/app/src/main/java/com/chwl/app/ui/pay/ChargeActivity.java @@ -1,6 +1,6 @@ -package com.yizhuan.habu.ui.pay; +package com.chwl.app.ui.pay; -import static com.yizhuan.xchat_android_core.pay.PayModel.RECHARGE_LIMIT; +import static com.chwl.core.pay.PayModel.RECHARGE_LIMIT; import android.annotation.SuppressLint; import android.app.Activity; @@ -32,29 +32,29 @@ import com.example.module_base.support.billing.IProductDetails; import com.example.module_base.support.billing.IPurchase; import com.example.module_base.support.google.IGoogleService; import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.habu.R; -import com.yizhuan.habu.application.IReportConstants; -import com.yizhuan.habu.application.ReportManager; -import com.yizhuan.habu.base.BaseMvpActivity; -import com.yizhuan.habu.common.widget.OriginalDrawStatusClickSpan; -import com.yizhuan.habu.pay.presenter.ChargePresenter; -import com.yizhuan.habu.pay.view.IChargeView; -import com.yizhuan.habu.ui.im.avtivity.NimP2PMessageActivity; -import com.yizhuan.habu.ui.setting.ModifyPwdActivity; -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2; -import com.yizhuan.habu.ui.webview.CommonWebViewActivity; -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.exception.FailReasonException; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.pay.bean.Banner; -import com.yizhuan.xchat_android_core.pay.bean.ChargeBean; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; -import com.yizhuan.xchat_android_core.utils.net.IgnoreException; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.FormatUtils; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.app.application.IReportConstants; +import com.chwl.app.application.ReportManager; +import com.chwl.app.base.BaseMvpActivity; +import com.chwl.app.common.widget.OriginalDrawStatusClickSpan; +import com.chwl.app.pay.presenter.ChargePresenter; +import com.chwl.app.pay.view.IChargeView; +import com.chwl.app.ui.im.avtivity.NimP2PMessageActivity; +import com.chwl.app.ui.setting.ModifyPwdActivity; +import com.chwl.app.ui.utils.ImageLoadUtilsV2; +import com.chwl.app.ui.webview.CommonWebViewActivity; +import com.chwl.core.DemoCache; +import com.chwl.core.UriProvider; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.exception.FailReasonException; +import com.chwl.core.pay.PayModel; +import com.chwl.core.pay.bean.Banner; +import com.chwl.core.pay.bean.ChargeBean; +import com.chwl.core.pay.bean.WalletInfo; +import com.chwl.core.utils.net.IgnoreException; +import com.chwl.library.base.factory.CreatePresenter; +import com.chwl.library.utils.FormatUtils; +import com.chwl.library.utils.SingleToastUtil; import com.zhpan.bannerview.BannerViewPager; import com.zhpan.bannerview.BaseBannerAdapter; import com.zhpan.bannerview.BaseViewHolder; diff --git a/app/src/main/java/com/yizhuan/habu/ui/pay/ChargeAdapter.java b/app/src/main/java/com/chwl/app/ui/pay/ChargeAdapter.java similarity index 89% rename from app/src/main/java/com/yizhuan/habu/ui/pay/ChargeAdapter.java rename to app/src/main/java/com/chwl/app/ui/pay/ChargeAdapter.java index 04bf9bcc6..5f9f7251a 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/pay/ChargeAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/pay/ChargeAdapter.java @@ -1,9 +1,9 @@ -package com.yizhuan.habu.ui.pay; +package com.chwl.app.ui.pay; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_core.pay.bean.ChargeBean; +import com.chwl.app.R; +import com.chwl.core.pay.bean.ChargeBean; import org.jetbrains.annotations.NotNull; diff --git a/app/src/main/java/com/yizhuan/habu/ui/praise/BezierEvaluator.java b/app/src/main/java/com/chwl/app/ui/praise/BezierEvaluator.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/ui/praise/BezierEvaluator.java rename to app/src/main/java/com/chwl/app/ui/praise/BezierEvaluator.java index ba9109715..e4ca48dff 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/praise/BezierEvaluator.java +++ b/app/src/main/java/com/chwl/app/ui/praise/BezierEvaluator.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.praise; +package com.chwl.app.ui.praise; import android.animation.TypeEvaluator; import android.graphics.PointF; diff --git a/app/src/main/java/com/yizhuan/habu/ui/praise/HiPraise.java b/app/src/main/java/com/chwl/app/ui/praise/HiPraise.java similarity index 86% rename from app/src/main/java/com/yizhuan/habu/ui/praise/HiPraise.java rename to app/src/main/java/com/chwl/app/ui/praise/HiPraise.java index 2ea854e68..68e67e047 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/praise/HiPraise.java +++ b/app/src/main/java/com/chwl/app/ui/praise/HiPraise.java @@ -1,9 +1,9 @@ -package com.yizhuan.habu.ui.praise; +package com.chwl.app.ui.praise; import android.graphics.Bitmap; -import com.yizhuan.habu.ui.praise.base.IDrawable; -import com.yizhuan.habu.ui.praise.base.IPraise; +import com.chwl.app.ui.praise.base.IDrawable; +import com.chwl.app.ui.praise.base.IPraise; import java.util.Random; diff --git a/app/src/main/java/com/yizhuan/habu/ui/praise/HiPraiseAnimationView.java b/app/src/main/java/com/chwl/app/ui/praise/HiPraiseAnimationView.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/ui/praise/HiPraiseAnimationView.java rename to app/src/main/java/com/chwl/app/ui/praise/HiPraiseAnimationView.java index 707ca28a1..fa0a4f766 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/praise/HiPraiseAnimationView.java +++ b/app/src/main/java/com/chwl/app/ui/praise/HiPraiseAnimationView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.praise; +package com.chwl.app.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.habu.ui.praise.base.IDrawTask; -import com.yizhuan.habu.ui.praise.base.IDrawable; -import com.yizhuan.habu.ui.praise.base.IPraise; -import com.yizhuan.habu.ui.praise.base.IPraiseView; +import com.chwl.app.ui.praise.base.IDrawTask; +import com.chwl.app.ui.praise.base.IDrawable; +import com.chwl.app.ui.praise.base.IPraise; +import com.chwl.app.ui.praise.base.IPraiseView; public class HiPraiseAnimationView extends SurfaceView implements IPraiseView, SurfaceHolder.Callback { diff --git a/app/src/main/java/com/yizhuan/habu/ui/praise/HiPraiseWithCallback.java b/app/src/main/java/com/chwl/app/ui/praise/HiPraiseWithCallback.java similarity index 85% rename from app/src/main/java/com/yizhuan/habu/ui/praise/HiPraiseWithCallback.java rename to app/src/main/java/com/chwl/app/ui/praise/HiPraiseWithCallback.java index 34eec155d..1f996e6f8 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/praise/HiPraiseWithCallback.java +++ b/app/src/main/java/com/chwl/app/ui/praise/HiPraiseWithCallback.java @@ -1,8 +1,8 @@ -package com.yizhuan.habu.ui.praise; +package com.chwl.app.ui.praise; import android.graphics.Bitmap; -import com.yizhuan.habu.ui.praise.base.IDrawable; +import com.chwl.app.ui.praise.base.IDrawable; public class HiPraiseWithCallback extends HiPraise { diff --git a/app/src/main/java/com/yizhuan/habu/ui/praise/OnDrawCallback.java b/app/src/main/java/com/chwl/app/ui/praise/OnDrawCallback.java similarity index 83% rename from app/src/main/java/com/yizhuan/habu/ui/praise/OnDrawCallback.java rename to app/src/main/java/com/chwl/app/ui/praise/OnDrawCallback.java index b072facbc..9911dca2f 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/praise/OnDrawCallback.java +++ b/app/src/main/java/com/chwl/app/ui/praise/OnDrawCallback.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.praise; +package com.chwl.app.ui.praise; /** * Created by apple on 16/10/20. diff --git a/app/src/main/java/com/yizhuan/habu/ui/praise/PraiseDrawable.java b/app/src/main/java/com/chwl/app/ui/praise/PraiseDrawable.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/praise/PraiseDrawable.java rename to app/src/main/java/com/chwl/app/ui/praise/PraiseDrawable.java index bff131dc0..d105bab95 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/praise/PraiseDrawable.java +++ b/app/src/main/java/com/chwl/app/ui/praise/PraiseDrawable.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.praise; +package com.chwl.app.ui.praise; import android.animation.FloatEvaluator; import android.animation.TimeInterpolator; @@ -13,7 +13,7 @@ import android.view.animation.LinearInterpolator; import androidx.annotation.NonNull; -import com.yizhuan.habu.ui.praise.base.IDrawable; +import com.chwl.app.ui.praise.base.IDrawable; import java.util.Random; diff --git a/app/src/main/java/com/yizhuan/habu/ui/praise/PraiseWithCallbackDrawable.java b/app/src/main/java/com/chwl/app/ui/praise/PraiseWithCallbackDrawable.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/ui/praise/PraiseWithCallbackDrawable.java rename to app/src/main/java/com/chwl/app/ui/praise/PraiseWithCallbackDrawable.java index 45ea5c92a..b6bae421d 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/praise/PraiseWithCallbackDrawable.java +++ b/app/src/main/java/com/chwl/app/ui/praise/PraiseWithCallbackDrawable.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.praise; +package com.chwl.app.ui.praise; import android.graphics.Bitmap; diff --git a/app/src/main/java/com/yizhuan/habu/ui/praise/SimpleDrawTask.java b/app/src/main/java/com/chwl/app/ui/praise/SimpleDrawTask.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/ui/praise/SimpleDrawTask.java rename to app/src/main/java/com/chwl/app/ui/praise/SimpleDrawTask.java index cf3a09f1a..a83775903 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/praise/SimpleDrawTask.java +++ b/app/src/main/java/com/chwl/app/ui/praise/SimpleDrawTask.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.praise; +package com.chwl.app.ui.praise; import android.graphics.Canvas; import android.graphics.Color; @@ -10,8 +10,8 @@ import android.os.Handler; import android.os.HandlerThread; import android.os.SystemClock; -import com.yizhuan.habu.ui.praise.base.IDrawTask; -import com.yizhuan.habu.ui.praise.base.IDrawable; +import com.chwl.app.ui.praise.base.IDrawTask; +import com.chwl.app.ui.praise.base.IDrawable; import java.util.Iterator; import java.util.concurrent.ArrayBlockingQueue; diff --git a/app/src/main/java/com/yizhuan/habu/ui/praise/UpdateThread.java b/app/src/main/java/com/chwl/app/ui/praise/UpdateThread.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/ui/praise/UpdateThread.java rename to app/src/main/java/com/chwl/app/ui/praise/UpdateThread.java index a9767412e..a721565e7 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/praise/UpdateThread.java +++ b/app/src/main/java/com/chwl/app/ui/praise/UpdateThread.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.praise; +package com.chwl.app.ui.praise; /** * @author lim lee 2017/3/10 diff --git a/app/src/main/java/com/yizhuan/habu/ui/praise/Utils.java b/app/src/main/java/com/chwl/app/ui/praise/Utils.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/ui/praise/Utils.java rename to app/src/main/java/com/chwl/app/ui/praise/Utils.java index 9b09d0a62..55797579d 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/praise/Utils.java +++ b/app/src/main/java/com/chwl/app/ui/praise/Utils.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.praise; +package com.chwl.app.ui.praise; import java.util.Random; diff --git a/app/src/main/java/com/yizhuan/habu/ui/praise/base/IDrawTask.java b/app/src/main/java/com/chwl/app/ui/praise/base/IDrawTask.java similarity index 83% rename from app/src/main/java/com/yizhuan/habu/ui/praise/base/IDrawTask.java rename to app/src/main/java/com/chwl/app/ui/praise/base/IDrawTask.java index 522600312..fe9171cb8 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/praise/base/IDrawTask.java +++ b/app/src/main/java/com/chwl/app/ui/praise/base/IDrawTask.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.praise.base; +package com.chwl.app.ui.praise.base; import android.graphics.Canvas; diff --git a/app/src/main/java/com/yizhuan/habu/ui/praise/base/IDrawable.java b/app/src/main/java/com/chwl/app/ui/praise/base/IDrawable.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/ui/praise/base/IDrawable.java rename to app/src/main/java/com/chwl/app/ui/praise/base/IDrawable.java index b74f74b48..b0e010eb7 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/praise/base/IDrawable.java +++ b/app/src/main/java/com/chwl/app/ui/praise/base/IDrawable.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.praise.base; +package com.chwl.app.ui.praise.base; import android.graphics.Canvas; diff --git a/app/src/main/java/com/yizhuan/habu/ui/praise/base/IPraise.java b/app/src/main/java/com/chwl/app/ui/praise/base/IPraise.java similarity index 76% rename from app/src/main/java/com/yizhuan/habu/ui/praise/base/IPraise.java rename to app/src/main/java/com/chwl/app/ui/praise/base/IPraise.java index 84cdddc55..39bfdcbcb 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/praise/base/IPraise.java +++ b/app/src/main/java/com/chwl/app/ui/praise/base/IPraise.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.praise.base; +package com.chwl.app.ui.praise.base; public interface IPraise { diff --git a/app/src/main/java/com/yizhuan/habu/ui/praise/base/IPraiseView.java b/app/src/main/java/com/chwl/app/ui/praise/base/IPraiseView.java similarity index 85% rename from app/src/main/java/com/yizhuan/habu/ui/praise/base/IPraiseView.java rename to app/src/main/java/com/chwl/app/ui/praise/base/IPraiseView.java index 251d088b6..25af21004 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/praise/base/IPraiseView.java +++ b/app/src/main/java/com/chwl/app/ui/praise/base/IPraiseView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.praise.base; +package com.chwl.app.ui.praise.base; public interface IPraiseView { diff --git a/app/src/main/java/com/yizhuan/habu/ui/radish/RadishRecordFragment.java b/app/src/main/java/com/chwl/app/ui/radish/RadishRecordFragment.java similarity index 86% rename from app/src/main/java/com/yizhuan/habu/ui/radish/RadishRecordFragment.java rename to app/src/main/java/com/chwl/app/ui/radish/RadishRecordFragment.java index 29f87f7ab..5748780dc 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/radish/RadishRecordFragment.java +++ b/app/src/main/java/com/chwl/app/ui/radish/RadishRecordFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.radish; +package com.chwl.app.ui.radish; import android.os.Bundle; import android.text.TextUtils; @@ -7,19 +7,19 @@ import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.habu.R; -import com.yizhuan.habu.bills.adapter.BillBaseAdapter; -import com.yizhuan.habu.bills.fragmemt.BaseBillsFragment; -import com.yizhuan.habu.radish.adapter.RadishRecordAdapter; -import com.yizhuan.habu.radish.presenter.RadishRecordFrgPresenter; -import com.yizhuan.habu.radish.view.IRadishRecordFrgView; -import com.yizhuan.habu.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.chwl.app.R; +import com.chwl.app.bills.adapter.BillBaseAdapter; +import com.chwl.app.bills.fragmemt.BaseBillsFragment; +import com.chwl.app.radish.adapter.RadishRecordAdapter; +import com.chwl.app.radish.presenter.RadishRecordFrgPresenter; +import com.chwl.app.radish.view.IRadishRecordFrgView; +import com.chwl.app.ui.widget.RecyclerViewNoBugLinearLayoutManager; +import com.chwl.core.Constants; +import com.chwl.core.bills.bean.BillItemEntity; +import com.chwl.core.bills.bean.RadishRecordInfo; +import com.chwl.core.bills.bean.RadishRecordListInfo; +import com.chwl.library.base.factory.CreatePresenter; +import com.chwl.library.utils.ListUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/relation/AttentionListActivity.java b/app/src/main/java/com/chwl/app/ui/relation/AttentionListActivity.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/ui/relation/AttentionListActivity.java rename to app/src/main/java/com/chwl/app/ui/relation/AttentionListActivity.java index a4ef78023..cce5d6549 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/relation/AttentionListActivity.java +++ b/app/src/main/java/com/chwl/app/ui/relation/AttentionListActivity.java @@ -1,6 +1,6 @@ -package com.yizhuan.habu.ui.relation; +package com.chwl.app.ui.relation; -import static com.yizhuan.habu.R.id.swipe_refresh; +import static com.chwl.app.R.id.swipe_refresh; import android.annotation.SuppressLint; import android.content.Context; @@ -14,18 +14,18 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.chad.library.adapter.base.BaseQuickAdapter; import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.habu.R; -import com.yizhuan.habu.avroom.activity.AVRoomActivity; -import com.yizhuan.habu.base.BaseActivity; -import com.yizhuan.habu.common.NoDataFragment; -import com.yizhuan.habu.ui.relation.adapter.AttentionListAdapter; -import com.yizhuan.habu.ui.user.activity.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.AttentionInfo; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.chwl.app.R; +import com.chwl.app.avroom.activity.AVRoomActivity; +import com.chwl.app.base.BaseActivity; +import com.chwl.app.common.NoDataFragment; +import com.chwl.app.ui.relation.adapter.AttentionListAdapter; +import com.chwl.app.ui.user.activity.UserInfoActivity; +import com.chwl.core.Constants; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.praise.event.PraiseEvent; +import com.chwl.core.user.AttentionModel; +import com.chwl.core.user.bean.AttentionInfo; +import com.chwl.library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/habu/ui/relation/FansListActivity.kt b/app/src/main/java/com/chwl/app/ui/relation/FansListActivity.kt similarity index 90% rename from app/src/main/java/com/yizhuan/habu/ui/relation/FansListActivity.kt rename to app/src/main/java/com/chwl/app/ui/relation/FansListActivity.kt index 328bc9f3b..9678d075b 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/relation/FansListActivity.kt +++ b/app/src/main/java/com/chwl/app/ui/relation/FansListActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.relation +package com.chwl.app.ui.relation import android.content.Context import android.content.Intent @@ -10,13 +10,13 @@ import android.widget.TextView import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import com.netease.nim.uikit.StatusBarUtil -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseActivity -import com.yizhuan.habu.friend.action.AbstractSelectFriendAction -import com.yizhuan.habu.home.fragment.AttentionFragment -import com.yizhuan.habu.ui.im.friend.FriendListFragment -import com.yizhuan.habu.ui.search.SearchActivity -import com.yizhuan.xchat_android_core.Constants +import com.chwl.app.R +import com.chwl.app.base.BaseActivity +import com.chwl.app.friend.action.AbstractSelectFriendAction +import com.chwl.app.home.fragment.AttentionFragment +import com.chwl.app.ui.im.friend.FriendListFragment +import com.chwl.app.ui.search.SearchActivity +import com.chwl.core.Constants /** * 粉丝列表 diff --git a/app/src/main/java/com/yizhuan/habu/ui/relation/FansListFragment.java b/app/src/main/java/com/chwl/app/ui/relation/FansListFragment.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/ui/relation/FansListFragment.java rename to app/src/main/java/com/chwl/app/ui/relation/FansListFragment.java index 7b959a26d..2c51b80df 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/relation/FansListFragment.java +++ b/app/src/main/java/com/chwl/app/ui/relation/FansListFragment.java @@ -1,6 +1,6 @@ -package com.yizhuan.habu.ui.relation; +package com.chwl.app.ui.relation; -import static com.yizhuan.habu.friend.action.AbstractSelectFriendAction.ROOM_MSG; +import static com.chwl.app.friend.action.AbstractSelectFriendAction.ROOM_MSG; import android.annotation.SuppressLint; import android.app.Activity; @@ -13,25 +13,25 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseFragment; -import com.yizhuan.habu.common.NoDataFragment; -import com.yizhuan.habu.friend.action.AbstractSelectFriendAction; -import com.yizhuan.habu.friend.view.SelectFriendActivity; -import com.yizhuan.habu.ui.relation.adapter.FansViewAdapter; -import com.yizhuan.habu.ui.user.activity.UserInfoActivity; -import com.yizhuan.habu.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.chwl.app.R; +import com.chwl.app.base.BaseFragment; +import com.chwl.app.common.NoDataFragment; +import com.chwl.app.friend.action.AbstractSelectFriendAction; +import com.chwl.app.friend.view.SelectFriendActivity; +import com.chwl.app.ui.relation.adapter.FansViewAdapter; +import com.chwl.app.ui.user.activity.UserInfoActivity; +import com.chwl.app.room_chat.activity.NimRoomP2PMessageActivity; +import com.chwl.core.Constants; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.im.friend.IMFriendModel; +import com.chwl.core.praise.PraiseModel; +import com.chwl.core.praise.event.PraiseEvent; +import com.chwl.core.user.AttentionModel; +import com.chwl.core.user.bean.FansInfo; +import com.chwl.core.user.bean.FansListInfo; +import com.chwl.core.user.event.LoginUserInfoUpdateEvent; +import com.chwl.core.utils.SystemUidUtil; +import com.chwl.library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/habu/ui/relation/adapter/AttentionListAdapter.java b/app/src/main/java/com/chwl/app/ui/relation/adapter/AttentionListAdapter.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/ui/relation/adapter/AttentionListAdapter.java rename to app/src/main/java/com/chwl/app/ui/relation/adapter/AttentionListAdapter.java index da06b6554..585430e47 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/relation/adapter/AttentionListAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/relation/adapter/AttentionListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.relation.adapter; +package com.chwl.app.ui.relation.adapter; import android.text.TextUtils; import android.view.View; @@ -7,16 +7,16 @@ import androidx.appcompat.widget.AppCompatImageView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.R; -import com.yizhuan.habu.friend.action.AbstractSelectFriendAction; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.habu.ui.widget.NobleAvatarView; -import com.yizhuan.habu.view.GenderAgeTextView; -import com.yizhuan.habu.vip.util.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.chwl.app.R; +import com.chwl.app.friend.action.AbstractSelectFriendAction; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.app.ui.widget.NobleAvatarView; +import com.chwl.app.view.GenderAgeTextView; +import com.chwl.app.vip.util.VipHelper; +import com.chwl.core.Constants; +import com.chwl.core.noble.NobleUtil; +import com.chwl.core.user.bean.AttentionInfo; +import com.chwl.core.utils.StringExtensionKt; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/relation/adapter/FansViewAdapter.java b/app/src/main/java/com/chwl/app/ui/relation/adapter/FansViewAdapter.java similarity index 89% rename from app/src/main/java/com/yizhuan/habu/ui/relation/adapter/FansViewAdapter.java rename to app/src/main/java/com/chwl/app/ui/relation/adapter/FansViewAdapter.java index ee6b60b39..fc17cb055 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/relation/adapter/FansViewAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/relation/adapter/FansViewAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.relation.adapter; +package com.chwl.app.ui.relation.adapter; import android.text.TextUtils; import android.view.View; @@ -8,17 +8,17 @@ import androidx.appcompat.widget.AppCompatImageView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.R; -import com.yizhuan.habu.friend.action.AbstractSelectFriendAction; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.habu.ui.widget.NobleAvatarView; -import com.yizhuan.habu.view.GenderAgeTextView; -import com.yizhuan.habu.vip.util.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.friend.action.AbstractSelectFriendAction; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.app.ui.widget.NobleAvatarView; +import com.chwl.app.view.GenderAgeTextView; +import com.chwl.app.vip.util.VipHelper; +import com.chwl.core.im.friend.IMFriendModel; +import com.chwl.core.noble.NobleUtil; +import com.chwl.core.user.bean.FansInfo; +import com.chwl.core.utils.StringExtensionKt; +import com.chwl.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/search/RoomHistoryAdapter.java b/app/src/main/java/com/chwl/app/ui/search/RoomHistoryAdapter.java similarity index 79% rename from app/src/main/java/com/yizhuan/habu/ui/search/RoomHistoryAdapter.java rename to app/src/main/java/com/chwl/app/ui/search/RoomHistoryAdapter.java index 39e1480f3..54fbce35e 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/search/RoomHistoryAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/search/RoomHistoryAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.search; +package com.chwl.app.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.habu.R; -import com.yizhuan.habu.common.widget.CircleImageView; -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.bean.RoomHistoryInfo; +import com.chwl.app.R; +import com.chwl.app.common.widget.CircleImageView; +import com.chwl.app.ui.utils.ImageLoadUtilsV2; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.core.bean.RoomHistoryInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/search/SearchActivity.java b/app/src/main/java/com/chwl/app/ui/search/SearchActivity.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/ui/search/SearchActivity.java rename to app/src/main/java/com/chwl/app/ui/search/SearchActivity.java index ff85e5560..cef8053a5 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/search/SearchActivity.java +++ b/app/src/main/java/com/chwl/app/ui/search/SearchActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.search; +package com.chwl.app.ui.search; import android.app.Activity; import android.content.Context; @@ -23,40 +23,40 @@ 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.habu.R; -import com.yizhuan.habu.avroom.activity.AVRoomActivity; -import com.yizhuan.habu.base.BaseMvpActivity; -import com.yizhuan.habu.common.ViewPagerAdapter; -import com.yizhuan.habu.common.widget.dialog.DialogManager; -import com.yizhuan.habu.decoration.helper.DecorationDialogHelper; -import com.yizhuan.habu.decoration.helper.DecorationSaleType; -import com.yizhuan.habu.friend.action.AbstractSelectFriendAction; -import com.yizhuan.habu.friend.view.SelectFriendActivity; -import com.yizhuan.habu.home.adapter.ContactsIndicatorAdapter; -import com.yizhuan.habu.ui.search.presenter.SearchPresenter; -import com.yizhuan.habu.ui.search.view.ISearchView; -import com.yizhuan.habu.ui.widget.magicindicator.MagicIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.ViewPagerHelper; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; -import com.yizhuan.habu.ui.widget.recyclerview.decoration.VerticalDecoration; -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.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.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.SizeUtils; +import com.chwl.app.R; +import com.chwl.app.avroom.activity.AVRoomActivity; +import com.chwl.app.base.BaseMvpActivity; +import com.chwl.app.common.ViewPagerAdapter; +import com.chwl.app.common.widget.dialog.DialogManager; +import com.chwl.app.decoration.helper.DecorationDialogHelper; +import com.chwl.app.decoration.helper.DecorationSaleType; +import com.chwl.app.friend.action.AbstractSelectFriendAction; +import com.chwl.app.friend.view.SelectFriendActivity; +import com.chwl.app.home.adapter.ContactsIndicatorAdapter; +import com.chwl.app.ui.search.presenter.SearchPresenter; +import com.chwl.app.ui.search.view.ISearchView; +import com.chwl.app.ui.widget.magicindicator.MagicIndicator; +import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.chwl.app.ui.widget.recyclerview.decoration.VerticalDecoration; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.bean.RoomHistoryInfo; +import com.chwl.core.community.dynamic.DynamicModel; +import com.chwl.core.community.im.DynamicImMsg; +import com.chwl.core.community.im.WorldDynamicAttachment; +import com.chwl.core.decoration.car.bean.CarInfo; +import com.chwl.core.decoration.headwear.bean.HeadWearInfo; +import com.chwl.core.manager.IMNetEaseManager; +import com.chwl.core.relation.cp.CpBindUnbindEvent; +import com.chwl.core.room.bean.SearchRoomInfo; +import com.chwl.core.utils.SharedPreferenceUtils; +import com.chwl.core.utils.net.DontWarnObserver; +import com.chwl.library.base.factory.CreatePresenter; +import com.chwl.library.utils.ImeUtil; +import com.chwl.library.utils.JavaUtil; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; +import com.chwl.library.utils.SizeUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/habu/ui/search/SearchAdapter.java b/app/src/main/java/com/chwl/app/ui/search/SearchAdapter.java similarity index 92% rename from app/src/main/java/com/yizhuan/habu/ui/search/SearchAdapter.java rename to app/src/main/java/com/chwl/app/ui/search/SearchAdapter.java index 5056f42d8..a881e8c72 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/search/SearchAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/search/SearchAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.search; +package com.chwl.app.ui.search; import android.content.Context; import android.view.View; @@ -11,15 +11,15 @@ import androidx.core.content.ContextCompat; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.coorchice.library.SuperTextView; -import com.yizhuan.habu.R; -import com.yizhuan.habu.avroom.activity.AVRoomActivity; -import com.yizhuan.habu.friend.action.AbstractSelectFriendAction; -import com.yizhuan.habu.ui.user.activity.UserInfoActivity; -import com.yizhuan.habu.ui.widget.NobleAvatarView; -import com.yizhuan.habu.utils.RegexUtil; -import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.avroom.activity.AVRoomActivity; +import com.chwl.app.friend.action.AbstractSelectFriendAction; +import com.chwl.app.ui.user.activity.UserInfoActivity; +import com.chwl.app.ui.widget.NobleAvatarView; +import com.chwl.app.utils.RegexUtil; +import com.chwl.core.room.bean.SearchRoomInfo; +import com.chwl.core.user.UserModel; +import com.chwl.library.utils.ResUtil; /** * @author chenran diff --git a/app/src/main/java/com/yizhuan/habu/ui/search/SearchDetailFragment.java b/app/src/main/java/com/chwl/app/ui/search/SearchDetailFragment.java similarity index 85% rename from app/src/main/java/com/yizhuan/habu/ui/search/SearchDetailFragment.java rename to app/src/main/java/com/chwl/app/ui/search/SearchDetailFragment.java index 81629e194..f950d6c5a 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/search/SearchDetailFragment.java +++ b/app/src/main/java/com/chwl/app/ui/search/SearchDetailFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.search; +package com.chwl.app.ui.search; import android.os.Bundle; import android.text.style.ForegroundColorSpan; @@ -7,26 +7,26 @@ import androidx.annotation.Nullable; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.yizhuan.habu.R; -import com.yizhuan.habu.avroom.widget.MessageView; -import com.yizhuan.habu.base.BaseMvpFragment; -import com.yizhuan.habu.common.widget.dialog.DialogManager; -import com.yizhuan.habu.decoration.helper.DecorationHelper; -import com.yizhuan.habu.friend.action.AbstractSelectFriendAction; -import com.yizhuan.habu.module_hall.HallDataManager; -import com.yizhuan.habu.module_hall.hall.activity.HallSearchActivity; -import com.yizhuan.habu.ui.im.avtivity.NimP2PMessageActivity; -import com.yizhuan.habu.ui.im.friend.FriendFragmentCpDelegate; -import com.yizhuan.habu.ui.search.presenter.SearchPresenter; -import com.yizhuan.habu.ui.search.view.ISearchView; -import com.yizhuan.xchat_android_core.bean.RoomHistoryInfo; -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.utils.net.BeanObserver; -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.ResUtil; +import com.chwl.app.R; +import com.chwl.app.avroom.widget.MessageView; +import com.chwl.app.base.BaseMvpFragment; +import com.chwl.app.common.widget.dialog.DialogManager; +import com.chwl.app.decoration.helper.DecorationHelper; +import com.chwl.app.friend.action.AbstractSelectFriendAction; +import com.chwl.app.module_hall.HallDataManager; +import com.chwl.app.module_hall.hall.activity.HallSearchActivity; +import com.chwl.app.ui.im.avtivity.NimP2PMessageActivity; +import com.chwl.app.ui.im.friend.FriendFragmentCpDelegate; +import com.chwl.app.ui.search.presenter.SearchPresenter; +import com.chwl.app.ui.search.view.ISearchView; +import com.chwl.core.bean.RoomHistoryInfo; +import com.chwl.core.module_hall.hall.HallModel; +import com.chwl.core.room.bean.SearchRoomInfo; +import com.chwl.core.utils.net.BeanObserver; +import com.chwl.core.utils.net.RxHelper; +import com.chwl.library.base.factory.CreatePresenter; +import com.chwl.library.utils.JavaUtil; +import com.chwl.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/search/SearchHallActivity.java b/app/src/main/java/com/chwl/app/ui/search/SearchHallActivity.java similarity index 87% rename from app/src/main/java/com/yizhuan/habu/ui/search/SearchHallActivity.java rename to app/src/main/java/com/chwl/app/ui/search/SearchHallActivity.java index d34c2b176..f99b42464 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/search/SearchHallActivity.java +++ b/app/src/main/java/com/chwl/app/ui/search/SearchHallActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.search; +package com.chwl.app.ui.search; import android.content.Context; import android.content.Intent; @@ -18,23 +18,23 @@ import androidx.fragment.app.Fragment; import androidx.viewpager.widget.ViewPager; import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseMvpActivity; -import com.yizhuan.habu.common.ViewPagerAdapter; -import com.yizhuan.habu.friend.action.AbstractSelectFriendAction; -import com.yizhuan.habu.friend.view.SelectFriendActivity; -import com.yizhuan.habu.home.adapter.ContactsIndicatorAdapter; -import com.yizhuan.habu.ui.search.presenter.SearchPresenter; -import com.yizhuan.habu.ui.search.view.ISearchView; -import com.yizhuan.habu.ui.widget.magicindicator.MagicIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.ViewPagerHelper; -import com.yizhuan.habu.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.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseMvpActivity; +import com.chwl.app.common.ViewPagerAdapter; +import com.chwl.app.friend.action.AbstractSelectFriendAction; +import com.chwl.app.friend.view.SelectFriendActivity; +import com.chwl.app.home.adapter.ContactsIndicatorAdapter; +import com.chwl.app.ui.search.presenter.SearchPresenter; +import com.chwl.app.ui.search.view.ISearchView; +import com.chwl.app.ui.widget.magicindicator.MagicIndicator; +import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.chwl.core.bean.RoomHistoryInfo; +import com.chwl.core.room.bean.SearchRoomInfo; +import com.chwl.library.base.factory.CreatePresenter; +import com.chwl.library.utils.ImeUtil; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/search/SearchHistoryAdapter.java b/app/src/main/java/com/chwl/app/ui/search/SearchHistoryAdapter.java similarity index 92% rename from app/src/main/java/com/yizhuan/habu/ui/search/SearchHistoryAdapter.java rename to app/src/main/java/com/chwl/app/ui/search/SearchHistoryAdapter.java index ccd38a7c3..96f58bf03 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/search/SearchHistoryAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/search/SearchHistoryAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.search; +package com.chwl.app.ui.search; import android.text.TextUtils; @@ -6,7 +6,7 @@ import androidx.annotation.Nullable; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.R; +import com.chwl.app.R; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/search/event/SearchEvent.java b/app/src/main/java/com/chwl/app/ui/search/event/SearchEvent.java similarity index 76% rename from app/src/main/java/com/yizhuan/habu/ui/search/event/SearchEvent.java rename to app/src/main/java/com/chwl/app/ui/search/event/SearchEvent.java index 395c5e85e..2dae37b49 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/search/event/SearchEvent.java +++ b/app/src/main/java/com/chwl/app/ui/search/event/SearchEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.search.event; +package com.chwl.app.ui.search.event; public class SearchEvent { public String inPutText; diff --git a/app/src/main/java/com/yizhuan/habu/ui/search/presenter/SearchPresenter.java b/app/src/main/java/com/chwl/app/ui/search/presenter/SearchPresenter.java similarity index 85% rename from app/src/main/java/com/yizhuan/habu/ui/search/presenter/SearchPresenter.java rename to app/src/main/java/com/chwl/app/ui/search/presenter/SearchPresenter.java index a8fd3480f..ca0624790 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/search/presenter/SearchPresenter.java +++ b/app/src/main/java/com/chwl/app/ui/search/presenter/SearchPresenter.java @@ -1,19 +1,19 @@ -package com.yizhuan.habu.ui.search.presenter; +package com.chwl.app.ui.search.presenter; import android.annotation.SuppressLint; import android.os.Bundle; import androidx.annotation.Nullable; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseMvpPresenter; -import com.yizhuan.habu.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.ResUtil; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.chwl.app.R; +import com.chwl.app.base.BaseMvpPresenter; +import com.chwl.app.ui.search.view.ISearchView; +import com.chwl.core.room.bean.SearchRoomInfo; +import com.chwl.core.room.model.AvRoomModel; +import com.chwl.core.user.UserModel; +import com.chwl.library.utils.NetworkUtils; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.config.BasicConfig; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/search/view/ISearchView.java b/app/src/main/java/com/chwl/app/ui/search/view/ISearchView.java similarity index 67% rename from app/src/main/java/com/yizhuan/habu/ui/search/view/ISearchView.java rename to app/src/main/java/com/chwl/app/ui/search/view/ISearchView.java index 3cc81ecf0..c0f05f41d 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/search/view/ISearchView.java +++ b/app/src/main/java/com/chwl/app/ui/search/view/ISearchView.java @@ -1,8 +1,8 @@ -package com.yizhuan.habu.ui.search.view; +package com.chwl.app.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.chwl.core.bean.RoomHistoryInfo; +import com.chwl.core.room.bean.SearchRoomInfo; +import com.chwl.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/setting/FeedbackActivity.java b/app/src/main/java/com/chwl/app/ui/setting/FeedbackActivity.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/ui/setting/FeedbackActivity.java rename to app/src/main/java/com/chwl/app/ui/setting/FeedbackActivity.java index cb2087a45..532822c37 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/setting/FeedbackActivity.java +++ b/app/src/main/java/com/chwl/app/ui/setting/FeedbackActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.setting; +package com.chwl.app.ui.setting; import android.content.Context; import android.content.Intent; @@ -8,11 +8,11 @@ import android.widget.EditText; import com.netease.nim.uikit.StatusBarUtil; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseActivity; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.home.model.HomeModel; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseActivity; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.home.model.HomeModel; +import com.chwl.library.utils.ResUtil; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; diff --git a/app/src/main/java/com/yizhuan/habu/ui/setting/GrantedPermissionsActivity.kt b/app/src/main/java/com/chwl/app/ui/setting/GrantedPermissionsActivity.kt similarity index 88% rename from app/src/main/java/com/yizhuan/habu/ui/setting/GrantedPermissionsActivity.kt rename to app/src/main/java/com/chwl/app/ui/setting/GrantedPermissionsActivity.kt index f29de0613..a1ef56cf0 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/setting/GrantedPermissionsActivity.kt +++ b/app/src/main/java/com/chwl/app/ui/setting/GrantedPermissionsActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.setting +package com.chwl.app.ui.setting import android.content.Context import android.content.Intent @@ -11,15 +11,15 @@ 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.habu.R -import com.yizhuan.habu.base.BaseActivity -import com.yizhuan.habu.common.EmptyViewHelper -import com.yizhuan.habu.ui.setting.bean.PermissionEntity -import com.yizhuan.habu.ui.utils.RVDelegate -import com.yizhuan.habu.ui.widget.DividerItemDecoration -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil -import com.yizhuan.habu.utils.PermissionUtil -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.base.BaseActivity +import com.chwl.app.common.EmptyViewHelper +import com.chwl.app.ui.setting.bean.PermissionEntity +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.app.ui.widget.DividerItemDecoration +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil +import com.chwl.app.utils.PermissionUtil +import com.chwl.library.utils.ResUtil import io.reactivex.Completable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/com/yizhuan/habu/ui/setting/LabActivity.java b/app/src/main/java/com/chwl/app/ui/setting/LabActivity.java similarity index 87% rename from app/src/main/java/com/yizhuan/habu/ui/setting/LabActivity.java rename to app/src/main/java/com/chwl/app/ui/setting/LabActivity.java index b696d58a1..379ff54a7 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/setting/LabActivity.java +++ b/app/src/main/java/com/chwl/app/ui/setting/LabActivity.java @@ -1,16 +1,16 @@ -package com.yizhuan.habu.ui.setting; +package com.chwl.app.ui.setting; import android.os.Bundle; import android.view.View; import android.widget.RadioButton; import android.widget.RadioGroup; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseActivity; -import com.yizhuan.habu.ui.utils.ImageLoadKt; -import com.yizhuan.xchat_android_library.common.application.Env; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseActivity; +import com.chwl.app.ui.utils.ImageLoadKt; +import com.chwl.library.common.application.Env; +import com.chwl.core.auth.AuthModel; +import com.chwl.library.utils.ResUtil; diff --git a/app/src/main/java/com/yizhuan/habu/ui/setting/ModifyPwdActivity.java b/app/src/main/java/com/chwl/app/ui/setting/ModifyPwdActivity.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/ui/setting/ModifyPwdActivity.java rename to app/src/main/java/com/chwl/app/ui/setting/ModifyPwdActivity.java index 967709f3d..5735dbf15 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/setting/ModifyPwdActivity.java +++ b/app/src/main/java/com/chwl/app/ui/setting/ModifyPwdActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.setting; +package com.chwl.app.ui.setting; import android.annotation.SuppressLint; import android.content.Context; @@ -10,18 +10,18 @@ import android.text.TextWatcher; import android.view.View; import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseBindingActivity; -import com.yizhuan.habu.databinding.ActivityModifyPwdBinding; -import com.yizhuan.habu.ui.login.CodeDownTimer; -import com.yizhuan.habu.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.user.UserModel; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.TextWatcherWrapper; +import com.chwl.app.R; +import com.chwl.app.base.BaseBindingActivity; +import com.chwl.app.databinding.ActivityModifyPwdBinding; +import com.chwl.app.ui.login.CodeDownTimer; +import com.chwl.app.ui.login.PasswordValidator; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.auth.event.LogoutEvent; +import com.chwl.core.user.UserModel; +import com.chwl.core.utils.net.BeanObserver; +import com.chwl.library.annatation.ActLayoutRes; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.TextWatcherWrapper; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/habu/ui/setting/NoticeSettingActivity.java b/app/src/main/java/com/chwl/app/ui/setting/NoticeSettingActivity.java similarity index 92% rename from app/src/main/java/com/yizhuan/habu/ui/setting/NoticeSettingActivity.java rename to app/src/main/java/com/chwl/app/ui/setting/NoticeSettingActivity.java index 11c62c0cc..b95be7d6d 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/setting/NoticeSettingActivity.java +++ b/app/src/main/java/com/chwl/app/ui/setting/NoticeSettingActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.setting; +package com.chwl.app.ui.setting; import android.annotation.SuppressLint; import android.content.Context; @@ -10,14 +10,14 @@ import android.widget.TextView; import com.netease.nim.uikit.StatusBarUtil; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseViewBindingActivity; -import com.yizhuan.habu.common.widget.TutuSwitchView; -import com.yizhuan.habu.databinding.ActivityNoticeSettingBinding; -import com.yizhuan.xchat_android_core.settings.SettingsModel; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.widget.IOSSwitchView; +import com.chwl.app.R; +import com.chwl.app.base.BaseViewBindingActivity; +import com.chwl.app.common.widget.TutuSwitchView; +import com.chwl.app.databinding.ActivityNoticeSettingBinding; +import com.chwl.core.settings.SettingsModel; +import com.chwl.core.utils.net.DontWarnObserver; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.widget.IOSSwitchView; /** * create by lvzebiao @2019/12/23 diff --git a/app/src/main/java/com/yizhuan/habu/ui/setting/PermissionGuideActivity.kt b/app/src/main/java/com/chwl/app/ui/setting/PermissionGuideActivity.kt similarity index 86% rename from app/src/main/java/com/yizhuan/habu/ui/setting/PermissionGuideActivity.kt rename to app/src/main/java/com/chwl/app/ui/setting/PermissionGuideActivity.kt index 85fa1eea6..432c43096 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/setting/PermissionGuideActivity.kt +++ b/app/src/main/java/com/chwl/app/ui/setting/PermissionGuideActivity.kt @@ -1,14 +1,14 @@ -package com.yizhuan.habu.ui.setting +package com.chwl.app.ui.setting import android.content.Context import android.content.Intent import android.view.View -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingActivity -import com.yizhuan.habu.databinding.ActivityPermissionGuideBinding -import com.yizhuan.habu.ui.webview.CommonWebViewActivity -import com.yizhuan.xchat_android_core.UriProvider -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingActivity +import com.chwl.app.databinding.ActivityPermissionGuideBinding +import com.chwl.app.ui.webview.CommonWebViewActivity +import com.chwl.core.UriProvider +import com.chwl.library.utils.ResUtil class PermissionGuideActivity : BaseViewBindingActivity(), View.OnClickListener { diff --git a/app/src/main/java/com/yizhuan/habu/ui/setting/PrivacySettingActivity.java b/app/src/main/java/com/chwl/app/ui/setting/PrivacySettingActivity.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/ui/setting/PrivacySettingActivity.java rename to app/src/main/java/com/chwl/app/ui/setting/PrivacySettingActivity.java index 75e8a6555..c68495569 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/setting/PrivacySettingActivity.java +++ b/app/src/main/java/com/chwl/app/ui/setting/PrivacySettingActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.setting; +package com.chwl.app.ui.setting; import android.annotation.SuppressLint; import android.content.Context; @@ -7,15 +7,15 @@ import android.text.TextUtils; import com.netease.nim.uikit.StatusBarUtil; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseViewBindingActivity; -import com.yizhuan.habu.databinding.ActivityPrivacySettingBinding; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.settings.SettingsModel; -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.chwl.app.R; +import com.chwl.app.base.BaseViewBindingActivity; +import com.chwl.app.databinding.ActivityPrivacySettingBinding; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.settings.SettingsModel; +import com.chwl.core.user.UserModel; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.core.utils.net.RxHelper; +import com.chwl.library.widget.IOSSwitchView; import java.util.concurrent.CancellationException; diff --git a/app/src/main/java/com/yizhuan/habu/ui/setting/ResetPasswordActivity.kt b/app/src/main/java/com/chwl/app/ui/setting/ResetPasswordActivity.kt similarity index 92% rename from app/src/main/java/com/yizhuan/habu/ui/setting/ResetPasswordActivity.kt rename to app/src/main/java/com/chwl/app/ui/setting/ResetPasswordActivity.kt index 8de8454a9..2ed5ec2ea 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/setting/ResetPasswordActivity.kt +++ b/app/src/main/java/com/chwl/app/ui/setting/ResetPasswordActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.setting +package com.chwl.app.ui.setting import android.annotation.SuppressLint import android.content.Context @@ -12,17 +12,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.habu.R -import com.yizhuan.habu.base.BaseViewBindingActivity -import com.yizhuan.habu.databinding.ActivityResetLoginPwdBinding -import com.yizhuan.habu.ui.login.AreaCodeActivity -import com.yizhuan.habu.ui.login.BindPhoneActivity -import com.yizhuan.habu.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.utils.ResUtil -import com.yizhuan.xchat_android_library.utils.TextWatcherWrapper +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingActivity +import com.chwl.app.databinding.ActivityResetLoginPwdBinding +import com.chwl.app.ui.login.AreaCodeActivity +import com.chwl.app.ui.login.BindPhoneActivity +import com.chwl.app.ui.login.helper.LogoutHelper +import com.chwl.core.auth.AuthModel +import com.chwl.core.code.CodeType +import com.chwl.core.user.UserModel +import com.chwl.library.utils.ResUtil +import com.chwl.library.utils.TextWatcherWrapper import io.reactivex.SingleObserver import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable diff --git a/app/src/main/java/com/yizhuan/habu/ui/setting/SettingActivity.kt b/app/src/main/java/com/chwl/app/ui/setting/SettingActivity.kt similarity index 86% rename from app/src/main/java/com/yizhuan/habu/ui/setting/SettingActivity.kt rename to app/src/main/java/com/chwl/app/ui/setting/SettingActivity.kt index ce9177e87..a612bac07 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/setting/SettingActivity.kt +++ b/app/src/main/java/com/chwl/app/ui/setting/SettingActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.setting +package com.chwl.app.ui.setting import android.annotation.SuppressLint import android.content.Intent @@ -8,31 +8,31 @@ import android.text.SpannableString import android.view.View import com.example.lib_utils.log.ILog import com.netease.nim.uikit.StatusBarUtil -import com.yizhuan.habu.upgrade.AppUpgradeHelper -import com.yizhuan.habu.BuildConfig -import com.yizhuan.habu.R -import com.yizhuan.habu.UIHelper -import com.yizhuan.habu.base.BaseViewBindingActivity -import com.yizhuan.habu.common.widget.dialog.DialogManager.OkCancelDialogListener -import com.yizhuan.habu.databinding.ActivitySettingBinding -import com.yizhuan.habu.ui.im.avtivity.BlackListManageActivity -import com.yizhuan.habu.ui.login.BindPhoneActivity -import com.yizhuan.habu.ui.login.ShowBindPhoneActivity -import com.yizhuan.habu.ui.login.helper.LogoutHelper -import com.yizhuan.habu.ui.user.activity.AboutActivity -import com.yizhuan.habu.ui.webview.CommonWebViewActivity -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_library.common.SpConstants -import com.yizhuan.xchat_android_library.common.file.FileHelper -import com.yizhuan.xchat_android_library.common.util.SPUtils -import com.yizhuan.xchat_android_library.utils.ResUtil -import com.yizhuan.xchat_android_library.utils.config.BasicConfig -import com.yizhuan.xchat_android_library.utils.file.JXFileUtils +import com.chwl.app.upgrade.AppUpgradeHelper +import com.chwl.app.BuildConfig +import com.chwl.app.R +import com.chwl.app.UIHelper +import com.chwl.app.base.BaseViewBindingActivity +import com.chwl.app.common.widget.dialog.DialogManager.OkCancelDialogListener +import com.chwl.app.databinding.ActivitySettingBinding +import com.chwl.app.ui.im.avtivity.BlackListManageActivity +import com.chwl.app.ui.login.BindPhoneActivity +import com.chwl.app.ui.login.ShowBindPhoneActivity +import com.chwl.app.ui.login.helper.LogoutHelper +import com.chwl.app.ui.user.activity.AboutActivity +import com.chwl.app.ui.webview.CommonWebViewActivity +import com.chwl.core.UriProvider +import com.chwl.core.auth.AuthModel +import com.chwl.core.auth.event.LogoutEvent +import com.chwl.core.user.UserModel +import com.chwl.core.user.bean.UserInfo +import com.chwl.core.utils.SharedPreferenceUtils +import com.chwl.library.common.SpConstants +import com.chwl.library.common.file.FileHelper +import com.chwl.library.common.util.SPUtils +import com.chwl.library.utils.ResUtil +import com.chwl.library.utils.config.BasicConfig +import com.chwl.library.utils.file.JXFileUtils import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/yizhuan/habu/ui/setting/ShieldManageActivity.kt b/app/src/main/java/com/chwl/app/ui/setting/ShieldManageActivity.kt similarity index 86% rename from app/src/main/java/com/yizhuan/habu/ui/setting/ShieldManageActivity.kt rename to app/src/main/java/com/chwl/app/ui/setting/ShieldManageActivity.kt index ee808b273..ff7783c04 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/setting/ShieldManageActivity.kt +++ b/app/src/main/java/com/chwl/app/ui/setting/ShieldManageActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.setting +package com.chwl.app.ui.setting import android.annotation.SuppressLint import android.content.Context @@ -6,14 +6,14 @@ import android.content.Intent import androidx.activity.viewModels import androidx.recyclerview.widget.LinearLayoutManager import com.netease.nim.uikit.StatusBarUtil -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingActivity -import com.yizhuan.habu.common.EmptyViewHelper -import com.yizhuan.habu.databinding.ActivityShieldManageBinding -import com.yizhuan.habu.ui.setting.adapter.RoomShieldAdapter -import com.yizhuan.habu.ui.setting.viewmodel.SetViewModel -import com.yizhuan.habu.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.set.bean.ShieldInfo +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingActivity +import com.chwl.app.common.EmptyViewHelper +import com.chwl.app.databinding.ActivityShieldManageBinding +import com.chwl.app.ui.setting.adapter.RoomShieldAdapter +import com.chwl.app.ui.setting.viewmodel.SetViewModel +import com.chwl.app.ui.utils.RVDelegate +import com.chwl.core.set.bean.ShieldInfo /** * author: wushaocheng diff --git a/app/src/main/java/com/yizhuan/habu/ui/setting/VerifyPhoneActivity.kt b/app/src/main/java/com/chwl/app/ui/setting/VerifyPhoneActivity.kt similarity index 92% rename from app/src/main/java/com/yizhuan/habu/ui/setting/VerifyPhoneActivity.kt rename to app/src/main/java/com/chwl/app/ui/setting/VerifyPhoneActivity.kt index c5949c1ac..b8a1d2710 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/setting/VerifyPhoneActivity.kt +++ b/app/src/main/java/com/chwl/app/ui/setting/VerifyPhoneActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.setting +package com.chwl.app.ui.setting import android.annotation.SuppressLint import android.app.Activity @@ -11,16 +11,16 @@ import android.text.TextWatcher import android.view.View import androidx.core.content.ContextCompat import com.netease.nim.uikit.StatusBarUtil -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingActivity -import com.yizhuan.habu.databinding.ActivityVerifyPhoneBinding -import com.yizhuan.habu.ui.login.AreaCodeActivity -import com.yizhuan.habu.ui.login.BindPhoneActivity -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.code.CodeType -import com.yizhuan.xchat_android_core.pay.PayModel -import com.yizhuan.xchat_android_core.utils.net.BeanObserver -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingActivity +import com.chwl.app.databinding.ActivityVerifyPhoneBinding +import com.chwl.app.ui.login.AreaCodeActivity +import com.chwl.app.ui.login.BindPhoneActivity +import com.chwl.core.auth.AuthModel +import com.chwl.core.code.CodeType +import com.chwl.core.pay.PayModel +import com.chwl.core.utils.net.BeanObserver +import com.chwl.library.utils.ResUtil class VerifyPhoneActivity : BaseViewBindingActivity(), View.OnClickListener, TextWatcher { diff --git a/app/src/main/java/com/yizhuan/habu/ui/setting/adapter/RoomShieldAdapter.kt b/app/src/main/java/com/chwl/app/ui/setting/adapter/RoomShieldAdapter.kt similarity index 73% rename from app/src/main/java/com/yizhuan/habu/ui/setting/adapter/RoomShieldAdapter.kt rename to app/src/main/java/com/chwl/app/ui/setting/adapter/RoomShieldAdapter.kt index 1c9c5a1d5..544acfd56 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/setting/adapter/RoomShieldAdapter.kt +++ b/app/src/main/java/com/chwl/app/ui/setting/adapter/RoomShieldAdapter.kt @@ -1,13 +1,13 @@ -package com.yizhuan.habu.ui.setting.adapter +package com.chwl.app.ui.setting.adapter import android.widget.ImageView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.xchat_android_core.set.bean.ShieldInfo -import com.yizhuan.xchat_android_core.utils.TextUtils +import com.chwl.app.R +import com.chwl.app.ui.utils.ImageLoadUtilsV2 +import com.chwl.app.ui.utils.load +import com.chwl.core.set.bean.ShieldInfo +import com.chwl.core.utils.TextUtils class RoomShieldAdapter : BaseQuickAdapter(R.layout.item_room_shield) { diff --git a/app/src/main/java/com/yizhuan/habu/ui/setting/bean/PermissionEntity.kt b/app/src/main/java/com/chwl/app/ui/setting/bean/PermissionEntity.kt similarity index 90% rename from app/src/main/java/com/yizhuan/habu/ui/setting/bean/PermissionEntity.kt rename to app/src/main/java/com/chwl/app/ui/setting/bean/PermissionEntity.kt index 84f5c9fa9..153e45957 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/setting/bean/PermissionEntity.kt +++ b/app/src/main/java/com/chwl/app/ui/setting/bean/PermissionEntity.kt @@ -1,10 +1,10 @@ -package com.yizhuan.habu.ui.setting.bean +package com.chwl.app.ui.setting.bean import android.Manifest import android.os.Build -import com.yizhuan.habu.R -import com.yizhuan.xchat_android_core.utils.TextUtils -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.core.utils.TextUtils +import com.chwl.library.utils.ResUtil enum class PermissionEntity( val alias: String, diff --git a/app/src/main/java/com/yizhuan/habu/ui/setting/viewmodel/SetViewModel.kt b/app/src/main/java/com/chwl/app/ui/setting/viewmodel/SetViewModel.kt similarity index 76% rename from app/src/main/java/com/yizhuan/habu/ui/setting/viewmodel/SetViewModel.kt rename to app/src/main/java/com/chwl/app/ui/setting/viewmodel/SetViewModel.kt index 4b3c98b04..874eabace 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/setting/viewmodel/SetViewModel.kt +++ b/app/src/main/java/com/chwl/app/ui/setting/viewmodel/SetViewModel.kt @@ -1,12 +1,12 @@ -package com.yizhuan.habu.ui.setting.viewmodel +package com.chwl.app.ui.setting.viewmodel import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import com.yizhuan.habu.base.BaseViewModel -import com.yizhuan.xchat_android_core.bean.response.ListResult -import com.yizhuan.xchat_android_core.set.bean.ShieldInfo -import com.yizhuan.xchat_android_core.set.model.SetModel -import com.yizhuan.xchat_android_core.utils.toast +import com.chwl.app.base.BaseViewModel +import com.chwl.core.bean.response.ListResult +import com.chwl.core.set.bean.ShieldInfo +import com.chwl.core.set.model.SetModel +import com.chwl.core.utils.toast class SetViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/GrandintDrawableCreator.kt b/app/src/main/java/com/chwl/app/ui/user/GrandintDrawableCreator.kt similarity index 91% rename from app/src/main/java/com/yizhuan/habu/ui/user/GrandintDrawableCreator.kt rename to app/src/main/java/com/chwl/app/ui/user/GrandintDrawableCreator.kt index 02395b7cb..9511d0221 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/GrandintDrawableCreator.kt +++ b/app/src/main/java/com/chwl/app/ui/user/GrandintDrawableCreator.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.user +package com.chwl.app.ui.user import android.graphics.drawable.Drawable import android.graphics.drawable.GradientDrawable diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/activity/AboutActivity.java b/app/src/main/java/com/chwl/app/ui/user/activity/AboutActivity.java similarity index 81% rename from app/src/main/java/com/yizhuan/habu/ui/user/activity/AboutActivity.java rename to app/src/main/java/com/chwl/app/ui/user/activity/AboutActivity.java index 856d7d864..4c885fa3b 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/activity/AboutActivity.java +++ b/app/src/main/java/com/chwl/app/ui/user/activity/AboutActivity.java @@ -1,15 +1,15 @@ -package com.yizhuan.habu.ui.user.activity; +package com.chwl.app.ui.user.activity; import android.content.Intent; import android.os.Bundle; import android.widget.TextView; import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.habu.BuildConfig; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseActivity; -import com.yizhuan.habu.ui.setting.LabActivity; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.chwl.app.BuildConfig; +import com.chwl.app.R; +import com.chwl.app.base.BaseActivity; +import com.chwl.app.ui.setting.LabActivity; +import com.chwl.library.utils.config.BasicConfig; public class AboutActivity extends BaseActivity { diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/activity/EditUserLabelActivity.kt b/app/src/main/java/com/chwl/app/ui/user/activity/EditUserLabelActivity.kt similarity index 90% rename from app/src/main/java/com/yizhuan/habu/ui/user/activity/EditUserLabelActivity.kt rename to app/src/main/java/com/chwl/app/ui/user/activity/EditUserLabelActivity.kt index 01bb2f6d9..5ca889bbc 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/activity/EditUserLabelActivity.kt +++ b/app/src/main/java/com/chwl/app/ui/user/activity/EditUserLabelActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.user.activity +package com.chwl.app.ui.user.activity import android.content.Context import android.content.Intent @@ -14,21 +14,21 @@ import com.google.android.flexbox.FlexWrap import com.google.android.flexbox.FlexboxLayoutManager import com.google.android.flexbox.JustifyContent import com.netease.nim.uikit.StatusBarUtil -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingActivity -import com.yizhuan.habu.base.TitleBar -import com.yizhuan.habu.databinding.ActivityEditUserLabelBinding -import com.yizhuan.habu.ui.user.adapter.CommonWrapIndicatorAdapter -import com.yizhuan.habu.ui.user.adapter.MyUserLabelAdapter -import com.yizhuan.habu.ui.user.event.LabelEvent -import com.yizhuan.habu.ui.user.event.UserLabelEvent -import com.yizhuan.habu.ui.user.fragment.LabelFragment -import com.yizhuan.habu.ui.widget.magicindicator.ViewPagerHelper -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator -import com.yizhuan.xchat_android_core.user.UserModel -import com.yizhuan.xchat_android_core.user.bean.UserLabelInfo -import com.yizhuan.xchat_android_library.common.entity.CommonTabEntity -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingActivity +import com.chwl.app.base.TitleBar +import com.chwl.app.databinding.ActivityEditUserLabelBinding +import com.chwl.app.ui.user.adapter.CommonWrapIndicatorAdapter +import com.chwl.app.ui.user.adapter.MyUserLabelAdapter +import com.chwl.app.ui.user.event.LabelEvent +import com.chwl.app.ui.user.event.UserLabelEvent +import com.chwl.app.ui.user.fragment.LabelFragment +import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator +import com.chwl.core.user.UserModel +import com.chwl.core.user.bean.UserLabelInfo +import com.chwl.library.common.entity.CommonTabEntity +import com.chwl.library.utils.ResUtil import io.reactivex.SingleObserver import io.reactivex.disposables.Disposable import org.greenrobot.eventbus.EventBus diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/activity/ShowPhotoActivity.java b/app/src/main/java/com/chwl/app/ui/user/activity/ShowPhotoActivity.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/ui/user/activity/ShowPhotoActivity.java rename to app/src/main/java/com/chwl/app/ui/user/activity/ShowPhotoActivity.java index c71009872..37aa5dbc5 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/activity/ShowPhotoActivity.java +++ b/app/src/main/java/com/chwl/app/ui/user/activity/ShowPhotoActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.user.activity; +package com.chwl.app.ui.user.activity; import android.os.Bundle; import android.widget.ImageView; @@ -7,10 +7,10 @@ import android.widget.TextView; import androidx.annotation.Nullable; import androidx.viewpager.widget.ViewPager; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseActivity; -import com.yizhuan.habu.ui.user.adapter.PhotoAdapter; -import com.yizhuan.xchat_android_core.user.bean.UserPhoto; +import com.chwl.app.R; +import com.chwl.app.base.BaseActivity; +import com.chwl.app.ui.user.adapter.PhotoAdapter; +import com.chwl.core.user.bean.UserPhoto; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/activity/UserGiftActivity.kt b/app/src/main/java/com/chwl/app/ui/user/activity/UserGiftActivity.kt similarity index 74% rename from app/src/main/java/com/yizhuan/habu/ui/user/activity/UserGiftActivity.kt rename to app/src/main/java/com/chwl/app/ui/user/activity/UserGiftActivity.kt index 6509ecbac..d9acb373e 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/activity/UserGiftActivity.kt +++ b/app/src/main/java/com/chwl/app/ui/user/activity/UserGiftActivity.kt @@ -1,20 +1,20 @@ -package com.yizhuan.habu.ui.user.activity +package com.chwl.app.ui.user.activity import android.widget.LinearLayout import android.widget.TextView import androidx.fragment.app.Fragment import androidx.viewpager.widget.ViewPager import com.netease.nim.uikit.StatusBarUtil -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingActivity -import com.yizhuan.habu.databinding.ActivityUserGiftBinding -import com.yizhuan.habu.ui.user.fragment.UserInfoGiftFragment -import com.yizhuan.habu.ui.user.adapter.CommonWrapIndicatorAdapter -import com.yizhuan.habu.ui.user.adapter.UserInfoPagerAdapter -import com.yizhuan.habu.ui.widget.magicindicator.MagicIndicator -import com.yizhuan.habu.ui.widget.magicindicator.ViewPagerHelper -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingActivity +import com.chwl.app.databinding.ActivityUserGiftBinding +import com.chwl.app.ui.user.fragment.UserInfoGiftFragment +import com.chwl.app.ui.user.adapter.CommonWrapIndicatorAdapter +import com.chwl.app.ui.user.adapter.UserInfoPagerAdapter +import com.chwl.app.ui.widget.magicindicator.MagicIndicator +import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator +import com.chwl.library.utils.ResUtil class UserGiftActivity : BaseViewBindingActivity() { diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/activity/UserInfoActivity.java b/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoActivity.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/ui/user/activity/UserInfoActivity.java rename to app/src/main/java/com/chwl/app/ui/user/activity/UserInfoActivity.java index b6a11a826..7deed257d 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/activity/UserInfoActivity.java +++ b/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoActivity.java @@ -1,6 +1,6 @@ -package com.yizhuan.habu.ui.user.activity; +package com.chwl.app.ui.user.activity; -import static com.yizhuan.habu.ui.user.activity.UserInfoActivity.IdentityState.OWN; +import static com.chwl.app.ui.user.activity.UserInfoActivity.IdentityState.OWN; import android.annotation.SuppressLint; import android.content.ClipData; @@ -31,67 +31,67 @@ import com.opensource.svgaplayer.SVGADrawable; import com.opensource.svgaplayer.SVGAImageView; import com.opensource.svgaplayer.SVGAParser; import com.opensource.svgaplayer.SVGAVideoEntity; -import com.yizhuan.habu.R; -import com.yizhuan.habu.UIHelper; -import com.yizhuan.habu.audio.helper.AudioPlayerHelper; -import com.yizhuan.habu.audio.helper.OnPlayListener; -import com.yizhuan.habu.avroom.ButtonItemFactory; -import com.yizhuan.habu.avroom.activity.AVRoomActivity; -import com.yizhuan.habu.base.BaseBindingActivity; -import com.yizhuan.habu.common.widget.dialog.CommonPopupDialog; -import com.yizhuan.habu.common.widget.dialog.DialogManager; -import com.yizhuan.habu.databinding.ActivityUserInfoBinding; -import com.yizhuan.habu.family.view.activity.FamilyHomeActivity; -import com.yizhuan.habu.family.view.activity.FamilyMemberListActivity; -import com.yizhuan.habu.family.view.activity.FamilyMemberSearchActivity; -import com.yizhuan.habu.ui.im.avtivity.NimFriendModel; -import com.yizhuan.habu.ui.im.avtivity.NimP2PMessageActivity; -import com.yizhuan.habu.ui.user.adapter.SelfPhotoAdapter; -import com.yizhuan.habu.ui.user.adapter.UserInfoIndicatorAdapter; -import com.yizhuan.habu.ui.user.adapter.UserInfoLabelAdapter; -import com.yizhuan.habu.ui.user.adapter.UserInfoPagerAdapter; -import com.yizhuan.habu.ui.user.adapter.UserInfoPhotoAdapter; -import com.yizhuan.habu.ui.user.adapter.UserPhotoAdapter; -import com.yizhuan.habu.ui.user.dialog.UserLabelDialog; -import com.yizhuan.habu.ui.user.fragment.UserInfoGiftWallFragment; -import com.yizhuan.habu.ui.user.fragment.UserInfoInfoFragment; -import com.yizhuan.habu.ui.user.viewmodel.UserInfoViewModel; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2; -import com.yizhuan.habu.ui.widget.ButtonItem; -import com.yizhuan.habu.ui.widget.ObservableScrollView; -import com.yizhuan.habu.ui.widget.magicindicator.ViewPagerHelper; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; -import com.yizhuan.habu.ui.widget.rollviewpager.HintView; -import com.yizhuan.habu.ui.widget.rollviewpager.RollPagerView; -import com.yizhuan.habu.ui.widget.rollviewpager.adapter.StaticPagerAdapterWrapper; -import com.yizhuan.habu.utils.RegexUtil; -import com.yizhuan.habu.vip.util.VipHelper; +import com.chwl.app.R; +import com.chwl.app.UIHelper; +import com.chwl.app.audio.helper.AudioPlayerHelper; +import com.chwl.app.audio.helper.OnPlayListener; +import com.chwl.app.avroom.ButtonItemFactory; +import com.chwl.app.avroom.activity.AVRoomActivity; +import com.chwl.app.base.BaseBindingActivity; +import com.chwl.app.common.widget.dialog.CommonPopupDialog; +import com.chwl.app.common.widget.dialog.DialogManager; +import com.chwl.app.databinding.ActivityUserInfoBinding; +import com.chwl.app.family.view.activity.FamilyHomeActivity; +import com.chwl.app.family.view.activity.FamilyMemberListActivity; +import com.chwl.app.family.view.activity.FamilyMemberSearchActivity; +import com.chwl.app.ui.im.avtivity.NimFriendModel; +import com.chwl.app.ui.im.avtivity.NimP2PMessageActivity; +import com.chwl.app.ui.user.adapter.SelfPhotoAdapter; +import com.chwl.app.ui.user.adapter.UserInfoIndicatorAdapter; +import com.chwl.app.ui.user.adapter.UserInfoLabelAdapter; +import com.chwl.app.ui.user.adapter.UserInfoPagerAdapter; +import com.chwl.app.ui.user.adapter.UserInfoPhotoAdapter; +import com.chwl.app.ui.user.adapter.UserPhotoAdapter; +import com.chwl.app.ui.user.dialog.UserLabelDialog; +import com.chwl.app.ui.user.fragment.UserInfoGiftWallFragment; +import com.chwl.app.ui.user.fragment.UserInfoInfoFragment; +import com.chwl.app.ui.user.viewmodel.UserInfoViewModel; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.app.ui.utils.ImageLoadUtilsV2; +import com.chwl.app.ui.widget.ButtonItem; +import com.chwl.app.ui.widget.ObservableScrollView; +import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.chwl.app.ui.widget.rollviewpager.HintView; +import com.chwl.app.ui.widget.rollviewpager.RollPagerView; +import com.chwl.app.ui.widget.rollviewpager.adapter.StaticPagerAdapterWrapper; +import com.chwl.app.utils.RegexUtil; +import com.chwl.app.vip.util.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.RoomQueueInfo; -import com.yizhuan.xchat_android_core.im.friend.IMFriendModel; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.manager.AudioEngineManager; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -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.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.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.Logger; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.common.widget.LinesFlexBoxLayoutManager; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.SizeUtils; +import com.chwl.core.Constants; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.bean.RoomQueueInfo; +import com.chwl.core.im.friend.IMFriendModel; +import com.chwl.core.level.UserLevelVo; +import com.chwl.core.manager.AudioEngineManager; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.praise.PraiseModel; +import com.chwl.core.praise.event.IsLikedEvent; +import com.chwl.core.praise.event.PraiseEvent; +import com.chwl.core.user.UserInfoUiMgr; +import com.chwl.core.user.UserModel; +import com.chwl.core.user.bean.UserDetailInfo; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.core.user.bean.UserPhoto; +import com.chwl.core.user.event.LoginUserInfoUpdateEvent; +import com.chwl.core.utils.LogUtils; +import com.chwl.core.utils.Logger; +import com.chwl.library.annatation.ActLayoutRes; +import com.chwl.library.common.widget.LinesFlexBoxLayoutManager; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; +import com.chwl.library.utils.SizeUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/activity/UserInfoModifyActivity.kt b/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoModifyActivity.kt similarity index 93% rename from app/src/main/java/com/yizhuan/habu/ui/user/activity/UserInfoModifyActivity.kt rename to app/src/main/java/com/chwl/app/ui/user/activity/UserInfoModifyActivity.kt index 128fcfdd0..826f06f6a 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/activity/UserInfoModifyActivity.kt +++ b/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoModifyActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.user.activity +package com.chwl.app.ui.user.activity import android.Manifest import android.annotation.SuppressLint @@ -26,38 +26,38 @@ import com.sleepbot.datetimepicker.time.RadialPickerLayout import com.sleepbot.datetimepicker.time.TimePickerDialog import com.trello.rxlifecycle3.android.ActivityEvent import com.yalantis.ucrop.UCrop -import com.yizhuan.habu.R -import com.yizhuan.habu.UIHelper -import com.yizhuan.habu.application.XChatApplication -import com.yizhuan.habu.audio.SoundSignatureActivity -import com.yizhuan.habu.base.BaseViewBindingActivity -import com.yizhuan.habu.common.util.BitmapUtil -import com.yizhuan.habu.common.util.Utils -import com.yizhuan.habu.databinding.ActivityUserInfoModifyBinding -import com.yizhuan.habu.ui.login.ModifyInfoActivity -import com.yizhuan.habu.ui.user.adapter.UserInfoLabelAdapter -import com.yizhuan.habu.ui.user.adapter.UserModifyLabelAdapter -import com.yizhuan.habu.ui.user.adapter.UserPhotoAdapter -import com.yizhuan.habu.ui.user.adapter.UserPhotoAdapter.ImageClickListener -import com.yizhuan.habu.ui.user.dialog.UserAreaDialog -import com.yizhuan.habu.ui.utils.ImageLoadUtils -import com.yizhuan.habu.ui.widget.dialog.CommonTipDialog -import com.yizhuan.habu.ui.widget.recyclerview.decoration.ColorDecoration -import com.yizhuan.habu.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_core.utils.Logger -import com.yizhuan.xchat_android_library.common.file.FileHelper -import com.yizhuan.xchat_android_library.common.photo.PhotoProviderNew -import com.yizhuan.xchat_android_library.common.util.PhotoCompressCallback -import com.yizhuan.xchat_android_library.common.util.PhotoCompressUtil -import com.yizhuan.xchat_android_library.common.widget.LinesFlexBoxLayoutManager -import com.yizhuan.xchat_android_library.easypermisssion.EasyPermissions -import com.yizhuan.xchat_android_library.utils.ResUtil -import com.yizhuan.xchat_android_library.utils.TimeUtils +import com.chwl.app.R +import com.chwl.app.UIHelper +import com.chwl.app.application.XChatApplication +import com.chwl.app.audio.SoundSignatureActivity +import com.chwl.app.base.BaseViewBindingActivity +import com.chwl.app.common.util.BitmapUtil +import com.chwl.app.common.util.Utils +import com.chwl.app.databinding.ActivityUserInfoModifyBinding +import com.chwl.app.ui.login.ModifyInfoActivity +import com.chwl.app.ui.user.adapter.UserInfoLabelAdapter +import com.chwl.app.ui.user.adapter.UserModifyLabelAdapter +import com.chwl.app.ui.user.adapter.UserPhotoAdapter +import com.chwl.app.ui.user.adapter.UserPhotoAdapter.ImageClickListener +import com.chwl.app.ui.user.dialog.UserAreaDialog +import com.chwl.app.ui.utils.ImageLoadUtils +import com.chwl.app.ui.widget.dialog.CommonTipDialog +import com.chwl.app.ui.widget.recyclerview.decoration.ColorDecoration +import com.chwl.app.utils.RegexUtil +import com.chwl.core.auth.AuthModel +import com.chwl.core.file.FileModel +import com.chwl.core.user.UserModel +import com.chwl.core.user.bean.UserInfo +import com.chwl.core.user.bean.UserPhoto +import com.chwl.core.utils.Logger +import com.chwl.library.common.file.FileHelper +import com.chwl.library.common.photo.PhotoProviderNew +import com.chwl.library.common.util.PhotoCompressCallback +import com.chwl.library.common.util.PhotoCompressUtil +import com.chwl.library.common.widget.LinesFlexBoxLayoutManager +import com.chwl.library.easypermisssion.EasyPermissions +import com.chwl.library.utils.ResUtil +import com.chwl.library.utils.TimeUtils import io.reactivex.Completable import io.reactivex.SingleObserver import io.reactivex.disposables.Disposable diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/activity/UserModifyPhotosActivity.kt b/app/src/main/java/com/chwl/app/ui/user/activity/UserModifyPhotosActivity.kt similarity index 91% rename from app/src/main/java/com/yizhuan/habu/ui/user/activity/UserModifyPhotosActivity.kt rename to app/src/main/java/com/chwl/app/ui/user/activity/UserModifyPhotosActivity.kt index e77f8f535..896f4cf47 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/activity/UserModifyPhotosActivity.kt +++ b/app/src/main/java/com/chwl/app/ui/user/activity/UserModifyPhotosActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.user.activity +package com.chwl.app.ui.user.activity import android.Manifest import android.annotation.SuppressLint @@ -18,24 +18,24 @@ import com.netease.nim.uikit.StatusBarUtil import com.orhanobut.logger.Logger import com.trello.rxlifecycle3.android.ActivityEvent import com.yalantis.ucrop.UCrop -import com.yizhuan.habu.R -import com.yizhuan.habu.application.XChatApplication -import com.yizhuan.habu.base.TitleBar -import com.yizhuan.habu.common.util.BitmapUtil -import com.yizhuan.habu.ui.user.adapter.UserModifyPhotosAdapter -import com.yizhuan.habu.ui.user.adapter.UserModifyPhotosAdapter.PhotoItemClickListener -import com.yizhuan.habu.ui.widget.dialog.CommonTipDialog -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.common.file.FileHelper -import com.yizhuan.xchat_android_library.common.photo.PhotoProviderNew -import com.yizhuan.xchat_android_library.common.util.PhotoCompressCallback -import com.yizhuan.xchat_android_library.common.util.PhotoCompressUtil -import com.yizhuan.xchat_android_library.easypermisssion.EasyPermissions -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.application.XChatApplication +import com.chwl.app.base.TitleBar +import com.chwl.app.common.util.BitmapUtil +import com.chwl.app.ui.user.adapter.UserModifyPhotosAdapter +import com.chwl.app.ui.user.adapter.UserModifyPhotosAdapter.PhotoItemClickListener +import com.chwl.app.ui.widget.dialog.CommonTipDialog +import com.chwl.core.file.FileModel +import com.chwl.core.user.UserModel +import com.chwl.core.user.bean.UserInfo +import com.chwl.core.user.bean.UserPhoto +import com.chwl.core.utils.net.BeanObserver +import com.chwl.library.common.file.FileHelper +import com.chwl.library.common.photo.PhotoProviderNew +import com.chwl.library.common.util.PhotoCompressCallback +import com.chwl.library.common.util.PhotoCompressUtil +import com.chwl.library.easypermisssion.EasyPermissions +import com.chwl.library.utils.ResUtil import kotlinx.coroutines.Job import java.io.FileNotFoundException import java.text.SimpleDateFormat @@ -290,7 +290,7 @@ class UserModifyPhotosActivity : TakePhotoActivity(), PhotoItemClickListener, mostCompressSize = IMAGE_MOST_COMPRESS_SIZE ) } catch (e: FileNotFoundException) { - com.yizhuan.xchat_android_core.utils.Logger.error(TAG, e.message) + com.chwl.core.utils.Logger.error(TAG, e.message) } } } @@ -310,7 +310,7 @@ class UserModifyPhotosActivity : TakePhotoActivity(), PhotoItemClickListener, } if (sourceSize > 0) { //不能上传图片的最小文件大小 - com.yizhuan.xchat_android_core.utils.Logger.debug(TAG, "sourceSize: $sourceSize") + com.chwl.core.utils.Logger.debug(TAG, "sourceSize: $sourceSize") if (sourceSize < MIN_HEAD_PHOTO_SIZE) { toast(R.string.text_bitmap_too_small) return diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/ArrayWheelAdapter.java b/app/src/main/java/com/chwl/app/ui/user/adapter/ArrayWheelAdapter.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/ui/user/adapter/ArrayWheelAdapter.java rename to app/src/main/java/com/chwl/app/ui/user/adapter/ArrayWheelAdapter.java index f2f40ff29..c109516eb 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/ArrayWheelAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/user/adapter/ArrayWheelAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.user.adapter; +package com.chwl.app.ui.user.adapter; import com.contrarywind.adapter.WheelAdapter; diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/CommonWrapIndicatorAdapter.java b/app/src/main/java/com/chwl/app/ui/user/adapter/CommonWrapIndicatorAdapter.java similarity index 79% rename from app/src/main/java/com/yizhuan/habu/ui/user/adapter/CommonWrapIndicatorAdapter.java rename to app/src/main/java/com/chwl/app/ui/user/adapter/CommonWrapIndicatorAdapter.java index 72c01e5eb..85c534172 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/CommonWrapIndicatorAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/user/adapter/CommonWrapIndicatorAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.user.adapter; +package com.chwl.app.ui.user.adapter; import android.content.Context; import android.view.Gravity; @@ -8,15 +8,15 @@ import android.widget.TextView; import androidx.core.content.ContextCompat; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.indicators.GradientLinePagerIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.indicators.GradientLineRoundPagerIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; +import com.chwl.app.R; +import com.chwl.app.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.GradientLinePagerIndicator; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.GradientLineRoundPagerIndicator; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/GiftAdapter.java b/app/src/main/java/com/chwl/app/ui/user/adapter/GiftAdapter.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/ui/user/adapter/GiftAdapter.java rename to app/src/main/java/com/chwl/app/ui/user/adapter/GiftAdapter.java index e0d87fb6b..7b89aa3c4 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/GiftAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/user/adapter/GiftAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.user.adapter; +package com.chwl.app.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.habu.R; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.user.bean.UserDetailInfo; +import com.chwl.app.R; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.core.user.bean.UserDetailInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/MainIndicatorAdapter.java b/app/src/main/java/com/chwl/app/ui/user/adapter/MainIndicatorAdapter.java similarity index 87% rename from app/src/main/java/com/yizhuan/habu/ui/user/adapter/MainIndicatorAdapter.java rename to app/src/main/java/com/chwl/app/ui/user/adapter/MainIndicatorAdapter.java index 4024adeeb..3b252af07 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/MainIndicatorAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/user/adapter/MainIndicatorAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.user.adapter; +package com.chwl.app.ui.user.adapter; import android.content.Context; import android.graphics.Canvas; @@ -8,15 +8,15 @@ import android.widget.TextView; import androidx.core.content.ContextCompat; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView; -import com.yizhuan.habu.ui.widget.magicindicator.FragmentContainerHelper; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.indicators.GradientLinePagerIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; +import com.chwl.app.R; +import com.chwl.app.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView; +import com.chwl.app.ui.widget.magicindicator.FragmentContainerHelper; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.GradientLinePagerIndicator; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/MyUserLabelAdapter.kt b/app/src/main/java/com/chwl/app/ui/user/adapter/MyUserLabelAdapter.kt similarity index 77% rename from app/src/main/java/com/yizhuan/habu/ui/user/adapter/MyUserLabelAdapter.kt rename to app/src/main/java/com/chwl/app/ui/user/adapter/MyUserLabelAdapter.kt index e1694d7b9..3859c79eb 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/MyUserLabelAdapter.kt +++ b/app/src/main/java/com/chwl/app/ui/user/adapter/MyUserLabelAdapter.kt @@ -1,9 +1,9 @@ -package com.yizhuan.habu.ui.user.adapter +package com.chwl.app.ui.user.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.xchat_android_core.user.bean.UserLabelItemInfo +import com.chwl.app.R +import com.chwl.core.user.bean.UserLabelItemInfo /** * author: wushaocheng diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/PhotoAdapter.java b/app/src/main/java/com/chwl/app/ui/user/adapter/PhotoAdapter.java similarity index 92% rename from app/src/main/java/com/yizhuan/habu/ui/user/adapter/PhotoAdapter.java rename to app/src/main/java/com/chwl/app/ui/user/adapter/PhotoAdapter.java index ed0eed433..7920d09b8 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/PhotoAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/user/adapter/PhotoAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.user.adapter; +package com.chwl.app.ui.user.adapter; import android.content.Context; import android.view.View; @@ -7,8 +7,8 @@ import android.widget.ImageView; import androidx.viewpager.widget.PagerAdapter; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.user.bean.UserPhoto; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.core.user.bean.UserPhoto; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/SelfPhotoAdapter.kt b/app/src/main/java/com/chwl/app/ui/user/adapter/SelfPhotoAdapter.kt similarity index 85% rename from app/src/main/java/com/yizhuan/habu/ui/user/adapter/SelfPhotoAdapter.kt rename to app/src/main/java/com/chwl/app/ui/user/adapter/SelfPhotoAdapter.kt index ffac43522..0fec7945e 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/SelfPhotoAdapter.kt +++ b/app/src/main/java/com/chwl/app/ui/user/adapter/SelfPhotoAdapter.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.user.adapter +package com.chwl.app.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.habu.R -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil -import com.yizhuan.habu.ui.widget.rollviewpager.adapter.StaticPagerAdapterWrapper -import com.yizhuan.xchat_android_core.user.bean.UserDetailInfo +import com.chwl.app.R +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil +import com.chwl.app.ui.widget.rollviewpager.adapter.StaticPagerAdapterWrapper +import com.chwl.core.user.bean.UserDetailInfo class SelfPhotoAdapter( photoBeans: List, diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/SkillCardAdapter.kt b/app/src/main/java/com/chwl/app/ui/user/adapter/SkillCardAdapter.kt similarity index 84% rename from app/src/main/java/com/yizhuan/habu/ui/user/adapter/SkillCardAdapter.kt rename to app/src/main/java/com/chwl/app/ui/user/adapter/SkillCardAdapter.kt index 5bc983cd9..a0a882ac3 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/SkillCardAdapter.kt +++ b/app/src/main/java/com/chwl/app/ui/user/adapter/SkillCardAdapter.kt @@ -1,14 +1,14 @@ -package com.yizhuan.habu.ui.user.adapter +package com.chwl.app.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.habu.R -import com.yizhuan.habu.ui.user.GradientDrawableCreator -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil -import com.yizhuan.xchat_android_core.user.bean.UserInfoSkillEntity +import com.chwl.app.R +import com.chwl.app.ui.user.GradientDrawableCreator +import com.chwl.app.ui.utils.ImageLoadUtilsV2 +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil +import com.chwl.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/habu/ui/user/adapter/SkillPicsAdapter.kt b/app/src/main/java/com/chwl/app/ui/user/adapter/SkillPicsAdapter.kt similarity index 75% rename from app/src/main/java/com/yizhuan/habu/ui/user/adapter/SkillPicsAdapter.kt rename to app/src/main/java/com/chwl/app/ui/user/adapter/SkillPicsAdapter.kt index 1f618ed27..ebd8880e8 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/SkillPicsAdapter.kt +++ b/app/src/main/java/com/chwl/app/ui/user/adapter/SkillPicsAdapter.kt @@ -1,9 +1,9 @@ -package com.yizhuan.habu.ui.user.adapter +package com.chwl.app.ui.user.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2 +import com.chwl.app.R +import com.chwl.app.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/habu/ui/user/adapter/UserDesAdapter.java b/app/src/main/java/com/chwl/app/ui/user/adapter/UserDesAdapter.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserDesAdapter.java rename to app/src/main/java/com/chwl/app/ui/user/adapter/UserDesAdapter.java index 74ec306c4..4b4523360 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserDesAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/user/adapter/UserDesAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.user.adapter; +package com.chwl.app.ui.user.adapter; import android.app.Activity; import android.content.Context; @@ -14,28 +14,28 @@ 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.habu.BR; -import com.yizhuan.habu.R; -import com.yizhuan.habu.UIHelper; -import com.yizhuan.habu.audio.widget.VoiceLine; -import com.yizhuan.habu.bindadapter.BaseAdapter; -import com.yizhuan.habu.miniworld.activity.TopicMainActivity; -import com.yizhuan.habu.ui.user.activity.ShowPhotoActivity; -import com.yizhuan.habu.ui.widget.SquareImageView; -import com.yizhuan.habu.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.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.ResUtil; -import com.yizhuan.xchat_android_library.utils.SizeUtils; +import com.chwl.app.BR; +import com.chwl.app.R; +import com.chwl.app.UIHelper; +import com.chwl.app.audio.widget.VoiceLine; +import com.chwl.app.bindadapter.BaseAdapter; +import com.chwl.app.miniworld.activity.TopicMainActivity; +import com.chwl.app.ui.user.activity.ShowPhotoActivity; +import com.chwl.app.ui.widget.SquareImageView; +import com.chwl.app.ui.widget.recyclerview.decoration.VerticalDecoration; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.bean.UserInfoItem; +import com.chwl.core.family.bean.FamilyInfo; +import com.chwl.core.module_hall.hall.bean.HTeamInfo; +import com.chwl.core.module_hall.hall.bean.OwnerHallInfo; +import com.chwl.core.user.bean.JoinWorldInfo; +import com.chwl.core.user.bean.UserGameInfo; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.core.user.bean.UserPhoto; +import com.chwl.core.utils.StringUtils; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SizeUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserGiftAdapter.java b/app/src/main/java/com/chwl/app/ui/user/adapter/UserGiftAdapter.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserGiftAdapter.java rename to app/src/main/java/com/chwl/app/ui/user/adapter/UserGiftAdapter.java index 64654e20f..aa5ccab1a 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserGiftAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/user/adapter/UserGiftAdapter.java @@ -1,14 +1,14 @@ -package com.yizhuan.habu.ui.user.adapter; +package com.chwl.app.ui.user.adapter; import android.content.Context; import android.view.View; import android.widget.ImageView; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.bean.UserInfoItem; -import com.yizhuan.xchat_android_core.user.bean.GiftWallInfo; +import com.chwl.app.R; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.core.bean.UserInfoItem; +import com.chwl.core.user.bean.GiftWallInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserInfoCarAdapter.java b/app/src/main/java/com/chwl/app/ui/user/adapter/UserInfoCarAdapter.java similarity index 82% rename from app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserInfoCarAdapter.java rename to app/src/main/java/com/chwl/app/ui/user/adapter/UserInfoCarAdapter.java index 39a5505cb..76467aabe 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserInfoCarAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/user/adapter/UserInfoCarAdapter.java @@ -1,17 +1,17 @@ -package com.yizhuan.habu.ui.user.adapter; +package com.chwl.app.ui.user.adapter; -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.chwl.core.decoration.car.bean.CarInfo.STATUS_OFF_SHELF; +import static com.chwl.core.decoration.car.bean.CarInfo.STATUS_OUT_OF_DATE; import android.content.Context; import android.widget.ImageView; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.R; -import com.yizhuan.habu.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.chwl.app.R; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.core.bean.CarButtonInfo; +import com.chwl.core.bean.UserInfoItem; +import com.chwl.core.decoration.car.bean.CarInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserInfoDynamicAdapter.java b/app/src/main/java/com/chwl/app/ui/user/adapter/UserInfoDynamicAdapter.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserInfoDynamicAdapter.java rename to app/src/main/java/com/chwl/app/ui/user/adapter/UserInfoDynamicAdapter.java index c331d9e62..5b92edefb 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserInfoDynamicAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/user/adapter/UserInfoDynamicAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.user.adapter; +package com.chwl.app.ui.user.adapter; import android.app.Activity; @@ -18,25 +18,25 @@ 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.log.LogUtil; -import com.yizhuan.habu.R; -import com.yizhuan.habu.community.dynamic.view.DynamicDetailActivity; -import com.yizhuan.habu.community.helper.CalcSize; -import com.yizhuan.habu.community.helper.DynamicUiHelper; -import com.yizhuan.habu.community.helper.ImageUiHelper; -import com.yizhuan.habu.community.photo.BigPhotoActivity; -import com.yizhuan.habu.community.photo.DynamicImageAdapter; -import com.yizhuan.habu.community.photo.PagerOption; -import com.yizhuan.habu.community.utils.ObjectTypeHelper; -import com.yizhuan.habu.community.widget.ExpandableTextView; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.habu.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.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.app.community.dynamic.view.DynamicDetailActivity; +import com.chwl.app.community.helper.CalcSize; +import com.chwl.app.community.helper.DynamicUiHelper; +import com.chwl.app.community.helper.ImageUiHelper; +import com.chwl.app.community.photo.BigPhotoActivity; +import com.chwl.app.community.photo.DynamicImageAdapter; +import com.chwl.app.community.photo.PagerOption; +import com.chwl.app.community.utils.ObjectTypeHelper; +import com.chwl.app.community.widget.ExpandableTextView; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.utils.TimeUiUtils; +import com.chwl.core.community.bean.DynamicMedia; +import com.chwl.core.community.bean.WorldDynamicBean; +import com.chwl.core.community.dynamic.DynamicModel; +import com.chwl.core.utils.net.DontWarnObserver; +import com.chwl.core.utils.net.RxHelper; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserInfoIndicatorAdapter.java b/app/src/main/java/com/chwl/app/ui/user/adapter/UserInfoIndicatorAdapter.java similarity index 82% rename from app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserInfoIndicatorAdapter.java rename to app/src/main/java/com/chwl/app/ui/user/adapter/UserInfoIndicatorAdapter.java index af57d886d..5d0ee5418 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserInfoIndicatorAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/user/adapter/UserInfoIndicatorAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.user.adapter; +package com.chwl.app.ui.user.adapter; import android.content.Context; import android.view.Gravity; @@ -8,14 +8,14 @@ import android.widget.TextView; import androidx.core.content.ContextCompat; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.indicators.GradientLinePagerIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; +import com.chwl.app.R; +import com.chwl.app.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.GradientLinePagerIndicator; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserInfoLabelAdapter.kt b/app/src/main/java/com/chwl/app/ui/user/adapter/UserInfoLabelAdapter.kt similarity index 87% rename from app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserInfoLabelAdapter.kt rename to app/src/main/java/com/chwl/app/ui/user/adapter/UserInfoLabelAdapter.kt index b34217ec3..77b461357 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserInfoLabelAdapter.kt +++ b/app/src/main/java/com/chwl/app/ui/user/adapter/UserInfoLabelAdapter.kt @@ -1,9 +1,9 @@ -package com.yizhuan.habu.ui.user.adapter +package com.chwl.app.ui.user.adapter import androidx.appcompat.widget.AppCompatTextView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R +import com.chwl.app.R /** * author: wushaocheng diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserInfoPagerAdapter.kt b/app/src/main/java/com/chwl/app/ui/user/adapter/UserInfoPagerAdapter.kt similarity index 91% rename from app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserInfoPagerAdapter.kt rename to app/src/main/java/com/chwl/app/ui/user/adapter/UserInfoPagerAdapter.kt index f50dc74a3..b7e53c36f 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserInfoPagerAdapter.kt +++ b/app/src/main/java/com/chwl/app/ui/user/adapter/UserInfoPagerAdapter.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.user.adapter +package com.chwl.app.ui.user.adapter import android.annotation.SuppressLint import androidx.fragment.app.Fragment diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserInfoPhotoAdapter.java b/app/src/main/java/com/chwl/app/ui/user/adapter/UserInfoPhotoAdapter.java similarity index 82% rename from app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserInfoPhotoAdapter.java rename to app/src/main/java/com/chwl/app/ui/user/adapter/UserInfoPhotoAdapter.java index 97f86dfb2..85238e43f 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserInfoPhotoAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/user/adapter/UserInfoPhotoAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.user.adapter; +package com.chwl.app.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.habu.R; -import com.yizhuan.habu.ui.user.activity.ShowPhotoActivity; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.habu.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.chwl.app.R; +import com.chwl.app.ui.user.activity.ShowPhotoActivity; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.app.ui.widget.rollviewpager.adapter.StaticPagerAdapterWrapper; +import com.chwl.core.user.bean.UserDetailInfo; +import com.chwl.core.user.bean.UserPhoto; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserJoinWorldAdapter.java b/app/src/main/java/com/chwl/app/ui/user/adapter/UserJoinWorldAdapter.java similarity index 74% rename from app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserJoinWorldAdapter.java rename to app/src/main/java/com/chwl/app/ui/user/adapter/UserJoinWorldAdapter.java index ef4bbf750..a9603e8b7 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserJoinWorldAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/user/adapter/UserJoinWorldAdapter.java @@ -1,11 +1,11 @@ -package com.yizhuan.habu.ui.user.adapter; +package com.chwl.app.ui.user.adapter; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.R; -import com.yizhuan.habu.common.widget.RectRoundImageView; -import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2; -import com.yizhuan.xchat_android_core.user.bean.JoinWorldInfo; +import com.chwl.app.R; +import com.chwl.app.common.widget.RectRoundImageView; +import com.chwl.app.ui.utils.ImageLoadUtilsV2; +import com.chwl.core.user.bean.JoinWorldInfo; public class UserJoinWorldAdapter extends BaseQuickAdapter { diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserLabelAdapter.kt b/app/src/main/java/com/chwl/app/ui/user/adapter/UserLabelAdapter.kt similarity index 90% rename from app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserLabelAdapter.kt rename to app/src/main/java/com/chwl/app/ui/user/adapter/UserLabelAdapter.kt index abd803e1b..79dd2a22f 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserLabelAdapter.kt +++ b/app/src/main/java/com/chwl/app/ui/user/adapter/UserLabelAdapter.kt @@ -1,12 +1,12 @@ -package com.yizhuan.habu.ui.user.adapter +package com.chwl.app.ui.user.adapter import androidx.appcompat.widget.AppCompatTextView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.hjq.toast.ToastUtils -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.user.event.UserLabelEvent -import com.yizhuan.xchat_android_core.user.bean.UserLabelItemInfo +import com.chwl.app.R +import com.chwl.app.ui.user.event.UserLabelEvent +import com.chwl.core.user.bean.UserLabelItemInfo import org.greenrobot.eventbus.EventBus /** diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserLabelDialogAdapter.kt b/app/src/main/java/com/chwl/app/ui/user/adapter/UserLabelDialogAdapter.kt similarity index 81% rename from app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserLabelDialogAdapter.kt rename to app/src/main/java/com/chwl/app/ui/user/adapter/UserLabelDialogAdapter.kt index a8653d0af..ccd24e2f9 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserLabelDialogAdapter.kt +++ b/app/src/main/java/com/chwl/app/ui/user/adapter/UserLabelDialogAdapter.kt @@ -1,10 +1,10 @@ -package com.yizhuan.habu.ui.user.adapter +package com.chwl.app.ui.user.adapter import androidx.appcompat.widget.AppCompatTextView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.xchat_android_core.user.bean.UserLabelItemInfo +import com.chwl.app.R +import com.chwl.core.user.bean.UserLabelItemInfo /** * author: wushaocheng diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserModifyLabelAdapter.kt b/app/src/main/java/com/chwl/app/ui/user/adapter/UserModifyLabelAdapter.kt similarity index 90% rename from app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserModifyLabelAdapter.kt rename to app/src/main/java/com/chwl/app/ui/user/adapter/UserModifyLabelAdapter.kt index 37efd563a..309b467d6 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserModifyLabelAdapter.kt +++ b/app/src/main/java/com/chwl/app/ui/user/adapter/UserModifyLabelAdapter.kt @@ -1,9 +1,9 @@ -package com.yizhuan.habu.ui.user.adapter +package com.chwl.app.ui.user.adapter import androidx.appcompat.widget.AppCompatTextView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R +import com.chwl.app.R /** * author: wushaocheng diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserModifyPhotosAdapter.java b/app/src/main/java/com/chwl/app/ui/user/adapter/UserModifyPhotosAdapter.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserModifyPhotosAdapter.java rename to app/src/main/java/com/chwl/app/ui/user/adapter/UserModifyPhotosAdapter.java index 6fa1088bd..f34249ed8 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserModifyPhotosAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/user/adapter/UserModifyPhotosAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.user.adapter; +package com.chwl.app.ui.user.adapter; 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.habu.R; -import com.yizhuan.xchat_android_core.user.bean.UserPhoto; +import com.chwl.app.R; +import com.chwl.core.user.bean.UserPhoto; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserPhotoAdapter.java b/app/src/main/java/com/chwl/app/ui/user/adapter/UserPhotoAdapter.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserPhotoAdapter.java rename to app/src/main/java/com/chwl/app/ui/user/adapter/UserPhotoAdapter.java index 0eb86cc15..d496e6cb3 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserPhotoAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/user/adapter/UserPhotoAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.user.adapter; +package com.chwl.app.ui.user.adapter; import android.view.LayoutInflater; import android.view.View; @@ -6,11 +6,11 @@ import android.view.ViewGroup; import androidx.recyclerview.widget.RecyclerView; -import com.yizhuan.habu.R; -import com.yizhuan.habu.common.widget.RectRoundImageView; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.user.bean.UserPhoto; +import com.chwl.app.R; +import com.chwl.app.common.widget.RectRoundImageView; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.user.bean.UserPhoto; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserTabBaseAdapter.java b/app/src/main/java/com/chwl/app/ui/user/adapter/UserTabBaseAdapter.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserTabBaseAdapter.java rename to app/src/main/java/com/chwl/app/ui/user/adapter/UserTabBaseAdapter.java index 9dedd47e4..918025106 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/adapter/UserTabBaseAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/user/adapter/UserTabBaseAdapter.java @@ -1,12 +1,12 @@ -package com.yizhuan.habu.ui.user.adapter; +package com.chwl.app.ui.user.adapter; import android.content.Context; import com.chad.library.adapter.base.BaseMultiItemQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_core.bean.GiftTitleInfo; -import com.yizhuan.xchat_android_core.bean.UserInfoItem; +import com.chwl.app.R; +import com.chwl.core.bean.GiftTitleInfo; +import com.chwl.core.bean.UserInfoItem; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/decorationsend/DSAttentionFragment.java b/app/src/main/java/com/chwl/app/ui/user/decorationsend/DSAttentionFragment.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/ui/user/decorationsend/DSAttentionFragment.java rename to app/src/main/java/com/chwl/app/ui/user/decorationsend/DSAttentionFragment.java index 1cc08bf20..225e96063 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/decorationsend/DSAttentionFragment.java +++ b/app/src/main/java/com/chwl/app/ui/user/decorationsend/DSAttentionFragment.java @@ -1,6 +1,6 @@ -package com.yizhuan.habu.ui.user.decorationsend; +package com.chwl.app.ui.user.decorationsend; -import static com.yizhuan.habu.R.id.swipe_refresh; +import static com.chwl.app.R.id.swipe_refresh; import android.app.Activity; import android.os.Bundle; @@ -10,15 +10,15 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import com.yizhuan.habu.R; -import com.yizhuan.habu.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.chwl.app.R; +import com.chwl.app.base.BaseFragment; +import com.chwl.core.Constants; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.praise.event.PraiseEvent; +import com.chwl.core.user.AttentionModel; +import com.chwl.core.user.bean.AttentionInfo; +import com.chwl.core.user.event.LoginUserInfoUpdateEvent; +import com.chwl.library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/decorationsend/DSAttentionListAdapter.java b/app/src/main/java/com/chwl/app/ui/user/decorationsend/DSAttentionListAdapter.java similarity index 85% rename from app/src/main/java/com/yizhuan/habu/ui/user/decorationsend/DSAttentionListAdapter.java rename to app/src/main/java/com/chwl/app/ui/user/decorationsend/DSAttentionListAdapter.java index 6b68f1551..ca46b0f12 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/decorationsend/DSAttentionListAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/user/decorationsend/DSAttentionListAdapter.java @@ -1,9 +1,9 @@ -package com.yizhuan.habu.ui.user.decorationsend; +package com.chwl.app.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.chwl.core.level.UserLevelVo; +import com.chwl.core.noble.NobleInfo; +import com.chwl.core.user.bean.AttentionInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/decorationsend/DSBaseListAdapter.java b/app/src/main/java/com/chwl/app/ui/user/decorationsend/DSBaseListAdapter.java similarity index 89% rename from app/src/main/java/com/yizhuan/habu/ui/user/decorationsend/DSBaseListAdapter.java rename to app/src/main/java/com/chwl/app/ui/user/decorationsend/DSBaseListAdapter.java index 9dcce1c9e..56e2e0c14 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/decorationsend/DSBaseListAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/user/decorationsend/DSBaseListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.user.decorationsend; +package com.chwl.app.ui.user.decorationsend; import android.text.TextUtils; import android.view.View; @@ -8,12 +8,12 @@ import androidx.appcompat.widget.AppCompatImageView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.habu.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.chwl.app.R; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.app.ui.widget.NobleAvatarView; +import com.chwl.core.level.UserLevelVo; +import com.chwl.core.noble.NobleInfo; +import com.chwl.core.noble.NobleUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/decorationsend/DSFansListFragment.java b/app/src/main/java/com/chwl/app/ui/user/decorationsend/DSFansListFragment.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/ui/user/decorationsend/DSFansListFragment.java rename to app/src/main/java/com/chwl/app/ui/user/decorationsend/DSFansListFragment.java index ab857f00f..2f5d5b84c 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/decorationsend/DSFansListFragment.java +++ b/app/src/main/java/com/chwl/app/ui/user/decorationsend/DSFansListFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.user.decorationsend; +package com.chwl.app.ui.user.decorationsend; import android.app.Activity; import android.content.Context; @@ -9,17 +9,17 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseFragment; -import com.yizhuan.habu.ui.user.activity.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.chwl.app.R; +import com.chwl.app.base.BaseFragment; +import com.chwl.app.ui.user.activity.UserInfoActivity; +import com.chwl.core.Constants; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.praise.event.PraiseEvent; +import com.chwl.core.user.AttentionModel; +import com.chwl.core.user.bean.FansInfo; +import com.chwl.core.user.bean.FansListInfo; +import com.chwl.core.user.event.LoginUserInfoUpdateEvent; +import com.chwl.library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/decorationsend/DSFansViewAdapter.java b/app/src/main/java/com/chwl/app/ui/user/decorationsend/DSFansViewAdapter.java similarity index 86% rename from app/src/main/java/com/yizhuan/habu/ui/user/decorationsend/DSFansViewAdapter.java rename to app/src/main/java/com/chwl/app/ui/user/decorationsend/DSFansViewAdapter.java index 161f06273..d4708bdd3 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/decorationsend/DSFansViewAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/user/decorationsend/DSFansViewAdapter.java @@ -1,9 +1,9 @@ -package com.yizhuan.habu.ui.user.decorationsend; +package com.chwl.app.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.chwl.core.level.UserLevelVo; +import com.chwl.core.noble.NobleInfo; +import com.chwl.core.user.bean.FansInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/decorationsend/DSFriendListAdapter.java b/app/src/main/java/com/chwl/app/ui/user/decorationsend/DSFriendListAdapter.java similarity index 85% rename from app/src/main/java/com/yizhuan/habu/ui/user/decorationsend/DSFriendListAdapter.java rename to app/src/main/java/com/chwl/app/ui/user/decorationsend/DSFriendListAdapter.java index f3084bf42..10a3649d8 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/decorationsend/DSFriendListAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/user/decorationsend/DSFriendListAdapter.java @@ -1,9 +1,9 @@ -package com.yizhuan.habu.ui.user.decorationsend; +package com.chwl.app.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.chwl.core.level.UserLevelVo; +import com.chwl.core.noble.NobleInfo; +import com.chwl.core.user.bean.UserInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/decorationsend/DSFriendListFragment.java b/app/src/main/java/com/chwl/app/ui/user/decorationsend/DSFriendListFragment.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/ui/user/decorationsend/DSFriendListFragment.java rename to app/src/main/java/com/chwl/app/ui/user/decorationsend/DSFriendListFragment.java index b13f6f65b..4a1b8850c 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/decorationsend/DSFriendListFragment.java +++ b/app/src/main/java/com/chwl/app/ui/user/decorationsend/DSFriendListFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.user.decorationsend; +package com.chwl.app.ui.user.decorationsend; import android.app.Activity; import android.os.Bundle; @@ -8,15 +8,15 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import com.yizhuan.habu.R; -import com.yizhuan.habu.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.chwl.app.R; +import com.chwl.app.base.BaseFragment; +import com.chwl.core.im.friend.IMFriendModel; +import com.chwl.core.manager.IMNetEaseManager; +import com.chwl.core.manager.RelationShipEvent; +import com.chwl.core.user.UserModel; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.core.user.event.LoginUserInfoUpdateEvent; +import com.chwl.library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/decorationsend/DecorationSendActivity.java b/app/src/main/java/com/chwl/app/ui/user/decorationsend/DecorationSendActivity.java similarity index 85% rename from app/src/main/java/com/yizhuan/habu/ui/user/decorationsend/DecorationSendActivity.java rename to app/src/main/java/com/chwl/app/ui/user/decorationsend/DecorationSendActivity.java index 76d0d1179..cd0fe9ebf 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/decorationsend/DecorationSendActivity.java +++ b/app/src/main/java/com/chwl/app/ui/user/decorationsend/DecorationSendActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.user.decorationsend; +package com.chwl.app.ui.user.decorationsend; import android.content.Context; import android.content.Intent; @@ -6,23 +6,23 @@ import android.view.View; import androidx.fragment.app.Fragment; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseBindingActivity; -import com.yizhuan.habu.base.TitleBar; -import com.yizhuan.habu.common.ViewPagerAdapter; -import com.yizhuan.habu.databinding.ActivityDecorationSendBinding; -import com.yizhuan.habu.decoration.helper.DecorationDialogHelper; -import com.yizhuan.habu.decoration.helper.DecorationSaleType; -import com.yizhuan.habu.decoration.view.widgets.CarMagicIndicator; -import com.yizhuan.habu.friend.action.AbstractSelectFriendAction; -import com.yizhuan.habu.ui.search.SearchActivity; -import com.yizhuan.habu.ui.widget.magicindicator.ViewPagerHelper; -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseBindingActivity; +import com.chwl.app.base.TitleBar; +import com.chwl.app.common.ViewPagerAdapter; +import com.chwl.app.databinding.ActivityDecorationSendBinding; +import com.chwl.app.decoration.helper.DecorationDialogHelper; +import com.chwl.app.decoration.helper.DecorationSaleType; +import com.chwl.app.decoration.view.widgets.CarMagicIndicator; +import com.chwl.app.friend.action.AbstractSelectFriendAction; +import com.chwl.app.ui.search.SearchActivity; +import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.chwl.core.decoration.car.bean.CarInfo; +import com.chwl.core.decoration.headwear.bean.HeadWearInfo; +import com.chwl.core.home.bean.TabInfo; +import com.chwl.library.annatation.ActLayoutRes; +import com.chwl.library.utils.ResUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/decorationsend/UserInfoSkillDecoration.kt b/app/src/main/java/com/chwl/app/ui/user/decorationsend/UserInfoSkillDecoration.kt similarity index 88% rename from app/src/main/java/com/yizhuan/habu/ui/user/decorationsend/UserInfoSkillDecoration.kt rename to app/src/main/java/com/chwl/app/ui/user/decorationsend/UserInfoSkillDecoration.kt index f8e83b689..1518dbdfd 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/decorationsend/UserInfoSkillDecoration.kt +++ b/app/src/main/java/com/chwl/app/ui/user/decorationsend/UserInfoSkillDecoration.kt @@ -1,10 +1,10 @@ -package com.yizhuan.habu.ui.user.decorationsend +package com.chwl.app.ui.user.decorationsend import android.content.Context import android.graphics.Rect import android.view.View import androidx.recyclerview.widget.RecyclerView -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil +import com.chwl.app.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/habu/ui/user/dialog/UserAreaDialog.kt b/app/src/main/java/com/chwl/app/ui/user/dialog/UserAreaDialog.kt similarity index 90% rename from app/src/main/java/com/yizhuan/habu/ui/user/dialog/UserAreaDialog.kt rename to app/src/main/java/com/chwl/app/ui/user/dialog/UserAreaDialog.kt index 7f92455d1..bedaf7a46 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/dialog/UserAreaDialog.kt +++ b/app/src/main/java/com/chwl/app/ui/user/dialog/UserAreaDialog.kt @@ -1,11 +1,11 @@ -package com.yizhuan.habu.ui.user.dialog +package com.chwl.app.ui.user.dialog import android.os.Bundle import android.view.Gravity import android.view.WindowManager -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.databinding.DialogUserAreaPickerBinding -import com.yizhuan.habu.ui.user.adapter.ArrayWheelAdapter +import com.chwl.app.base.BaseDialog +import com.chwl.app.databinding.DialogUserAreaPickerBinding +import com.chwl.app.ui.user.adapter.ArrayWheelAdapter import java.io.Serializable diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/dialog/UserLabelDialog.kt b/app/src/main/java/com/chwl/app/ui/user/dialog/UserLabelDialog.kt similarity index 87% rename from app/src/main/java/com/yizhuan/habu/ui/user/dialog/UserLabelDialog.kt rename to app/src/main/java/com/chwl/app/ui/user/dialog/UserLabelDialog.kt index 8a979fe22..0db339ce5 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/dialog/UserLabelDialog.kt +++ b/app/src/main/java/com/chwl/app/ui/user/dialog/UserLabelDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.user.dialog +package com.chwl.app.ui.user.dialog import android.os.Bundle import android.view.View @@ -6,12 +6,12 @@ import com.google.android.flexbox.FlexDirection import com.google.android.flexbox.FlexWrap import com.google.android.flexbox.FlexboxLayoutManager import com.google.android.flexbox.JustifyContent -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.databinding.DialogUserTagBinding -import com.yizhuan.habu.ui.user.activity.EditUserLabelActivity -import com.yizhuan.habu.ui.user.adapter.UserLabelDialogAdapter -import com.yizhuan.xchat_android_core.auth.AuthModel +import com.chwl.app.R +import com.chwl.app.base.BaseDialog +import com.chwl.app.databinding.DialogUserTagBinding +import com.chwl.app.ui.user.activity.EditUserLabelActivity +import com.chwl.app.ui.user.adapter.UserLabelDialogAdapter +import com.chwl.core.auth.AuthModel import java.io.Serializable /** diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/event/LabelEvent.kt b/app/src/main/java/com/chwl/app/ui/user/event/LabelEvent.kt similarity index 75% rename from app/src/main/java/com/yizhuan/habu/ui/user/event/LabelEvent.kt rename to app/src/main/java/com/chwl/app/ui/user/event/LabelEvent.kt index 408d071f9..958b05892 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/event/LabelEvent.kt +++ b/app/src/main/java/com/chwl/app/ui/user/event/LabelEvent.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.user.event +package com.chwl.app.ui.user.event import lombok.AllArgsConstructor import lombok.Data diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/event/UserLabelEvent.kt b/app/src/main/java/com/chwl/app/ui/user/event/UserLabelEvent.kt similarity index 76% rename from app/src/main/java/com/yizhuan/habu/ui/user/event/UserLabelEvent.kt rename to app/src/main/java/com/chwl/app/ui/user/event/UserLabelEvent.kt index 3f0d02f0e..343e40034 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/event/UserLabelEvent.kt +++ b/app/src/main/java/com/chwl/app/ui/user/event/UserLabelEvent.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.user.event +package com.chwl.app.ui.user.event import lombok.AllArgsConstructor import lombok.Data diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/fragment/LabelFragment.kt b/app/src/main/java/com/chwl/app/ui/user/fragment/LabelFragment.kt similarity index 82% rename from app/src/main/java/com/yizhuan/habu/ui/user/fragment/LabelFragment.kt rename to app/src/main/java/com/chwl/app/ui/user/fragment/LabelFragment.kt index b2e53a7be..7b0f0a2bf 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/fragment/LabelFragment.kt +++ b/app/src/main/java/com/chwl/app/ui/user/fragment/LabelFragment.kt @@ -1,15 +1,15 @@ -package com.yizhuan.habu.ui.user.fragment +package com.chwl.app.ui.user.fragment import com.google.android.flexbox.FlexDirection import com.google.android.flexbox.FlexWrap import com.google.android.flexbox.FlexboxLayoutManager import com.google.android.flexbox.JustifyContent -import com.yizhuan.habu.base.BaseViewBindingFragment -import com.yizhuan.habu.databinding.FragmentMyTagBinding -import com.yizhuan.habu.ui.user.adapter.UserLabelAdapter -import com.yizhuan.habu.ui.user.event.LabelEvent -import com.yizhuan.habu.ui.user.event.UserLabelEvent -import com.yizhuan.xchat_android_core.user.bean.UserLabelItemInfo +import com.chwl.app.base.BaseViewBindingFragment +import com.chwl.app.databinding.FragmentMyTagBinding +import com.chwl.app.ui.user.adapter.UserLabelAdapter +import com.chwl.app.ui.user.event.LabelEvent +import com.chwl.app.ui.user.event.UserLabelEvent +import com.chwl.core.user.bean.UserLabelItemInfo import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/fragment/UserInfoCarFragment.java b/app/src/main/java/com/chwl/app/ui/user/fragment/UserInfoCarFragment.java similarity index 87% rename from app/src/main/java/com/yizhuan/habu/ui/user/fragment/UserInfoCarFragment.java rename to app/src/main/java/com/chwl/app/ui/user/fragment/UserInfoCarFragment.java index da1b781eb..82037815d 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/fragment/UserInfoCarFragment.java +++ b/app/src/main/java/com/chwl/app/ui/user/fragment/UserInfoCarFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.user.fragment; +package com.chwl.app.ui.user.fragment; import android.graphics.Rect; import android.os.Bundle; @@ -11,24 +11,24 @@ import androidx.recyclerview.widget.RecyclerView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.trello.rxlifecycle3.android.FragmentEvent; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseBindingFragment; -import com.yizhuan.habu.databinding.LayoutUserCarStoreBinding; -import com.yizhuan.habu.decoration.view.DecorationStoreActivity; -import com.yizhuan.habu.decoration.view.MyDecorationActivity; -import com.yizhuan.habu.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.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.SizeUtils; +import com.chwl.app.R; +import com.chwl.app.base.BaseBindingFragment; +import com.chwl.app.databinding.LayoutUserCarStoreBinding; +import com.chwl.app.decoration.view.DecorationStoreActivity; +import com.chwl.app.decoration.view.MyDecorationActivity; +import com.chwl.app.ui.user.adapter.UserInfoCarAdapter; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.bean.CarButtonInfo; +import com.chwl.core.bean.GiftTitleInfo; +import com.chwl.core.bean.UserInfoItem; +import com.chwl.core.bean.response.ServiceResult; +import com.chwl.core.decoration.car.CarModel; +import com.chwl.core.decoration.car.bean.CarInfo; +import com.chwl.core.user.UserInfoUiMgr; +import com.chwl.library.annatation.ActLayoutRes; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SizeUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/fragment/UserInfoDynamicFragment.kt b/app/src/main/java/com/chwl/app/ui/user/fragment/UserInfoDynamicFragment.kt similarity index 82% rename from app/src/main/java/com/yizhuan/habu/ui/user/fragment/UserInfoDynamicFragment.kt rename to app/src/main/java/com/chwl/app/ui/user/fragment/UserInfoDynamicFragment.kt index 47cb8a188..486b9ee10 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/fragment/UserInfoDynamicFragment.kt +++ b/app/src/main/java/com/chwl/app/ui/user/fragment/UserInfoDynamicFragment.kt @@ -1,33 +1,33 @@ -package com.yizhuan.habu.ui.user.fragment +package com.chwl.app.ui.user.fragment 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.habu.R -import com.yizhuan.habu.UIHelper -import com.yizhuan.habu.avroom.ButtonItemFactory -import com.yizhuan.habu.base.BaseViewBindingFragment -import com.yizhuan.habu.common.widget.dialog.DialogManager.OkCancelDialogListener -import com.yizhuan.habu.community.helper.ShareDynamicHelper -import com.yizhuan.habu.databinding.FragmentUserinfoDynamicBinding -import com.yizhuan.habu.ui.user.adapter.UserInfoDynamicAdapter -import com.yizhuan.habu.ui.user.viewmodel.UserInfoViewModel -import com.yizhuan.habu.ui.widget.ButtonItem -import com.yizhuan.habu.ui.widget.recyclerview.decoration.HorizontalDecoration +import com.chwl.app.R +import com.chwl.app.UIHelper +import com.chwl.app.avroom.ButtonItemFactory +import com.chwl.app.base.BaseViewBindingFragment +import com.chwl.app.common.widget.dialog.DialogManager.OkCancelDialogListener +import com.chwl.app.community.helper.ShareDynamicHelper +import com.chwl.app.databinding.FragmentUserinfoDynamicBinding +import com.chwl.app.ui.user.adapter.UserInfoDynamicAdapter +import com.chwl.app.ui.user.viewmodel.UserInfoViewModel +import com.chwl.app.ui.widget.ButtonItem +import com.chwl.app.ui.widget.recyclerview.decoration.HorizontalDecoration 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.dynamic.DynamicModel -import com.yizhuan.xchat_android_core.community.event.DynamicRefreshEvent -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.BeanObserver -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes -import com.yizhuan.xchat_android_library.utils.ResUtil -import com.yizhuan.xchat_android_library.utils.SizeUtils +import com.chwl.core.auth.AuthModel +import com.chwl.core.community.bean.WorldDynamicBean +import com.chwl.core.community.dynamic.DynamicModel +import com.chwl.core.community.event.DynamicRefreshEvent +import com.chwl.core.user.UserModel +import com.chwl.core.user.bean.UserDetailInfo +import com.chwl.core.utils.net.BeanObserver +import com.chwl.core.utils.net.DontWarnObserver +import com.chwl.library.annatation.ActLayoutRes +import com.chwl.library.utils.ResUtil +import com.chwl.library.utils.SizeUtils import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/fragment/UserInfoGiftFragment.java b/app/src/main/java/com/chwl/app/ui/user/fragment/UserInfoGiftFragment.java similarity index 89% rename from app/src/main/java/com/yizhuan/habu/ui/user/fragment/UserInfoGiftFragment.java rename to app/src/main/java/com/chwl/app/ui/user/fragment/UserInfoGiftFragment.java index db7cc5103..21e2fbec8 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/fragment/UserInfoGiftFragment.java +++ b/app/src/main/java/com/chwl/app/ui/user/fragment/UserInfoGiftFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.user.fragment; +package com.chwl.app.ui.user.fragment; import android.os.Bundle; import android.util.Log; @@ -12,19 +12,19 @@ import androidx.recyclerview.widget.GridLayoutManager; import com.chad.library.adapter.base.BaseQuickAdapter; import com.trello.rxlifecycle3.android.FragmentEvent; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseBindingFragment; -import com.yizhuan.habu.databinding.FragmentUserInfoGiftBinding; -import com.yizhuan.habu.ui.user.adapter.UserGiftAdapter; -import com.yizhuan.xchat_android_core.bean.UserInfoItem; -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.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.chwl.app.R; +import com.chwl.app.base.BaseBindingFragment; +import com.chwl.app.databinding.FragmentUserInfoGiftBinding; +import com.chwl.app.ui.user.adapter.UserGiftAdapter; +import com.chwl.core.bean.UserInfoItem; +import com.chwl.core.user.UserInfoUiMgr; +import com.chwl.core.user.UserModel; +import com.chwl.core.user.bean.GiftWallInfo; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.core.user.event.LoginUserInfoUpdateEvent; +import com.chwl.core.utils.net.BeanObserver; +import com.chwl.library.annatation.ActLayoutRes; +import com.chwl.library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/fragment/UserInfoGiftWallFragment.kt b/app/src/main/java/com/chwl/app/ui/user/fragment/UserInfoGiftWallFragment.kt similarity index 76% rename from app/src/main/java/com/yizhuan/habu/ui/user/fragment/UserInfoGiftWallFragment.kt rename to app/src/main/java/com/chwl/app/ui/user/fragment/UserInfoGiftWallFragment.kt index 57fdcef0c..c800cab03 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/fragment/UserInfoGiftWallFragment.kt +++ b/app/src/main/java/com/chwl/app/ui/user/fragment/UserInfoGiftWallFragment.kt @@ -1,19 +1,19 @@ -package com.yizhuan.habu.ui.user.fragment +package com.chwl.app.ui.user.fragment import android.content.Intent import android.widget.LinearLayout import android.widget.TextView import androidx.fragment.app.Fragment import androidx.viewpager.widget.ViewPager -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseViewBindingFragment -import com.yizhuan.habu.databinding.FragmentUserinfoGiftWallBinding -import com.yizhuan.habu.ui.user.activity.UserGiftActivity -import com.yizhuan.habu.ui.user.adapter.CommonWrapIndicatorAdapter -import com.yizhuan.habu.ui.user.adapter.UserInfoPagerAdapter -import com.yizhuan.habu.ui.widget.magicindicator.MagicIndicator -import com.yizhuan.habu.ui.widget.magicindicator.ViewPagerHelper -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingFragment +import com.chwl.app.databinding.FragmentUserinfoGiftWallBinding +import com.chwl.app.ui.user.activity.UserGiftActivity +import com.chwl.app.ui.user.adapter.CommonWrapIndicatorAdapter +import com.chwl.app.ui.user.adapter.UserInfoPagerAdapter +import com.chwl.app.ui.widget.magicindicator.MagicIndicator +import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator class UserInfoGiftWallFragment : BaseViewBindingFragment() { diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/fragment/UserInfoInfoFragment.kt b/app/src/main/java/com/chwl/app/ui/user/fragment/UserInfoInfoFragment.kt similarity index 85% rename from app/src/main/java/com/yizhuan/habu/ui/user/fragment/UserInfoInfoFragment.kt rename to app/src/main/java/com/chwl/app/ui/user/fragment/UserInfoInfoFragment.kt index 66cf78fd2..aae6da4e0 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/fragment/UserInfoInfoFragment.kt +++ b/app/src/main/java/com/chwl/app/ui/user/fragment/UserInfoInfoFragment.kt @@ -1,36 +1,36 @@ -package com.yizhuan.habu.ui.user.fragment +package com.chwl.app.ui.user.fragment import android.view.View import androidx.fragment.app.activityViewModels import com.netease.nim.uikit.common.util.sys.TimeUtil import com.trello.rxlifecycle3.android.FragmentEvent -import com.yizhuan.habu.R -import com.yizhuan.habu.UIHelper -import com.yizhuan.habu.avroom.ButtonItemFactory -import com.yizhuan.habu.base.BaseViewBindingFragment -import com.yizhuan.habu.common.widget.dialog.DialogManager -import com.yizhuan.habu.community.helper.ShareDynamicHelper -import com.yizhuan.habu.databinding.FragmentUserinfoUserinfoBinding -import com.yizhuan.habu.module_hall.hall.activity.ModuleClanActivity -import com.yizhuan.habu.module_hall.hall.activity.ModuleHallActivity -import com.yizhuan.habu.ui.user.adapter.UserInfoDynamicAdapter -import com.yizhuan.habu.ui.user.viewmodel.UserInfoViewModel -import com.yizhuan.habu.ui.widget.ButtonItem +import com.chwl.app.R +import com.chwl.app.UIHelper +import com.chwl.app.avroom.ButtonItemFactory +import com.chwl.app.base.BaseViewBindingFragment +import com.chwl.app.common.widget.dialog.DialogManager +import com.chwl.app.community.helper.ShareDynamicHelper +import com.chwl.app.databinding.FragmentUserinfoUserinfoBinding +import com.chwl.app.module_hall.hall.activity.ModuleClanActivity +import com.chwl.app.module_hall.hall.activity.ModuleHallActivity +import com.chwl.app.ui.user.adapter.UserInfoDynamicAdapter +import com.chwl.app.ui.user.viewmodel.UserInfoViewModel +import com.chwl.app.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.WorldDynamicBean -import com.yizhuan.xchat_android_core.community.dynamic.DynamicModel -import com.yizhuan.xchat_android_core.community.event.DynamicRefreshEvent -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.UserInfoUiMgr -import com.yizhuan.xchat_android_core.user.UserModel -import com.yizhuan.xchat_android_core.user.bean.UserDetailInfo -import com.yizhuan.xchat_android_core.utils.StarUtils -import com.yizhuan.xchat_android_core.utils.net.BeanObserver -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.core.auth.AuthModel +import com.chwl.core.community.bean.WorldDynamicBean +import com.chwl.core.community.dynamic.DynamicModel +import com.chwl.core.community.event.DynamicRefreshEvent +import com.chwl.core.module_hall.hall.bean.ClanAndHallInfo +import com.chwl.core.module_hall.hall.bean.ClanInfo +import com.chwl.core.module_hall.hall.bean.HallInfo +import com.chwl.core.user.UserInfoUiMgr +import com.chwl.core.user.UserModel +import com.chwl.core.user.bean.UserDetailInfo +import com.chwl.core.utils.StarUtils +import com.chwl.core.utils.net.BeanObserver +import com.chwl.core.utils.net.DontWarnObserver +import com.chwl.library.utils.ResUtil import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/yizhuan/habu/ui/user/viewmodel/UserInfoViewModel.kt b/app/src/main/java/com/chwl/app/ui/user/viewmodel/UserInfoViewModel.kt similarity index 82% rename from app/src/main/java/com/yizhuan/habu/ui/user/viewmodel/UserInfoViewModel.kt rename to app/src/main/java/com/chwl/app/ui/user/viewmodel/UserInfoViewModel.kt index ff2d86737..f4450ea6b 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/user/viewmodel/UserInfoViewModel.kt +++ b/app/src/main/java/com/chwl/app/ui/user/viewmodel/UserInfoViewModel.kt @@ -1,17 +1,17 @@ -package com.yizhuan.habu.ui.user.viewmodel +package com.chwl.app.ui.user.viewmodel import android.annotation.SuppressLint import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel -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.UserInfo -import com.yizhuan.xchat_android_core.utils.net.BeanObserver -import com.yizhuan.xchat_android_core.utils.toast +import com.chwl.core.module_hall.hall.HallModel +import com.chwl.core.module_hall.hall.bean.ClanAndHallInfo +import com.chwl.core.user.UserInfoUiMgr +import com.chwl.core.user.UserModel +import com.chwl.core.user.bean.UserDetailInfo +import com.chwl.core.user.bean.UserInfo +import com.chwl.core.utils.net.BeanObserver +import com.chwl.core.utils.toast import io.reactivex.disposables.CompositeDisposable import io.reactivex.disposables.Disposable diff --git a/app/src/main/java/com/yizhuan/habu/ui/utils/ArrayUtils.java b/app/src/main/java/com/chwl/app/ui/utils/ArrayUtils.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/ui/utils/ArrayUtils.java rename to app/src/main/java/com/chwl/app/ui/utils/ArrayUtils.java index bf96d58c3..6fa5b1ac8 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/utils/ArrayUtils.java +++ b/app/src/main/java/com/chwl/app/ui/utils/ArrayUtils.java @@ -1,6 +1,6 @@ -package com.yizhuan.habu.ui.utils; +package com.chwl.app.ui.utils; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.chwl.library.utils.log.MLog; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/app/src/main/java/com/yizhuan/habu/ui/utils/DesignUtils.java b/app/src/main/java/com/chwl/app/ui/utils/DesignUtils.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/utils/DesignUtils.java rename to app/src/main/java/com/chwl/app/ui/utils/DesignUtils.java index 9dd3172d3..cf2589477 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/utils/DesignUtils.java +++ b/app/src/main/java/com/chwl/app/ui/utils/DesignUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.utils; +package com.chwl.app.ui.utils; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; diff --git a/app/src/main/java/com/yizhuan/habu/ui/gift/util/GlideCacheUtil.java b/app/src/main/java/com/chwl/app/ui/utils/GlideCacheUtil.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/ui/gift/util/GlideCacheUtil.java rename to app/src/main/java/com/chwl/app/ui/utils/GlideCacheUtil.java index ae15d3c17..222e3a434 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/gift/util/GlideCacheUtil.java +++ b/app/src/main/java/com/chwl/app/ui/utils/GlideCacheUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.gift.util; +package com.chwl.app.ui.utils; import android.content.Context; import android.os.Looper; diff --git a/app/src/main/java/com/yizhuan/habu/ui/utils/ImageLoad.kt b/app/src/main/java/com/chwl/app/ui/utils/ImageLoad.kt similarity index 97% rename from app/src/main/java/com/yizhuan/habu/ui/utils/ImageLoad.kt rename to app/src/main/java/com/chwl/app/ui/utils/ImageLoad.kt index 323419f6d..76a27f833 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/utils/ImageLoad.kt +++ b/app/src/main/java/com/chwl/app/ui/utils/ImageLoad.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.utils +package com.chwl.app.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.habu.R -import com.yizhuan.xchat_android_core.utils.LogUtils +import com.chwl.app.R +import com.chwl.core.utils.LogUtils import java.io.File import java.net.MalformedURLException import java.net.URL diff --git a/app/src/main/java/com/yizhuan/habu/ui/utils/ImageLoadUtils.java b/app/src/main/java/com/chwl/app/ui/utils/ImageLoadUtils.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/utils/ImageLoadUtils.java rename to app/src/main/java/com/chwl/app/ui/utils/ImageLoadUtils.java index 75136ac72..e227b75a2 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/utils/ImageLoadUtils.java +++ b/app/src/main/java/com/chwl/app/ui/utils/ImageLoadUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.utils; +package com.chwl.app.ui.utils; import android.content.Context; import android.graphics.Bitmap; @@ -28,11 +28,11 @@ import com.netease.nim.uikit.common.util.string.StringUtil; import com.netease.nim.uikit.support.glide.GlideApp; import com.tencent.qgame.animplayer.AnimView; import com.tencent.qgame.animplayer.util.ScaleType; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.habu.utils.BlurTransformation; -import com.yizhuan.xchat_android_core.utils.LogUtils; -import com.yizhuan.xchat_android_core.utils.SystemUtils; +import com.chwl.app.R; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.utils.BlurTransformation; +import com.chwl.core.utils.LogUtils; +import com.chwl.core.utils.SystemUtils; import java.io.File; diff --git a/app/src/main/java/com/yizhuan/habu/ui/utils/ImageLoadUtilsV2.java b/app/src/main/java/com/chwl/app/ui/utils/ImageLoadUtilsV2.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/utils/ImageLoadUtilsV2.java rename to app/src/main/java/com/chwl/app/ui/utils/ImageLoadUtilsV2.java index 0d17c2baa..1f2c8603e 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/utils/ImageLoadUtilsV2.java +++ b/app/src/main/java/com/chwl/app/ui/utils/ImageLoadUtilsV2.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.utils; +package com.chwl.app.ui.utils; import android.app.Activity; import android.content.Context; @@ -12,8 +12,8 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.bumptech.glide.request.RequestOptions; import com.netease.nim.uikit.support.glide.GlideApp; import com.netease.nim.uikit.support.glide.GlideRequest; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.R; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; /** * create by lvzebiao @2019/7/26 diff --git a/app/src/main/java/com/yizhuan/habu/ui/utils/NinePatchBitmapFactory.java b/app/src/main/java/com/chwl/app/ui/utils/NinePatchBitmapFactory.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/ui/utils/NinePatchBitmapFactory.java rename to app/src/main/java/com/chwl/app/ui/utils/NinePatchBitmapFactory.java index 723bc589b..bd9bb3e5a 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/utils/NinePatchBitmapFactory.java +++ b/app/src/main/java/com/chwl/app/ui/utils/NinePatchBitmapFactory.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.utils; +package com.chwl.app.ui.utils; import android.content.res.Resources; import android.graphics.Bitmap; diff --git a/app/src/main/java/com/yizhuan/habu/ui/utils/RVDelegate.java b/app/src/main/java/com/chwl/app/ui/utils/RVDelegate.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/ui/utils/RVDelegate.java rename to app/src/main/java/com/chwl/app/ui/utils/RVDelegate.java index 323b82aac..150294416 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/utils/RVDelegate.java +++ b/app/src/main/java/com/chwl/app/ui/utils/RVDelegate.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.utils; +package com.chwl.app.ui.utils; import android.view.View; @@ -8,13 +8,13 @@ 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.habu.R; -import com.yizhuan.habu.base.IDataStatus; -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.IDataStatus; +import com.chwl.app.common.EmptyViewHelper; +import com.chwl.core.bean.response.ListResult; +import com.chwl.core.utils.LogUtils; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/utils/SurfaceViewAnimation.java b/app/src/main/java/com/chwl/app/ui/utils/SurfaceViewAnimation.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/ui/utils/SurfaceViewAnimation.java rename to app/src/main/java/com/chwl/app/ui/utils/SurfaceViewAnimation.java index a91c89de8..656f33cf3 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/utils/SurfaceViewAnimation.java +++ b/app/src/main/java/com/chwl/app/ui/utils/SurfaceViewAnimation.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.utils; +package com.chwl.app.ui.utils; import android.content.res.AssetManager; import android.graphics.Bitmap; diff --git a/app/src/main/java/com/yizhuan/habu/ui/utils/sys/InstallUtil.java b/app/src/main/java/com/chwl/app/ui/utils/sys/InstallUtil.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/utils/sys/InstallUtil.java rename to app/src/main/java/com/chwl/app/ui/utils/sys/InstallUtil.java index 8b0ec8f5b..a56f39792 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/utils/sys/InstallUtil.java +++ b/app/src/main/java/com/chwl/app/ui/utils/sys/InstallUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.utils.sys; +package com.chwl.app.ui.utils.sys; import android.content.Context; import android.content.Intent; diff --git a/app/src/main/java/com/chwl/app/ui/utils/sys/PermissionUtil.kt b/app/src/main/java/com/chwl/app/ui/utils/sys/PermissionUtil.kt new file mode 100644 index 000000000..d2d466af9 --- /dev/null +++ b/app/src/main/java/com/chwl/app/ui/utils/sys/PermissionUtil.kt @@ -0,0 +1,4 @@ +package com.chwl.app.ui.utils.sys + +class PermissionUtil { +} \ No newline at end of file diff --git a/app/src/main/java/com/yizhuan/habu/ui/wallet/ExchangeGoldActivity.java b/app/src/main/java/com/chwl/app/ui/wallet/ExchangeGoldActivity.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/ui/wallet/ExchangeGoldActivity.java rename to app/src/main/java/com/chwl/app/ui/wallet/ExchangeGoldActivity.java index 3e4598111..e7d4b9a1d 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/wallet/ExchangeGoldActivity.java +++ b/app/src/main/java/com/chwl/app/ui/wallet/ExchangeGoldActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.wallet; +package com.chwl.app.ui.wallet; import android.content.Context; import android.content.Intent; @@ -13,15 +13,15 @@ import android.widget.TextView; import androidx.core.content.ContextCompat; import com.netease.nim.uikit.common.util.string.StringUtil; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseActivity; -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseActivity; +import com.chwl.app.ui.widget.password.PassWordFragment; +import com.chwl.core.pay.PayModel; +import com.chwl.core.pay.bean.WalletInfo; +import com.chwl.core.utils.SharedPreferenceUtils; +import com.chwl.core.utils.net.BeanObserver; +import com.chwl.library.utils.FormatUtils; +import com.chwl.library.utils.ResUtil; /** * @author chenran diff --git a/app/src/main/java/com/yizhuan/habu/ui/wallet/adapter/WithdrawJewelAdapter.java b/app/src/main/java/com/chwl/app/ui/wallet/adapter/WithdrawJewelAdapter.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/ui/wallet/adapter/WithdrawJewelAdapter.java rename to app/src/main/java/com/chwl/app/ui/wallet/adapter/WithdrawJewelAdapter.java index 6b999bbf6..2cf61417d 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/wallet/adapter/WithdrawJewelAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/wallet/adapter/WithdrawJewelAdapter.java @@ -1,13 +1,13 @@ -package com.yizhuan.habu.ui.wallet.adapter; +package com.chwl.app.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.habu.R; -import com.yizhuan.xchat_android_core.withdraw.bean.WithdrwaListInfo; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.core.withdraw.bean.WithdrwaListInfo; +import com.chwl.library.utils.ResUtil; /** *

钻石提现界面

diff --git a/app/src/main/java/com/yizhuan/habu/ui/wallet/adapter/WithdrawRedListAdapter.java b/app/src/main/java/com/chwl/app/ui/wallet/adapter/WithdrawRedListAdapter.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/ui/wallet/adapter/WithdrawRedListAdapter.java rename to app/src/main/java/com/chwl/app/ui/wallet/adapter/WithdrawRedListAdapter.java index 552b984fc..760c2d9e5 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/wallet/adapter/WithdrawRedListAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/wallet/adapter/WithdrawRedListAdapter.java @@ -1,12 +1,12 @@ -package com.yizhuan.habu.ui.wallet.adapter; +package com.chwl.app.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.habu.R; -import com.yizhuan.xchat_android_core.redPacket.bean.WithdrawRedListInfo; +import com.chwl.app.R; +import com.chwl.core.redPacket.bean.WithdrawRedListInfo; /** *

红包提现展示列表

diff --git a/app/src/main/java/com/yizhuan/habu/ui/wallet/sendgold/SendGoldActivity.java b/app/src/main/java/com/chwl/app/ui/wallet/sendgold/SendGoldActivity.java similarity index 86% rename from app/src/main/java/com/yizhuan/habu/ui/wallet/sendgold/SendGoldActivity.java rename to app/src/main/java/com/chwl/app/ui/wallet/sendgold/SendGoldActivity.java index 510a28fda..6d76dcd81 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/wallet/sendgold/SendGoldActivity.java +++ b/app/src/main/java/com/chwl/app/ui/wallet/sendgold/SendGoldActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.wallet.sendgold; +package com.chwl.app.ui.wallet.sendgold; import android.content.Context; import android.content.Intent; @@ -13,32 +13,32 @@ import androidx.recyclerview.widget.GridLayoutManager; import com.chad.library.adapter.base.BaseQuickAdapter; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseViewBindingActivity; -import com.yizhuan.habu.bills.activities.ChargeBillsActivity; -import com.yizhuan.habu.databinding.ActivitySendGoldBinding; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.habu.ui.widget.TextWatcherSimple; -import com.yizhuan.habu.ui.widget.password.PassWordFragment; -import com.yizhuan.habu.ui.widget.password.PasswordEvent; -import com.yizhuan.habu.ui.widget.recyclerview.decoration.GridSpacingItemDecoration; -import com.yizhuan.habu.utils.RegexUtil; -import com.yizhuan.habu.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.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseViewBindingActivity; +import com.chwl.app.bills.activities.ChargeBillsActivity; +import com.chwl.app.databinding.ActivitySendGoldBinding; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.app.ui.widget.TextWatcherSimple; +import com.chwl.app.ui.widget.password.PassWordFragment; +import com.chwl.app.ui.widget.password.PasswordEvent; +import com.chwl.app.ui.widget.recyclerview.decoration.GridSpacingItemDecoration; +import com.chwl.app.utils.RegexUtil; +import com.chwl.app.utils.SpannableBuilder; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.pay.GoldGiveModel; +import com.chwl.core.pay.IGoldGiveModel; +import com.chwl.core.pay.PayModel; +import com.chwl.core.pay.bean.GiveInfo; +import com.chwl.core.pay.bean.WalletInfo; +import com.chwl.core.pay.event.GetWalletInfoEvent; +import com.chwl.core.pay.event.SendGoldSuccessEvent; +import com.chwl.core.user.UserModel; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.core.utils.net.DontWarnObserver; +import com.chwl.library.utils.FormatUtils; +import com.chwl.library.utils.JavaUtil; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/habu/ui/wallet/sendgold/SendGoldListAdpater.java b/app/src/main/java/com/chwl/app/ui/wallet/sendgold/SendGoldListAdpater.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/ui/wallet/sendgold/SendGoldListAdpater.java rename to app/src/main/java/com/chwl/app/ui/wallet/sendgold/SendGoldListAdpater.java index cde67eb5e..4cbf60447 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/wallet/sendgold/SendGoldListAdpater.java +++ b/app/src/main/java/com/chwl/app/ui/wallet/sendgold/SendGoldListAdpater.java @@ -1,12 +1,12 @@ -package com.yizhuan.habu.ui.wallet.sendgold; +package com.chwl.app.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.habu.R; -import com.yizhuan.xchat_android_core.pay.bean.GiveInfo; +import com.chwl.app.R; +import com.chwl.core.pay.bean.GiveInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/webview/CommonWebViewActivity.java b/app/src/main/java/com/chwl/app/ui/webview/CommonWebViewActivity.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/ui/webview/CommonWebViewActivity.java rename to app/src/main/java/com/chwl/app/ui/webview/CommonWebViewActivity.java index 36d75dde9..73b684f96 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/webview/CommonWebViewActivity.java +++ b/app/src/main/java/com/chwl/app/ui/webview/CommonWebViewActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.webview; +package com.chwl.app.ui.webview; import android.annotation.SuppressLint; import android.annotation.TargetApi; @@ -38,22 +38,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.habu.R; -import com.yizhuan.habu.application.XChatApplication; -import com.yizhuan.habu.base.BaseActivity; -import com.yizhuan.habu.ui.im.RouterHandler; -import com.yizhuan.habu.ui.webview.event.ShowNavEvent; -import com.yizhuan.habu.ui.webview.event.TaroPayResultEvent; -import com.yizhuan.habu.ui.widget.ShareDialog; -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.application.XChatApplication; +import com.chwl.app.base.BaseActivity; +import com.chwl.app.ui.im.RouterHandler; +import com.chwl.app.ui.webview.event.ShowNavEvent; +import com.chwl.app.ui.webview.event.TaroPayResultEvent; +import com.chwl.app.ui.widget.ShareDialog; +import com.chwl.app.utils.WebViewUtils; +import com.chwl.core.Constants; +import com.chwl.core.UriProvider; +import com.chwl.core.certification.event.CertificationResultEvent; +import com.chwl.core.share.ShareModel; +import com.chwl.core.web.bean.WebJsBeanInfo; +import com.chwl.core.web.event.WebViewRefreshEvent; +import com.chwl.library.rxbus.RxBus; +import com.chwl.library.utils.ResUtil; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/habu/ui/webview/CommonWebViewFragment.java b/app/src/main/java/com/chwl/app/ui/webview/CommonWebViewFragment.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/ui/webview/CommonWebViewFragment.java rename to app/src/main/java/com/chwl/app/ui/webview/CommonWebViewFragment.java index 38620bf64..673328e75 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/webview/CommonWebViewFragment.java +++ b/app/src/main/java/com/chwl/app/ui/webview/CommonWebViewFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.webview; +package com.chwl.app.ui.webview; import android.content.DialogInterface; import android.content.Intent; @@ -14,12 +14,12 @@ import android.webkit.WebViewClient; import androidx.appcompat.app.AlertDialog; import com.orhanobut.logger.Logger; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseBindingFragment; -import com.yizhuan.habu.common.widget.dialog.BaseAlertDialogBuilder; -import com.yizhuan.habu.databinding.FragmentCommonWebViewBinding; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseBindingFragment; +import com.chwl.app.common.widget.dialog.BaseAlertDialogBuilder; +import com.chwl.app.databinding.FragmentCommonWebViewBinding; +import com.chwl.library.annatation.ActLayoutRes; +import com.chwl.library.utils.ResUtil; @ActLayoutRes(R.layout.fragment_common_web_view) public class CommonWebViewFragment extends BaseBindingFragment { diff --git a/app/src/main/java/com/yizhuan/habu/ui/webview/DatingRuleWebViewActivity.java b/app/src/main/java/com/chwl/app/ui/webview/DatingRuleWebViewActivity.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/ui/webview/DatingRuleWebViewActivity.java rename to app/src/main/java/com/chwl/app/ui/webview/DatingRuleWebViewActivity.java index be3c32b0c..e3da35b69 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/webview/DatingRuleWebViewActivity.java +++ b/app/src/main/java/com/chwl/app/ui/webview/DatingRuleWebViewActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.webview; +package com.chwl.app.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.habu.R; +import com.chwl.app.R; public class DatingRuleWebViewActivity extends CommonWebViewActivity { diff --git a/app/src/main/java/com/yizhuan/habu/ui/webview/DialogWebViewActivity.java b/app/src/main/java/com/chwl/app/ui/webview/DialogWebViewActivity.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/ui/webview/DialogWebViewActivity.java rename to app/src/main/java/com/chwl/app/ui/webview/DialogWebViewActivity.java index c928f6a7e..d0ccd4fb7 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/webview/DialogWebViewActivity.java +++ b/app/src/main/java/com/chwl/app/ui/webview/DialogWebViewActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.webview; +package com.chwl.app.ui.webview; import android.content.Context; import android.content.Intent; @@ -8,7 +8,7 @@ import android.view.ViewGroup; import android.view.WindowManager; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.yizhuan.habu.R; +import com.chwl.app.R; public class DialogWebViewActivity extends CommonWebViewActivity { diff --git a/app/src/main/java/com/yizhuan/habu/ui/webview/FairyDialogWebViewActivity.java b/app/src/main/java/com/chwl/app/ui/webview/FairyDialogWebViewActivity.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/ui/webview/FairyDialogWebViewActivity.java rename to app/src/main/java/com/chwl/app/ui/webview/FairyDialogWebViewActivity.java index 152e0d787..ede068182 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/webview/FairyDialogWebViewActivity.java +++ b/app/src/main/java/com/chwl/app/ui/webview/FairyDialogWebViewActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.webview; +package com.chwl.app.ui.webview; import android.content.Context; import android.content.Intent; @@ -13,7 +13,7 @@ import android.widget.FrameLayout; import androidx.annotation.Nullable; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.yizhuan.habu.R; +import com.chwl.app.R; public class FairyDialogWebViewActivity extends CommonWebViewActivity { diff --git a/app/src/main/java/com/yizhuan/habu/ui/webview/JSInterface.java b/app/src/main/java/com/chwl/app/ui/webview/JSInterface.java similarity index 87% rename from app/src/main/java/com/yizhuan/habu/ui/webview/JSInterface.java rename to app/src/main/java/com/chwl/app/ui/webview/JSInterface.java index 59c09ac0b..fdddda93e 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/webview/JSInterface.java +++ b/app/src/main/java/com/chwl/app/ui/webview/JSInterface.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.webview; +package com.chwl.app.ui.webview; import static android.content.Context.CLIPBOARD_SERVICE; @@ -18,45 +18,45 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.netease.nim.uikit.common.util.log.LogUtil; import com.orhanobut.logger.Logger; -import com.yizhuan.habu.UIHelper; -import com.yizhuan.habu.application.IReportConstants; -import com.yizhuan.habu.application.ReportManager; -import com.yizhuan.habu.avroom.activity.AVRoomActivity; -import com.yizhuan.habu.decoration.view.DecorationStoreActivity; -import com.yizhuan.habu.family.view.activity.FamilyHomeActivity; -import com.yizhuan.habu.public_chat_hall.activity.PublicChatHallHomeActivity; -import com.yizhuan.habu.ui.im.RouterHandler; -import com.yizhuan.habu.ui.im.avtivity.NimP2PMessageActivity; -import com.yizhuan.habu.ui.pay.ChargeActivity; -import com.yizhuan.habu.ui.webview.event.H5NotifyClientEvent; -import com.yizhuan.habu.ui.webview.event.ShowNavEvent; -import com.yizhuan.habu.ui.webview.event.TaroPayResultEvent; -import com.yizhuan.habu.ui.widget.ShareDialog; +import com.chwl.app.UIHelper; +import com.chwl.app.application.IReportConstants; +import com.chwl.app.application.ReportManager; +import com.chwl.app.avroom.activity.AVRoomActivity; +import com.chwl.app.decoration.view.DecorationStoreActivity; +import com.chwl.app.family.view.activity.FamilyHomeActivity; +import com.chwl.app.public_chat_hall.activity.PublicChatHallHomeActivity; +import com.chwl.app.ui.im.RouterHandler; +import com.chwl.app.ui.im.avtivity.NimP2PMessageActivity; +import com.chwl.app.ui.pay.ChargeActivity; +import com.chwl.app.ui.webview.event.H5NotifyClientEvent; +import com.chwl.app.ui.webview.event.ShowNavEvent; +import com.chwl.app.ui.webview.event.TaroPayResultEvent; +import com.chwl.app.ui.widget.ShareDialog; import com.yizhuan.xchat_android_constants.XChatConstants; -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.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.pay.PayModel; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; -import com.yizhuan.xchat_android_core.praise.PraiseModel; -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.user.UserModel; -import com.yizhuan.xchat_android_core.web.bean.WebJsBeanInfo; -import com.yizhuan.xchat_android_library.common.util.DeviceUtil; -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.chwl.core.Constants; +import com.chwl.core.UriProvider; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.decoration.bean.DecorationStoreRouterType; +import com.chwl.core.file.FileModel; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.market_verify.MarketVerifyModel; +import com.chwl.core.pay.PayModel; +import com.chwl.core.pay.bean.WalletInfo; +import com.chwl.core.praise.PraiseModel; +import com.chwl.core.public_chat_hall.manager.PublicChatHallDataManager; +import com.chwl.core.room.bean.RoomInfo; +import com.chwl.core.user.UserModel; +import com.chwl.core.web.bean.WebJsBeanInfo; +import com.chwl.library.common.util.DeviceUtil; +import com.chwl.library.record.AuditRecorderConfiguration; +import com.chwl.library.record.ExtAudioRecorder; +import com.chwl.library.rxbus.RxBus; +import com.chwl.library.utils.AppMetaDataUtil; +import com.chwl.library.utils.AppUtils; +import com.chwl.library.utils.DeviceUuidFactory; +import com.chwl.library.utils.SystemUtils; +import com.chwl.library.utils.VersionUtil; +import com.chwl.library.utils.config.BasicConfig; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/yizhuan/habu/ui/webview/ShareH5Event.java b/app/src/main/java/com/chwl/app/ui/webview/ShareH5Event.java similarity index 78% rename from app/src/main/java/com/yizhuan/habu/ui/webview/ShareH5Event.java rename to app/src/main/java/com/chwl/app/ui/webview/ShareH5Event.java index f18715cb9..ec52c0b28 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/webview/ShareH5Event.java +++ b/app/src/main/java/com/chwl/app/ui/webview/ShareH5Event.java @@ -1,6 +1,6 @@ -package com.yizhuan.habu.ui.webview; +package com.chwl.app.ui.webview; -import com.yizhuan.xchat_android_core.web.bean.WebJsBeanInfo; +import com.chwl.core.web.bean.WebJsBeanInfo; /** * Created by MadisonRong on 26/06/2018. diff --git a/app/src/main/java/com/yizhuan/habu/ui/webview/SimpleJSInterface.java b/app/src/main/java/com/chwl/app/ui/webview/SimpleJSInterface.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/ui/webview/SimpleJSInterface.java rename to app/src/main/java/com/chwl/app/ui/webview/SimpleJSInterface.java index 0190ba43d..9a7127392 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/webview/SimpleJSInterface.java +++ b/app/src/main/java/com/chwl/app/ui/webview/SimpleJSInterface.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.webview; +package com.chwl.app.ui.webview; import android.app.Activity; import android.content.Context; @@ -9,11 +9,11 @@ import android.webkit.JavascriptInterface; import com.alibaba.fastjson.JSONObject; import com.orhanobut.logger.Logger; import com.tencent.vasdolly.helper.ChannelReaderUtil; -import com.yizhuan.habu.application.XChatApplication; +import com.chwl.app.application.XChatApplication; import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_library.utils.AppUtils; -import com.yizhuan.xchat_android_library.utils.VersionUtil; +import com.chwl.core.Constants; +import com.chwl.library.utils.AppUtils; +import com.chwl.library.utils.VersionUtil; /** *

html js 与webview 交互接口

diff --git a/app/src/main/java/com/yizhuan/habu/ui/webview/SimpleWebViewActivity.java b/app/src/main/java/com/chwl/app/ui/webview/SimpleWebViewActivity.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/webview/SimpleWebViewActivity.java rename to app/src/main/java/com/chwl/app/ui/webview/SimpleWebViewActivity.java index c587860de..cd3aab812 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/webview/SimpleWebViewActivity.java +++ b/app/src/main/java/com/chwl/app/ui/webview/SimpleWebViewActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.webview; +package com.chwl.app.ui.webview; import android.annotation.SuppressLint; import android.annotation.TargetApi; @@ -29,9 +29,9 @@ import androidx.appcompat.app.AppCompatActivity; import com.netease.nim.uikit.StatusBarUtil; import com.orhanobut.logger.Logger; -import com.yizhuan.habu.R; -import com.yizhuan.habu.utils.WebViewUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.utils.WebViewUtils; +import com.chwl.library.utils.ResUtil; import java.lang.ref.WeakReference; diff --git a/app/src/main/java/com/yizhuan/habu/ui/webview/TarotPayWebViewActivity.java b/app/src/main/java/com/chwl/app/ui/webview/TarotPayWebViewActivity.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/ui/webview/TarotPayWebViewActivity.java rename to app/src/main/java/com/chwl/app/ui/webview/TarotPayWebViewActivity.java index 3e25c7427..0dffc6f20 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/webview/TarotPayWebViewActivity.java +++ b/app/src/main/java/com/chwl/app/ui/webview/TarotPayWebViewActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.webview; +package com.chwl.app.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.habu.R; +import com.chwl.app.R; /** diff --git a/app/src/main/java/com/yizhuan/habu/ui/webview/event/CloseDialogWebViewEvent.java b/app/src/main/java/com/chwl/app/ui/webview/event/CloseDialogWebViewEvent.java similarity index 65% rename from app/src/main/java/com/yizhuan/habu/ui/webview/event/CloseDialogWebViewEvent.java rename to app/src/main/java/com/chwl/app/ui/webview/event/CloseDialogWebViewEvent.java index b845705b6..95103b0e5 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/webview/event/CloseDialogWebViewEvent.java +++ b/app/src/main/java/com/chwl/app/ui/webview/event/CloseDialogWebViewEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.webview.event; +package com.chwl.app.ui.webview.event; /** * create by lvzebiao @2019/12/3 diff --git a/app/src/main/java/com/yizhuan/habu/ui/webview/event/H5NotifyClientEvent.java b/app/src/main/java/com/chwl/app/ui/webview/event/H5NotifyClientEvent.java similarity index 68% rename from app/src/main/java/com/yizhuan/habu/ui/webview/event/H5NotifyClientEvent.java rename to app/src/main/java/com/chwl/app/ui/webview/event/H5NotifyClientEvent.java index f03131368..548fde408 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/webview/event/H5NotifyClientEvent.java +++ b/app/src/main/java/com/chwl/app/ui/webview/event/H5NotifyClientEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.habu.ui.webview.event; +package com.chwl.app.ui.webview.event; -import com.yizhuan.xchat_android_core.base.BaseBusEvent; +import com.chwl.core.base.BaseBusEvent; /** * h5通知客户端的事件 diff --git a/app/src/main/java/com/yizhuan/habu/ui/webview/event/ShowNavEvent.java b/app/src/main/java/com/chwl/app/ui/webview/event/ShowNavEvent.java similarity index 86% rename from app/src/main/java/com/yizhuan/habu/ui/webview/event/ShowNavEvent.java rename to app/src/main/java/com/chwl/app/ui/webview/event/ShowNavEvent.java index 7d93e7b0d..fef504ade 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/webview/event/ShowNavEvent.java +++ b/app/src/main/java/com/chwl/app/ui/webview/event/ShowNavEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.webview.event; +package com.chwl.app.ui.webview.event; import lombok.Data; diff --git a/app/src/main/java/com/yizhuan/habu/ui/webview/event/TaroPayResultEvent.java b/app/src/main/java/com/chwl/app/ui/webview/event/TaroPayResultEvent.java similarity index 86% rename from app/src/main/java/com/yizhuan/habu/ui/webview/event/TaroPayResultEvent.java rename to app/src/main/java/com/chwl/app/ui/webview/event/TaroPayResultEvent.java index 7a06ea67f..e33cdbaec 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/webview/event/TaroPayResultEvent.java +++ b/app/src/main/java/com/chwl/app/ui/webview/event/TaroPayResultEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.webview.event; +package com.chwl.app.ui.webview.event; /** diff --git a/app/src/main/java/com/yizhuan/habu/ui/webview/room_banner/RoomBannerTabAdapter.kt b/app/src/main/java/com/chwl/app/ui/webview/room_banner/RoomBannerTabAdapter.kt similarity index 87% rename from app/src/main/java/com/yizhuan/habu/ui/webview/room_banner/RoomBannerTabAdapter.kt rename to app/src/main/java/com/chwl/app/ui/webview/room_banner/RoomBannerTabAdapter.kt index a1d9e3c42..17ab03b85 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/webview/room_banner/RoomBannerTabAdapter.kt +++ b/app/src/main/java/com/chwl/app/ui/webview/room_banner/RoomBannerTabAdapter.kt @@ -1,13 +1,13 @@ -package com.yizhuan.habu.ui.webview.room_banner +package com.chwl.app.ui.webview.room_banner import android.view.View import android.widget.ImageView import androidx.core.view.isInvisible import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.utils.load -import com.yizhuan.xchat_android_core.home.bean.BannerInfo +import com.chwl.app.R +import com.chwl.app.ui.utils.load +import com.chwl.core.home.bean.BannerInfo /** * Created by Max on 2023/11/17 12:30 diff --git a/app/src/main/java/com/yizhuan/habu/ui/webview/room_banner/RoomBannerWebDialogActivity.kt b/app/src/main/java/com/chwl/app/ui/webview/room_banner/RoomBannerWebDialogActivity.kt similarity index 94% rename from app/src/main/java/com/yizhuan/habu/ui/webview/room_banner/RoomBannerWebDialogActivity.kt rename to app/src/main/java/com/chwl/app/ui/webview/room_banner/RoomBannerWebDialogActivity.kt index 9871bd0a3..cf3a79c4b 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/webview/room_banner/RoomBannerWebDialogActivity.kt +++ b/app/src/main/java/com/chwl/app/ui/webview/room_banner/RoomBannerWebDialogActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.webview.room_banner +package com.chwl.app.ui.webview.room_banner import android.content.Context import android.content.Intent @@ -8,9 +8,9 @@ import android.view.View import android.view.WindowManager import androidx.recyclerview.widget.RecyclerView import com.example.lib_utils.UiUtils -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.webview.CommonWebViewActivity -import com.yizhuan.xchat_android_core.home.bean.BannerInfo +import com.chwl.app.R +import com.chwl.app.ui.webview.CommonWebViewActivity +import com.chwl.core.home.bean.BannerInfo /** diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/Anticlockwise.java b/app/src/main/java/com/chwl/app/ui/widget/Anticlockwise.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/widget/Anticlockwise.java rename to app/src/main/java/com/chwl/app/ui/widget/Anticlockwise.java index c3b1240c7..c63e210e3 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/Anticlockwise.java +++ b/app/src/main/java/com/chwl/app/ui/widget/Anticlockwise.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.annotation.SuppressLint; import android.content.Context; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/AppBarLayoutBehavior.java b/app/src/main/java/com/chwl/app/ui/widget/AppBarLayoutBehavior.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/ui/widget/AppBarLayoutBehavior.java rename to app/src/main/java/com/chwl/app/ui/widget/AppBarLayoutBehavior.java index aa108cc0e..758b3b7f4 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/AppBarLayoutBehavior.java +++ b/app/src/main/java/com/chwl/app/ui/widget/AppBarLayoutBehavior.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/ButtonItem.java b/app/src/main/java/com/chwl/app/ui/widget/ButtonItem.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/widget/ButtonItem.java rename to app/src/main/java/com/chwl/app/ui/widget/ButtonItem.java index 2cb09e45b..35c58181a 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/ButtonItem.java +++ b/app/src/main/java/com/chwl/app/ui/widget/ButtonItem.java @@ -1,7 +1,7 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; -import com.yizhuan.habu.R; +import com.chwl.app.R; public class ButtonItem { public static final int BUTTON_TYPE_NORMAL = 0; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/CharAlignTextView.java b/app/src/main/java/com/chwl/app/ui/widget/CharAlignTextView.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/widget/CharAlignTextView.java rename to app/src/main/java/com/chwl/app/ui/widget/CharAlignTextView.java index 105935a66..f41499fc6 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/CharAlignTextView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/CharAlignTextView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.content.Context; import android.graphics.Canvas; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/CustomExpandableText.java b/app/src/main/java/com/chwl/app/ui/widget/CustomExpandableText.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/ui/widget/CustomExpandableText.java rename to app/src/main/java/com/chwl/app/ui/widget/CustomExpandableText.java index 006dae5b7..3402fac80 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/CustomExpandableText.java +++ b/app/src/main/java/com/chwl/app/ui/widget/CustomExpandableText.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.annotation.TargetApi; import android.content.Context; @@ -20,7 +20,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.yizhuan.habu.R; +import com.chwl.app.R; public class CustomExpandableText extends LinearLayout implements View.OnClickListener { protected TextView mTv; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/DatingSelectDialog.kt b/app/src/main/java/com/chwl/app/ui/widget/DatingSelectDialog.kt similarity index 72% rename from app/src/main/java/com/yizhuan/habu/ui/widget/DatingSelectDialog.kt rename to app/src/main/java/com/chwl/app/ui/widget/DatingSelectDialog.kt index c824a6765..a5ddd1652 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/DatingSelectDialog.kt +++ b/app/src/main/java/com/chwl/app/ui/widget/DatingSelectDialog.kt @@ -1,11 +1,11 @@ -package com.yizhuan.habu.ui.widget +package com.chwl.app.ui.widget import com.netease.nim.uikit.common.util.sys.ScreenUtil -import com.yizhuan.habu.R -import com.yizhuan.habu.base.BaseDialog -import com.yizhuan.habu.databinding.DialogDatingSelectBinding -import com.yizhuan.xchat_android_core.room.event.DatingSelectUserEvent -import com.yizhuan.xchat_android_library.utils.ResUtil +import com.chwl.app.R +import com.chwl.app.base.BaseDialog +import com.chwl.app.databinding.DialogDatingSelectBinding +import com.chwl.core.room.event.DatingSelectUserEvent +import com.chwl.library.utils.ResUtil 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/habu/ui/widget/DefaultToolBar.java b/app/src/main/java/com/chwl/app/ui/widget/DefaultToolBar.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/ui/widget/DefaultToolBar.java rename to app/src/main/java/com/chwl/app/ui/widget/DefaultToolBar.java index 788dce778..79cd25220 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/DefaultToolBar.java +++ b/app/src/main/java/com/chwl/app/ui/widget/DefaultToolBar.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.content.Context; import android.text.TextUtils; @@ -11,7 +11,7 @@ import androidx.annotation.Nullable; import androidx.appcompat.widget.Toolbar; import androidx.core.content.ContextCompat; -import com.yizhuan.habu.R; +import com.chwl.app.R; /** *

默认工具toolbar 界面

diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/DividerItemDecoration.java b/app/src/main/java/com/chwl/app/ui/widget/DividerItemDecoration.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/ui/widget/DividerItemDecoration.java rename to app/src/main/java/com/chwl/app/ui/widget/DividerItemDecoration.java index 363c71d49..529262868 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/DividerItemDecoration.java +++ b/app/src/main/java/com/chwl/app/ui/widget/DividerItemDecoration.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.content.Context; import android.graphics.Canvas; @@ -10,8 +10,8 @@ import android.view.View; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.library.utils.ResUtil; /** diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/DividerUtil.java b/app/src/main/java/com/chwl/app/ui/widget/DividerUtil.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/ui/widget/DividerUtil.java rename to app/src/main/java/com/chwl/app/ui/widget/DividerUtil.java index acc8089a9..ebd610ff5 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/DividerUtil.java +++ b/app/src/main/java/com/chwl/app/ui/widget/DividerUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.graphics.Rect; import android.view.View; @@ -6,7 +6,7 @@ import android.view.View; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.yizhuan.xchat_android_library.utils.SizeUtils; +import com.chwl.library.utils.SizeUtils; public class DividerUtil { public static void addhorizontalDivider(RecyclerView recyclerView, float dp) { diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/EdgeTransparentView.java b/app/src/main/java/com/chwl/app/ui/widget/EdgeTransparentView.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/widget/EdgeTransparentView.java rename to app/src/main/java/com/chwl/app/ui/widget/EdgeTransparentView.java index 49470f082..b3fc66c88 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/EdgeTransparentView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/EdgeTransparentView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.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.habu.R; +import com.chwl.app.R; /** diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/FixedTouchViewPager.java b/app/src/main/java/com/chwl/app/ui/widget/FixedTouchViewPager.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/ui/widget/FixedTouchViewPager.java rename to app/src/main/java/com/chwl/app/ui/widget/FixedTouchViewPager.java index c64e63566..a0b0f246d 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/FixedTouchViewPager.java +++ b/app/src/main/java/com/chwl/app/ui/widget/FixedTouchViewPager.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.content.Context; import android.util.AttributeSet; @@ -6,7 +6,7 @@ import android.view.MotionEvent; import androidx.viewpager.widget.ViewPager; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.chwl.library.utils.log.MLog; /** diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/FlickerAvatarView.java b/app/src/main/java/com/chwl/app/ui/widget/FlickerAvatarView.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/ui/widget/FlickerAvatarView.java rename to app/src/main/java/com/chwl/app/ui/widget/FlickerAvatarView.java index 22871f74d..01dc01792 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/FlickerAvatarView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/FlickerAvatarView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.animation.Animator; import android.animation.ObjectAnimator; @@ -12,8 +12,8 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.databinding.DataBindingUtil; -import com.yizhuan.habu.R; -import com.yizhuan.habu.databinding.LayoutFlickerAvatarBinding; +import com.chwl.app.R; +import com.chwl.app.databinding.LayoutFlickerAvatarBinding; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/GiftAvatarAdapter.java b/app/src/main/java/com/chwl/app/ui/widget/GiftAvatarAdapter.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/ui/widget/GiftAvatarAdapter.java rename to app/src/main/java/com/chwl/app/ui/widget/GiftAvatarAdapter.java index e667e7434..ae7d262dc 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/GiftAvatarAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/widget/GiftAvatarAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.content.Context; import android.view.LayoutInflater; @@ -11,14 +11,14 @@ import android.widget.TextView; import androidx.recyclerview.widget.RecyclerView; import com.coorchice.library.SuperTextView; -import com.yizhuan.habu.R; -import com.yizhuan.habu.common.widget.CircleImageView; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -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_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.common.widget.CircleImageView; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.room.pk.bean.PKTeamInfo; +import com.chwl.core.room.queue.bean.MicMemberInfo; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/GiftDialog.java b/app/src/main/java/com/chwl/app/ui/widget/GiftDialog.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/ui/widget/GiftDialog.java rename to app/src/main/java/com/chwl/app/ui/widget/GiftDialog.java index c0a9dfae0..0e3df196f 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/GiftDialog.java +++ b/app/src/main/java/com/chwl/app/ui/widget/GiftDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.annotation.SuppressLint; import android.app.Activity; @@ -37,69 +37,69 @@ import com.chad.library.adapter.base.BaseViewHolder; 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.habu.BR; -import com.yizhuan.habu.R; -import com.yizhuan.habu.application.IReportConstants; -import com.yizhuan.habu.application.ReportManager; -import com.yizhuan.habu.avroom.firstcharge.FirstChargeDialog; -import com.yizhuan.habu.base.BaseActivity; -import com.yizhuan.habu.common.widget.CircleImageView; -import com.yizhuan.habu.radish.task.activity.TaskCenterActivity; -import com.yizhuan.habu.ui.adapter.StarWeekAdapter; -import com.yizhuan.habu.ui.gift.dialog.GiftInfoVm; -import com.yizhuan.habu.ui.gift.dialog.PageIndicatorView; -import com.yizhuan.habu.ui.pay.ChargeActivity; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.habu.ui.webview.CommonWebViewActivity; -import com.yizhuan.habu.ui.webview.DialogWebViewActivity; -import com.yizhuan.habu.ui.widget.dialog.GiftManualQuantityDialog; -import com.yizhuan.habu.ui.widget.drawgift.DrawGiftHelper; -import com.yizhuan.habu.ui.widget.drawgift.DrawGiftView; -import com.yizhuan.habu.ui.widget.magicindicator.GiftIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.habu.ui.widget.recyclerview.decoration.VerticalDecoration; -import com.yizhuan.habu.utils.RegexUtil; -import com.yizhuan.habu.utils.SpannableBuilder; -import com.yizhuan.habu.vip.VipMainActivity; -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.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.LuckyBagNoticeInfo; -import com.yizhuan.xchat_android_core.gift.bean.SimpleUserInfo; -import com.yizhuan.xchat_android_core.gift.event.UpdateKnapEvent; -import com.yizhuan.xchat_android_core.gift.event.UpdateKnapFreeGiftDataEvent; -import com.yizhuan.xchat_android_core.gift.event.UpdateKnapFreeGiftEvent; -import com.yizhuan.xchat_android_core.gift.event.UpdateKnapFreeGiftNumEvent; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomFreeGiftMsgBean; -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.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.common.util.DeviceUtil; -import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil; -import com.yizhuan.xchat_android_library.utils.FormatUtils; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.TextWatcherWrapper; +import com.chwl.app.BR; +import com.chwl.app.R; +import com.chwl.app.application.IReportConstants; +import com.chwl.app.application.ReportManager; +import com.chwl.app.avroom.firstcharge.FirstChargeDialog; +import com.chwl.app.base.BaseActivity; +import com.chwl.app.common.widget.CircleImageView; +import com.chwl.app.radish.task.activity.TaskCenterActivity; +import com.chwl.app.ui.adapter.StarWeekAdapter; +import com.chwl.app.ui.gift.dialog.GiftInfoVm; +import com.chwl.app.ui.gift.dialog.PageIndicatorView; +import com.chwl.app.ui.pay.ChargeActivity; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.app.ui.webview.CommonWebViewActivity; +import com.chwl.app.ui.webview.DialogWebViewActivity; +import com.chwl.app.ui.widget.dialog.GiftManualQuantityDialog; +import com.chwl.app.ui.widget.drawgift.DrawGiftHelper; +import com.chwl.app.ui.widget.drawgift.DrawGiftView; +import com.chwl.app.ui.widget.magicindicator.GiftIndicator; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.ui.widget.recyclerview.decoration.VerticalDecoration; +import com.chwl.app.utils.RegexUtil; +import com.chwl.app.utils.SpannableBuilder; +import com.chwl.app.vip.VipMainActivity; +import com.chwl.core.Constants; +import com.chwl.core.UriProvider; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.bean.RoomQueueInfo; +import com.chwl.core.gift.GiftModel; +import com.chwl.core.gift.bean.GiftInfo; +import com.chwl.core.gift.bean.GiftTab; +import com.chwl.core.gift.bean.GiftType; +import com.chwl.core.gift.bean.LuckyBagNoticeInfo; +import com.chwl.core.gift.bean.SimpleUserInfo; +import com.chwl.core.gift.event.UpdateKnapEvent; +import com.chwl.core.gift.event.UpdateKnapFreeGiftDataEvent; +import com.chwl.core.gift.event.UpdateKnapFreeGiftEvent; +import com.chwl.core.gift.event.UpdateKnapFreeGiftNumEvent; +import com.chwl.core.im.custom.bean.RoomFreeGiftMsgBean; +import com.chwl.core.initial.InitialModel; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.manager.IMNetEaseManager; +import com.chwl.core.manager.RoomEvent; +import com.chwl.core.pay.PayModel; +import com.chwl.core.pay.bean.WalletInfo; +import com.chwl.core.pay.event.FirstChargeEvent; +import com.chwl.core.pay.event.UpdateWalletInfoEvent; +import com.chwl.core.room.anotherroompk.ShowUserInfoDialogEvent; +import com.chwl.core.room.pk.model.PkModel; +import com.chwl.core.room.queue.bean.MicMemberInfo; +import com.chwl.core.user.UserModel; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.core.utils.StringExtensionKt; +import com.chwl.core.utils.net.RxHelper; +import com.chwl.library.bindinglist.IItem; +import com.chwl.library.bindinglist.MultiTypeAdapter; +import com.chwl.library.common.util.DeviceUtil; +import com.chwl.library.utils.AppMetaDataUtil; +import com.chwl.library.utils.FormatUtils; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; +import com.chwl.library.utils.TextWatcherWrapper; import com.zhpan.bannerview.BannerViewPager; import com.zhpan.bannerview.utils.BannerUtils; import com.zyyoona7.lib.EasyPopup; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/GiftRecyclerView.java b/app/src/main/java/com/chwl/app/ui/widget/GiftRecyclerView.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/widget/GiftRecyclerView.java rename to app/src/main/java/com/chwl/app/ui/widget/GiftRecyclerView.java index dbec1e324..8daaac1bb 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/GiftRecyclerView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/GiftRecyclerView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/GridViewWithoutScroll.java b/app/src/main/java/com/chwl/app/ui/widget/GridViewWithoutScroll.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/ui/widget/GridViewWithoutScroll.java rename to app/src/main/java/com/chwl/app/ui/widget/GridViewWithoutScroll.java index 30cd726ce..d5f7c08fe 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/GridViewWithoutScroll.java +++ b/app/src/main/java/com/chwl/app/ui/widget/GridViewWithoutScroll.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.annotation.TargetApi; import android.content.Context; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/InterceptTouchLayout.java b/app/src/main/java/com/chwl/app/ui/widget/InterceptTouchLayout.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/ui/widget/InterceptTouchLayout.java rename to app/src/main/java/com/chwl/app/ui/widget/InterceptTouchLayout.java index 1fd5354c9..8b4381d2a 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/InterceptTouchLayout.java +++ b/app/src/main/java/com/chwl/app/ui/widget/InterceptTouchLayout.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.annotation.TargetApi; import android.content.Context; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/LeftNotiDialog.java b/app/src/main/java/com/chwl/app/ui/widget/LeftNotiDialog.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/ui/widget/LeftNotiDialog.java rename to app/src/main/java/com/chwl/app/ui/widget/LeftNotiDialog.java index 5a3c86d59..529de58f7 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/LeftNotiDialog.java +++ b/app/src/main/java/com/chwl/app/ui/widget/LeftNotiDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.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.habu.R; +import com.chwl.app.R; /** * Created by zhouxiangfeng on 2017/5/13. diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/LevelHeadView.java b/app/src/main/java/com/chwl/app/ui/widget/LevelHeadView.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/ui/widget/LevelHeadView.java rename to app/src/main/java/com/chwl/app/ui/widget/LevelHeadView.java index 7c656218f..d66fc695a 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/LevelHeadView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/LevelHeadView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.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.habu.R; -import com.yizhuan.habu.common.widget.CircleImageView; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.chwl.app.R; +import com.chwl.app.common.widget.CircleImageView; +import com.chwl.core.user.bean.UserInfo; /** * Created by zhouxiangfeng on 2017/6/3. diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/LevelUpDialog.java b/app/src/main/java/com/chwl/app/ui/widget/LevelUpDialog.java similarity index 83% rename from app/src/main/java/com/yizhuan/habu/ui/widget/LevelUpDialog.java rename to app/src/main/java/com/chwl/app/ui/widget/LevelUpDialog.java index 61bad09bb..ae43d8ba9 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/LevelUpDialog.java +++ b/app/src/main/java/com/chwl/app/ui/widget/LevelUpDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.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.habu.R; -import com.yizhuan.habu.base.BaseBindingActivity; -import com.yizhuan.habu.databinding.DialogLevelUpBinding; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; +import com.chwl.app.R; +import com.chwl.app.base.BaseBindingActivity; +import com.chwl.app.databinding.DialogLevelUpBinding; +import com.chwl.library.annatation.ActLayoutRes; /** * Created by huangmeng1 on 2018/6/21. diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/LinearLayoutManagerWrapper.java b/app/src/main/java/com/chwl/app/ui/widget/LinearLayoutManagerWrapper.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/ui/widget/LinearLayoutManagerWrapper.java rename to app/src/main/java/com/chwl/app/ui/widget/LinearLayoutManagerWrapper.java index 5f7d2026a..563e92160 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/LinearLayoutManagerWrapper.java +++ b/app/src/main/java/com/chwl/app/ui/widget/LinearLayoutManagerWrapper.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/ListViewWithoutScroll.java b/app/src/main/java/com/chwl/app/ui/widget/ListViewWithoutScroll.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/ui/widget/ListViewWithoutScroll.java rename to app/src/main/java/com/chwl/app/ui/widget/ListViewWithoutScroll.java index 2c8067ce5..2f5ba1406 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/ListViewWithoutScroll.java +++ b/app/src/main/java/com/chwl/app/ui/widget/ListViewWithoutScroll.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.annotation.TargetApi; import android.content.Context; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/LivingIconView.java b/app/src/main/java/com/chwl/app/ui/widget/LivingIconView.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/ui/widget/LivingIconView.java rename to app/src/main/java/com/chwl/app/ui/widget/LivingIconView.java index c63e824e4..252c1e5c0 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/LivingIconView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/LivingIconView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.content.Context; import android.content.res.TypedArray; @@ -10,8 +10,8 @@ import android.view.ViewGroup; import androidx.annotation.Nullable; import androidx.appcompat.widget.AppCompatImageView; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.R; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/LoadingAdapter.java b/app/src/main/java/com/chwl/app/ui/widget/LoadingAdapter.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/widget/LoadingAdapter.java rename to app/src/main/java/com/chwl/app/ui/widget/LoadingAdapter.java index 364889c4e..97cb1da8e 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/LoadingAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/widget/LoadingAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.view.LayoutInflater; import android.view.View; @@ -9,7 +9,7 @@ import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.StaggeredGridLayoutManager; -import com.yizhuan.habu.R; +import com.chwl.app.R; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/LoadingDialog.java b/app/src/main/java/com/chwl/app/ui/widget/LoadingDialog.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/ui/widget/LoadingDialog.java rename to app/src/main/java/com/chwl/app/ui/widget/LoadingDialog.java index 1e424a8a1..762f9b274 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/LoadingDialog.java +++ b/app/src/main/java/com/chwl/app/ui/widget/LoadingDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.content.Context; import android.graphics.drawable.AnimationDrawable; @@ -7,7 +7,7 @@ import android.widget.ImageView; import androidx.appcompat.app.AppCompatDialog; -import com.yizhuan.habu.R; +import com.chwl.app.R; /** * @author xiaoyu diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/MagicAdapter.java b/app/src/main/java/com/chwl/app/ui/widget/MagicAdapter.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/ui/widget/MagicAdapter.java rename to app/src/main/java/com/chwl/app/ui/widget/MagicAdapter.java index d8e7cc8cf..1359635c3 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/MagicAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/widget/MagicAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.content.Context; import android.view.LayoutInflater; @@ -10,10 +10,10 @@ import android.widget.TextView; import androidx.recyclerview.widget.RecyclerView; import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_core.magic.bean.MagicInfo; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.core.magic.bean.MagicInfo; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; import java.util.List; import java.util.Locale; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/MagicRecyclerView.java b/app/src/main/java/com/chwl/app/ui/widget/MagicRecyclerView.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/widget/MagicRecyclerView.java rename to app/src/main/java/com/chwl/app/ui/widget/MagicRecyclerView.java index 5f928e810..b4c862ef8 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/MagicRecyclerView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/MagicRecyclerView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/MainRedPointTab.java b/app/src/main/java/com/chwl/app/ui/widget/MainRedPointTab.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/ui/widget/MainRedPointTab.java rename to app/src/main/java/com/chwl/app/ui/widget/MainRedPointTab.java index d03008bf1..f9676d24e 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/MainRedPointTab.java +++ b/app/src/main/java/com/chwl/app/ui/widget/MainRedPointTab.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.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.habu.R; -import com.yizhuan.habu.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.chwl.app.R; +import com.chwl.app.common.svga.SimpleSvgaCallback; +import com.chwl.core.home.bean.MainTabInfo; +import com.chwl.core.home.bean.MainTabType; +import com.chwl.core.utils.CheckUtils; +import com.chwl.core.utils.TextUtils; import java.net.MalformedURLException; import java.net.URL; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/MainTab.java b/app/src/main/java/com/chwl/app/ui/widget/MainTab.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/widget/MainTab.java rename to app/src/main/java/com/chwl/app/ui/widget/MainTab.java index a4c5854a7..61a20c5f7 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/MainTab.java +++ b/app/src/main/java/com/chwl/app/ui/widget/MainTab.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.content.Context; import android.content.res.TypedArray; @@ -11,7 +11,7 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.yizhuan.habu.R; +import com.chwl.app.R; /** *

main tab 控件

diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/MainTabLayout.java b/app/src/main/java/com/chwl/app/ui/widget/MainTabLayout.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/ui/widget/MainTabLayout.java rename to app/src/main/java/com/chwl/app/ui/widget/MainTabLayout.java index 088bdb047..346f385ae 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/MainTabLayout.java +++ b/app/src/main/java/com/chwl/app/ui/widget/MainTabLayout.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.content.Context; import android.util.AttributeSet; @@ -9,10 +9,10 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.Size; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_core.home.bean.MainTabInfo; -import com.yizhuan.xchat_android_core.home.bean.MainTabType; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.chwl.app.R; +import com.chwl.core.home.bean.MainTabInfo; +import com.chwl.core.home.bean.MainTabType; +import com.chwl.library.utils.ListUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/MarqueeLayout.java b/app/src/main/java/com/chwl/app/ui/widget/MarqueeLayout.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/ui/widget/MarqueeLayout.java rename to app/src/main/java/com/chwl/app/ui/widget/MarqueeLayout.java index 9a8149c1d..b8078d090 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/MarqueeLayout.java +++ b/app/src/main/java/com/chwl/app/ui/widget/MarqueeLayout.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -14,10 +14,10 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.ScreenUtils; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.chwl.app.R; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.ScreenUtils; +import com.chwl.library.utils.log.MLog; /** * @author xxf-kaede diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/MarqueeTextView.kt b/app/src/main/java/com/chwl/app/ui/widget/MarqueeTextView.kt similarity index 99% rename from app/src/main/java/com/yizhuan/habu/ui/widget/MarqueeTextView.kt rename to app/src/main/java/com/chwl/app/ui/widget/MarqueeTextView.kt index 10a464071..a226d3ca2 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/MarqueeTextView.kt +++ b/app/src/main/java/com/chwl/app/ui/widget/MarqueeTextView.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget +package com.chwl.app.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.habu.R +import com.chwl.app.R import java.lang.ref.WeakReference import kotlin.math.abs import kotlin.math.ceil diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/MultipleGraduallyTextView.kt b/app/src/main/java/com/chwl/app/ui/widget/MultipleGraduallyTextView.kt similarity index 97% rename from app/src/main/java/com/yizhuan/habu/ui/widget/MultipleGraduallyTextView.kt rename to app/src/main/java/com/chwl/app/ui/widget/MultipleGraduallyTextView.kt index 0bcc452a5..2430644ef 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/MultipleGraduallyTextView.kt +++ b/app/src/main/java/com/chwl/app/ui/widget/MultipleGraduallyTextView.kt @@ -1,10 +1,10 @@ -package com.yizhuan.habu.ui.widget +package com.chwl.app.ui.widget import android.content.Context import android.graphics.* import android.util.AttributeSet import androidx.appcompat.widget.AppCompatTextView -import com.yizhuan.habu.R +import com.chwl.app.R class MultipleGraduallyTextView(context: Context, attr: AttributeSet?, def: Int) : AppCompatTextView(context, attr, def) { diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/MyItemAnimator.java b/app/src/main/java/com/chwl/app/ui/widget/MyItemAnimator.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/ui/widget/MyItemAnimator.java rename to app/src/main/java/com/chwl/app/ui/widget/MyItemAnimator.java index e63f3e545..15031040d 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/MyItemAnimator.java +++ b/app/src/main/java/com/chwl/app/ui/widget/MyItemAnimator.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/NobleAvatarView.java b/app/src/main/java/com/chwl/app/ui/widget/NobleAvatarView.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/ui/widget/NobleAvatarView.java rename to app/src/main/java/com/chwl/app/ui/widget/NobleAvatarView.java index c2b91409c..35584e39e 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/NobleAvatarView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/NobleAvatarView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.content.Context; import android.text.TextUtils; @@ -9,13 +9,13 @@ import android.widget.RelativeLayout; import androidx.annotation.Nullable; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; -import com.yizhuan.habu.R; -import com.yizhuan.habu.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.user.bean.UserInfo; -import com.yizhuan.xchat_android_library.utils.SizeUtils; +import com.chwl.app.R; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.core.noble.NobleInfo; +import com.chwl.core.noble.NobleResourceType; +import com.chwl.core.noble.NobleUtil; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.library.utils.SizeUtils; /** *

贵族头像

diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/NobleOpenNoticeView.java b/app/src/main/java/com/chwl/app/ui/widget/NobleOpenNoticeView.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/ui/widget/NobleOpenNoticeView.java rename to app/src/main/java/com/chwl/app/ui/widget/NobleOpenNoticeView.java index b79277caf..88611bd98 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/NobleOpenNoticeView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/NobleOpenNoticeView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.content.Context; import android.graphics.Color; @@ -19,9 +19,9 @@ import com.opensource.svgaplayer.SVGADrawable; import com.opensource.svgaplayer.SVGAImageView; import com.opensource.svgaplayer.SVGAParser; import com.opensource.svgaplayer.SVGAVideoEntity; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.noble.NobleUtil; +import com.chwl.app.R; +import com.chwl.core.noble.NobleInfo; +import com.chwl.core.noble.NobleUtil; import java.net.MalformedURLException; import java.net.URL; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/NumView.java b/app/src/main/java/com/chwl/app/ui/widget/NumView.java similarity index 89% rename from app/src/main/java/com/yizhuan/habu/ui/widget/NumView.java rename to app/src/main/java/com/chwl/app/ui/widget/NumView.java index 5f13f8588..e8a3c3c04 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/NumView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/NumView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.content.Context; import android.util.AttributeSet; @@ -7,8 +7,8 @@ import android.widget.LinearLayout; import androidx.annotation.Nullable; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_library.utils.JavaUtil; +import com.chwl.app.R; +import com.chwl.library.utils.JavaUtil; public class NumView extends LinearLayout { diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/ObservableScrollView.java b/app/src/main/java/com/chwl/app/ui/widget/ObservableScrollView.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/ui/widget/ObservableScrollView.java rename to app/src/main/java/com/chwl/app/ui/widget/ObservableScrollView.java index 323ef0ea6..0e31cba70 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/ObservableScrollView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/ObservableScrollView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; /** * Created by chenran on 2017/10/17. diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/OnPageSelectedListener.java b/app/src/main/java/com/chwl/app/ui/widget/OnPageSelectedListener.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/ui/widget/OnPageSelectedListener.java rename to app/src/main/java/com/chwl/app/ui/widget/OnPageSelectedListener.java index aadc40762..35e7bdd8b 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/OnPageSelectedListener.java +++ b/app/src/main/java/com/chwl/app/ui/widget/OnPageSelectedListener.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import androidx.viewpager.widget.ViewPager; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/ParentClickHorizontalScrollView.java b/app/src/main/java/com/chwl/app/ui/widget/ParentClickHorizontalScrollView.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/widget/ParentClickHorizontalScrollView.java rename to app/src/main/java/com/chwl/app/ui/widget/ParentClickHorizontalScrollView.java index 172209819..7383723b6 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/ParentClickHorizontalScrollView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/ParentClickHorizontalScrollView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/PinEntryEditText.java b/app/src/main/java/com/chwl/app/ui/widget/PinEntryEditText.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/ui/widget/PinEntryEditText.java rename to app/src/main/java/com/chwl/app/ui/widget/PinEntryEditText.java index 36ef60dbc..7d9e493ed 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/PinEntryEditText.java +++ b/app/src/main/java/com/chwl/app/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.habu.ui.widget; +package com.chwl.app.ui.widget; import android.animation.Animator; import android.animation.AnimatorSet; @@ -43,7 +43,7 @@ import androidx.appcompat.widget.AppCompatEditText; import androidx.core.content.ContextCompat; import androidx.core.view.ViewCompat; -import com.yizhuan.habu.R; +import com.chwl.app.R; public class PinEntryEditText extends AppCompatEditText { diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/RecallDialog.java b/app/src/main/java/com/chwl/app/ui/widget/RecallDialog.java similarity index 83% rename from app/src/main/java/com/yizhuan/habu/ui/widget/RecallDialog.java rename to app/src/main/java/com/chwl/app/ui/widget/RecallDialog.java index 1a8e0674e..870bb803d 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/RecallDialog.java +++ b/app/src/main/java/com/chwl/app/ui/widget/RecallDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.content.Context; import android.content.Intent; @@ -10,17 +10,17 @@ import android.widget.EditText; import android.widget.TextView; import com.netease.nim.uikit.common.util.string.StringUtil; -import com.yizhuan.habu.R; -import com.yizhuan.habu.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.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseActivity; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.recall.RecallModel; +import com.chwl.core.recall.bean.GoBackInfo; +import com.chwl.core.recall.event.GoBackEvent; +import com.chwl.core.user.UserModel; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.core.utils.SharedPreferenceUtils; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/RectLayout.java b/app/src/main/java/com/chwl/app/ui/widget/RectLayout.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/ui/widget/RectLayout.java rename to app/src/main/java/com/chwl/app/ui/widget/RectLayout.java index 690879c4f..4bdeb8672 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/RectLayout.java +++ b/app/src/main/java/com/chwl/app/ui/widget/RectLayout.java @@ -1,11 +1,11 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.content.Context; import android.content.res.TypedArray; import android.util.AttributeSet; import android.widget.RelativeLayout; -import com.yizhuan.habu.R; +import com.chwl.app.R; /** * Created by jack diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/RecyclerRefreshLayout.java b/app/src/main/java/com/chwl/app/ui/widget/RecyclerRefreshLayout.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/ui/widget/RecyclerRefreshLayout.java rename to app/src/main/java/com/chwl/app/ui/widget/RecyclerRefreshLayout.java index 92cc0cac9..80fb9c448 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/RecyclerRefreshLayout.java +++ b/app/src/main/java/com/chwl/app/ui/widget/RecyclerRefreshLayout.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.content.Context; import android.util.AttributeSet; @@ -12,7 +12,7 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.StaggeredGridLayoutManager; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import com.yizhuan.habu.R; +import com.chwl.app.R; /** diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/RecyclerViewNoBugLinearLayoutManager.java b/app/src/main/java/com/chwl/app/ui/widget/RecyclerViewNoBugLinearLayoutManager.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/ui/widget/RecyclerViewNoBugLinearLayoutManager.java rename to app/src/main/java/com/chwl/app/ui/widget/RecyclerViewNoBugLinearLayoutManager.java index ed427d9e4..38aa682ab 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/RecyclerViewNoBugLinearLayoutManager.java +++ b/app/src/main/java/com/chwl/app/ui/widget/RecyclerViewNoBugLinearLayoutManager.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/RecyclerViewNoViewpagerScroll.java b/app/src/main/java/com/chwl/app/ui/widget/RecyclerViewNoViewpagerScroll.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/ui/widget/RecyclerViewNoViewpagerScroll.java rename to app/src/main/java/com/chwl/app/ui/widget/RecyclerViewNoViewpagerScroll.java index bfb8a5325..4f7cbb716 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/RecyclerViewNoViewpagerScroll.java +++ b/app/src/main/java/com/chwl/app/ui/widget/RecyclerViewNoViewpagerScroll.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/RedPointView.java b/app/src/main/java/com/chwl/app/ui/widget/RedPointView.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/ui/widget/RedPointView.java rename to app/src/main/java/com/chwl/app/ui/widget/RedPointView.java index b734417aa..116b69f71 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/RedPointView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/RedPointView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.content.Context; import android.content.res.TypedArray; @@ -12,8 +12,8 @@ import android.util.AttributeSet; import androidx.annotation.Nullable; import androidx.appcompat.widget.AppCompatTextView; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.R; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; /** * 本来是继承View，但是发现new出来的paint和textview不一样，（暂时没找到原因） diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/ScollLinearLayoutManager.java b/app/src/main/java/com/chwl/app/ui/widget/ScollLinearLayoutManager.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/widget/ScollLinearLayoutManager.java rename to app/src/main/java/com/chwl/app/ui/widget/ScollLinearLayoutManager.java index 9287f9140..25bc90ffa 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/ScollLinearLayoutManager.java +++ b/app/src/main/java/com/chwl/app/ui/widget/ScollLinearLayoutManager.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.content.Context; import android.graphics.PointF; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/ShareDialog.java b/app/src/main/java/com/chwl/app/ui/widget/ShareDialog.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/ui/widget/ShareDialog.java rename to app/src/main/java/com/chwl/app/ui/widget/ShareDialog.java index 230b1654a..59805335d 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/ShareDialog.java +++ b/app/src/main/java/com/chwl/app/ui/widget/ShareDialog.java @@ -1,6 +1,6 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; -import static com.yizhuan.xchat_android_library.utils.ResUtil.getString; +import static com.chwl.library.utils.ResUtil.getString; import android.content.Context; import android.os.Bundle; @@ -11,9 +11,9 @@ import android.view.WindowManager; import android.widget.TextView; import com.google.android.material.bottomsheet.BottomSheetDialog; -import com.yizhuan.habu.R; -import com.yizhuan.habu.application.ReportManager; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.app.application.ReportManager; +import com.chwl.library.utils.SingleToastUtil; import java.util.HashMap; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/ShareRedBagDialog.java b/app/src/main/java/com/chwl/app/ui/widget/ShareRedBagDialog.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/ui/widget/ShareRedBagDialog.java rename to app/src/main/java/com/chwl/app/ui/widget/ShareRedBagDialog.java index c759af056..04f121cf1 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/ShareRedBagDialog.java +++ b/app/src/main/java/com/chwl/app/ui/widget/ShareRedBagDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.app.Dialog; import android.content.Context; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/SimpleAnimListener.java b/app/src/main/java/com/chwl/app/ui/widget/SimpleAnimListener.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/ui/widget/SimpleAnimListener.java rename to app/src/main/java/com/chwl/app/ui/widget/SimpleAnimListener.java index 175cd40f0..b7c080a58 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/SimpleAnimListener.java +++ b/app/src/main/java/com/chwl/app/ui/widget/SimpleAnimListener.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/SquareImageView.java b/app/src/main/java/com/chwl/app/ui/widget/SquareImageView.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/ui/widget/SquareImageView.java rename to app/src/main/java/com/chwl/app/ui/widget/SquareImageView.java index 1c69cd7df..6af482dc7 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/SquareImageView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/SquareImageView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/SquareLayout.java b/app/src/main/java/com/chwl/app/ui/widget/SquareLayout.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/ui/widget/SquareLayout.java rename to app/src/main/java/com/chwl/app/ui/widget/SquareLayout.java index 639232d74..948521f31 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/SquareLayout.java +++ b/app/src/main/java/com/chwl/app/ui/widget/SquareLayout.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/SuperEditText.java b/app/src/main/java/com/chwl/app/ui/widget/SuperEditText.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/widget/SuperEditText.java rename to app/src/main/java/com/chwl/app/ui/widget/SuperEditText.java index f4340fb55..8296d6f0e 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/SuperEditText.java +++ b/app/src/main/java/com/chwl/app/ui/widget/SuperEditText.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.content.Context; import android.content.res.TypedArray; @@ -15,7 +15,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.yizhuan.habu.R; +import com.chwl.app.R; /** * Created by huangmeng1 on 2018/6/27. diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/TextWatcherSimple.java b/app/src/main/java/com/chwl/app/ui/widget/TextWatcherSimple.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/ui/widget/TextWatcherSimple.java rename to app/src/main/java/com/chwl/app/ui/widget/TextWatcherSimple.java index 32af8ede6..ed321336c 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/TextWatcherSimple.java +++ b/app/src/main/java/com/chwl/app/ui/widget/TextWatcherSimple.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.text.TextWatcher; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/TopRoundLinearLayout.java b/app/src/main/java/com/chwl/app/ui/widget/TopRoundLinearLayout.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/ui/widget/TopRoundLinearLayout.java rename to app/src/main/java/com/chwl/app/ui/widget/TopRoundLinearLayout.java index c5f5124ec..46c727ba7 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/TopRoundLinearLayout.java +++ b/app/src/main/java/com/chwl/app/ui/widget/TopRoundLinearLayout.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.content.Context; import android.graphics.Canvas; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/UserInfoDialog.java b/app/src/main/java/com/chwl/app/ui/widget/UserInfoDialog.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/ui/widget/UserInfoDialog.java rename to app/src/main/java/com/chwl/app/ui/widget/UserInfoDialog.java index be35ea7b0..95799121f 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/UserInfoDialog.java +++ b/app/src/main/java/com/chwl/app/ui/widget/UserInfoDialog.java @@ -1,9 +1,9 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.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.yizhuan.xchat_android_library.utils.ResUtil.getString; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAGON_BAR; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAGON_BAR_CANCEL; +import static com.chwl.core.manager.RoomEvent.DRAGON_BAR_CANCEL; +import static com.chwl.library.utils.ResUtil.getString; import android.annotation.SuppressLint; import android.content.ClipData; @@ -32,64 +32,64 @@ 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.habu.R; -import com.yizhuan.habu.UIHelper; -import com.yizhuan.habu.avroom.ButtonItemFactory; -import com.yizhuan.habu.avroom.activity.AVRoomActivity; -import com.yizhuan.habu.avroom.adapter.UpMicAdapter; -import com.yizhuan.habu.avroom.giftvalue.GiftValueDialogUiHelper; -import com.yizhuan.habu.avroom.widget.ViewItem; -import com.yizhuan.habu.common.widget.dialog.DialogManager; -import com.yizhuan.habu.ui.user.activity.UserInfoActivity; -import com.yizhuan.habu.ui.user.adapter.SkillPicsAdapter; -import com.yizhuan.habu.ui.user.decorationsend.UserInfoSkillDecoration; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.habu.utils.RegexUtil; -import com.yizhuan.habu.view.GenderAgeTextView; -import com.yizhuan.habu.vip.util.VipHelper; +import com.chwl.app.R; +import com.chwl.app.UIHelper; +import com.chwl.app.avroom.ButtonItemFactory; +import com.chwl.app.avroom.activity.AVRoomActivity; +import com.chwl.app.avroom.adapter.UpMicAdapter; +import com.chwl.app.avroom.giftvalue.GiftValueDialogUiHelper; +import com.chwl.app.avroom.widget.ViewItem; +import com.chwl.app.common.widget.dialog.DialogManager; +import com.chwl.app.ui.user.activity.UserInfoActivity; +import com.chwl.app.ui.user.adapter.SkillPicsAdapter; +import com.chwl.app.ui.user.decorationsend.UserInfoSkillDecoration; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.app.utils.RegexUtil; +import com.chwl.app.view.GenderAgeTextView; +import com.chwl.app.vip.util.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.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.Logger; -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.chwl.core.Constants; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.bean.RoomMicInfo; +import com.chwl.core.bean.RoomQueueInfo; +import com.chwl.core.decoration.headwear.bean.HeadWearInfo; +import com.chwl.core.family.bean.FamilyInfo; +import com.chwl.core.family.model.FamilyModel; +import com.chwl.core.im.custom.bean.FaceAttachment; +import com.chwl.core.kick.KickModel; +import com.chwl.core.level.UserLevelVo; +import com.chwl.core.manager.AvRoomDataManager; +import com.chwl.core.manager.IMNetEaseManager; +import com.chwl.core.manager.RoomEvent; +import com.chwl.core.market_verify.MarketVerifyModel; +import com.chwl.core.noble.NobleInfo; +import com.chwl.core.noble.NobleUtil; +import com.chwl.core.praise.PraiseModel; +import com.chwl.core.room.bean.RoomInfo; +import com.chwl.core.room.bean.RoomResult; +import com.chwl.core.room.dragonball.DragonBallModel; +import com.chwl.core.room.event.DatingSelectUserEvent; +import com.chwl.core.room.event.RoomAtEvent; +import com.chwl.core.room.face.FaceReceiveInfo; +import com.chwl.core.room.giftvalue.GiftValueModel; +import com.chwl.core.room.giftvalue.bean.RoomGiftValue; +import com.chwl.core.room.giftvalue.helper.GiftValueMrg; +import com.chwl.core.room.model.AvRoomModel; +import com.chwl.core.room.model.HomePartyModel; +import com.chwl.core.super_admin.model.SuperAdminModel; +import com.chwl.core.super_admin.util.SuperAdminUtil; +import com.chwl.core.user.UserModel; +import com.chwl.core.user.bean.BaseInfo; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.core.utils.Logger; +import com.chwl.core.utils.StringUtils; +import com.chwl.core.utils.net.BeanObserver; +import com.chwl.core.utils.net.DontWarnObserver; +import com.chwl.core.utils.net.RxHelper; +import com.chwl.library.net.rxnet.callback.CallBack; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.SingleToastUtil; +import com.chwl.library.utils.config.BasicConfig; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/UserInfoView.java b/app/src/main/java/com/chwl/app/ui/widget/UserInfoView.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/ui/widget/UserInfoView.java rename to app/src/main/java/com/chwl/app/ui/widget/UserInfoView.java index b157a29b5..0ffca6325 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/UserInfoView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/UserInfoView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.content.Context; import android.text.TextUtils; @@ -11,10 +11,10 @@ import android.widget.TextView; import androidx.annotation.Nullable; import androidx.appcompat.widget.AppCompatImageView; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.habu.utils.RegexUtil; -import com.yizhuan.xchat_android_core.user.bean.SimpleUserInfo; +import com.chwl.app.R; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.app.utils.RegexUtil; +import com.chwl.core.user.bean.SimpleUserInfo; /** * 用户信息展示 一个通用的展示，用户昵称，性别，经验等级，魅力等级 diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/UserInfoWrapContentPager.java b/app/src/main/java/com/chwl/app/ui/widget/UserInfoWrapContentPager.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/ui/widget/UserInfoWrapContentPager.java rename to app/src/main/java/com/chwl/app/ui/widget/UserInfoWrapContentPager.java index a18ae8968..033cecb72 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/UserInfoWrapContentPager.java +++ b/app/src/main/java/com/chwl/app/ui/widget/UserInfoWrapContentPager.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/UserMagicIndicator.java b/app/src/main/java/com/chwl/app/ui/widget/UserMagicIndicator.java similarity index 79% rename from app/src/main/java/com/yizhuan/habu/ui/widget/UserMagicIndicator.java rename to app/src/main/java/com/chwl/app/ui/widget/UserMagicIndicator.java index b7e9b4409..89554873a 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/UserMagicIndicator.java +++ b/app/src/main/java/com/chwl/app/ui/widget/UserMagicIndicator.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.content.Context; import android.view.ViewGroup; @@ -6,15 +6,15 @@ import android.widget.FrameLayout; import androidx.core.content.ContextCompat; -import com.yizhuan.habu.R; -import com.yizhuan.habu.decoration.view.widgets.BadgeScaleTransitionPagerTitleView; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; -import com.yizhuan.xchat_android_core.home.bean.TabInfo; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.decoration.view.widgets.BadgeScaleTransitionPagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; +import com.chwl.core.home.bean.TabInfo; +import com.chwl.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/WrapContentViewPager.java b/app/src/main/java/com/chwl/app/ui/widget/WrapContentViewPager.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/ui/widget/WrapContentViewPager.java rename to app/src/main/java/com/chwl/app/ui/widget/WrapContentViewPager.java index 9ae94bf9c..be4de604f 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/WrapContentViewPager.java +++ b/app/src/main/java/com/chwl/app/ui/widget/WrapContentViewPager.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget; +package com.chwl.app.ui.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/XRecyclerView/ScaleTransitionPagerTitleView.java b/app/src/main/java/com/chwl/app/ui/widget/XRecyclerView/ScaleTransitionPagerTitleView.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/ui/widget/XRecyclerView/ScaleTransitionPagerTitleView.java rename to app/src/main/java/com/chwl/app/ui/widget/XRecyclerView/ScaleTransitionPagerTitleView.java index 34d43b307..c593cd543 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/XRecyclerView/ScaleTransitionPagerTitleView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/XRecyclerView/ScaleTransitionPagerTitleView.java @@ -1,9 +1,9 @@ -package com.yizhuan.habu.ui.widget.XRecyclerView; +package com.chwl.app.ui.widget.XRecyclerView; import android.content.Context; import android.text.TextPaint; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.titles.ColorTransitionPagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.titles.ColorTransitionPagerTitleView; /** diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/bubble/LeBubbleTextView.java b/app/src/main/java/com/chwl/app/ui/widget/bubble/LeBubbleTextView.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/widget/bubble/LeBubbleTextView.java rename to app/src/main/java/com/chwl/app/ui/widget/bubble/LeBubbleTextView.java index 4b69ce639..31ad48d58 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/bubble/LeBubbleTextView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/bubble/LeBubbleTextView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.bubble; +package com.chwl.app.ui.widget.bubble; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/bubble/LeBubbleTextViewHelper.java b/app/src/main/java/com/chwl/app/ui/widget/bubble/LeBubbleTextViewHelper.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/widget/bubble/LeBubbleTextViewHelper.java rename to app/src/main/java/com/chwl/app/ui/widget/bubble/LeBubbleTextViewHelper.java index 0967bcedb..a75c96184 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/bubble/LeBubbleTextViewHelper.java +++ b/app/src/main/java/com/chwl/app/ui/widget/bubble/LeBubbleTextViewHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.bubble; +package com.chwl.app.ui.widget.bubble; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/bubble/LeBubbleTextViews.java b/app/src/main/java/com/chwl/app/ui/widget/bubble/LeBubbleTextViews.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/widget/bubble/LeBubbleTextViews.java rename to app/src/main/java/com/chwl/app/ui/widget/bubble/LeBubbleTextViews.java index 630dd6a3e..8469a6e49 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/bubble/LeBubbleTextViews.java +++ b/app/src/main/java/com/chwl/app/ui/widget/bubble/LeBubbleTextViews.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.bubble; +package com.chwl.app.ui.widget.bubble; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/bubble/LeBubbleTitleTextView.java b/app/src/main/java/com/chwl/app/ui/widget/bubble/LeBubbleTitleTextView.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/widget/bubble/LeBubbleTitleTextView.java rename to app/src/main/java/com/chwl/app/ui/widget/bubble/LeBubbleTitleTextView.java index d424320a9..c53824084 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/bubble/LeBubbleTitleTextView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/bubble/LeBubbleTitleTextView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.bubble; +package com.chwl.app.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.habu.R; +import com.chwl.app.R; /** diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/bubble/LeBubbleView.java b/app/src/main/java/com/chwl/app/ui/widget/bubble/LeBubbleView.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/ui/widget/bubble/LeBubbleView.java rename to app/src/main/java/com/chwl/app/ui/widget/bubble/LeBubbleView.java index 8abde8761..7d6c11caf 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/bubble/LeBubbleView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/bubble/LeBubbleView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.bubble; +package com.chwl.app.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.habu.R; +import com.chwl.app.R; /** diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/bubble/LeRoundRectDrawable2.java b/app/src/main/java/com/chwl/app/ui/widget/bubble/LeRoundRectDrawable2.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/widget/bubble/LeRoundRectDrawable2.java rename to app/src/main/java/com/chwl/app/ui/widget/bubble/LeRoundRectDrawable2.java index 315c4410f..518689293 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/bubble/LeRoundRectDrawable2.java +++ b/app/src/main/java/com/chwl/app/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.habu.ui.widget.bubble; +package com.chwl.app.ui.widget.bubble; import android.graphics.Canvas; import android.graphics.ColorFilter; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/bubble/LeStateColorDrawable.java b/app/src/main/java/com/chwl/app/ui/widget/bubble/LeStateColorDrawable.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/ui/widget/bubble/LeStateColorDrawable.java rename to app/src/main/java/com/chwl/app/ui/widget/bubble/LeStateColorDrawable.java index fcd4e45d6..6e1f2f726 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/bubble/LeStateColorDrawable.java +++ b/app/src/main/java/com/chwl/app/ui/widget/bubble/LeStateColorDrawable.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.bubble; +package com.chwl.app.ui.widget.bubble; import android.graphics.drawable.ColorDrawable; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/bubble/TintedBitmapDrawable.java b/app/src/main/java/com/chwl/app/ui/widget/bubble/TintedBitmapDrawable.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/ui/widget/bubble/TintedBitmapDrawable.java rename to app/src/main/java/com/chwl/app/ui/widget/bubble/TintedBitmapDrawable.java index 7715bcbed..00621624f 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/bubble/TintedBitmapDrawable.java +++ b/app/src/main/java/com/chwl/app/ui/widget/bubble/TintedBitmapDrawable.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.bubble; +package com.chwl.app.ui.widget.bubble; import android.content.res.Resources; import android.graphics.Bitmap; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/dialog/AllPlayEffectDialog.java b/app/src/main/java/com/chwl/app/ui/widget/dialog/AllPlayEffectDialog.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/ui/widget/dialog/AllPlayEffectDialog.java rename to app/src/main/java/com/chwl/app/ui/widget/dialog/AllPlayEffectDialog.java index caa4817f7..6879ed2d7 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/dialog/AllPlayEffectDialog.java +++ b/app/src/main/java/com/chwl/app/ui/widget/dialog/AllPlayEffectDialog.java @@ -1,9 +1,9 @@ -package com.yizhuan.habu.ui.widget.dialog; +package com.chwl.app.ui.widget.dialog; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_ALL; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_SERVER_ALL; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ALL_ROOM_NOTIFY_BY_SVGA; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L5; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_ALL; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_SERVER_ALL; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ALL_ROOM_NOTIFY_BY_SVGA; +import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L5; import android.content.Context; import android.graphics.Color; @@ -31,23 +31,23 @@ import com.opensource.svgaplayer.SVGADynamicEntity; import com.opensource.svgaplayer.SVGAImageView; import com.opensource.svgaplayer.SVGAParser; import com.opensource.svgaplayer.SVGAVideoEntity; -import com.yizhuan.habu.R; -import com.yizhuan.habu.avroom.activity.AVRoomActivity; -import com.yizhuan.habu.common.svga.SimpleSvgaCallback; -import com.yizhuan.habu.databinding.DialogAllPlayEffectBinding; -import com.yizhuan.habu.ui.webview.CommonWebViewActivity; -import com.yizhuan.habu.utils.RegexUtil; -import com.yizhuan.habu.utils.SpannableBuilder; -import com.yizhuan.xchat_android_core.gift.bean.LuckyBagNoticeInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.NotifyH5Info; -import com.yizhuan.xchat_android_core.im.custom.bean.PlayEffectInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomBoxPrizeInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomLuckySeaMsgBean; -import com.yizhuan.xchat_android_core.im.custom.bean.TarotMsgBean; -import com.yizhuan.xchat_android_core.treasurefairy.FairyMsgInfoBean; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.StringUtils; +import com.chwl.app.R; +import com.chwl.app.avroom.activity.AVRoomActivity; +import com.chwl.app.common.svga.SimpleSvgaCallback; +import com.chwl.app.databinding.DialogAllPlayEffectBinding; +import com.chwl.app.ui.webview.CommonWebViewActivity; +import com.chwl.app.utils.RegexUtil; +import com.chwl.app.utils.SpannableBuilder; +import com.chwl.core.gift.bean.LuckyBagNoticeInfo; +import com.chwl.core.im.custom.bean.CustomAttachment; +import com.chwl.core.im.custom.bean.NotifyH5Info; +import com.chwl.core.im.custom.bean.PlayEffectInfo; +import com.chwl.core.im.custom.bean.RoomBoxPrizeInfo; +import com.chwl.core.im.custom.bean.RoomLuckySeaMsgBean; +import com.chwl.core.im.custom.bean.TarotMsgBean; +import com.chwl.core.treasurefairy.FairyMsgInfoBean; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.StringUtils; public class AllPlayEffectDialog extends BaseDialog { diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/dialog/AllServiceGiftGoRoomTipsDialog.kt b/app/src/main/java/com/chwl/app/ui/widget/dialog/AllServiceGiftGoRoomTipsDialog.kt similarity index 86% rename from app/src/main/java/com/yizhuan/habu/ui/widget/dialog/AllServiceGiftGoRoomTipsDialog.kt rename to app/src/main/java/com/chwl/app/ui/widget/dialog/AllServiceGiftGoRoomTipsDialog.kt index 3ccb2f33e..6ecab9ac6 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/dialog/AllServiceGiftGoRoomTipsDialog.kt +++ b/app/src/main/java/com/chwl/app/ui/widget/dialog/AllServiceGiftGoRoomTipsDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.dialog +package com.chwl.app.ui.widget.dialog import android.content.Context import android.os.Bundle @@ -8,13 +8,13 @@ import android.view.Window import android.view.WindowManager import androidx.databinding.DataBindingUtil import com.example.lib_utils.ktx.singleClick -import com.yizhuan.habu.R -import com.yizhuan.habu.avroom.activity.AVRoomActivity -import com.yizhuan.habu.databinding.AllServiceGiftGoRoomTipsDialogBinding -import com.yizhuan.habu.public_chat_hall.activity.PublicChatHallHomeActivity -import com.yizhuan.xchat_android_core.initial.InitialModel -import com.yizhuan.xchat_android_library.common.util.SPUtils -import com.yizhuan.xchat_android_library.utils.JavaUtil +import com.chwl.app.R +import com.chwl.app.avroom.activity.AVRoomActivity +import com.chwl.app.databinding.AllServiceGiftGoRoomTipsDialogBinding +import com.chwl.app.public_chat_hall.activity.PublicChatHallHomeActivity +import com.chwl.core.initial.InitialModel +import com.chwl.library.common.util.SPUtils +import com.chwl.library.utils.JavaUtil /** * Created by Max on 2023/10/30 10:29 diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/dialog/AllServiceGiftLevelDialog.kt b/app/src/main/java/com/chwl/app/ui/widget/dialog/AllServiceGiftLevelDialog.kt similarity index 93% rename from app/src/main/java/com/yizhuan/habu/ui/widget/dialog/AllServiceGiftLevelDialog.kt rename to app/src/main/java/com/chwl/app/ui/widget/dialog/AllServiceGiftLevelDialog.kt index 1726c5000..2b76786d7 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/dialog/AllServiceGiftLevelDialog.kt +++ b/app/src/main/java/com/chwl/app/ui/widget/dialog/AllServiceGiftLevelDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.dialog +package com.chwl.app.ui.widget.dialog import android.content.Context import android.graphics.Color @@ -16,13 +16,13 @@ import com.example.lib_utils.ktx.getColorById import com.example.lib_utils.ktx.singleClick import com.example.lib_utils.ktx.toStringRes import com.example.lib_utils.spannable.SpannableTextBuilder -import com.yizhuan.habu.R -import com.yizhuan.habu.avroom.activity.AVRoomActivity -import com.yizhuan.habu.databinding.DialogGiftAllServiceLevelBinding -import com.yizhuan.habu.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_library.utils.JavaUtil +import com.chwl.app.R +import com.chwl.app.avroom.activity.AVRoomActivity +import com.chwl.app.databinding.DialogGiftAllServiceLevelBinding +import com.chwl.app.public_chat_hall.activity.PublicChatHallHomeActivity +import com.chwl.core.initial.InitialModel +import com.chwl.core.noble.AllServiceGiftProtocol +import com.chwl.library.utils.JavaUtil import io.reactivex.Observable import io.reactivex.disposables.Disposable import java.util.concurrent.TimeUnit diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/dialog/AllServiceVipLevelUPDialog.java b/app/src/main/java/com/chwl/app/ui/widget/dialog/AllServiceVipLevelUPDialog.java similarity index 92% rename from app/src/main/java/com/yizhuan/habu/ui/widget/dialog/AllServiceVipLevelUPDialog.java rename to app/src/main/java/com/chwl/app/ui/widget/dialog/AllServiceVipLevelUPDialog.java index e333c13ee..cfa58f98f 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/dialog/AllServiceVipLevelUPDialog.java +++ b/app/src/main/java/com/chwl/app/ui/widget/dialog/AllServiceVipLevelUPDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.dialog; +package com.chwl.app.ui.widget.dialog; import android.content.Context; import android.graphics.Color; @@ -22,14 +22,14 @@ import com.opensource.svgaplayer.SVGADynamicEntity; import com.opensource.svgaplayer.SVGAImageView; import com.opensource.svgaplayer.SVGAParser; import com.opensource.svgaplayer.SVGAVideoEntity; -import com.yizhuan.habu.R; -import com.yizhuan.habu.common.svga.SimpleSvgaCallback; -import com.yizhuan.habu.common.widget.CircleImageSpan; -import com.yizhuan.habu.databinding.DialogVipAllServiceLevelUpBinding; -import com.yizhuan.habu.utils.SpannableBuilder; -import com.yizhuan.xchat_android_core.utils.StringExtensionKt; -import com.yizhuan.xchat_android_core.vip.VipMessageInfo; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.common.svga.SimpleSvgaCallback; +import com.chwl.app.common.widget.CircleImageSpan; +import com.chwl.app.databinding.DialogVipAllServiceLevelUpBinding; +import com.chwl.app.utils.SpannableBuilder; +import com.chwl.core.utils.StringExtensionKt; +import com.chwl.core.vip.VipMessageInfo; +import com.chwl.library.utils.ResUtil; import java.net.URL; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/dialog/BaseDialog.java b/app/src/main/java/com/chwl/app/ui/widget/dialog/BaseDialog.java similarity index 82% rename from app/src/main/java/com/yizhuan/habu/ui/widget/dialog/BaseDialog.java rename to app/src/main/java/com/chwl/app/ui/widget/dialog/BaseDialog.java index 1a8a3b2a1..9c978841a 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/dialog/BaseDialog.java +++ b/app/src/main/java/com/chwl/app/ui/widget/dialog/BaseDialog.java @@ -1,10 +1,10 @@ -package com.yizhuan.habu.ui.widget.dialog; +package com.chwl.app.ui.widget.dialog; import android.content.Context; import androidx.appcompat.app.AppCompatDialog; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.library.utils.SingleToastUtil; /** * Created by huangmeng1 on 2018/4/11. diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/dialog/CommonDialog.java b/app/src/main/java/com/chwl/app/ui/widget/dialog/CommonDialog.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/ui/widget/dialog/CommonDialog.java rename to app/src/main/java/com/chwl/app/ui/widget/dialog/CommonDialog.java index 92d57ae13..fb841606b 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/dialog/CommonDialog.java +++ b/app/src/main/java/com/chwl/app/ui/widget/dialog/CommonDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.dialog; +package com.chwl.app.ui.widget.dialog; import android.content.Context; import android.os.Bundle; @@ -10,9 +10,9 @@ import android.widget.TextView; import androidx.annotation.ColorRes; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_core.utils.TextUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.core.utils.TextUtils; +import com.chwl.library.utils.ResUtil; import static android.graphics.Typeface.BOLD; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/dialog/CommonLoadingDialog.java b/app/src/main/java/com/chwl/app/ui/widget/dialog/CommonLoadingDialog.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/ui/widget/dialog/CommonLoadingDialog.java rename to app/src/main/java/com/chwl/app/ui/widget/dialog/CommonLoadingDialog.java index 08e7c5de9..c76600700 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/dialog/CommonLoadingDialog.java +++ b/app/src/main/java/com/chwl/app/ui/widget/dialog/CommonLoadingDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.dialog; +package com.chwl.app.ui.widget.dialog; import android.content.Context; import android.graphics.drawable.AnimationDrawable; @@ -10,8 +10,8 @@ import android.widget.TextView; import com.opensource.svgaplayer.SVGAImageView; import com.opensource.svgaplayer.SVGAParser; import com.opensource.svgaplayer.SVGAVideoEntity; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.library.utils.ResUtil; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/dialog/CommonMessageDialog.kt b/app/src/main/java/com/chwl/app/ui/widget/dialog/CommonMessageDialog.kt similarity index 55% rename from app/src/main/java/com/yizhuan/habu/ui/widget/dialog/CommonMessageDialog.kt rename to app/src/main/java/com/chwl/app/ui/widget/dialog/CommonMessageDialog.kt index 5fcc78c0c..58e5812c9 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/dialog/CommonMessageDialog.kt +++ b/app/src/main/java/com/chwl/app/ui/widget/dialog/CommonMessageDialog.kt @@ -1,10 +1,10 @@ -package com.yizhuan.habu.ui.widget.dialog +package com.chwl.app.ui.widget.dialog import android.content.Context -import com.yizhuan.habu.R -import com.yizhuan.habu.databinding.DialogCommonMessageBinding -import com.yizhuan.habu.treasure_box.widget.dialog.BaseBindingDialog -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes +import com.chwl.app.R +import com.chwl.app.databinding.DialogCommonMessageBinding +import com.chwl.app.treasure_box.widget.dialog.BaseBindingDialog +import com.chwl.library.annatation.ActLayoutRes @ActLayoutRes(R.layout.dialog_common_message) class CommonMessageDialog(context: Context, theme: Int) : diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/dialog/CommonTipDialog.java b/app/src/main/java/com/chwl/app/ui/widget/dialog/CommonTipDialog.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/ui/widget/dialog/CommonTipDialog.java rename to app/src/main/java/com/chwl/app/ui/widget/dialog/CommonTipDialog.java index 614d224a0..02dc17c0c 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/dialog/CommonTipDialog.java +++ b/app/src/main/java/com/chwl/app/ui/widget/dialog/CommonTipDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.dialog; +package com.chwl.app.ui.widget.dialog; import static android.graphics.Typeface.BOLD; @@ -12,9 +12,9 @@ import android.widget.TextView; import androidx.annotation.ColorRes; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_core.utils.TextUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.core.utils.TextUtils; +import com.chwl.library.utils.ResUtil; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/dialog/ExchangeDiamondTipDialog.java b/app/src/main/java/com/chwl/app/ui/widget/dialog/ExchangeDiamondTipDialog.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/ui/widget/dialog/ExchangeDiamondTipDialog.java rename to app/src/main/java/com/chwl/app/ui/widget/dialog/ExchangeDiamondTipDialog.java index 4984b61ae..a7c8d8139 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/dialog/ExchangeDiamondTipDialog.java +++ b/app/src/main/java/com/chwl/app/ui/widget/dialog/ExchangeDiamondTipDialog.java @@ -1,11 +1,11 @@ -package com.yizhuan.habu.ui.widget.dialog; +package com.chwl.app.ui.widget.dialog; import android.content.Context; import android.os.Bundle; import android.widget.ImageView; import android.widget.TextView; -import com.yizhuan.habu.R; +import com.chwl.app.R; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/dialog/GiftManualQuantityDialog.java b/app/src/main/java/com/chwl/app/ui/widget/dialog/GiftManualQuantityDialog.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/ui/widget/dialog/GiftManualQuantityDialog.java rename to app/src/main/java/com/chwl/app/ui/widget/dialog/GiftManualQuantityDialog.java index 0ae4bc9c5..2f2303bc2 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/dialog/GiftManualQuantityDialog.java +++ b/app/src/main/java/com/chwl/app/ui/widget/dialog/GiftManualQuantityDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.dialog; +package com.chwl.app.ui.widget.dialog; import android.app.Dialog; import android.content.Context; @@ -12,10 +12,10 @@ import android.view.WindowManager; import android.widget.EditText; import android.widget.TextView; -import com.yizhuan.habu.R; -import com.yizhuan.habu.utils.KeyBoardUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.app.utils.KeyBoardUtils; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/dialog/GiveDiamondTipDialog.java b/app/src/main/java/com/chwl/app/ui/widget/dialog/GiveDiamondTipDialog.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/ui/widget/dialog/GiveDiamondTipDialog.java rename to app/src/main/java/com/chwl/app/ui/widget/dialog/GiveDiamondTipDialog.java index 111509496..bb30b309c 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/dialog/GiveDiamondTipDialog.java +++ b/app/src/main/java/com/chwl/app/ui/widget/dialog/GiveDiamondTipDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.dialog; +package com.chwl.app.ui.widget.dialog; import static android.graphics.Typeface.BOLD; @@ -16,9 +16,9 @@ import android.widget.TextView; import androidx.annotation.ColorRes; import androidx.constraintlayout.widget.ConstraintLayout; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_core.utils.TextUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.core.utils.TextUtils; +import com.chwl.library.utils.ResUtil; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/dialog/MonsterDialog.java b/app/src/main/java/com/chwl/app/ui/widget/dialog/MonsterDialog.java similarity index 92% rename from app/src/main/java/com/yizhuan/habu/ui/widget/dialog/MonsterDialog.java rename to app/src/main/java/com/chwl/app/ui/widget/dialog/MonsterDialog.java index c0d2cf35b..2926e4273 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/dialog/MonsterDialog.java +++ b/app/src/main/java/com/chwl/app/ui/widget/dialog/MonsterDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.dialog; +package com.chwl.app.ui.widget.dialog; import android.content.Context; import android.graphics.Color; @@ -14,14 +14,14 @@ import android.view.WindowManager; import androidx.databinding.DataBindingUtil; -import com.yizhuan.habu.R; -import com.yizhuan.habu.avroom.activity.AVRoomActivity; -import com.yizhuan.habu.databinding.DialogMonsterBinding; -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.SizeUtils; +import com.chwl.app.R; +import com.chwl.app.avroom.activity.AVRoomActivity; +import com.chwl.app.databinding.DialogMonsterBinding; +import com.chwl.app.ui.webview.CommonWebViewActivity; +import com.chwl.core.UriProvider; +import com.chwl.core.monsterhunting.bean.MonsterInfo; +import com.chwl.core.monsterhunting.bean.MonsterProtocol; +import com.chwl.library.utils.SizeUtils; import java.text.SimpleDateFormat; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/dialog/OpenNobleDialog.java b/app/src/main/java/com/chwl/app/ui/widget/dialog/OpenNobleDialog.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/ui/widget/dialog/OpenNobleDialog.java rename to app/src/main/java/com/chwl/app/ui/widget/dialog/OpenNobleDialog.java index 86797c6b2..e23c11a77 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/dialog/OpenNobleDialog.java +++ b/app/src/main/java/com/chwl/app/ui/widget/dialog/OpenNobleDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.dialog; +package com.chwl.app.ui.widget.dialog; import android.content.Context; import android.os.Bundle; @@ -8,11 +8,11 @@ import android.widget.TextView; import androidx.appcompat.app.AppCompatDialog; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.webview.CommonWebViewActivity; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.ui.webview.CommonWebViewActivity; +import com.chwl.core.UriProvider; +import com.chwl.core.noble.NobleUtil; +import com.chwl.library.utils.ResUtil; /** *

开通贵族弹窗提示

diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/dialog/OpenNobleGlobalNoticeDialog.java b/app/src/main/java/com/chwl/app/ui/widget/dialog/OpenNobleGlobalNoticeDialog.java similarity index 92% rename from app/src/main/java/com/yizhuan/habu/ui/widget/dialog/OpenNobleGlobalNoticeDialog.java rename to app/src/main/java/com/chwl/app/ui/widget/dialog/OpenNobleGlobalNoticeDialog.java index 50792a3cc..9cfbc2442 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/dialog/OpenNobleGlobalNoticeDialog.java +++ b/app/src/main/java/com/chwl/app/ui/widget/dialog/OpenNobleGlobalNoticeDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.dialog; +package com.chwl.app.ui.widget.dialog; import android.animation.Animator; import android.content.Context; @@ -12,9 +12,9 @@ import android.view.WindowManager; import androidx.appcompat.app.AppCompatDialog; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.widget.MarqueeLayout; -import com.yizhuan.xchat_android_library.utils.SizeUtils; +import com.chwl.app.R; +import com.chwl.app.ui.widget.MarqueeLayout; +import com.chwl.library.utils.SizeUtils; /** *

diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/drawgift/DrawGiftHelper.java b/app/src/main/java/com/chwl/app/ui/widget/drawgift/DrawGiftHelper.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/ui/widget/drawgift/DrawGiftHelper.java rename to app/src/main/java/com/chwl/app/ui/widget/drawgift/DrawGiftHelper.java index 811d7d910..973353f6d 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/drawgift/DrawGiftHelper.java +++ b/app/src/main/java/com/chwl/app/ui/widget/drawgift/DrawGiftHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.drawgift; +package com.chwl.app.ui.widget.drawgift; import android.app.Activity; import android.graphics.Bitmap; @@ -13,8 +13,8 @@ import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.transition.Transition; import com.netease.nim.uikit.common.util.sys.ScreenUtil; import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/drawgift/DrawGiftModel.java b/app/src/main/java/com/chwl/app/ui/widget/drawgift/DrawGiftModel.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/ui/widget/drawgift/DrawGiftModel.java rename to app/src/main/java/com/chwl/app/ui/widget/drawgift/DrawGiftModel.java index fc71d420a..17c7ac3dc 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/drawgift/DrawGiftModel.java +++ b/app/src/main/java/com/chwl/app/ui/widget/drawgift/DrawGiftModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.drawgift; +package com.chwl.app.ui.widget.drawgift; import android.graphics.Bitmap; import android.graphics.Matrix; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/drawgift/DrawGiftPlayHelper.java b/app/src/main/java/com/chwl/app/ui/widget/drawgift/DrawGiftPlayHelper.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/ui/widget/drawgift/DrawGiftPlayHelper.java rename to app/src/main/java/com/chwl/app/ui/widget/drawgift/DrawGiftPlayHelper.java index 2296dc426..bc89ff4c3 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/drawgift/DrawGiftPlayHelper.java +++ b/app/src/main/java/com/chwl/app/ui/widget/drawgift/DrawGiftPlayHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.drawgift; +package com.chwl.app.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.habu.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.chwl.app.R; +import com.chwl.core.gift.GiftModel; +import com.chwl.core.gift.bean.GiftInfo; +import com.chwl.library.utils.ListUtils; import java.lang.ref.WeakReference; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/drawgift/DrawGiftPlayView.java b/app/src/main/java/com/chwl/app/ui/widget/drawgift/DrawGiftPlayView.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/ui/widget/drawgift/DrawGiftPlayView.java rename to app/src/main/java/com/chwl/app/ui/widget/drawgift/DrawGiftPlayView.java index c5aca840a..c9e2e1beb 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/drawgift/DrawGiftPlayView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/drawgift/DrawGiftPlayView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.drawgift; +package com.chwl.app.ui.widget.drawgift; import android.animation.Animator; import android.animation.ValueAnimator; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/drawgift/DrawGiftView.java b/app/src/main/java/com/chwl/app/ui/widget/drawgift/DrawGiftView.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/ui/widget/drawgift/DrawGiftView.java rename to app/src/main/java/com/chwl/app/ui/widget/drawgift/DrawGiftView.java index dffb6b300..e5fbf52e6 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/drawgift/DrawGiftView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/drawgift/DrawGiftView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.drawgift; +package com.chwl.app.ui.widget.drawgift; import android.app.Activity; import android.content.Context; @@ -17,8 +17,8 @@ import android.view.View; import android.view.WindowManager; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.library.utils.ResUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/dynamicface/DynamicFaceAdapter.java b/app/src/main/java/com/chwl/app/ui/widget/dynamicface/DynamicFaceAdapter.java similarity index 89% rename from app/src/main/java/com/yizhuan/habu/ui/widget/dynamicface/DynamicFaceAdapter.java rename to app/src/main/java/com/chwl/app/ui/widget/dynamicface/DynamicFaceAdapter.java index ae8c9ae4f..38732b810 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/dynamicface/DynamicFaceAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/widget/dynamicface/DynamicFaceAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.dynamicface; +package com.chwl.app.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.habu.R; -import com.yizhuan.habu.ui.utils.ImageLoadUtils; -import com.yizhuan.habu.vip.util.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.chwl.app.R; +import com.chwl.app.ui.utils.ImageLoadUtils; +import com.chwl.app.vip.util.VipHelper; +import com.chwl.core.gift.bean.SimpleVipInfo; +import com.chwl.core.room.face.FaceInfo; +import com.chwl.core.utils.TextUtils; +import com.chwl.library.utils.config.BasicConfig; import java.io.File; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/dynamicface/DynamicFaceBuilder.java b/app/src/main/java/com/chwl/app/ui/widget/dynamicface/DynamicFaceBuilder.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/ui/widget/dynamicface/DynamicFaceBuilder.java rename to app/src/main/java/com/chwl/app/ui/widget/dynamicface/DynamicFaceBuilder.java index 7036acd5f..834d5a588 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/dynamicface/DynamicFaceBuilder.java +++ b/app/src/main/java/com/chwl/app/ui/widget/dynamicface/DynamicFaceBuilder.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.dynamicface; +package com.chwl.app.ui.widget.dynamicface; /** * Created by chenran on 2017/9/9. diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/dynamicface/DynamicFaceDialog.java b/app/src/main/java/com/chwl/app/ui/widget/dynamicface/DynamicFaceDialog.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/ui/widget/dynamicface/DynamicFaceDialog.java rename to app/src/main/java/com/chwl/app/ui/widget/dynamicface/DynamicFaceDialog.java index 932e0d188..8290c415c 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/dynamicface/DynamicFaceDialog.java +++ b/app/src/main/java/com/chwl/app/ui/widget/dynamicface/DynamicFaceDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.dynamicface; +package com.chwl.app.ui.widget.dynamicface; import android.content.Context; import android.os.Bundle; @@ -18,18 +18,18 @@ import androidx.viewpager.widget.ViewPager; import com.google.android.material.bottomsheet.BottomSheetBehavior; import com.google.android.material.bottomsheet.BottomSheetDialog; -import com.yizhuan.habu.R; -import com.yizhuan.habu.common.util.Utils; -import com.yizhuan.habu.common.widget.dialog.DialogManager; -import com.yizhuan.habu.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.utils.LogUtils; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.chwl.app.R; +import com.chwl.app.common.util.Utils; +import com.chwl.app.common.widget.dialog.DialogManager; +import com.chwl.app.vip.VipMainActivity; +import com.chwl.core.market_verify.MarketVerifyModel; +import com.chwl.core.room.event.FaceIsReadyEvent; +import com.chwl.core.room.face.DynamicFaceModel; +import com.chwl.core.room.face.FaceInfo; +import com.chwl.core.utils.LogUtils; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; +import com.chwl.library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/dynamicface/FaceItem.java b/app/src/main/java/com/chwl/app/ui/widget/dynamicface/FaceItem.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/ui/widget/dynamicface/FaceItem.java rename to app/src/main/java/com/chwl/app/ui/widget/dynamicface/FaceItem.java index 993996461..aeb7fec30 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/dynamicface/FaceItem.java +++ b/app/src/main/java/com/chwl/app/ui/widget/dynamicface/FaceItem.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.dynamicface; +package com.chwl.app.ui.widget.dynamicface; /** * Created by chenran on 2017/9/9. diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/dynamicface/FaceResultItem.java b/app/src/main/java/com/chwl/app/ui/widget/dynamicface/FaceResultItem.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/ui/widget/dynamicface/FaceResultItem.java rename to app/src/main/java/com/chwl/app/ui/widget/dynamicface/FaceResultItem.java index 52b611810..b70c85c05 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/dynamicface/FaceResultItem.java +++ b/app/src/main/java/com/chwl/app/ui/widget/dynamicface/FaceResultItem.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.dynamicface; +package com.chwl.app.ui.widget.dynamicface; /** * Created by chenran on 2017/9/9. diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/higuide/GuideUtils.java b/app/src/main/java/com/chwl/app/ui/widget/higuide/GuideUtils.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/widget/higuide/GuideUtils.java rename to app/src/main/java/com/chwl/app/ui/widget/higuide/GuideUtils.java index 94ed91784..c18677bc4 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/higuide/GuideUtils.java +++ b/app/src/main/java/com/chwl/app/ui/widget/higuide/GuideUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.higuide; +package com.chwl.app.ui.widget.higuide; import android.content.Context; import android.graphics.Point; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/higuide/GuideView.java b/app/src/main/java/com/chwl/app/ui/widget/higuide/GuideView.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/ui/widget/higuide/GuideView.java rename to app/src/main/java/com/chwl/app/ui/widget/higuide/GuideView.java index 04ce132c8..6bc10d664 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/higuide/GuideView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/higuide/GuideView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.higuide; +package com.chwl.app.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.habu.ui.widget.higuide.Overlay.HightLight; -import com.yizhuan.habu.ui.widget.higuide.Overlay.Tips; -import com.yizhuan.habu.ui.widget.higuide.Overlay.Tips.Margin; +import com.chwl.app.ui.widget.higuide.Overlay.HightLight; +import com.chwl.app.ui.widget.higuide.Overlay.Tips; +import com.chwl.app.ui.widget.higuide.Overlay.Tips.Margin; /** * Create By Zii at 2018/5/3. diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/higuide/HiGuide.java b/app/src/main/java/com/chwl/app/ui/widget/higuide/HiGuide.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/ui/widget/higuide/HiGuide.java rename to app/src/main/java/com/chwl/app/ui/widget/higuide/HiGuide.java index e0e93d3d6..c031f558a 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/higuide/HiGuide.java +++ b/app/src/main/java/com/chwl/app/ui/widget/higuide/HiGuide.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.higuide; +package com.chwl.app.ui.widget.higuide; import android.app.Activity; import android.content.Context; @@ -8,9 +8,9 @@ import android.widget.FrameLayout; import androidx.annotation.IntDef; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.widget.higuide.GuideView.RemoveCallback; -import com.yizhuan.habu.ui.widget.higuide.Overlay.Tips; +import com.chwl.app.R; +import com.chwl.app.ui.widget.higuide.GuideView.RemoveCallback; +import com.chwl.app.ui.widget.higuide.Overlay.Tips; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/higuide/HiLightInfo.java b/app/src/main/java/com/chwl/app/ui/widget/higuide/HiLightInfo.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/ui/widget/higuide/HiLightInfo.java rename to app/src/main/java/com/chwl/app/ui/widget/higuide/HiLightInfo.java index a09c536c9..c1d8f365e 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/higuide/HiLightInfo.java +++ b/app/src/main/java/com/chwl/app/ui/widget/higuide/HiLightInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.higuide; +package com.chwl.app.ui.widget.higuide; import android.graphics.RectF; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/higuide/LightConfig.java b/app/src/main/java/com/chwl/app/ui/widget/higuide/LightConfig.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/ui/widget/higuide/LightConfig.java rename to app/src/main/java/com/chwl/app/ui/widget/higuide/LightConfig.java index 5d9e77f39..d5cf3b50d 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/higuide/LightConfig.java +++ b/app/src/main/java/com/chwl/app/ui/widget/higuide/LightConfig.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.higuide; +package com.chwl.app.ui.widget.higuide; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/higuide/OverLayer.java b/app/src/main/java/com/chwl/app/ui/widget/higuide/OverLayer.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/ui/widget/higuide/OverLayer.java rename to app/src/main/java/com/chwl/app/ui/widget/higuide/OverLayer.java index 8aaa43f13..9f4d489ce 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/higuide/OverLayer.java +++ b/app/src/main/java/com/chwl/app/ui/widget/higuide/OverLayer.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.higuide; +package com.chwl.app.ui.widget.higuide; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/higuide/Overlay.java b/app/src/main/java/com/chwl/app/ui/widget/higuide/Overlay.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/ui/widget/higuide/Overlay.java rename to app/src/main/java/com/chwl/app/ui/widget/higuide/Overlay.java index 1db2dbfad..a8b988a9a 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/higuide/Overlay.java +++ b/app/src/main/java/com/chwl/app/ui/widget/higuide/Overlay.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.higuide; +package com.chwl.app.ui.widget.higuide; import android.graphics.Color; import android.graphics.RectF; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/higuide/TuTuGuideHelper.java b/app/src/main/java/com/chwl/app/ui/widget/higuide/TuTuGuideHelper.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/widget/higuide/TuTuGuideHelper.java rename to app/src/main/java/com/chwl/app/ui/widget/higuide/TuTuGuideHelper.java index e312101ab..a118152ab 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/higuide/TuTuGuideHelper.java +++ b/app/src/main/java/com/chwl/app/ui/widget/higuide/TuTuGuideHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.higuide; +package com.chwl.app.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.habu.R; -import com.yizhuan.habu.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.chwl.app.R; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.core.utils.ActivityUtil; +import com.chwl.core.utils.SharedPreferenceUtils; +import com.chwl.library.utils.ListUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/higuide/TuTuGuideView.java b/app/src/main/java/com/chwl/app/ui/widget/higuide/TuTuGuideView.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/ui/widget/higuide/TuTuGuideView.java rename to app/src/main/java/com/chwl/app/ui/widget/higuide/TuTuGuideView.java index 662439c0b..10eec0ad0 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/higuide/TuTuGuideView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/higuide/TuTuGuideView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.higuide; +package com.chwl.app.ui.widget.higuide; import android.content.Context; import android.graphics.Canvas; @@ -14,8 +14,8 @@ import android.widget.TextView; import androidx.annotation.NonNull; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.R; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/interfacex/MicListItem.java b/app/src/main/java/com/chwl/app/ui/widget/interfacex/MicListItem.java similarity index 75% rename from app/src/main/java/com/yizhuan/habu/ui/widget/interfacex/MicListItem.java rename to app/src/main/java/com/chwl/app/ui/widget/interfacex/MicListItem.java index f17ea6379..1cf5e6bc6 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/interfacex/MicListItem.java +++ b/app/src/main/java/com/chwl/app/ui/widget/interfacex/MicListItem.java @@ -1,6 +1,6 @@ -package com.yizhuan.habu.ui.widget.interfacex; +package com.chwl.app.ui.widget.interfacex; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.chwl.core.user.bean.UserInfo; /** * Created by zhouxiangfeng on 2017/6/15. diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/FragmentContainerHelper.java b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/FragmentContainerHelper.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/FragmentContainerHelper.java rename to app/src/main/java/com/chwl/app/ui/widget/magicindicator/FragmentContainerHelper.java index 3a92c02f5..a05d063b3 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/FragmentContainerHelper.java +++ b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/FragmentContainerHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.magicindicator; +package com.chwl.app.ui.widget.magicindicator; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -8,7 +8,7 @@ import android.os.Build; import android.view.animation.AccelerateDecelerateInterpolator; import android.view.animation.Interpolator; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/GiftIndicator.java b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/GiftIndicator.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/GiftIndicator.java rename to app/src/main/java/com/chwl/app/ui/widget/magicindicator/GiftIndicator.java index 998c0227a..7ab4ccb12 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/GiftIndicator.java +++ b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/GiftIndicator.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.magicindicator; +package com.chwl.app.ui.widget.magicindicator; import android.content.Context; import android.util.AttributeSet; @@ -9,9 +9,9 @@ import android.widget.TextView; import androidx.annotation.Nullable; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.gift.bean.GiftTab; +import com.chwl.app.R; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.core.gift.bean.GiftTab; import java.util.ArrayList; import java.util.HashMap; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/MagicIndicator.java b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/MagicIndicator.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/MagicIndicator.java rename to app/src/main/java/com/chwl/app/ui/widget/magicindicator/MagicIndicator.java index 7680c36f5..7cd2e5f41 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/MagicIndicator.java +++ b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/MagicIndicator.java @@ -1,11 +1,11 @@ -package com.yizhuan.habu.ui.widget.magicindicator; +package com.chwl.app.ui.widget.magicindicator; import android.content.Context; import android.util.AttributeSet; import android.view.View; import android.widget.FrameLayout; -import com.yizhuan.habu.ui.widget.magicindicator.abs.IPagerNavigator; +import com.chwl.app.ui.widget.magicindicator.abs.IPagerNavigator; /** * 整个框架的入口，核心 diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/NavigatorHelper.java b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/NavigatorHelper.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/NavigatorHelper.java rename to app/src/main/java/com/chwl/app/ui/widget/magicindicator/NavigatorHelper.java index 5eaeeb9eb..f15149e0a 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/NavigatorHelper.java +++ b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/NavigatorHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.magicindicator; +package com.chwl.app.ui.widget.magicindicator; import android.util.SparseArray; import android.util.SparseBooleanArray; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/ScrollState.java b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/ScrollState.java similarity index 82% rename from app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/ScrollState.java rename to app/src/main/java/com/chwl/app/ui/widget/magicindicator/ScrollState.java index b2e9761c3..df196ed81 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/ScrollState.java +++ b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/ScrollState.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.magicindicator; +package com.chwl.app.ui.widget.magicindicator; /** * 自定义滚动状态，消除对ViewPager的依赖 diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/ViewPagerHelper.java b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/ViewPagerHelper.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/ViewPagerHelper.java rename to app/src/main/java/com/chwl/app/ui/widget/magicindicator/ViewPagerHelper.java index fa45a1876..eade6530a 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/ViewPagerHelper.java +++ b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/ViewPagerHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.magicindicator; +package com.chwl.app.ui.widget.magicindicator; import androidx.viewpager.widget.ViewPager; import androidx.viewpager2.widget.ViewPager2; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/abs/IPagerNavigator.java b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/abs/IPagerNavigator.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/abs/IPagerNavigator.java rename to app/src/main/java/com/chwl/app/ui/widget/magicindicator/abs/IPagerNavigator.java index b86d6d43e..603513bf2 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/abs/IPagerNavigator.java +++ b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/abs/IPagerNavigator.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.magicindicator.abs; +package com.chwl.app.ui.widget.magicindicator.abs; /** * 抽象的ViewPager导航器 diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/ArgbEvaluatorHolder.java b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/ArgbEvaluatorHolder.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/ArgbEvaluatorHolder.java rename to app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/ArgbEvaluatorHolder.java index bea51779c..885b27b63 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/ArgbEvaluatorHolder.java +++ b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/ArgbEvaluatorHolder.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.magicindicator.buildins; +package com.chwl.app.ui.widget.magicindicator.buildins; /** diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/UIUtil.java b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/UIUtil.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/UIUtil.java rename to app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/UIUtil.java index 764da7172..a92ae4f5c 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/UIUtil.java +++ b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/UIUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.magicindicator.buildins; +package com.chwl.app.ui.widget.magicindicator.buildins; import android.content.Context; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/circlenavigator/CircleNavigator.java b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/circlenavigator/CircleNavigator.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/circlenavigator/CircleNavigator.java rename to app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/circlenavigator/CircleNavigator.java index 7cbe5ed66..39ef8103d 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/circlenavigator/CircleNavigator.java +++ b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/circlenavigator/CircleNavigator.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.magicindicator.buildins.circlenavigator; +package com.chwl.app.ui.widget.magicindicator.buildins.circlenavigator; import android.content.Context; import android.graphics.Canvas; @@ -10,8 +10,8 @@ import android.view.ViewConfiguration; import android.view.animation.Interpolator; import android.view.animation.LinearInterpolator; -import com.yizhuan.habu.ui.widget.magicindicator.abs.IPagerNavigator; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.ui.widget.magicindicator.abs.IPagerNavigator; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/CommonNavigator.java b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/CommonNavigator.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/CommonNavigator.java rename to app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/CommonNavigator.java index 1b2543b71..154b77320 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/CommonNavigator.java +++ b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/CommonNavigator.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator; +package com.chwl.app.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.habu.R; -import com.yizhuan.habu.ui.widget.magicindicator.NavigatorHelper; -import com.yizhuan.habu.ui.widget.magicindicator.ScrollState; -import com.yizhuan.habu.ui.widget.magicindicator.abs.IPagerNavigator; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; +import com.chwl.app.R; +import com.chwl.app.ui.widget.magicindicator.NavigatorHelper; +import com.chwl.app.ui.widget.magicindicator.ScrollState; +import com.chwl.app.ui.widget.magicindicator.abs.IPagerNavigator; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/abs/CommonNavigatorAdapter.java b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/abs/CommonNavigatorAdapter.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/abs/CommonNavigatorAdapter.java rename to app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/abs/CommonNavigatorAdapter.java index 3a1df25f2..258b310d1 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/abs/CommonNavigatorAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/abs/CommonNavigatorAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs; +package com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs; import android.content.Context; import android.database.DataSetObservable; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/abs/IMeasurablePagerTitleView.java b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/abs/IMeasurablePagerTitleView.java similarity index 79% rename from app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/abs/IMeasurablePagerTitleView.java rename to app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/abs/IMeasurablePagerTitleView.java index 50fe5441f..6d70a591c 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/abs/IMeasurablePagerTitleView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/abs/IMeasurablePagerTitleView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs; +package com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs; /** diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/abs/IPagerIndicator.java b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/abs/IPagerIndicator.java similarity index 71% rename from app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/abs/IPagerIndicator.java rename to app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/abs/IPagerIndicator.java index ea9208c89..1b7b39d07 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/abs/IPagerIndicator.java +++ b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/abs/IPagerIndicator.java @@ -1,7 +1,7 @@ -package com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs; +package com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/abs/IPagerTitleView.java b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/abs/IPagerTitleView.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/abs/IPagerTitleView.java rename to app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/abs/IPagerTitleView.java index e03707a78..813a95039 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/abs/IPagerTitleView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/abs/IPagerTitleView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs; +package com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs; /** * 抽象的指示器标题，适用于CommonNavigator diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/indicators/BezierPagerIndicator.java b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/BezierPagerIndicator.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/indicators/BezierPagerIndicator.java rename to app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/BezierPagerIndicator.java index 333458a04..250a10891 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/indicators/BezierPagerIndicator.java +++ b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/BezierPagerIndicator.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.indicators; +package com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.indicators; import android.content.Context; import android.graphics.Canvas; @@ -9,11 +9,11 @@ import android.view.animation.AccelerateInterpolator; import android.view.animation.DecelerateInterpolator; import android.view.animation.Interpolator; -import com.yizhuan.habu.ui.widget.magicindicator.FragmentContainerHelper; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.ArgbEvaluatorHolder; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; +import com.chwl.app.ui.widget.magicindicator.FragmentContainerHelper; +import com.chwl.app.ui.widget.magicindicator.buildins.ArgbEvaluatorHolder; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; import java.util.Arrays; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/indicators/GradientLinePagerIndicator.java b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/GradientLinePagerIndicator.java similarity index 88% rename from app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/indicators/GradientLinePagerIndicator.java rename to app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/GradientLinePagerIndicator.java index eb1a62207..d0abae1d9 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/indicators/GradientLinePagerIndicator.java +++ b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/GradientLinePagerIndicator.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.indicators; +package com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.indicators; import android.content.Context; import android.graphics.Canvas; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/indicators/GradientLineRoundPagerIndicator.java b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/GradientLineRoundPagerIndicator.java similarity index 83% rename from app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/indicators/GradientLineRoundPagerIndicator.java rename to app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/GradientLineRoundPagerIndicator.java index 5493fd0f0..c0ef6548d 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/indicators/GradientLineRoundPagerIndicator.java +++ b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/GradientLineRoundPagerIndicator.java @@ -1,10 +1,10 @@ -package com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.indicators; +package com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.indicators; import android.content.Context; import android.graphics.Canvas; import android.graphics.LinearGradient; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; /** * 实现渐变指示器帮助类 diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/indicators/LinePagerIndicator.java b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/LinePagerIndicator.java similarity index 92% rename from app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/indicators/LinePagerIndicator.java rename to app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/LinePagerIndicator.java index 71045528b..77e623a67 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/indicators/LinePagerIndicator.java +++ b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/LinePagerIndicator.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.indicators; +package com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.indicators; import android.content.Context; import android.graphics.Canvas; @@ -8,11 +8,11 @@ import android.view.View; import android.view.animation.Interpolator; import android.view.animation.LinearInterpolator; -import com.yizhuan.habu.ui.widget.magicindicator.FragmentContainerHelper; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.ArgbEvaluatorHolder; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; +import com.chwl.app.ui.widget.magicindicator.FragmentContainerHelper; +import com.chwl.app.ui.widget.magicindicator.buildins.ArgbEvaluatorHolder; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; import java.util.Arrays; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/indicators/TestPagerIndicator.java b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/TestPagerIndicator.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/indicators/TestPagerIndicator.java rename to app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/TestPagerIndicator.java index 183c6379f..086ba1ef1 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/indicators/TestPagerIndicator.java +++ b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/TestPagerIndicator.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.indicators; +package com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.indicators; import android.content.Context; import android.graphics.Canvas; @@ -7,9 +7,9 @@ import android.graphics.Paint; import android.graphics.RectF; import android.view.View; -import com.yizhuan.habu.ui.widget.magicindicator.FragmentContainerHelper; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; +import com.chwl.app.ui.widget.magicindicator.FragmentContainerHelper; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/indicators/TriangularPagerIndicator.java b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/TriangularPagerIndicator.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/indicators/TriangularPagerIndicator.java rename to app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/TriangularPagerIndicator.java index bb6c670a5..a9d603ad3 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/indicators/TriangularPagerIndicator.java +++ b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/TriangularPagerIndicator.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.indicators; +package com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.indicators; import android.content.Context; import android.graphics.Canvas; @@ -8,10 +8,10 @@ import android.view.View; import android.view.animation.Interpolator; import android.view.animation.LinearInterpolator; -import com.yizhuan.habu.ui.widget.magicindicator.FragmentContainerHelper; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; +import com.chwl.app.ui.widget.magicindicator.FragmentContainerHelper; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/indicators/WrapPagerIndicator.kt b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/WrapPagerIndicator.kt similarity index 90% rename from app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/indicators/WrapPagerIndicator.kt rename to app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/WrapPagerIndicator.kt index 292ec4df3..ec8260298 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/indicators/WrapPagerIndicator.kt +++ b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/WrapPagerIndicator.kt @@ -1,15 +1,15 @@ -package com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.indicators +package com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.indicators import android.content.Context import android.graphics.* -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator import android.view.animation.LinearInterpolator -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData import android.view.View import android.view.animation.Interpolator -import com.yizhuan.habu.R -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil -import com.yizhuan.habu.ui.widget.magicindicator.FragmentContainerHelper +import com.chwl.app.R +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil +import com.chwl.app.ui.widget.magicindicator.FragmentContainerHelper /** * 包裹住内容区域的指示器，类似天天快报的切换效果，需要和IMeasurablePagerTitleView配合使用 diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/model/PositionData.java b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/model/PositionData.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/model/PositionData.java rename to app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/model/PositionData.java index 5247330e4..2a7deef71 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/model/PositionData.java +++ b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/model/PositionData.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.model; +package com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.model; /** * 保存指示器标题的坐标 diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/titles/ClipPagerTitleView.java b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/titles/ClipPagerTitleView.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/titles/ClipPagerTitleView.java rename to app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/titles/ClipPagerTitleView.java index fed7c76ec..7f06da039 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/titles/ClipPagerTitleView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/titles/ClipPagerTitleView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.titles; +package com.chwl.app.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.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; /** diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/titles/ColorTransitionPagerTitleView.java b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/titles/ColorTransitionPagerTitleView.java similarity index 86% rename from app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/titles/ColorTransitionPagerTitleView.java rename to app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/titles/ColorTransitionPagerTitleView.java index ef7b61a65..c30355164 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/titles/ColorTransitionPagerTitleView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/titles/ColorTransitionPagerTitleView.java @@ -1,8 +1,8 @@ -package com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.titles; +package com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.titles; import android.content.Context; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.ArgbEvaluatorHolder; +import com.chwl.app.ui.widget.magicindicator.buildins.ArgbEvaluatorHolder; /** diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/titles/CommonPagerTitleView.java b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/titles/CommonPagerTitleView.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/titles/CommonPagerTitleView.java rename to app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/titles/CommonPagerTitleView.java index ea4359eef..96a0eb3e0 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/titles/CommonPagerTitleView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/titles/CommonPagerTitleView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.titles; +package com.chwl.app.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.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; /** diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/titles/DummyPagerTitleView.java b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/titles/DummyPagerTitleView.java similarity index 81% rename from app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/titles/DummyPagerTitleView.java rename to app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/titles/DummyPagerTitleView.java index 3995ce1cc..7d4c14878 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/titles/DummyPagerTitleView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/titles/DummyPagerTitleView.java @@ -1,9 +1,9 @@ -package com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.titles; +package com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.titles; import android.content.Context; import android.view.View; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; /** * 空指示器标题，用于只需要指示器而不需要title的需求 diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/titles/SimplePagerTitleView.java b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/titles/SimplePagerTitleView.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/titles/SimplePagerTitleView.java rename to app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/titles/SimplePagerTitleView.java index bd77d93f1..f017eff78 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/titles/SimplePagerTitleView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/titles/SimplePagerTitleView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.titles; +package com.chwl.app.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.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; /** diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgeAnchor.java b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgeAnchor.java similarity index 78% rename from app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgeAnchor.java rename to app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgeAnchor.java index 5bfbc95bb..75b4fd943 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgeAnchor.java +++ b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgeAnchor.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.titles.badge; +package com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.titles.badge; /** * 角标的锚点 diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgePagerTitleView.java b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgePagerTitleView.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgePagerTitleView.java rename to app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgePagerTitleView.java index 01b3bc2ff..121a82d92 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgePagerTitleView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgePagerTitleView.java @@ -1,11 +1,11 @@ -package com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.titles.badge; +package com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.titles.badge; import android.content.Context; import android.view.View; import android.widget.FrameLayout; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; /** diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgeRule.java b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgeRule.java similarity index 86% rename from app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgeRule.java rename to app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgeRule.java index 637dd88e4..b3eb9a4ac 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgeRule.java +++ b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgeRule.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.titles.badge; +package com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.titles.badge; /** diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/ext/FontChangePagerTitleView.java b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/ext/FontChangePagerTitleView.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/ext/FontChangePagerTitleView.java rename to app/src/main/java/com/chwl/app/ui/widget/magicindicator/ext/FontChangePagerTitleView.java index 1bcb09591..06d517653 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/ext/FontChangePagerTitleView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/ext/FontChangePagerTitleView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.magicindicator.ext; +package com.chwl.app.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.habu.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; /** * create by lvzebiao @2019/5/5 diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/ext/MainCommonNavigatorAdapter.java b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/ext/MainCommonNavigatorAdapter.java similarity index 82% rename from app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/ext/MainCommonNavigatorAdapter.java rename to app/src/main/java/com/chwl/app/ui/widget/magicindicator/ext/MainCommonNavigatorAdapter.java index b11d5d1b7..098c29bbc 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/magicindicator/ext/MainCommonNavigatorAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/widget/magicindicator/ext/MainCommonNavigatorAdapter.java @@ -1,13 +1,13 @@ -package com.yizhuan.habu.ui.widget.magicindicator.ext; +package com.chwl.app.ui.widget.magicindicator.ext; import android.content.Context; import androidx.core.content.ContextCompat; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.chwl.app.R; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/marqueeview/AvRoomNobleWelcomeView.java b/app/src/main/java/com/chwl/app/ui/widget/marqueeview/AvRoomNobleWelcomeView.java similarity index 93% rename from app/src/main/java/com/yizhuan/habu/ui/widget/marqueeview/AvRoomNobleWelcomeView.java rename to app/src/main/java/com/chwl/app/ui/widget/marqueeview/AvRoomNobleWelcomeView.java index cd48716d7..51c59293a 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/marqueeview/AvRoomNobleWelcomeView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/marqueeview/AvRoomNobleWelcomeView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.marqueeview; +package com.chwl.app.ui.widget.marqueeview; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -15,11 +15,11 @@ import android.widget.TextView; import androidx.appcompat.widget.AppCompatImageView; -import com.yizhuan.habu.R; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_library.utils.ScreenUtils; -import com.yizhuan.xchat_android_library.utils.SizeUtils; +import com.chwl.app.R; +import com.chwl.core.noble.NobleInfo; +import com.chwl.core.noble.NobleUtil; +import com.chwl.library.utils.ScreenUtils; +import com.chwl.library.utils.SizeUtils; /** *

贵族进入房间欢迎界面 diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/marqueeview/BetterMarqueeView.java b/app/src/main/java/com/chwl/app/ui/widget/marqueeview/BetterMarqueeView.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/widget/marqueeview/BetterMarqueeView.java rename to app/src/main/java/com/chwl/app/ui/widget/marqueeview/BetterMarqueeView.java index ed8eeeed9..d0279f723 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/marqueeview/BetterMarqueeView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/marqueeview/BetterMarqueeView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.marqueeview; +package com.chwl.app.ui.widget.marqueeview; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/marqueeview/MarqueeView.java b/app/src/main/java/com/chwl/app/ui/widget/marqueeview/MarqueeView.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/widget/marqueeview/MarqueeView.java rename to app/src/main/java/com/chwl/app/ui/widget/marqueeview/MarqueeView.java index 4a60d8342..823bd35cc 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/marqueeview/MarqueeView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/marqueeview/MarqueeView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.marqueeview; +package com.chwl.app.ui.widget.marqueeview; import android.content.Context; import android.content.res.TypedArray; @@ -15,8 +15,8 @@ import android.widget.ViewFlipper; import androidx.annotation.AnimRes; -import com.yizhuan.habu.R; -import com.yizhuan.habu.common.util.Utils; +import com.chwl.app.R; +import com.chwl.app.common.util.Utils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/password/PassWordFragment.java b/app/src/main/java/com/chwl/app/ui/widget/password/PassWordFragment.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/ui/widget/password/PassWordFragment.java rename to app/src/main/java/com/chwl/app/ui/widget/password/PassWordFragment.java index d89b078ed..74630748d 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/password/PassWordFragment.java +++ b/app/src/main/java/com/chwl/app/ui/widget/password/PassWordFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.password; +package com.chwl.app.ui.widget.password; import android.app.Activity; @@ -18,12 +18,12 @@ import androidx.fragment.app.FragmentManager; import com.jungly.gridpasswordview.GridPasswordView; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.yizhuan.habu.R; -import com.yizhuan.habu.common.widget.dialog.DialogManager; -import com.yizhuan.habu.ui.setting.VerifyPhoneActivity; -import com.yizhuan.habu.ui.wallet.ExchangeGoldActivity; -import com.yizhuan.habu.ui.withdraw.WithdrawActivity; -import com.yizhuan.xchat_android_library.utils.codec.DESUtils; +import com.chwl.app.R; +import com.chwl.app.common.widget.dialog.DialogManager; +import com.chwl.app.ui.setting.VerifyPhoneActivity; +import com.chwl.app.ui.wallet.ExchangeGoldActivity; +import com.chwl.app.ui.withdraw.WithdrawActivity; +import com.chwl.library.utils.codec.DESUtils; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/password/PasswordEvent.java b/app/src/main/java/com/chwl/app/ui/widget/password/PasswordEvent.java similarity index 89% rename from app/src/main/java/com/yizhuan/habu/ui/widget/password/PasswordEvent.java rename to app/src/main/java/com/chwl/app/ui/widget/password/PasswordEvent.java index 82df0ca4f..bfaf9a0d3 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/password/PasswordEvent.java +++ b/app/src/main/java/com/chwl/app/ui/widget/password/PasswordEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.password; +package com.chwl.app.ui.widget.password; import lombok.Data; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/password/PasswordKeyboardView.java b/app/src/main/java/com/chwl/app/ui/widget/password/PasswordKeyboardView.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/widget/password/PasswordKeyboardView.java rename to app/src/main/java/com/chwl/app/ui/widget/password/PasswordKeyboardView.java index bb4ca6a9f..337ac7fa4 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/password/PasswordKeyboardView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/password/PasswordKeyboardView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.password; +package com.chwl.app.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.habu.R; +import com.chwl.app.R; import java.util.Arrays; import java.util.Collections; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/password/PasswordView.java b/app/src/main/java/com/chwl/app/ui/widget/password/PasswordView.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/ui/widget/password/PasswordView.java rename to app/src/main/java/com/chwl/app/ui/widget/password/PasswordView.java index 8b69e56d3..0261be378 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/password/PasswordView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/password/PasswordView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.password; +package com.chwl.app.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.habu.R; +import com.chwl.app.R; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/recyclerview/decoration/ColorDecoration.java b/app/src/main/java/com/chwl/app/ui/widget/recyclerview/decoration/ColorDecoration.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/ui/widget/recyclerview/decoration/ColorDecoration.java rename to app/src/main/java/com/chwl/app/ui/widget/recyclerview/decoration/ColorDecoration.java index 359d9c9f6..324554530 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/recyclerview/decoration/ColorDecoration.java +++ b/app/src/main/java/com/chwl/app/ui/widget/recyclerview/decoration/ColorDecoration.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.recyclerview.decoration; +package com.chwl.app.ui.widget.recyclerview.decoration; import android.graphics.Canvas; import android.graphics.Rect; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/recyclerview/decoration/DatingItemDecoration.java b/app/src/main/java/com/chwl/app/ui/widget/recyclerview/decoration/DatingItemDecoration.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/ui/widget/recyclerview/decoration/DatingItemDecoration.java rename to app/src/main/java/com/chwl/app/ui/widget/recyclerview/decoration/DatingItemDecoration.java index cee059501..1703bbbd2 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/recyclerview/decoration/DatingItemDecoration.java +++ b/app/src/main/java/com/chwl/app/ui/widget/recyclerview/decoration/DatingItemDecoration.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.recyclerview.decoration; +package com.chwl.app.ui.widget.recyclerview.decoration; import android.graphics.Rect; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/recyclerview/decoration/DividerItemDecoration.java b/app/src/main/java/com/chwl/app/ui/widget/recyclerview/decoration/DividerItemDecoration.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/widget/recyclerview/decoration/DividerItemDecoration.java rename to app/src/main/java/com/chwl/app/ui/widget/recyclerview/decoration/DividerItemDecoration.java index 2636836ff..de590af8f 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/recyclerview/decoration/DividerItemDecoration.java +++ b/app/src/main/java/com/chwl/app/ui/widget/recyclerview/decoration/DividerItemDecoration.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.recyclerview.decoration; +package com.chwl.app.ui.widget.recyclerview.decoration; import android.content.Context; import android.content.res.TypedArray; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/recyclerview/decoration/GridSpacingItemDecoration.java b/app/src/main/java/com/chwl/app/ui/widget/recyclerview/decoration/GridSpacingItemDecoration.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/ui/widget/recyclerview/decoration/GridSpacingItemDecoration.java rename to app/src/main/java/com/chwl/app/ui/widget/recyclerview/decoration/GridSpacingItemDecoration.java index 2aebae3fe..8dfda0602 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/recyclerview/decoration/GridSpacingItemDecoration.java +++ b/app/src/main/java/com/chwl/app/ui/widget/recyclerview/decoration/GridSpacingItemDecoration.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.recyclerview.decoration; +package com.chwl.app.ui.widget.recyclerview.decoration; import android.content.Context; import android.graphics.Rect; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/recyclerview/decoration/GridSpacingItemNewDecoration.java b/app/src/main/java/com/chwl/app/ui/widget/recyclerview/decoration/GridSpacingItemNewDecoration.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/widget/recyclerview/decoration/GridSpacingItemNewDecoration.java rename to app/src/main/java/com/chwl/app/ui/widget/recyclerview/decoration/GridSpacingItemNewDecoration.java index 263933953..4fcd60c9c 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/recyclerview/decoration/GridSpacingItemNewDecoration.java +++ b/app/src/main/java/com/chwl/app/ui/widget/recyclerview/decoration/GridSpacingItemNewDecoration.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.recyclerview.decoration; +package com.chwl.app.ui.widget.recyclerview.decoration; import android.graphics.Rect; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/recyclerview/decoration/GridVItemDecoration.java b/app/src/main/java/com/chwl/app/ui/widget/recyclerview/decoration/GridVItemDecoration.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/ui/widget/recyclerview/decoration/GridVItemDecoration.java rename to app/src/main/java/com/chwl/app/ui/widget/recyclerview/decoration/GridVItemDecoration.java index 6fa531d3a..f73cdeded 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/recyclerview/decoration/GridVItemDecoration.java +++ b/app/src/main/java/com/chwl/app/ui/widget/recyclerview/decoration/GridVItemDecoration.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.recyclerview.decoration; +package com.chwl.app.ui.widget.recyclerview.decoration; import android.content.Context; import android.graphics.Rect; @@ -7,7 +7,7 @@ import android.view.View; import androidx.recyclerview.widget.RecyclerView; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil; +import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil; import lombok.Setter; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/recyclerview/decoration/HorizontalDecoration.java b/app/src/main/java/com/chwl/app/ui/widget/recyclerview/decoration/HorizontalDecoration.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/ui/widget/recyclerview/decoration/HorizontalDecoration.java rename to app/src/main/java/com/chwl/app/ui/widget/recyclerview/decoration/HorizontalDecoration.java index 67b1bfb45..820292546 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/recyclerview/decoration/HorizontalDecoration.java +++ b/app/src/main/java/com/chwl/app/ui/widget/recyclerview/decoration/HorizontalDecoration.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.recyclerview.decoration; +package com.chwl.app.ui.widget.recyclerview.decoration; import android.graphics.Rect; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/recyclerview/decoration/SpacingDecoration.java b/app/src/main/java/com/chwl/app/ui/widget/recyclerview/decoration/SpacingDecoration.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/widget/recyclerview/decoration/SpacingDecoration.java rename to app/src/main/java/com/chwl/app/ui/widget/recyclerview/decoration/SpacingDecoration.java index 9d26320f0..5b8648161 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/recyclerview/decoration/SpacingDecoration.java +++ b/app/src/main/java/com/chwl/app/ui/widget/recyclerview/decoration/SpacingDecoration.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.recyclerview.decoration; +package com.chwl.app.ui.widget.recyclerview.decoration; import android.graphics.Rect; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/recyclerview/decoration/TagItemDecoration.kt b/app/src/main/java/com/chwl/app/ui/widget/recyclerview/decoration/TagItemDecoration.kt similarity index 96% rename from app/src/main/java/com/yizhuan/habu/ui/widget/recyclerview/decoration/TagItemDecoration.kt rename to app/src/main/java/com/chwl/app/ui/widget/recyclerview/decoration/TagItemDecoration.kt index 379c329a6..74be55185 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/recyclerview/decoration/TagItemDecoration.kt +++ b/app/src/main/java/com/chwl/app/ui/widget/recyclerview/decoration/TagItemDecoration.kt @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.recyclerview.decoration +package com.chwl.app.ui.widget.recyclerview.decoration import android.graphics.Rect import android.view.View diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/recyclerview/decoration/VerticalDecoration.java b/app/src/main/java/com/chwl/app/ui/widget/recyclerview/decoration/VerticalDecoration.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/ui/widget/recyclerview/decoration/VerticalDecoration.java rename to app/src/main/java/com/chwl/app/ui/widget/recyclerview/decoration/VerticalDecoration.java index bedc4acf1..e430441e2 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/recyclerview/decoration/VerticalDecoration.java +++ b/app/src/main/java/com/chwl/app/ui/widget/recyclerview/decoration/VerticalDecoration.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.recyclerview.decoration; +package com.chwl.app.ui.widget.recyclerview.decoration; import android.graphics.Rect; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/recyclerview/layoutmanager/FullyGridLayoutManager.java b/app/src/main/java/com/chwl/app/ui/widget/recyclerview/layoutmanager/FullyGridLayoutManager.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/widget/recyclerview/layoutmanager/FullyGridLayoutManager.java rename to app/src/main/java/com/chwl/app/ui/widget/recyclerview/layoutmanager/FullyGridLayoutManager.java index a274ca492..539ab15c7 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/recyclerview/layoutmanager/FullyGridLayoutManager.java +++ b/app/src/main/java/com/chwl/app/ui/widget/recyclerview/layoutmanager/FullyGridLayoutManager.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.recyclerview.layoutmanager; +package com.chwl.app.ui.widget.recyclerview.layoutmanager; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/recyclerview/layoutmanager/FullyLinearLayoutManager.java b/app/src/main/java/com/chwl/app/ui/widget/recyclerview/layoutmanager/FullyLinearLayoutManager.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/widget/recyclerview/layoutmanager/FullyLinearLayoutManager.java rename to app/src/main/java/com/chwl/app/ui/widget/recyclerview/layoutmanager/FullyLinearLayoutManager.java index 755b827eb..beb8209c8 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/recyclerview/layoutmanager/FullyLinearLayoutManager.java +++ b/app/src/main/java/com/chwl/app/ui/widget/recyclerview/layoutmanager/FullyLinearLayoutManager.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.recyclerview.layoutmanager; +package com.chwl.app.ui.widget.recyclerview.layoutmanager; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/rollviewpager/HintView.java b/app/src/main/java/com/chwl/app/ui/widget/rollviewpager/HintView.java similarity index 68% rename from app/src/main/java/com/yizhuan/habu/ui/widget/rollviewpager/HintView.java rename to app/src/main/java/com/chwl/app/ui/widget/rollviewpager/HintView.java index 64f2f82ad..3807c06f9 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/rollviewpager/HintView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/rollviewpager/HintView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.rollviewpager; +package com.chwl.app.ui.widget.rollviewpager; public interface HintView { diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/rollviewpager/OnItemClickListener.java b/app/src/main/java/com/chwl/app/ui/widget/rollviewpager/OnItemClickListener.java similarity index 70% rename from app/src/main/java/com/yizhuan/habu/ui/widget/rollviewpager/OnItemClickListener.java rename to app/src/main/java/com/chwl/app/ui/widget/rollviewpager/OnItemClickListener.java index 95ee93e3c..bb0a334be 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/rollviewpager/OnItemClickListener.java +++ b/app/src/main/java/com/chwl/app/ui/widget/rollviewpager/OnItemClickListener.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.rollviewpager; +package com.chwl.app.ui.widget.rollviewpager; /** * Created by zhuchenxi on 16/8/4. diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/rollviewpager/RollPagerView.java b/app/src/main/java/com/chwl/app/ui/widget/rollviewpager/RollPagerView.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/ui/widget/rollviewpager/RollPagerView.java rename to app/src/main/java/com/chwl/app/ui/widget/rollviewpager/RollPagerView.java index f0ba5e4dd..c913addd1 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/rollviewpager/RollPagerView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/rollviewpager/RollPagerView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.rollviewpager; +package com.chwl.app.ui.widget.rollviewpager; import android.content.Context; import android.content.res.TypedArray; @@ -21,9 +21,9 @@ import androidx.viewpager.widget.PagerAdapter; import androidx.viewpager.widget.ViewPager; import androidx.viewpager.widget.ViewPager.OnPageChangeListener; -import com.yizhuan.habu.R; -import com.yizhuan.habu.ui.widget.rollviewpager.adapter.LoopPagerAdapter; -import com.yizhuan.habu.ui.widget.rollviewpager.hintview.ColorPointHintView; +import com.chwl.app.R; +import com.chwl.app.ui.widget.rollviewpager.adapter.LoopPagerAdapter; +import com.chwl.app.ui.widget.rollviewpager.hintview.ColorPointHintView; import java.lang.ref.WeakReference; import java.lang.reflect.Field; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/rollviewpager/Util.java b/app/src/main/java/com/chwl/app/ui/widget/rollviewpager/Util.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/ui/widget/rollviewpager/Util.java rename to app/src/main/java/com/chwl/app/ui/widget/rollviewpager/Util.java index 8e28a9f5d..6360aadc1 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/rollviewpager/Util.java +++ b/app/src/main/java/com/chwl/app/ui/widget/rollviewpager/Util.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.rollviewpager; +package com.chwl.app.ui.widget.rollviewpager; import android.content.Context; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/rollviewpager/adapter/DynamicPagerAdapter.java b/app/src/main/java/com/chwl/app/ui/widget/rollviewpager/adapter/DynamicPagerAdapter.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/ui/widget/rollviewpager/adapter/DynamicPagerAdapter.java rename to app/src/main/java/com/chwl/app/ui/widget/rollviewpager/adapter/DynamicPagerAdapter.java index 1066cf24f..c6d5866c6 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/rollviewpager/adapter/DynamicPagerAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/widget/rollviewpager/adapter/DynamicPagerAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.rollviewpager.adapter; +package com.chwl.app.ui.widget.rollviewpager.adapter; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/rollviewpager/adapter/LoopPagerAdapter.java b/app/src/main/java/com/chwl/app/ui/widget/rollviewpager/adapter/LoopPagerAdapter.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/ui/widget/rollviewpager/adapter/LoopPagerAdapter.java rename to app/src/main/java/com/chwl/app/ui/widget/rollviewpager/adapter/LoopPagerAdapter.java index 121686c6e..36fcf6937 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/rollviewpager/adapter/LoopPagerAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/widget/rollviewpager/adapter/LoopPagerAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.rollviewpager.adapter; +package com.chwl.app.ui.widget.rollviewpager.adapter; import android.database.DataSetObserver; import android.view.View; @@ -7,8 +7,8 @@ import android.view.ViewGroup; import androidx.viewpager.widget.PagerAdapter; import androidx.viewpager.widget.ViewPager; -import com.yizhuan.habu.ui.widget.rollviewpager.HintView; -import com.yizhuan.habu.ui.widget.rollviewpager.RollPagerView; +import com.chwl.app.ui.widget.rollviewpager.HintView; +import com.chwl.app.ui.widget.rollviewpager.RollPagerView; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/rollviewpager/adapter/StaticPagerAdapter.java b/app/src/main/java/com/chwl/app/ui/widget/rollviewpager/adapter/StaticPagerAdapter.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/ui/widget/rollviewpager/adapter/StaticPagerAdapter.java rename to app/src/main/java/com/chwl/app/ui/widget/rollviewpager/adapter/StaticPagerAdapter.java index 522fecc4b..4d6a6b8a2 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/rollviewpager/adapter/StaticPagerAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/widget/rollviewpager/adapter/StaticPagerAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.rollviewpager.adapter; +package com.chwl.app.ui.widget.rollviewpager.adapter; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/rollviewpager/adapter/StaticPagerAdapterWrapper.java b/app/src/main/java/com/chwl/app/ui/widget/rollviewpager/adapter/StaticPagerAdapterWrapper.java similarity index 90% rename from app/src/main/java/com/yizhuan/habu/ui/widget/rollviewpager/adapter/StaticPagerAdapterWrapper.java rename to app/src/main/java/com/chwl/app/ui/widget/rollviewpager/adapter/StaticPagerAdapterWrapper.java index f02db22c1..66cf90f3b 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/rollviewpager/adapter/StaticPagerAdapterWrapper.java +++ b/app/src/main/java/com/chwl/app/ui/widget/rollviewpager/adapter/StaticPagerAdapterWrapper.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.rollviewpager.adapter; +package com.chwl.app.ui.widget.rollviewpager.adapter; import android.content.Context; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/rollviewpager/hintview/ColorPointHintView.java b/app/src/main/java/com/chwl/app/ui/widget/rollviewpager/hintview/ColorPointHintView.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/ui/widget/rollviewpager/hintview/ColorPointHintView.java rename to app/src/main/java/com/chwl/app/ui/widget/rollviewpager/hintview/ColorPointHintView.java index 36dc8b56f..108e43bb4 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/rollviewpager/hintview/ColorPointHintView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/rollviewpager/hintview/ColorPointHintView.java @@ -1,10 +1,10 @@ -package com.yizhuan.habu.ui.widget.rollviewpager.hintview; +package com.chwl.app.ui.widget.rollviewpager.hintview; import android.content.Context; import android.graphics.drawable.Drawable; import android.graphics.drawable.GradientDrawable; -import com.yizhuan.habu.ui.widget.rollviewpager.Util; +import com.chwl.app.ui.widget.rollviewpager.Util; /** diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/rollviewpager/hintview/IconHintView.java b/app/src/main/java/com/chwl/app/ui/widget/rollviewpager/hintview/IconHintView.java similarity index 95% rename from app/src/main/java/com/yizhuan/habu/ui/widget/rollviewpager/hintview/IconHintView.java rename to app/src/main/java/com/chwl/app/ui/widget/rollviewpager/hintview/IconHintView.java index 43a299017..7116bed20 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/rollviewpager/hintview/IconHintView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/rollviewpager/hintview/IconHintView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.rollviewpager.hintview; +package com.chwl.app.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.habu.ui.widget.rollviewpager.Util; +import com.chwl.app.ui.widget.rollviewpager.Util; /** diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/rollviewpager/hintview/ShapeHintView.java b/app/src/main/java/com/chwl/app/ui/widget/rollviewpager/hintview/ShapeHintView.java similarity index 94% rename from app/src/main/java/com/yizhuan/habu/ui/widget/rollviewpager/hintview/ShapeHintView.java rename to app/src/main/java/com/chwl/app/ui/widget/rollviewpager/hintview/ShapeHintView.java index 1ceb143ea..df543d662 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/rollviewpager/hintview/ShapeHintView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/rollviewpager/hintview/ShapeHintView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.rollviewpager.hintview; +package com.chwl.app.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.habu.ui.widget.rollviewpager.HintView; +import com.chwl.app.ui.widget.rollviewpager.HintView; public abstract class ShapeHintView extends LinearLayout implements HintView { diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/rollviewpager/hintview/TextHintView.java b/app/src/main/java/com/chwl/app/ui/widget/rollviewpager/hintview/TextHintView.java similarity index 87% rename from app/src/main/java/com/yizhuan/habu/ui/widget/rollviewpager/hintview/TextHintView.java rename to app/src/main/java/com/chwl/app/ui/widget/rollviewpager/hintview/TextHintView.java index 93e0c38f4..8076bd812 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/rollviewpager/hintview/TextHintView.java +++ b/app/src/main/java/com/chwl/app/ui/widget/rollviewpager/hintview/TextHintView.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.rollviewpager.hintview; +package com.chwl.app.ui.widget.rollviewpager.hintview; import android.content.Context; import android.util.AttributeSet; @@ -6,7 +6,7 @@ import android.view.Gravity; import androidx.appcompat.widget.AppCompatTextView; -import com.yizhuan.habu.ui.widget.rollviewpager.HintView; +import com.chwl.app.ui.widget.rollviewpager.HintView; public class TextHintView extends AppCompatTextView implements HintView { diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/viewpager/NoScrollViewPager.java b/app/src/main/java/com/chwl/app/ui/widget/viewpager/NoScrollViewPager.java similarity index 96% rename from app/src/main/java/com/yizhuan/habu/ui/widget/viewpager/NoScrollViewPager.java rename to app/src/main/java/com/chwl/app/ui/widget/viewpager/NoScrollViewPager.java index 45624c834..81b54f129 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/viewpager/NoScrollViewPager.java +++ b/app/src/main/java/com/chwl/app/ui/widget/viewpager/NoScrollViewPager.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.widget.viewpager; +package com.chwl.app.ui.widget.viewpager; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yizhuan/habu/ui/widget/viewpager/ScrollViewPager.java b/app/src/main/java/com/chwl/app/ui/widget/viewpager/ScrollViewPager.java similarity index 86% rename from app/src/main/java/com/yizhuan/habu/ui/widget/viewpager/ScrollViewPager.java rename to app/src/main/java/com/chwl/app/ui/widget/viewpager/ScrollViewPager.java index 7a874c662..8c46d29b8 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/widget/viewpager/ScrollViewPager.java +++ b/app/src/main/java/com/chwl/app/ui/widget/viewpager/ScrollViewPager.java @@ -1,10 +1,10 @@ -package com.yizhuan.habu.ui.widget.viewpager; +package com.chwl.app.ui.widget.viewpager; import android.content.Context; import android.util.AttributeSet; import android.view.MotionEvent; -import com.yizhuan.habu.ui.widget.rollviewpager.RollPagerView; +import com.chwl.app.ui.widget.rollviewpager.RollPagerView; public class ScrollViewPager extends RollPagerView { public ScrollViewPager(Context context) { diff --git a/app/src/main/java/com/yizhuan/habu/ui/withdraw/BinderAlipayActivity.java b/app/src/main/java/com/chwl/app/ui/withdraw/BinderAlipayActivity.java similarity index 92% rename from app/src/main/java/com/yizhuan/habu/ui/withdraw/BinderAlipayActivity.java rename to app/src/main/java/com/chwl/app/ui/withdraw/BinderAlipayActivity.java index a7eea9b88..78d78ac8b 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/withdraw/BinderAlipayActivity.java +++ b/app/src/main/java/com/chwl/app/ui/withdraw/BinderAlipayActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.withdraw; +package com.chwl.app.ui.withdraw; import android.annotation.SuppressLint; import android.content.Context; @@ -14,18 +14,18 @@ import android.widget.ImageView; import android.widget.TextView; import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseActivity; -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseActivity; +import com.chwl.app.ui.login.CodeDownTimer; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.code.CodeType; +import com.chwl.core.user.UserModel; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.core.utils.net.BeanObserver; +import com.chwl.core.withdraw.WithdrawModel; +import com.chwl.core.withdraw.bean.WithdrawInfo; +import com.chwl.library.utils.FormatUtils; +import com.chwl.library.utils.ResUtil; import java.text.MessageFormat; diff --git a/app/src/main/java/com/yizhuan/habu/ui/withdraw/WithdrawActivity.java b/app/src/main/java/com/chwl/app/ui/withdraw/WithdrawActivity.java similarity index 91% rename from app/src/main/java/com/yizhuan/habu/ui/withdraw/WithdrawActivity.java rename to app/src/main/java/com/chwl/app/ui/withdraw/WithdrawActivity.java index b47f6d0c5..90419db1d 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/withdraw/WithdrawActivity.java +++ b/app/src/main/java/com/chwl/app/ui/withdraw/WithdrawActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.ui.withdraw; +package com.chwl.app.ui.withdraw; import android.annotation.SuppressLint; import android.content.Intent; @@ -10,32 +10,32 @@ import androidx.recyclerview.widget.GridLayoutManager; import com.chad.library.adapter.base.BaseQuickAdapter; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseViewBindingActivity; -import com.yizhuan.habu.base.TitleBar; -import com.yizhuan.habu.bills.activities.WithdrawBillsActivity; -import com.yizhuan.habu.common.widget.dialog.DialogManager; -import com.yizhuan.habu.databinding.ActivityWithdrawBinding; -import com.yizhuan.habu.ui.setting.ModifyPwdActivity; -import com.yizhuan.habu.ui.wallet.adapter.WithdrawJewelAdapter; -import com.yizhuan.habu.ui.webview.CommonWebViewActivity; -import com.yizhuan.habu.ui.widget.password.PassWordFragment; -import com.yizhuan.habu.ui.withdraw.bankcard.BindWithdrawBankCardActivity; -import com.yizhuan.habu.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.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseViewBindingActivity; +import com.chwl.app.base.TitleBar; +import com.chwl.app.bills.activities.WithdrawBillsActivity; +import com.chwl.app.common.widget.dialog.DialogManager; +import com.chwl.app.databinding.ActivityWithdrawBinding; +import com.chwl.app.ui.setting.ModifyPwdActivity; +import com.chwl.app.ui.wallet.adapter.WithdrawJewelAdapter; +import com.chwl.app.ui.webview.CommonWebViewActivity; +import com.chwl.app.ui.widget.password.PassWordFragment; +import com.chwl.app.ui.withdraw.bankcard.BindWithdrawBankCardActivity; +import com.chwl.app.utils.SpannableBuilder; +import com.chwl.core.UriProvider; +import com.chwl.core.auth.AuthModel; +import com.chwl.core.initial.bean.TaxInfo; +import com.chwl.core.user.UserModel; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.core.utils.net.BeanObserver; +import com.chwl.core.withdraw.WithdrawModel; +import com.chwl.core.withdraw.bean.ExchangerInfo; +import com.chwl.core.withdraw.bean.RefreshInfo; +import com.chwl.core.withdraw.bean.WithdrawInfo; +import com.chwl.core.withdraw.bean.WithdrwaListInfo; +import com.chwl.library.utils.FormatUtils; +import com.chwl.library.utils.ListUtils; +import com.chwl.library.utils.ResUtil; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/habu/ui/withdraw/WithdrawRuleActivity.java b/app/src/main/java/com/chwl/app/ui/withdraw/WithdrawRuleActivity.java similarity index 72% rename from app/src/main/java/com/yizhuan/habu/ui/withdraw/WithdrawRuleActivity.java rename to app/src/main/java/com/chwl/app/ui/withdraw/WithdrawRuleActivity.java index 11e71f765..6431dbcec 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/withdraw/WithdrawRuleActivity.java +++ b/app/src/main/java/com/chwl/app/ui/withdraw/WithdrawRuleActivity.java @@ -1,12 +1,12 @@ -package com.yizhuan.habu.ui.withdraw; +package com.chwl.app.ui.withdraw; import android.os.Bundle; import android.webkit.WebView; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseActivity; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseActivity; +import com.chwl.core.UriProvider; +import com.chwl.library.utils.ResUtil; public class WithdrawRuleActivity extends BaseActivity { private WebView mWebView; diff --git a/app/src/main/java/com/yizhuan/habu/ui/withdraw/bankcard/BindWithdrawBankCardActivity.java b/app/src/main/java/com/chwl/app/ui/withdraw/bankcard/BindWithdrawBankCardActivity.java similarity index 89% rename from app/src/main/java/com/yizhuan/habu/ui/withdraw/bankcard/BindWithdrawBankCardActivity.java rename to app/src/main/java/com/chwl/app/ui/withdraw/bankcard/BindWithdrawBankCardActivity.java index 9e80a6a4b..125c2371f 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/withdraw/bankcard/BindWithdrawBankCardActivity.java +++ b/app/src/main/java/com/chwl/app/ui/withdraw/bankcard/BindWithdrawBankCardActivity.java @@ -1,22 +1,22 @@ -package com.yizhuan.habu.ui.withdraw.bankcard; +package com.chwl.app.ui.withdraw.bankcard; import android.text.Editable; import android.text.TextUtils; import android.view.View; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.habu.R; -import com.yizhuan.habu.base.BaseViewBindingActivity; -import com.yizhuan.habu.databinding.ActivityBindWithdrawBankCardBinding; -import com.yizhuan.habu.ui.login.CodeDownTimer; -import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.R; +import com.chwl.app.base.BaseViewBindingActivity; +import com.chwl.app.databinding.ActivityBindWithdrawBankCardBinding; +import com.chwl.app.ui.login.CodeDownTimer; +import com.chwl.app.ui.widget.TextWatcherSimple; +import com.chwl.core.code.CodeModel; +import com.chwl.core.code.CodeType; +import com.chwl.core.user.UserModel; +import com.chwl.core.user.bean.UserInfo; +import com.chwl.core.utils.net.DontWarnObserver; +import com.chwl.core.withdraw.WithdrawModel; +import com.chwl.library.utils.ResUtil; /** * create by lvzebiao @2019/12/24 diff --git a/app/src/main/java/com/yizhuan/habu/utils/ActWhiteListMrg.java b/app/src/main/java/com/chwl/app/utils/ActWhiteListMrg.java similarity index 77% rename from app/src/main/java/com/yizhuan/habu/utils/ActWhiteListMrg.java rename to app/src/main/java/com/chwl/app/utils/ActWhiteListMrg.java index 12d07806a..9c740b9c1 100644 --- a/app/src/main/java/com/yizhuan/habu/utils/ActWhiteListMrg.java +++ b/app/src/main/java/com/chwl/app/utils/ActWhiteListMrg.java @@ -1,13 +1,13 @@ -package com.yizhuan.habu.utils; +package com.chwl.app.utils; import android.content.Context; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.yizhuan.habu.NimMiddleActivity; -import com.yizhuan.habu.R; -import com.yizhuan.habu.other.activity.SplashActivity; -import com.yizhuan.xchat_android_core.utils.ActivityUtil; -import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.chwl.app.NimMiddleActivity; +import com.chwl.app.R; +import com.chwl.app.other.activity.SplashActivity; +import com.chwl.core.utils.ActivityUtil; +import com.chwl.library.utils.ResUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/habu/utils/AppBarStateChangeListener.java b/app/src/main/java/com/chwl/app/utils/AppBarStateChangeListener.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/utils/AppBarStateChangeListener.java rename to app/src/main/java/com/chwl/app/utils/AppBarStateChangeListener.java index f864afe50..0dbe8ea62 100644 --- a/app/src/main/java/com/yizhuan/habu/utils/AppBarStateChangeListener.java +++ b/app/src/main/java/com/chwl/app/utils/AppBarStateChangeListener.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.utils; +package com.chwl.app.utils; import com.google.android.material.appbar.AppBarLayout; diff --git a/app/src/main/java/com/yizhuan/habu/utils/BlurTransformation.java b/app/src/main/java/com/chwl/app/utils/BlurTransformation.java similarity index 99% rename from app/src/main/java/com/yizhuan/habu/utils/BlurTransformation.java rename to app/src/main/java/com/chwl/app/utils/BlurTransformation.java index fdc9dc795..47d5a7bc7 100644 --- a/app/src/main/java/com/yizhuan/habu/utils/BlurTransformation.java +++ b/app/src/main/java/com/chwl/app/utils/BlurTransformation.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.utils; +package com.chwl.app.utils; import android.content.Context; import android.graphics.Bitmap; diff --git a/app/src/main/java/com/yizhuan/habu/utils/CertificateHelper.java b/app/src/main/java/com/chwl/app/utils/CertificateHelper.java similarity index 86% rename from app/src/main/java/com/yizhuan/habu/utils/CertificateHelper.java rename to app/src/main/java/com/chwl/app/utils/CertificateHelper.java index 43b035834..01aeef2e9 100644 --- a/app/src/main/java/com/yizhuan/habu/utils/CertificateHelper.java +++ b/app/src/main/java/com/chwl/app/utils/CertificateHelper.java @@ -1,8 +1,8 @@ -package com.yizhuan.habu.utils; +package com.chwl.app.utils; -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.chwl.core.certification.CertificationModel.CER_TYPE_FORCE; +import static com.chwl.core.certification.CertificationModel.CER_TYPE_GUIDE; +import static com.chwl.core.certification.CertificationModel.CER_TYPE_NONE; import android.content.Context; import android.text.Spannable; @@ -12,13 +12,13 @@ import android.text.style.ForegroundColorSpan; import androidx.annotation.NonNull; import androidx.core.content.ContextCompat; -import com.yizhuan.habu.R; -import com.yizhuan.habu.common.widget.dialog.DialogManager; -import com.yizhuan.habu.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.chwl.app.R; +import com.chwl.app.common.widget.dialog.DialogManager; +import com.chwl.app.ui.webview.CommonWebViewActivity; +import com.chwl.core.UriProvider; +import com.chwl.core.certification.CertificationModel; +import com.chwl.core.user.UserModel; +import com.chwl.core.user.bean.UserInfo; /** * 强制用户实名认证 diff --git a/app/src/main/java/com/yizhuan/habu/utils/CleanLeakUtils.java b/app/src/main/java/com/chwl/app/utils/CleanLeakUtils.java similarity index 98% rename from app/src/main/java/com/yizhuan/habu/utils/CleanLeakUtils.java rename to app/src/main/java/com/chwl/app/utils/CleanLeakUtils.java index ca43565ae..87f3eb3b4 100644 --- a/app/src/main/java/com/yizhuan/habu/utils/CleanLeakUtils.java +++ b/app/src/main/java/com/chwl/app/utils/CleanLeakUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.utils; +package com.chwl.app.utils; import android.content.Context; import android.os.Build; diff --git a/app/src/main/java/com/yizhuan/habu/utils/ClipboardUtils.java b/app/src/main/java/com/chwl/app/utils/ClipboardUtils.java similarity index 97% rename from app/src/main/java/com/yizhuan/habu/utils/ClipboardUtils.java rename to app/src/main/java/com/chwl/app/utils/ClipboardUtils.java index debbc27c5..77926f026 100644 --- a/app/src/main/java/com/yizhuan/habu/utils/ClipboardUtils.java +++ b/app/src/main/java/com/chwl/app/utils/ClipboardUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.habu.utils; +package com.chwl.app.utils; import android.annotation.TargetApi; import android.app.Activity; @@ -14,7 +14,7 @@ import android.util.Log; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.yizhuan.habu.application.XChatApplication; +import com.chwl.app.application.XChatApplication; /** * 

diff --git a/app/src/main/java/com/yizhuan/habu/utils/CommonJumpHelper.java b/app/src/main/java/com/chwl/app/utils/CommonJumpHelper.java
similarity index 70%
rename from app/src/main/java/com/yizhuan/habu/utils/CommonJumpHelper.java
rename to app/src/main/java/com/chwl/app/utils/CommonJumpHelper.java
index 3df49d534..dcb31b758 100644
--- a/app/src/main/java/com/yizhuan/habu/utils/CommonJumpHelper.java
+++ b/app/src/main/java/com/chwl/app/utils/CommonJumpHelper.java
@@ -1,20 +1,20 @@
-package com.yizhuan.habu.utils;
+package com.chwl.app.utils;
 
 
-import static com.yizhuan.xchat_android_core.home.bean.BannerInfo.SKIP_TYPE_ROUTER;
-import static com.yizhuan.xchat_android_core.home.bean.BannerInfo.SKIP_TYP_APP;
-import static com.yizhuan.xchat_android_core.home.bean.BannerInfo.SKIP_TYP_CHAT_ROOM;
-import static com.yizhuan.xchat_android_core.home.bean.BannerInfo.SKIP_TYP_H5;
+import static com.chwl.core.home.bean.BannerInfo.SKIP_TYPE_ROUTER;
+import static com.chwl.core.home.bean.BannerInfo.SKIP_TYP_APP;
+import static com.chwl.core.home.bean.BannerInfo.SKIP_TYP_CHAT_ROOM;
+import static com.chwl.core.home.bean.BannerInfo.SKIP_TYP_H5;
 
 import android.content.Context;
 import android.content.Intent;
 import android.text.TextUtils;
 
-import com.yizhuan.habu.avroom.activity.AVRoomActivity;
-import com.yizhuan.habu.ui.im.RouterHandler;
-import com.yizhuan.habu.ui.webview.CommonWebViewActivity;
-import com.yizhuan.xchat_android_core.home.bean.BannerInfo;
-import com.yizhuan.xchat_android_library.utils.JavaUtil;
+import com.chwl.app.avroom.activity.AVRoomActivity;
+import com.chwl.app.ui.im.RouterHandler;
+import com.chwl.app.ui.webview.CommonWebViewActivity;
+import com.chwl.core.home.bean.BannerInfo;
+import com.chwl.library.utils.JavaUtil;
 
 /**
  * 用于banner做通用跳转
diff --git a/app/src/main/java/com/yizhuan/habu/utils/FastBlur.java b/app/src/main/java/com/chwl/app/utils/FastBlur.java
similarity index 99%
rename from app/src/main/java/com/yizhuan/habu/utils/FastBlur.java
rename to app/src/main/java/com/chwl/app/utils/FastBlur.java
index 2bf3332e8..f86f2b786 100644
--- a/app/src/main/java/com/yizhuan/habu/utils/FastBlur.java
+++ b/app/src/main/java/com/chwl/app/utils/FastBlur.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.utils;
+package com.chwl.app.utils;
 
 import android.graphics.Bitmap;
 
diff --git a/app/src/main/java/com/yizhuan/habu/utils/FloatManager.java b/app/src/main/java/com/chwl/app/utils/FloatManager.java
similarity index 92%
rename from app/src/main/java/com/yizhuan/habu/utils/FloatManager.java
rename to app/src/main/java/com/chwl/app/utils/FloatManager.java
index e89c47f9e..df6021114 100644
--- a/app/src/main/java/com/yizhuan/habu/utils/FloatManager.java
+++ b/app/src/main/java/com/chwl/app/utils/FloatManager.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.utils;
+package com.chwl.app.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.habu.application.XChatApplication;
-import com.yizhuan.habu.ui.widget.MarqueeLayout;
-import com.yizhuan.xchat_android_library.utils.SizeUtils;
+import com.chwl.app.application.XChatApplication;
+import com.chwl.app.ui.widget.MarqueeLayout;
+import com.chwl.library.utils.SizeUtils;
 
 /**
  * 
 悬浮窗管理 

diff --git a/app/src/main/java/com/yizhuan/habu/utils/FontTextView.java b/app/src/main/java/com/chwl/app/utils/FontTextView.java
similarity index 96%
rename from app/src/main/java/com/yizhuan/habu/utils/FontTextView.java
rename to app/src/main/java/com/chwl/app/utils/FontTextView.java
index d9f610641..79ee1e7f5 100644
--- a/app/src/main/java/com/yizhuan/habu/utils/FontTextView.java
+++ b/app/src/main/java/com/chwl/app/utils/FontTextView.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.utils;
+package com.chwl.app.utils;
 
 import android.content.Context;
 import android.content.res.AssetManager;
diff --git a/app/src/main/java/com/yizhuan/habu/utils/KeyBoardUtils.java b/app/src/main/java/com/chwl/app/utils/KeyBoardUtils.java
similarity index 98%
rename from app/src/main/java/com/yizhuan/habu/utils/KeyBoardUtils.java
rename to app/src/main/java/com/chwl/app/utils/KeyBoardUtils.java
index 763ed5dde..612428e85 100644
--- a/app/src/main/java/com/yizhuan/habu/utils/KeyBoardUtils.java
+++ b/app/src/main/java/com/chwl/app/utils/KeyBoardUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.utils;
+package com.chwl.app.utils;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/app/src/main/java/com/yizhuan/habu/utils/LimitInputFliter.java b/app/src/main/java/com/chwl/app/utils/LimitInputFliter.java
similarity index 93%
rename from app/src/main/java/com/yizhuan/habu/utils/LimitInputFliter.java
rename to app/src/main/java/com/chwl/app/utils/LimitInputFliter.java
index 22f207a1d..736e9c2a3 100644
--- a/app/src/main/java/com/yizhuan/habu/utils/LimitInputFliter.java
+++ b/app/src/main/java/com/chwl/app/utils/LimitInputFliter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.utils;
+package com.chwl.app.utils;
 
 import android.text.InputFilter;
 import android.text.Spanned;
diff --git a/app/src/main/java/com/yizhuan/habu/utils/MsgBuilder.kt b/app/src/main/java/com/chwl/app/utils/MsgBuilder.kt
similarity index 93%
rename from app/src/main/java/com/yizhuan/habu/utils/MsgBuilder.kt
rename to app/src/main/java/com/chwl/app/utils/MsgBuilder.kt
index f5dfb7702..b36037405 100644
--- a/app/src/main/java/com/yizhuan/habu/utils/MsgBuilder.kt
+++ b/app/src/main/java/com/chwl/app/utils/MsgBuilder.kt
@@ -1,12 +1,12 @@
-package com.yizhuan.habu.utils
+package com.chwl.app.utils
 
 import android.text.style.ForegroundColorSpan
 import android.view.View
 import androidx.core.graphics.toColorInt
-import com.yizhuan.habu.ui.webview.CommonWebViewActivity
-import com.yizhuan.xchat_android_core.im.custom.bean.FairyMsgAttachment
-import com.yizhuan.xchat_android_core.manager.RoomEvent
-import com.yizhuan.xchat_android_core.utils.sub
+import com.chwl.app.ui.webview.CommonWebViewActivity
+import com.chwl.core.im.custom.bean.FairyMsgAttachment
+import com.chwl.core.manager.RoomEvent
+import com.chwl.core.utils.sub
 
 class MsgBuilder {
 
diff --git a/app/src/main/java/com/yizhuan/habu/utils/NotificationsUtils.java b/app/src/main/java/com/chwl/app/utils/NotificationsUtils.java
similarity index 96%
rename from app/src/main/java/com/yizhuan/habu/utils/NotificationsUtils.java
rename to app/src/main/java/com/chwl/app/utils/NotificationsUtils.java
index 464439679..0adf5bd36 100644
--- a/app/src/main/java/com/yizhuan/habu/utils/NotificationsUtils.java
+++ b/app/src/main/java/com/chwl/app/utils/NotificationsUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.utils;
+package com.chwl.app.utils;
 
 import android.app.Activity;
 import android.content.ComponentName;
@@ -12,9 +12,9 @@ import android.provider.Settings;
 import androidx.core.app.NotificationManagerCompat;
 
 import com.netease.nim.uikit.common.util.log.LogUtil;
-import com.yizhuan.habu.R;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
+import com.chwl.app.R;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SingleToastUtil;
 
 /**
  * 通知栏监测工具
diff --git a/app/src/main/java/com/yizhuan/habu/utils/NumberFormatUtil.java b/app/src/main/java/com/chwl/app/utils/NumberFormatUtil.java
similarity index 96%
rename from app/src/main/java/com/yizhuan/habu/utils/NumberFormatUtil.java
rename to app/src/main/java/com/chwl/app/utils/NumberFormatUtil.java
index e4087ea77..af442c9c5 100644
--- a/app/src/main/java/com/yizhuan/habu/utils/NumberFormatUtil.java
+++ b/app/src/main/java/com/chwl/app/utils/NumberFormatUtil.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.utils;
+package com.chwl.app.utils;
 
 import android.text.TextUtils;
 
diff --git a/app/src/main/java/com/yizhuan/habu/utils/OSUtils.java b/app/src/main/java/com/chwl/app/utils/OSUtils.java
similarity index 98%
rename from app/src/main/java/com/yizhuan/habu/utils/OSUtils.java
rename to app/src/main/java/com/chwl/app/utils/OSUtils.java
index c8801ca9c..f984cf315 100644
--- a/app/src/main/java/com/yizhuan/habu/utils/OSUtils.java
+++ b/app/src/main/java/com/chwl/app/utils/OSUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.utils;
+package com.chwl.app.utils;
 
 import android.text.TextUtils;
 
diff --git a/app/src/main/java/com/yizhuan/habu/utils/PermissionUtil.kt b/app/src/main/java/com/chwl/app/utils/PermissionUtil.kt
similarity index 97%
rename from app/src/main/java/com/yizhuan/habu/utils/PermissionUtil.kt
rename to app/src/main/java/com/chwl/app/utils/PermissionUtil.kt
index 32faeca36..30708da60 100644
--- a/app/src/main/java/com/yizhuan/habu/utils/PermissionUtil.kt
+++ b/app/src/main/java/com/chwl/app/utils/PermissionUtil.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.utils
+package com.chwl.app.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 androidx.core.content.ContextCompat
-import com.yizhuan.habu.BuildConfig
-import com.yizhuan.habu.ui.setting.bean.PermissionEntity
+import com.chwl.app.BuildConfig
+import com.chwl.app.ui.setting.bean.PermissionEntity
 
 class PermissionUtil {
     companion object {
diff --git a/app/src/main/java/com/yizhuan/habu/utils/PushMessageHandler.java b/app/src/main/java/com/chwl/app/utils/PushMessageHandler.java
similarity index 96%
rename from app/src/main/java/com/yizhuan/habu/utils/PushMessageHandler.java
rename to app/src/main/java/com/chwl/app/utils/PushMessageHandler.java
index 50a373f10..27435c973 100644
--- a/app/src/main/java/com/yizhuan/habu/utils/PushMessageHandler.java
+++ b/app/src/main/java/com/chwl/app/utils/PushMessageHandler.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.utils;
+package com.chwl.app.utils;
 
 import android.app.Activity;
 import android.content.ComponentName;
@@ -9,7 +9,7 @@ import android.text.TextUtils;
 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.chwl.core.DemoCache;
 
 import java.io.Serializable;
 import java.util.Map;
diff --git a/app/src/main/java/com/yizhuan/habu/utils/RSBlur.java b/app/src/main/java/com/chwl/app/utils/RSBlur.java
similarity index 98%
rename from app/src/main/java/com/yizhuan/habu/utils/RSBlur.java
rename to app/src/main/java/com/chwl/app/utils/RSBlur.java
index df24e3068..4f96055b0 100644
--- a/app/src/main/java/com/yizhuan/habu/utils/RSBlur.java
+++ b/app/src/main/java/com/chwl/app/utils/RSBlur.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.utils;
+package com.chwl.app.utils;
 
 import android.annotation.TargetApi;
 import android.content.Context;
diff --git a/app/src/main/java/com/yizhuan/habu/utils/RegexUtil.java b/app/src/main/java/com/chwl/app/utils/RegexUtil.java
similarity index 95%
rename from app/src/main/java/com/yizhuan/habu/utils/RegexUtil.java
rename to app/src/main/java/com/chwl/app/utils/RegexUtil.java
index fffa4b809..0c13f65de 100644
--- a/app/src/main/java/com/yizhuan/habu/utils/RegexUtil.java
+++ b/app/src/main/java/com/chwl/app/utils/RegexUtil.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.utils;
+package com.chwl.app.utils;
 
 import android.text.TextUtils;
 
@@ -55,7 +55,7 @@ public class RegexUtil {
     }
 
     public static String getNotPrintableStringReg() {
-        //  bug-fixed java.lang.RuntimeException:Unable to resume activity {com.yizhuan.habu/com.yizhuan.habu.MainActivity}: kotlin.KotlinNullPointerException
+        //  bug-fixed java.lang.RuntimeException:Unable to resume activity {com.chwl.app/com.chwl.app.MainActivity}: kotlin.KotlinNullPointerException
         return TextUtils.isEmpty(NOT_VISIBLE_CHARS) ? "" : NOT_VISIBLE_CHARS;
     }
 
diff --git a/app/src/main/java/com/yizhuan/habu/utils/SpannableBuilder.java b/app/src/main/java/com/chwl/app/utils/SpannableBuilder.java
similarity index 97%
rename from app/src/main/java/com/yizhuan/habu/utils/SpannableBuilder.java
rename to app/src/main/java/com/chwl/app/utils/SpannableBuilder.java
index 7e7b1f7bc..d2b5f6a34 100644
--- a/app/src/main/java/com/yizhuan/habu/utils/SpannableBuilder.java
+++ b/app/src/main/java/com/chwl/app/utils/SpannableBuilder.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.utils;
+package com.chwl.app.utils;
 
 import android.content.Context;
 import android.text.SpannableStringBuilder;
diff --git a/app/src/main/java/com/yizhuan/habu/utils/ThreadUtil.java b/app/src/main/java/com/chwl/app/utils/ThreadUtil.java
similarity index 97%
rename from app/src/main/java/com/yizhuan/habu/utils/ThreadUtil.java
rename to app/src/main/java/com/chwl/app/utils/ThreadUtil.java
index 5ec5d257f..8bedb7627 100644
--- a/app/src/main/java/com/yizhuan/habu/utils/ThreadUtil.java
+++ b/app/src/main/java/com/chwl/app/utils/ThreadUtil.java
@@ -1,10 +1,10 @@
-package com.yizhuan.habu.utils;
+package com.chwl.app.utils;
 
 import android.os.Handler;
 import android.os.Looper;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.library.utils.ResUtil;
 
 import java.util.concurrent.Executors;
 import java.util.concurrent.LinkedBlockingDeque;
diff --git a/app/src/main/java/com/yizhuan/habu/utils/TimeUiUtils.java b/app/src/main/java/com/chwl/app/utils/TimeUiUtils.java
similarity index 85%
rename from app/src/main/java/com/yizhuan/habu/utils/TimeUiUtils.java
rename to app/src/main/java/com/chwl/app/utils/TimeUiUtils.java
index cf10e187a..09954566a 100644
--- a/app/src/main/java/com/yizhuan/habu/utils/TimeUiUtils.java
+++ b/app/src/main/java/com/chwl/app/utils/TimeUiUtils.java
@@ -1,8 +1,8 @@
-package com.yizhuan.habu.utils;
+package com.chwl.app.utils;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.TimeUtils;
+import com.chwl.app.R;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.TimeUtils;
 
 /**
  * create by lvzebiao @2019/11/21
diff --git a/app/src/main/java/com/yizhuan/habu/utils/UserUtils.java b/app/src/main/java/com/chwl/app/utils/UserUtils.java
similarity index 77%
rename from app/src/main/java/com/yizhuan/habu/utils/UserUtils.java
rename to app/src/main/java/com/chwl/app/utils/UserUtils.java
index 891d059b1..775f38fa2 100644
--- a/app/src/main/java/com/yizhuan/habu/utils/UserUtils.java
+++ b/app/src/main/java/com/chwl/app/utils/UserUtils.java
@@ -1,9 +1,9 @@
-package com.yizhuan.habu.utils;
+package com.chwl.app.utils;
 
-import com.yizhuan.xchat_android_core.auth.AuthModel;
-import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
-import com.yizhuan.xchat_android_core.user.UserModel;
-import com.yizhuan.xchat_android_core.user.bean.UserInfo;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.user.UserModel;
+import com.chwl.core.user.bean.UserInfo;
 
 
 public class UserUtils {
diff --git a/app/src/main/java/com/yizhuan/habu/utils/VpSwipeRefreshLayout.java b/app/src/main/java/com/chwl/app/utils/VpSwipeRefreshLayout.java
similarity index 98%
rename from app/src/main/java/com/yizhuan/habu/utils/VpSwipeRefreshLayout.java
rename to app/src/main/java/com/chwl/app/utils/VpSwipeRefreshLayout.java
index c09b6790f..1e2a74da4 100644
--- a/app/src/main/java/com/yizhuan/habu/utils/VpSwipeRefreshLayout.java
+++ b/app/src/main/java/com/chwl/app/utils/VpSwipeRefreshLayout.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.utils;
+package com.chwl.app.utils;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/app/src/main/java/com/yizhuan/habu/utils/WebViewUtils.java b/app/src/main/java/com/chwl/app/utils/WebViewUtils.java
similarity index 94%
rename from app/src/main/java/com/yizhuan/habu/utils/WebViewUtils.java
rename to app/src/main/java/com/chwl/app/utils/WebViewUtils.java
index 20892ce4c..db04a3234 100644
--- a/app/src/main/java/com/yizhuan/habu/utils/WebViewUtils.java
+++ b/app/src/main/java/com/chwl/app/utils/WebViewUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.utils;
+package com.chwl.app.utils;
 
 import android.view.ViewGroup;
 import android.webkit.WebView;
diff --git a/app/src/main/java/com/yizhuan/habu/view/GenderAgeTextView.kt b/app/src/main/java/com/chwl/app/view/GenderAgeTextView.kt
similarity index 98%
rename from app/src/main/java/com/yizhuan/habu/view/GenderAgeTextView.kt
rename to app/src/main/java/com/chwl/app/view/GenderAgeTextView.kt
index adf8c254d..484474352 100644
--- a/app/src/main/java/com/yizhuan/habu/view/GenderAgeTextView.kt
+++ b/app/src/main/java/com/chwl/app/view/GenderAgeTextView.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.view
+package com.chwl.app.view
 
 import android.content.Context
 import android.graphics.Color
@@ -6,7 +6,7 @@ import android.util.AttributeSet
 import android.view.Gravity
 import androidx.appcompat.widget.AppCompatTextView
 import androidx.core.content.ContextCompat
-import com.yizhuan.habu.R
+import com.chwl.app.R
 import java.util.Calendar
 import java.util.Date
 
diff --git a/app/src/main/java/com/yizhuan/habu/view/NestedScrollableHost.kt b/app/src/main/java/com/chwl/app/view/NestedScrollableHost.kt
similarity index 99%
rename from app/src/main/java/com/yizhuan/habu/view/NestedScrollableHost.kt
rename to app/src/main/java/com/chwl/app/view/NestedScrollableHost.kt
index 828c0314a..d19d6f5c9 100644
--- a/app/src/main/java/com/yizhuan/habu/view/NestedScrollableHost.kt
+++ b/app/src/main/java/com/chwl/app/view/NestedScrollableHost.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yizhuan.habu.view
+package com.chwl.app.view
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/app/src/main/java/com/yizhuan/habu/view/ShadowFrameLayout.java b/app/src/main/java/com/chwl/app/view/ShadowFrameLayout.java
similarity index 98%
rename from app/src/main/java/com/yizhuan/habu/view/ShadowFrameLayout.java
rename to app/src/main/java/com/chwl/app/view/ShadowFrameLayout.java
index 3608f1ca5..9f16530a9 100644
--- a/app/src/main/java/com/yizhuan/habu/view/ShadowFrameLayout.java
+++ b/app/src/main/java/com/chwl/app/view/ShadowFrameLayout.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.view;
+package com.chwl.app.view;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -14,7 +14,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 
-import com.yizhuan.habu.R;
+import com.chwl.app.R;
 
 /**
  * @author wzq
diff --git a/app/src/main/java/com/yizhuan/habu/view/WrapHeightViewPager.kt b/app/src/main/java/com/chwl/app/view/WrapHeightViewPager.kt
similarity index 97%
rename from app/src/main/java/com/yizhuan/habu/view/WrapHeightViewPager.kt
rename to app/src/main/java/com/chwl/app/view/WrapHeightViewPager.kt
index 0f9bf30a9..ac5810dbc 100644
--- a/app/src/main/java/com/yizhuan/habu/view/WrapHeightViewPager.kt
+++ b/app/src/main/java/com/chwl/app/view/WrapHeightViewPager.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.view
+package com.chwl.app.view
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/app/src/main/java/com/yizhuan/habu/vip/VipBroadcastView.kt b/app/src/main/java/com/chwl/app/vip/VipBroadcastView.kt
similarity index 88%
rename from app/src/main/java/com/yizhuan/habu/vip/VipBroadcastView.kt
rename to app/src/main/java/com/chwl/app/vip/VipBroadcastView.kt
index ab30d0b6f..7e44a7678 100644
--- a/app/src/main/java/com/yizhuan/habu/vip/VipBroadcastView.kt
+++ b/app/src/main/java/com/chwl/app/vip/VipBroadcastView.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.vip
+package com.chwl.app.vip
 
 import android.animation.ObjectAnimator
 import android.annotation.SuppressLint
@@ -10,13 +10,13 @@ import androidx.core.animation.doOnEnd
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage
-import com.yizhuan.habu.databinding.LayoutVipBroadcastViewBinding
-import com.yizhuan.habu.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.chwl.app.databinding.LayoutVipBroadcastViewBinding
+import com.chwl.app.ui.utils.ImageLoadUtils
+import com.chwl.core.im.custom.bean.VipMessageAttachment
+import com.chwl.core.room.anotherroompk.ShowUserInfoDialogEvent
+import com.chwl.core.utils.subAndReplaceDot
+import com.chwl.core.vip.VipBroadcastMsgEvent
+import com.chwl.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/habu/vip/VipMainActivity.kt b/app/src/main/java/com/chwl/app/vip/VipMainActivity.kt
similarity index 93%
rename from app/src/main/java/com/yizhuan/habu/vip/VipMainActivity.kt
rename to app/src/main/java/com/chwl/app/vip/VipMainActivity.kt
index 27e573744..1df53cb58 100644
--- a/app/src/main/java/com/yizhuan/habu/vip/VipMainActivity.kt
+++ b/app/src/main/java/com/chwl/app/vip/VipMainActivity.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.vip
+package com.chwl.app.vip
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -26,35 +26,35 @@ import com.opensource.svgaplayer.SVGADrawable
 import com.opensource.svgaplayer.SVGAImageView
 import com.opensource.svgaplayer.SVGAParser
 import com.opensource.svgaplayer.SVGAVideoEntity
-import com.yizhuan.habu.R
-import com.yizhuan.habu.base.BaseViewBindingActivity
-import com.yizhuan.habu.base.TitleBar
-import com.yizhuan.habu.common.EmptyViewHelper
-import com.yizhuan.habu.databinding.ActivityVipMainBinding
-import com.yizhuan.habu.ui.pay.ChargeActivity
-import com.yizhuan.habu.ui.setting.ModifyPwdActivity
-import com.yizhuan.habu.ui.utils.RVDelegate
-import com.yizhuan.habu.ui.webview.CommonWebViewActivity
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator
-import com.yizhuan.habu.vip.adapter.VipAuthAdapter
-import com.yizhuan.habu.vip.adapter.VipMagicIndicatorAdapter
-import com.yizhuan.habu.vip.dialog.SelectPayTypeDialog
-import com.yizhuan.habu.vip.dialog.VipAuthDetailsDialog
-import com.yizhuan.habu.vip.dialog.VipRemainTimeDialog
-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.pay.PayModel
-import com.yizhuan.xchat_android_core.pay.bean.ChargeBean
-import com.yizhuan.xchat_android_core.pay.bean.PayRecordId
-import com.yizhuan.xchat_android_core.utils.net.IgnoreException
-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.common.util.DeviceUtil
-import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil
+import com.chwl.app.R
+import com.chwl.app.base.BaseViewBindingActivity
+import com.chwl.app.base.TitleBar
+import com.chwl.app.common.EmptyViewHelper
+import com.chwl.app.databinding.ActivityVipMainBinding
+import com.chwl.app.ui.pay.ChargeActivity
+import com.chwl.app.ui.setting.ModifyPwdActivity
+import com.chwl.app.ui.utils.RVDelegate
+import com.chwl.app.ui.webview.CommonWebViewActivity
+import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator
+import com.chwl.app.vip.adapter.VipAuthAdapter
+import com.chwl.app.vip.adapter.VipMagicIndicatorAdapter
+import com.chwl.app.vip.dialog.SelectPayTypeDialog
+import com.chwl.app.vip.dialog.VipAuthDetailsDialog
+import com.chwl.app.vip.dialog.VipRemainTimeDialog
+import com.chwl.core.Constants
+import com.chwl.core.UriProvider
+import com.chwl.core.auth.AuthModel
+import com.chwl.core.pay.PayModel
+import com.chwl.core.pay.bean.ChargeBean
+import com.chwl.core.pay.bean.PayRecordId
+import com.chwl.core.utils.net.IgnoreException
+import com.chwl.core.utils.toast
+import com.chwl.core.vip.VipAuthInfo
+import com.chwl.core.vip.VipInfo
+import com.chwl.core.vip.VipOpenEvent
+import com.chwl.library.common.util.DeviceUtil
+import com.chwl.library.utils.AppMetaDataUtil
+import com.chwl.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/habu/vip/VipSettingActivity.kt b/app/src/main/java/com/chwl/app/vip/VipSettingActivity.kt
similarity index 87%
rename from app/src/main/java/com/yizhuan/habu/vip/VipSettingActivity.kt
rename to app/src/main/java/com/chwl/app/vip/VipSettingActivity.kt
index ab333ccbe..08ffc4ef4 100644
--- a/app/src/main/java/com/yizhuan/habu/vip/VipSettingActivity.kt
+++ b/app/src/main/java/com/chwl/app/vip/VipSettingActivity.kt
@@ -1,15 +1,15 @@
-package com.yizhuan.habu.vip
+package com.chwl.app.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.habu.R
-import com.yizhuan.habu.base.BaseViewBindingActivity
-import com.yizhuan.habu.databinding.ActivityVipSettingBinding
-import com.yizhuan.xchat_android_core.user.UserModel
-import com.yizhuan.xchat_android_library.utils.ResUtil
+import com.chwl.app.R
+import com.chwl.app.base.BaseViewBindingActivity
+import com.chwl.app.databinding.ActivityVipSettingBinding
+import com.chwl.core.user.UserModel
+import com.chwl.library.utils.ResUtil
 
 class VipSettingActivity : BaseViewBindingActivity() {
 
diff --git a/app/src/main/java/com/yizhuan/habu/vip/VipViewModel.kt b/app/src/main/java/com/chwl/app/vip/VipViewModel.kt
similarity index 88%
rename from app/src/main/java/com/yizhuan/habu/vip/VipViewModel.kt
rename to app/src/main/java/com/chwl/app/vip/VipViewModel.kt
index 067a6ae2e..f945834f3 100644
--- a/app/src/main/java/com/yizhuan/habu/vip/VipViewModel.kt
+++ b/app/src/main/java/com/chwl/app/vip/VipViewModel.kt
@@ -1,20 +1,20 @@
-package com.yizhuan.habu.vip
+package com.chwl.app.vip
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import com.yizhuan.habu.R
-import com.yizhuan.habu.base.BaseViewModel
-import com.yizhuan.xchat_android_core.bean.response.BeanResult
-import com.yizhuan.xchat_android_core.home.model.HomeModel
-import com.yizhuan.xchat_android_core.module_hall.hall.HallModel
-import com.yizhuan.xchat_android_core.user.UserInfoUiMgr
-import com.yizhuan.xchat_android_core.user.UserModel
-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.yizhuan.xchat_android_library.utils.ResUtil
+import com.chwl.app.R
+import com.chwl.app.base.BaseViewModel
+import com.chwl.core.bean.response.BeanResult
+import com.chwl.core.home.model.HomeModel
+import com.chwl.core.module_hall.hall.HallModel
+import com.chwl.core.user.UserInfoUiMgr
+import com.chwl.core.user.UserModel
+import com.chwl.core.utils.toast
+import com.chwl.core.vip.VipAuthInfo
+import com.chwl.core.vip.VipBroadcastInfo
+import com.chwl.core.vip.VipInfo
+import com.chwl.core.vip.VipModel
+import com.chwl.library.utils.ResUtil
 
 class VipViewModel : BaseViewModel() {
     val userId: Long by lazy {
diff --git a/app/src/main/java/com/yizhuan/habu/vip/adapter/PayAdapter.kt b/app/src/main/java/com/chwl/app/vip/adapter/PayAdapter.kt
similarity index 85%
rename from app/src/main/java/com/yizhuan/habu/vip/adapter/PayAdapter.kt
rename to app/src/main/java/com/chwl/app/vip/adapter/PayAdapter.kt
index 36ca67245..4c9fcf3e4 100644
--- a/app/src/main/java/com/yizhuan/habu/vip/adapter/PayAdapter.kt
+++ b/app/src/main/java/com/chwl/app/vip/adapter/PayAdapter.kt
@@ -1,12 +1,12 @@
-package com.yizhuan.habu.vip.adapter
+package com.chwl.app.vip.adapter
 
 import android.widget.CheckBox
 import android.widget.ImageView
 import androidx.appcompat.widget.AppCompatTextView
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.BaseViewHolder
-import com.yizhuan.habu.R
-import com.yizhuan.habu.vip.bean.PayInfo
+import com.chwl.app.R
+import com.chwl.app.vip.bean.PayInfo
 
 class PayAdapter :
     BaseQuickAdapter(R.layout.item_pay) {
diff --git a/app/src/main/java/com/yizhuan/habu/vip/adapter/VipAuthAdapter.kt b/app/src/main/java/com/chwl/app/vip/adapter/VipAuthAdapter.kt
similarity index 78%
rename from app/src/main/java/com/yizhuan/habu/vip/adapter/VipAuthAdapter.kt
rename to app/src/main/java/com/chwl/app/vip/adapter/VipAuthAdapter.kt
index abb7829bf..61ab2c40e 100644
--- a/app/src/main/java/com/yizhuan/habu/vip/adapter/VipAuthAdapter.kt
+++ b/app/src/main/java/com/chwl/app/vip/adapter/VipAuthAdapter.kt
@@ -1,12 +1,12 @@
-package com.yizhuan.habu.vip.adapter
+package com.chwl.app.vip.adapter
 
 import android.widget.ImageView
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.BaseViewHolder
-import com.yizhuan.habu.R
-import com.yizhuan.habu.ui.utils.load
-import com.yizhuan.xchat_android_core.vip.VipAuthInfo
-import com.yizhuan.xchat_android_core.vip.VipInfo
+import com.chwl.app.R
+import com.chwl.app.ui.utils.load
+import com.chwl.core.vip.VipAuthInfo
+import com.chwl.core.vip.VipInfo
 
 class VipAuthAdapter :
     BaseQuickAdapter(R.layout.item_vip_auth) {
diff --git a/app/src/main/java/com/yizhuan/habu/vip/adapter/VipMagicIndicatorAdapter.java b/app/src/main/java/com/chwl/app/vip/adapter/VipMagicIndicatorAdapter.java
similarity index 85%
rename from app/src/main/java/com/yizhuan/habu/vip/adapter/VipMagicIndicatorAdapter.java
rename to app/src/main/java/com/chwl/app/vip/adapter/VipMagicIndicatorAdapter.java
index 41e59fcad..646d0ae5b 100644
--- a/app/src/main/java/com/yizhuan/habu/vip/adapter/VipMagicIndicatorAdapter.java
+++ b/app/src/main/java/com/chwl/app/vip/adapter/VipMagicIndicatorAdapter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.vip.adapter;
+package com.chwl.app.vip.adapter;
 
 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.habu.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator;
+import com.chwl.app.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView;
+import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
+import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter;
+import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator;
+import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView;
+import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/yizhuan/habu/vip/bean/PayInfo.kt b/app/src/main/java/com/chwl/app/vip/bean/PayInfo.kt
similarity index 79%
rename from app/src/main/java/com/yizhuan/habu/vip/bean/PayInfo.kt
rename to app/src/main/java/com/chwl/app/vip/bean/PayInfo.kt
index bf043ed5c..7884901a7 100644
--- a/app/src/main/java/com/yizhuan/habu/vip/bean/PayInfo.kt
+++ b/app/src/main/java/com/chwl/app/vip/bean/PayInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.vip.bean
+package com.chwl.app.vip.bean
 
 data class PayInfo(
     val url: Int = 0,
diff --git a/app/src/main/java/com/yizhuan/habu/vip/dialog/PaymentDialog.kt b/app/src/main/java/com/chwl/app/vip/dialog/PaymentDialog.kt
similarity index 85%
rename from app/src/main/java/com/yizhuan/habu/vip/dialog/PaymentDialog.kt
rename to app/src/main/java/com/chwl/app/vip/dialog/PaymentDialog.kt
index a9ce73f55..2e1ba8123 100644
--- a/app/src/main/java/com/yizhuan/habu/vip/dialog/PaymentDialog.kt
+++ b/app/src/main/java/com/chwl/app/vip/dialog/PaymentDialog.kt
@@ -1,16 +1,16 @@
-package com.yizhuan.habu.vip.dialog
+package com.chwl.app.vip.dialog
 
 import android.annotation.SuppressLint
 import android.view.Gravity
 import android.view.WindowManager
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.yizhuan.habu.R
-import com.yizhuan.habu.base.BaseDialog
-import com.yizhuan.habu.databinding.DialogPaymentBinding
-import com.yizhuan.habu.ui.utils.RVDelegate
-import com.yizhuan.habu.vip.adapter.PayAdapter
-import com.yizhuan.habu.vip.bean.PayInfo
-import com.yizhuan.xchat_android_library.utils.ResUtil
+import com.chwl.app.R
+import com.chwl.app.base.BaseDialog
+import com.chwl.app.databinding.DialogPaymentBinding
+import com.chwl.app.ui.utils.RVDelegate
+import com.chwl.app.vip.adapter.PayAdapter
+import com.chwl.app.vip.bean.PayInfo
+import com.chwl.library.utils.ResUtil
 
 /**
  * 支付选择弹窗
diff --git a/app/src/main/java/com/yizhuan/habu/vip/dialog/SelectPayTypeDialog.kt b/app/src/main/java/com/chwl/app/vip/dialog/SelectPayTypeDialog.kt
similarity index 89%
rename from app/src/main/java/com/yizhuan/habu/vip/dialog/SelectPayTypeDialog.kt
rename to app/src/main/java/com/chwl/app/vip/dialog/SelectPayTypeDialog.kt
index aa386f563..02e5123c2 100644
--- a/app/src/main/java/com/yizhuan/habu/vip/dialog/SelectPayTypeDialog.kt
+++ b/app/src/main/java/com/chwl/app/vip/dialog/SelectPayTypeDialog.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.vip.dialog
+package com.chwl.app.vip.dialog
 
 import android.annotation.SuppressLint
 import android.content.res.ColorStateList
@@ -9,17 +9,17 @@ import android.view.View
 import android.view.WindowManager
 import androidx.core.graphics.toColorInt
 import com.netease.nim.uikit.common.util.sys.ScreenUtil
-import com.yizhuan.habu.R
-import com.yizhuan.habu.base.BaseDialog
-import com.yizhuan.habu.databinding.DialogSelectPayTypeBinding
-import com.yizhuan.habu.ui.widget.dialog.CommonTipDialog
-import com.yizhuan.habu.utils.SpannableBuilder
-import com.yizhuan.xchat_android_core.pay.PayModel
-import com.yizhuan.xchat_android_core.pay.bean.WalletInfo
-import com.yizhuan.xchat_android_core.utils.Logger
-import com.yizhuan.xchat_android_library.utils.FormatUtils
-import com.yizhuan.xchat_android_library.utils.ResUtil
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil
+import com.chwl.app.R
+import com.chwl.app.base.BaseDialog
+import com.chwl.app.databinding.DialogSelectPayTypeBinding
+import com.chwl.app.ui.widget.dialog.CommonTipDialog
+import com.chwl.app.utils.SpannableBuilder
+import com.chwl.core.pay.PayModel
+import com.chwl.core.pay.bean.WalletInfo
+import com.chwl.core.utils.Logger
+import com.chwl.library.utils.FormatUtils
+import com.chwl.library.utils.ResUtil
+import com.chwl.library.utils.SingleToastUtil
 
 /**
  * 充值方式选择弹窗
diff --git a/app/src/main/java/com/yizhuan/habu/vip/dialog/VipAuthDetailsDialog.kt b/app/src/main/java/com/chwl/app/vip/dialog/VipAuthDetailsDialog.kt
similarity index 82%
rename from app/src/main/java/com/yizhuan/habu/vip/dialog/VipAuthDetailsDialog.kt
rename to app/src/main/java/com/chwl/app/vip/dialog/VipAuthDetailsDialog.kt
index 67e1c8926..17b411858 100644
--- a/app/src/main/java/com/yizhuan/habu/vip/dialog/VipAuthDetailsDialog.kt
+++ b/app/src/main/java/com/chwl/app/vip/dialog/VipAuthDetailsDialog.kt
@@ -1,9 +1,9 @@
-package com.yizhuan.habu.vip.dialog
+package com.chwl.app.vip.dialog
 
 import android.os.Bundle
-import com.yizhuan.habu.base.BaseDialog
-import com.yizhuan.habu.databinding.DialogVipAuthDetailsBinding
-import com.yizhuan.habu.ui.utils.load
+import com.chwl.app.base.BaseDialog
+import com.chwl.app.databinding.DialogVipAuthDetailsBinding
+import com.chwl.app.ui.utils.load
 
 class VipAuthDetailsDialog : BaseDialog() {
 
diff --git a/app/src/main/java/com/yizhuan/habu/vip/dialog/VipBroadcastDialog.kt b/app/src/main/java/com/chwl/app/vip/dialog/VipBroadcastDialog.kt
similarity index 88%
rename from app/src/main/java/com/yizhuan/habu/vip/dialog/VipBroadcastDialog.kt
rename to app/src/main/java/com/chwl/app/vip/dialog/VipBroadcastDialog.kt
index a0f119f7f..be98e9891 100644
--- a/app/src/main/java/com/yizhuan/habu/vip/dialog/VipBroadcastDialog.kt
+++ b/app/src/main/java/com/chwl/app/vip/dialog/VipBroadcastDialog.kt
@@ -1,17 +1,17 @@
-package com.yizhuan.habu.vip.dialog
+package com.chwl.app.vip.dialog
 
 import android.annotation.SuppressLint
 import android.os.Bundle
 import androidx.core.view.isVisible
 import androidx.fragment.app.viewModels
-import com.yizhuan.habu.R
-import com.yizhuan.habu.base.BaseActivity
-import com.yizhuan.habu.base.BaseDialog
-import com.yizhuan.habu.databinding.DialogVipBroadcastBinding
-import com.yizhuan.habu.vip.VipViewModel
-import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils
-import com.yizhuan.xchat_android_core.utils.toast
-import com.yizhuan.xchat_android_library.utils.ResUtil
+import com.chwl.app.R
+import com.chwl.app.base.BaseActivity
+import com.chwl.app.base.BaseDialog
+import com.chwl.app.databinding.DialogVipBroadcastBinding
+import com.chwl.app.vip.VipViewModel
+import com.chwl.core.utils.CurrentTimeUtils
+import com.chwl.core.utils.toast
+import com.chwl.library.utils.ResUtil
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
diff --git a/app/src/main/java/com/yizhuan/habu/vip/dialog/VipRemainTimeDialog.kt b/app/src/main/java/com/chwl/app/vip/dialog/VipRemainTimeDialog.kt
similarity index 76%
rename from app/src/main/java/com/yizhuan/habu/vip/dialog/VipRemainTimeDialog.kt
rename to app/src/main/java/com/chwl/app/vip/dialog/VipRemainTimeDialog.kt
index 5212eb711..9022150a4 100644
--- a/app/src/main/java/com/yizhuan/habu/vip/dialog/VipRemainTimeDialog.kt
+++ b/app/src/main/java/com/chwl/app/vip/dialog/VipRemainTimeDialog.kt
@@ -1,8 +1,8 @@
-package com.yizhuan.habu.vip.dialog
+package com.chwl.app.vip.dialog
 
 import android.os.Bundle
-import com.yizhuan.habu.base.BaseDialog
-import com.yizhuan.habu.databinding.DialogVipRemainTimeBinding
+import com.chwl.app.base.BaseDialog
+import com.chwl.app.databinding.DialogVipRemainTimeBinding
 
 class VipRemainTimeDialog : BaseDialog() {
 
diff --git a/app/src/main/java/com/yizhuan/habu/vip/dialog/VipUpgradeDialog.kt b/app/src/main/java/com/chwl/app/vip/dialog/VipUpgradeDialog.kt
similarity index 89%
rename from app/src/main/java/com/yizhuan/habu/vip/dialog/VipUpgradeDialog.kt
rename to app/src/main/java/com/chwl/app/vip/dialog/VipUpgradeDialog.kt
index 71759b47c..9dc7329a9 100644
--- a/app/src/main/java/com/yizhuan/habu/vip/dialog/VipUpgradeDialog.kt
+++ b/app/src/main/java/com/chwl/app/vip/dialog/VipUpgradeDialog.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.vip.dialog
+package com.chwl.app.vip.dialog
 
 import android.annotation.SuppressLint
 import android.os.Bundle
@@ -6,11 +6,11 @@ import androidx.fragment.app.activityViewModels
 import com.opensource.svgaplayer.SVGADrawable
 import com.opensource.svgaplayer.SVGAParser
 import com.opensource.svgaplayer.SVGAVideoEntity
-import com.yizhuan.habu.base.BaseActivity
-import com.yizhuan.habu.base.BaseDialog
-import com.yizhuan.habu.databinding.DialogVipUpgradeBinding
-import com.yizhuan.habu.vip.VipViewModel
-import com.yizhuan.xchat_android_core.vip.VipInfo
+import com.chwl.app.base.BaseActivity
+import com.chwl.app.base.BaseDialog
+import com.chwl.app.databinding.DialogVipUpgradeBinding
+import com.chwl.app.vip.VipViewModel
+import com.chwl.core.vip.VipInfo
 import java.net.MalformedURLException
 import java.net.URL
 
diff --git a/app/src/main/java/com/yizhuan/habu/vip/util/VipHelper.java b/app/src/main/java/com/chwl/app/vip/util/VipHelper.java
similarity index 85%
rename from app/src/main/java/com/yizhuan/habu/vip/util/VipHelper.java
rename to app/src/main/java/com/chwl/app/vip/util/VipHelper.java
index dfe7b6a67..016c87d68 100644
--- a/app/src/main/java/com/yizhuan/habu/vip/util/VipHelper.java
+++ b/app/src/main/java/com/chwl/app/vip/util/VipHelper.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.vip.util;
+package com.chwl.app.vip.util;
 
 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.habu.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.chwl.app.ui.utils.ImageLoadUtils;
+import com.chwl.core.user.UserModel;
+import com.chwl.core.user.bean.UserInfo;
+import com.chwl.core.utils.TextUtils;
+import com.chwl.core.vip.UserVipInfo;
 
 public class VipHelper {
 
diff --git a/app/src/main/java/com/yizhuan/habu/vip/view/VipBroadcastView.kt b/app/src/main/java/com/chwl/app/vip/view/VipBroadcastView.kt
similarity index 88%
rename from app/src/main/java/com/yizhuan/habu/vip/view/VipBroadcastView.kt
rename to app/src/main/java/com/chwl/app/vip/view/VipBroadcastView.kt
index df2495899..3cf4189aa 100644
--- a/app/src/main/java/com/yizhuan/habu/vip/view/VipBroadcastView.kt
+++ b/app/src/main/java/com/chwl/app/vip/view/VipBroadcastView.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.vip.view
+package com.chwl.app.vip.view
 
 import android.animation.ObjectAnimator
 import android.annotation.SuppressLint
@@ -10,13 +10,13 @@ import androidx.core.animation.doOnEnd
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage
-import com.yizhuan.habu.databinding.LayoutVipBroadcastViewBinding
-import com.yizhuan.habu.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.chwl.app.databinding.LayoutVipBroadcastViewBinding
+import com.chwl.app.ui.utils.ImageLoadUtils
+import com.chwl.core.im.custom.bean.VipMessageAttachment
+import com.chwl.core.room.anotherroompk.ShowUserInfoDialogEvent
+import com.chwl.core.utils.subAndReplaceDot
+import com.chwl.core.vip.VipBroadcastMsgEvent
+import com.chwl.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/jph/takephoto/app/TakePhotoActivity.java b/app/src/main/java/com/jph/takephoto/app/TakePhotoActivity.java
index 8f2d9bed2..c499f3340 100644
--- a/app/src/main/java/com/jph/takephoto/app/TakePhotoActivity.java
+++ b/app/src/main/java/com/jph/takephoto/app/TakePhotoActivity.java
@@ -13,8 +13,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.habu.R;
-import com.yizhuan.habu.base.BaseActivity;
+import com.chwl.app.R;
+import com.chwl.app.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 c45a59e8a..d75fc53bb 100644
--- a/app/src/main/java/com/jph/takephoto/app/TakePhotoFragment.java
+++ b/app/src/main/java/com/jph/takephoto/app/TakePhotoFragment.java
@@ -12,7 +12,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.habu.R;
+import com.chwl.app.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 7b15dfae9..7c936c57e 100644
--- a/app/src/main/java/com/jph/takephoto/app/TakePhotoFragmentActivity.java
+++ b/app/src/main/java/com/jph/takephoto/app/TakePhotoFragmentActivity.java
@@ -12,7 +12,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.habu.R;
+import com.chwl.app.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 4781b263e..43f543105 100644
--- a/app/src/main/java/com/jph/takephoto/app/TakePhotoImpl.java
+++ b/app/src/main/java/com/jph/takephoto/app/TakePhotoImpl.java
@@ -35,8 +35,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.habu.R;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
+import com.chwl.app.R;
+import com.chwl.library.utils.SingleToastUtil;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/app/src/main/java/com/jph/takephoto/compress/CompressImageUtil.java b/app/src/main/java/com/jph/takephoto/compress/CompressImageUtil.java
index 69ec6c1f2..a7c8526d7 100644
--- a/app/src/main/java/com/jph/takephoto/compress/CompressImageUtil.java
+++ b/app/src/main/java/com/jph/takephoto/compress/CompressImageUtil.java
@@ -7,8 +7,8 @@ import android.graphics.BitmapFactory;
 import android.os.Handler;
 
 import com.jph.takephoto.uitl.TFileUtils;
-import com.yizhuan.habu.R;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.library.utils.ResUtil;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
diff --git a/app/src/main/java/com/jph/takephoto/model/TExceptionType.java b/app/src/main/java/com/jph/takephoto/model/TExceptionType.java
index 62ab96733..c2b274d03 100644
--- a/app/src/main/java/com/jph/takephoto/model/TExceptionType.java
+++ b/app/src/main/java/com/jph/takephoto/model/TExceptionType.java
@@ -1,6 +1,6 @@
 package com.jph.takephoto.model;
-import com.yizhuan.habu.R;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.library.utils.ResUtil;
 
 /**
  * Author: JPH
diff --git a/app/src/main/java/com/jph/takephoto/permission/PermissionManager.java b/app/src/main/java/com/jph/takephoto/permission/PermissionManager.java
index 52ed40958..6781d60aa 100644
--- a/app/src/main/java/com/jph/takephoto/permission/PermissionManager.java
+++ b/app/src/main/java/com/jph/takephoto/permission/PermissionManager.java
@@ -13,9 +13,9 @@ 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.habu.R;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
+import com.chwl.app.R;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.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 18b0be58c..05875fab5 100644
--- a/app/src/main/java/com/jph/takephoto/uitl/TImageFiles.java
+++ b/app/src/main/java/com/jph/takephoto/uitl/TImageFiles.java
@@ -12,9 +12,9 @@ import android.webkit.MimeTypeMap;
 
 import com.jph.takephoto.model.TException;
 import com.jph.takephoto.model.TExceptionType;
-import com.yizhuan.habu.R;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
+import com.chwl.app.R;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.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 3fe8f6ed1..8d61e4563 100644
--- a/app/src/main/java/com/jph/takephoto/uitl/TUtils.java
+++ b/app/src/main/java/com/jph/takephoto/uitl/TUtils.java
@@ -20,8 +20,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.habu.R;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
+import com.chwl.app.R;
+import com.chwl.library.utils.SingleToastUtil;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/app/src/main/java/com/yizhuan/habu/avroom/redpackage/RedPackageEvent.java b/app/src/main/java/com/yizhuan/habu/avroom/redpackage/RedPackageEvent.java
deleted file mode 100644
index 12c846111..000000000
--- a/app/src/main/java/com/yizhuan/habu/avroom/redpackage/RedPackageEvent.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.yizhuan.habu.avroom.redpackage;
-
-public class RedPackageEvent {
-}
diff --git a/app/src/main/java/com/yizhuan/habu/bills/presenter/BillGiftIncomeGroupPresenter.java b/app/src/main/java/com/yizhuan/habu/bills/presenter/BillGiftIncomeGroupPresenter.java
deleted file mode 100644
index 4787cadac..000000000
--- a/app/src/main/java/com/yizhuan/habu/bills/presenter/BillGiftIncomeGroupPresenter.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.yizhuan.habu.bills.presenter;
-
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.habu.bills.view.IBillGiftIncomeGroupView;
-
-public class BillGiftIncomeGroupPresenter extends BaseMvpPresenter {
-}
diff --git a/app/src/main/java/com/yizhuan/habu/bills/view/IBillGiftIncomeGroupView.java b/app/src/main/java/com/yizhuan/habu/bills/view/IBillGiftIncomeGroupView.java
deleted file mode 100644
index 9e03024d0..000000000
--- a/app/src/main/java/com/yizhuan/habu/bills/view/IBillGiftIncomeGroupView.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.yizhuan.habu.bills.view;
-
-import com.yizhuan.xchat_android_library.base.IMvpBaseView;
-
-public interface IBillGiftIncomeGroupView extends IMvpBaseView {
-}
diff --git a/app/src/main/java/com/yizhuan/habu/bills/view/ISmoothToTopView.java b/app/src/main/java/com/yizhuan/habu/bills/view/ISmoothToTopView.java
deleted file mode 100644
index c134e0bcf..000000000
--- a/app/src/main/java/com/yizhuan/habu/bills/view/ISmoothToTopView.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.yizhuan.habu.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/habu/family/presenter/FamilyManagePresenter.java b/app/src/main/java/com/yizhuan/habu/family/presenter/FamilyManagePresenter.java
deleted file mode 100644
index 14f908a33..000000000
--- a/app/src/main/java/com/yizhuan/habu/family/presenter/FamilyManagePresenter.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.yizhuan.habu.family.presenter;
-
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.habu.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/habu/family/presenter/FamilySelectFriendPresenter.java b/app/src/main/java/com/yizhuan/habu/family/presenter/FamilySelectFriendPresenter.java
deleted file mode 100644
index 68254ab8e..000000000
--- a/app/src/main/java/com/yizhuan/habu/family/presenter/FamilySelectFriendPresenter.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.yizhuan.habu.family.presenter;
-
-
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.habu.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/habu/home/event/ContactTrashEvent.java b/app/src/main/java/com/yizhuan/habu/home/event/ContactTrashEvent.java
deleted file mode 100644
index e46b56458..000000000
--- a/app/src/main/java/com/yizhuan/habu/home/event/ContactTrashEvent.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.yizhuan.habu.home.event;
-
-public class ContactTrashEvent {
-}
diff --git a/app/src/main/java/com/yizhuan/habu/radish/task/presenter/TaskCenterFrgPresenter.java b/app/src/main/java/com/yizhuan/habu/radish/task/presenter/TaskCenterFrgPresenter.java
deleted file mode 100644
index 464edeb3f..000000000
--- a/app/src/main/java/com/yizhuan/habu/radish/task/presenter/TaskCenterFrgPresenter.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.yizhuan.habu.radish.task.presenter;
-
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.habu.radish.task.view.ITaskCenterViewFrg;
-
-public class TaskCenterFrgPresenter extends BaseMvpPresenter {
-}
diff --git a/app/src/main/java/com/yizhuan/habu/radish/task/presenter/TaskCenterPresenter.java b/app/src/main/java/com/yizhuan/habu/radish/task/presenter/TaskCenterPresenter.java
deleted file mode 100644
index 7e9d34042..000000000
--- a/app/src/main/java/com/yizhuan/habu/radish/task/presenter/TaskCenterPresenter.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.yizhuan.habu.radish.task.presenter;
-
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.habu.radish.task.view.ITaskCenterView;
-
-/**
- * create by lvzebiao @2019/3/27
- */
-public class TaskCenterPresenter extends BaseMvpPresenter {
-
-
-}
diff --git a/app/src/main/java/com/yizhuan/habu/radish/task/view/ITaskCenterView.java b/app/src/main/java/com/yizhuan/habu/radish/task/view/ITaskCenterView.java
deleted file mode 100644
index efba5612d..000000000
--- a/app/src/main/java/com/yizhuan/habu/radish/task/view/ITaskCenterView.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.yizhuan.habu.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/habu/radish/task/view/ITaskCenterViewFrg.java b/app/src/main/java/com/yizhuan/habu/radish/task/view/ITaskCenterViewFrg.java
deleted file mode 100644
index 13e7b199d..000000000
--- a/app/src/main/java/com/yizhuan/habu/radish/task/view/ITaskCenterViewFrg.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.yizhuan.habu.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/habu/radish/view/IRadishRecordView.java b/app/src/main/java/com/yizhuan/habu/radish/view/IRadishRecordView.java
deleted file mode 100644
index a0b65e298..000000000
--- a/app/src/main/java/com/yizhuan/habu/radish/view/IRadishRecordView.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.yizhuan.habu.radish.view;
-
-import com.yizhuan.xchat_android_library.base.IMvpBaseView;
-
-public interface IRadishRecordView extends IMvpBaseView {
-}
diff --git a/app/src/main/java/com/yizhuan/habu/ui/utils/sys/PermissionUtil.kt b/app/src/main/java/com/yizhuan/habu/ui/utils/sys/PermissionUtil.kt
deleted file mode 100644
index 92650be0c..000000000
--- a/app/src/main/java/com/yizhuan/habu/ui/utils/sys/PermissionUtil.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.yizhuan.habu.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 56c4bc2f8..624ff4845 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 9e2da6ef7..900e447ba 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.chwl.app.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 bbdfb98a6..958b170a3 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.habu.team.view.AddMemberSearchActivity">
+        tools:context="com.chwl.app.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 0810655df..dfe50c8de 100644
--- a/app/src/main/res/layout/activity_all_game.xml
+++ b/app/src/main/res/layout/activity_all_game.xml
@@ -3,6 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.yizhuan.habu.home.activity.AllGameActivity">
+    tools:context="com.chwl.app.home.activity.AllGameActivity">
 
 
diff --git a/app/src/main/res/layout/activity_area_code.xml b/app/src/main/res/layout/activity_area_code.xml
index 2f691bbed..4ae46b6e8 100644
--- a/app/src/main/res/layout/activity_area_code.xml
+++ b/app/src/main/res/layout/activity_area_code.xml
@@ -7,7 +7,7 @@
     android:background="@color/color_white"
     tools:context=".ui.login.AreaCodeActivity">
 
-    
 
-    
 
-    
 
-    
 
-    
 
-            
@@ -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 457948074..1378659ae 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_phone.xml b/app/src/main/res/layout/activity_bind_phone.xml
index e5b2c0dca..b4b08a18b 100644
--- a/app/src/main/res/layout/activity_bind_phone.xml
+++ b/app/src/main/res/layout/activity_bind_phone.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:background="@color/color_white">
 
-    
 
-    
 
-    
 
-    
 
-    
diff --git a/app/src/main/res/layout/activity_charge.xml b/app/src/main/res/layout/activity_charge.xml
index 4db515cec..de580630d 100644
--- a/app/src/main/res/layout/activity_charge.xml
+++ b/app/src/main/res/layout/activity_charge.xml
@@ -14,7 +14,7 @@
         android:background="@drawable/bg_common_normal"
         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 c75afc8ef..652fab7ba 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.habu.ui.webview.CommonWebViewActivity">
+    tools:context="com.chwl.app.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 d373a4dbc..e7a3260fb 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.chwl.app.home.activity.ErbanTopMessageActivity">
 
-    
 
 
-    
 
@@ -29,5 +29,5 @@
 
         
 
-    
+    
 
diff --git a/app/src/main/res/layout/activity_exchange_gold.xml b/app/src/main/res/layout/activity_exchange_gold.xml
index 0830d2607..5e9e98d78 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 27b2ff315..4843db9ec 100644
--- a/app/src/main/res/layout/activity_family_currency.xml
+++ b/app/src/main/res/layout/activity_family_currency.xml
@@ -7,7 +7,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 2239290c0..b2ff379b7 100644
--- a/app/src/main/res/layout/activity_family_game_list.xml
+++ b/app/src/main/res/layout/activity_family_game_list.xml
@@ -7,12 +7,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 dc09624a2..c65f9dedf 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="@string/layout_activity_family_home_03" />
                     
 
-                    
 
-                
+                
 
                 
 
-                    
         
 
-    
+    
 
-    
 
-    
@@ -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 3eae9c572..f8ee379a9 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 3f574e4cd..278ba2f00 100644
--- a/app/src/main/res/layout/activity_family_manage_activty.xml
+++ b/app/src/main/res/layout/activity_family_manage_activty.xml
@@ -7,7 +7,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 9daeb7122..0369492b0 100644
--- a/app/src/main/res/layout/activity_family_member_currency.xml
+++ b/app/src/main/res/layout/activity_family_member_currency.xml
@@ -7,7 +7,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 b9836defa..7d6805e74 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 697e88d87..be2b1697d 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" />
 
-                
+                
 
                 
 
-    
 
@@ -93,5 +93,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 96227d09a..83dfecce3 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 bb695fc60..7886b3c82 100644
--- a/app/src/main/res/layout/activity_fans.xml
+++ b/app/src/main/res/layout/activity_fans.xml
@@ -7,7 +7,7 @@
     android:background="@color/bg_normal_1c1b22"
     android:orientation="vertical">
 
-    
 
-        
 
-            
 
-            
 
-            
 
-        
 
-            
 
-            
 
-            
 
-        
 
-    
+    tools:context="com.chwl.app.ui.setting.FeedbackActivity">
 
-    
 
-    
 
-    
 
@@ -19,6 +19,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 87e584d5b..ba23dc1fd 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_give_gold_to_user.xml b/app/src/main/res/layout/activity_give_gold_to_user.xml
index e6ef5d34f..3120126d3 100644
--- a/app/src/main/res/layout/activity_give_gold_to_user.xml
+++ b/app/src/main/res/layout/activity_give_gold_to_user.xml
@@ -7,14 +7,14 @@
     android:background="@color/white"
     tools:context=".pay.activity.GiveGoldToUserActivity">
 
-    
 
-    
 
-        
 
-    
-    
+    tools:context="com.chwl.app.guide.GuideActivity">
 
     
 
-    
+            app:layout_behavior="com.chwl.app.ui.widget.AppBarLayoutBehavior">
 
             
 
-                
 
-    
 
-    
 
-    
 
@@ -31,6 +31,6 @@
                 android:layout_height="wrap_content" />
 
         
-    
+    
 
 
diff --git a/app/src/main/res/layout/activity_lucky_money_creation.xml b/app/src/main/res/layout/activity_lucky_money_creation.xml
index 0c9fefee2..3acd86ff2 100644
--- a/app/src/main/res/layout/activity_lucky_money_creation.xml
+++ b/app/src/main/res/layout/activity_lucky_money_creation.xml
@@ -14,7 +14,7 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        
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 fea6f8852..7df7bb00d 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 8f21b5c6e..63adaf0bd 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.habu.MainActivity">
+    tools:context="com.chwl.app.MainActivity">
 
     
 
-    
 
-        
 
-                
 
-                
 
-        
+        
 
     
 
-    
 
-        
 
-        
 
-            
 
-            
 
-            -->
 
-            
@@ -214,7 +214,7 @@
                 android:gravity="center"
                 android:text="@string/layout_activity_monster_hunting_05" />
 
-            
 
-        
 
-            
 
 
-        
 
-    
+        android:layout_height="wrap_content">
 
-    
 
-    -->
 
-    
 
-    
+    
 
     
+    tools:context="com.chwl.app.home.activity.NewUserListActivity">
 
-    
 
-    
 
@@ -33,5 +33,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 421f1b668..23fc315fb 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
@@ -6,7 +6,7 @@
     android:background="@color/bg_normal_1c1b22"
     android:orientation="vertical">
 
-    
 
-    
 
-            
 
-            
+        tools:context="com.chwl.app.ui.patriarch.PatriarchModeActivity">
 
-        
+        tools:context="com.chwl.app.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 9c4f84889..2534554a3 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 3ce32a2c4..913d3c616 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.chwl.app.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 e0ed3590d..ef98330a3 100644
--- a/app/src/main/res/layout/activity_reset_login_pwd.xml
+++ b/app/src/main/res/layout/activity_reset_login_pwd.xml
@@ -7,7 +7,7 @@
     android:background="@color/color_white"
     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 da335bff9..f1bd6f682 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 389498107..b6f91b456 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 e54deeb4d..88437a750 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.chwl.app.avroom.activity.RoomOnlineUserActivity">
         
 
-        
 
-            
+        tools:context="com.chwl.app.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 27cf7c118..dd05c2492 100644
--- a/app/src/main/res/layout/activity_search_hall.xml
+++ b/app/src/main/res/layout/activity_search_hall.xml
@@ -85,7 +85,7 @@
         android:orientation="vertical"
         android:visibility="gone">
 
-        
 
-    
@@ -110,6 +110,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
 
-    
+    
 
 
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_select_friend.xml b/app/src/main/res/layout/activity_select_friend.xml
index d74561543..81d5c004a 100644
--- a/app/src/main/res/layout/activity_select_friend.xml
+++ b/app/src/main/res/layout/activity_select_friend.xml
@@ -10,12 +10,12 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        
 
-        
 
-    
 
-    
 
-    
+    tools:context="com.chwl.app.ui.login.ShowBindPhoneActivity">
 
-    
+    tools:context="com.chwl.app.ui.user.activity.ShowPhotoActivity">
     
 
-    
 
-    
+    
 
     
 
-                    
 
-                    
+    tools:context="com.chwl.app.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_sound_signature.xml b/app/src/main/res/layout/activity_sound_signature.xml
index ecb3263df..432941253 100644
--- a/app/src/main/res/layout/activity_sound_signature.xml
+++ b/app/src/main/res/layout/activity_sound_signature.xml
@@ -113,7 +113,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/title_bar" />
 
-    
 
-    
 
-    
 
-    
+    
 
-    
+            type="com.chwl.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 159c0cdab..9a9cc35d5 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 c07befe07..6094cf690 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 043856763..4b997a2a2 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.habu.team.view.TeamWeeklyBillActivity">
+        tools:context="com.chwl.app.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 bb8c87f29..5dc6d6b33 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 a0dc84aba..0b07d24e6 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 21972603d..0ada48428 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/color_white"
     android:orientation="vertical">
 
-    
 
-    
+                app:layout_behavior="com.chwl.app.ui.widget.AppBarLayoutBehavior">
 
                 
 
-                            
-                            
+                            
 
                             
 
-                            
 
-                            
 
-                    
+            app:layout_behavior="com.chwl.app.ui.user.ScrollAwareBehavior" />
 
     
 
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 162d41fab..ed8869bba 100644
--- a/app/src/main/res/layout/activity_user_info_modify.xml
+++ b/app/src/main/res/layout/activity_user_info_modify.xml
@@ -7,7 +7,7 @@
     android:background="@color/color_white"
     android:orientation="vertical">
 
-    
 
 
-            
 
-    
 
-    
 
-    
 
-    
 
-    
+    
 
-    
 
-    
+    
 
     
 
-        
 
-        
 
-    
diff --git a/app/src/main/res/layout/activity_withdraw_bills.xml b/app/src/main/res/layout/activity_withdraw_bills.xml
index e83b185b5..fc735ef4f 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 ec18cbecf..5cf33aca9 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 1c8c0115e..981cbbc01 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 ede5992d3..d84b5b326 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 08ebd46a4..4fca6f516 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 07ec9d795..0021e0557 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 a5f36cbe1..233bb1687 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 7a1fcd51c..4827fb79f 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.chwl.core.noble.AllServiceGiftProtocol.DataBean" />
     
 
 
@@ -42,7 +42,7 @@
                 android:orientation="vertical"
                 app:layout_constraintGuide_percent="0.0586" />
 
-            
-    
 
-            
 
-            
 
-            
+            type="com.chwl.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 0c411911a..47aeafe9f 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.chwl.core.room.bean.RoomInfo" />
 
         
 
-                    
 
-                    
 
-        
diff --git a/app/src/main/res/layout/fragment_contact_list.xml b/app/src/main/res/layout/fragment_contact_list.xml
index 376c71373..d7865a4e3 100644
--- a/app/src/main/res/layout/fragment_contact_list.xml
+++ b/app/src/main/res/layout/fragment_contact_list.xml
@@ -23,7 +23,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        
diff --git a/app/src/main/res/layout/fragment_decoration_common.xml b/app/src/main/res/layout/fragment_decoration_common.xml
index 090b88409..4b286cde3 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 d8430f00c..d65f183fd 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 8fab411ec..56873d0ba 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 c443ad3b0..68f8c2b98 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 d16f672b7..74563127f 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 fa9607665..2f7fa6aef 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 8ca80a126..cd0729eb2 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 4cf1c062d..3ab10f28e 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -74,7 +74,7 @@
             android:layout_height="wrap_content"
             android:background="@color/transparent"
             app:elevation="0dp"
-            app:layout_behavior="com.yizhuan.habu.ui.widget.AppBarLayoutBehavior">
+            app:layout_behavior="com.chwl.app.ui.widget.AppBarLayoutBehavior">
 
             
 
-            
 
@@ -17,4 +17,4 @@
 
     
 
-
+
diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml
index 0af6eae0d..45ff47e9a 100644
--- a/app/src/main/res/layout/fragment_me.xml
+++ b/app/src/main/res/layout/fragment_me.xml
@@ -5,11 +5,11 @@
 
     
 
-        
+        
 
         
+            type="com.chwl.core.user.bean.UserInfo" />
 
         
 
-                
 
-                    
 
-                
 
-            
 
-    
         
+            type="com.chwl.app.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 7ce9c4d2d..b595b9a1a 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.chwl.app.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 ff966f3dc..323c9b14e 100644
--- a/app/src/main/res/layout/fragment_newbie_list.xml
+++ b/app/src/main/res/layout/fragment_newbie_list.xml
@@ -1,4 +1,4 @@
-
@@ -16,4 +16,4 @@
 
     
 
-
+
diff --git a/app/src/main/res/layout/fragment_newbie_message.xml b/app/src/main/res/layout/fragment_newbie_message.xml
index 043a7767f..4e7663730 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 @@
-
 
@@ -17,4 +17,4 @@
 
     
 
-
+
diff --git a/app/src/main/res/layout/fragment_party.xml b/app/src/main/res/layout/fragment_party.xml
index 1535d567e..25c45bf36 100644
--- a/app/src/main/res/layout/fragment_party.xml
+++ b/app/src/main/res/layout/fragment_party.xml
@@ -11,7 +11,7 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        
+        tools:context="com.chwl.app.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 d05815d46..9e91bde8a 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">
 
-    
 
-        
-    
 
-    
+    
 
\ 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 944ef164f..659916a4b 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.chwl.app.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 e6dbd7fc8..4f4fda643 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.chwl.app.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 855012433..78450c85f 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.chwl.app.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 cf09f1d97..ff7d1ea52 100644
--- a/app/src/main/res/layout/fragment_room_rank_list.xml
+++ b/app/src/main/res/layout/fragment_room_rank_list.xml
@@ -16,7 +16,7 @@
     
+        tools:context="com.chwl.app.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 5596603cb..5c12e6d1b 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 909520634..0af32d09a 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 fbab9cd71..21d50b8a1 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 c141483e8..607a71432 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 784ce6295..f91f63d71 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.chwl.app.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 1f3b3b6cd..7892cdd3b 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.chwl.core.family.bean.FamilyMemberInfo" />
     
 
     
     
-    
 
-    
 
-        
-        
+        
 
 
         
 
-        
-        
+        
     
 
     
 
-        
 
-        
         
+            type="com.chwl.core.decoration.car.bean.CarInfo" />
     
 
     
+            type="com.chwl.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.chwl.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 073ead327..72f35d3ee 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 7333b9d4d..4f2302cb1 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.chwl.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 e5081fef4..0dcaf752d 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_lately_give.xml b/app/src/main/res/layout/item_lately_give.xml
index ef3db5d55..80107f59a 100644
--- a/app/src/main/res/layout/item_lately_give.xml
+++ b/app/src/main/res/layout/item_lately_give.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    
+            type="com.chwl.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 b1ea440d0..bd49e9a25 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.chwl.core.decoration.headwear.bean.ChatBubbleInfo" />
     
 
     
+            type="com.chwl.core.decoration.headwear.bean.HeadWearInfo" />
     
 
     
+            type="com.chwl.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 e22404321..eb52148a0 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_room_banner.xml b/app/src/main/res/layout/item_room_banner.xml
index d6aab808e..515721203 100644
--- a/app/src/main/res/layout/item_room_banner.xml
+++ b/app/src/main/res/layout/item_room_banner.xml
@@ -8,7 +8,7 @@
     android:layout_marginEnd="15dp"
     android:layout_marginBottom="15dp">
 
-    
 
-    
 
-        
 
-        
 
-        
 
-        
 
-        
 
-        
 
-    
 
-        
 
-        
 
-        
 
-        
 
-        
 
-        
 
-        
 
-        
 
-        
 
-        
 
-    
 
-    
 
-    
 
-    
 
-    
 
-        
 
-        
 
-        
 
-        
 
-        
 
-    
 
-    
 
-    
 
-    
-
 
-
\ 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 7f6ee9f95..a05c8e40f 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.chwl.core.team.bean.TeamInfo" />
     
 
     
         
+            type="com.chwl.core.team.bean.TeamMemberInfo" />
     
 
     
+            type="com.chwl.core.team.bean.TeamTransactionRecordInfo" />
     
 
     
 
-            
 
-            
+            type="com.chwl.core.user.bean.UserGameInfo" />
     
 
     
 
-    
+            type="com.chwl.core.home.bean.BannerInfo" />
     
 
     
 
-        
 
-    
 
-        
+            type="com.chwl.core.relation.cp.CpRelation" />
 
         
+            type="com.chwl.core.relation.cp.CpInvitePageEntity" />
 
         
 
 
-        
 
-        
 
-    
 
-            
 
-        
 
-        
 
-        
 
-            
@@ -72,7 +72,7 @@
             android:gravity="center_vertical"
             android:orientation="vertical">
 
-            
@@ -111,7 +111,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 e45a1cfd3..59fdc2286 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.chwl.app.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 0b28511b3..665101728 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.chwl.app.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 2e4a85ee3..9697e9cc0 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..c52d27f1a 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.chwl.core.monsterhunting.bean.MonsterInfo"/>
     
 
     
 
-    
 
-        
 
-    
+    
 
     
 
-        
 
-    
 
-    
-    
@@ -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 d9b7dba75..350fe14c1 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 b9acf3e6a..5dc5fc88b 100644
--- a/app/src/main/res/layout/popup_message_tip.xml
+++ b/app/src/main/res/layout/popup_message_tip.xml
@@ -16,7 +16,7 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal">
 
-        
 
-            
 
-            
 
-        
 
-        
 
-        
 
 
-    
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/star_week_banner.xml b/app/src/main/res/layout/star_week_banner.xml
index 4f5ec391b..edd081e76 100644
--- a/app/src/main/res/layout/star_week_banner.xml
+++ b/app/src/main/res/layout/star_week_banner.xml
@@ -36,7 +36,7 @@
         app:layout_constraintTop_toTopOf="@+id/tv_star_week"
         tools:text="紅紅火火恍恍惚惚" />
 
-    
 
-    
 
-    
 
-    
 
-    
 
-    
 
-    
 
-    
 
-    
 
-    
 
-    
 
-    
 
-    
 
-    
 
-    
 
-    
 
-    
 
-        
 
-        
 
 
-        
 
 
-        
 
 
-        
 
-    
 
 
-    
 
-
+
 
 
 
@@ -24,7 +24,7 @@
 
 
 
-
+
 
 
 
@@ -32,7 +32,7 @@
 
 
 
-    
 
-    
 
-    
 
-    
 
-    
 
-        
 
-    
-    隱私設置
     通知提醒設置
 
-    com.yizhuan.habu.ui.behavior.FixAppBarBehavior
+    com.chwl.app.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 e4932db8d..f08cd58a1 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.habu.R;
+import com.chwl.app.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/CaptureStrategy.java b/app/src/module_album/java/com/zhihu/matisse/internal/entity/CaptureStrategy.java
index a405b23cc..6d724816e 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/entity/CaptureStrategy.java
+++ b/app/src/module_album/java/com/zhihu/matisse/internal/entity/CaptureStrategy.java
@@ -16,8 +16,8 @@
 package com.zhihu.matisse.internal.entity;
 
 import com.netease.nim.uikit.common.util.log.LogUtil;
-import com.yizhuan.habu.R;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.library.utils.ResUtil;
 
 public class CaptureStrategy {
 
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 4b82c7cf0..a899c15af 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
@@ -22,7 +22,7 @@ import android.content.Context;
 import androidx.annotation.IntDef;
 import androidx.fragment.app.FragmentActivity;
 
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
+import com.chwl.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 3f2bc2810..abca64d91 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.yizhuan.habu.R;
+import com.chwl.app.R;
 import com.zhihu.matisse.MimeType;
 import com.zhihu.matisse.engine.ImageEngine;
 import com.zhihu.matisse.engine.impl.GlideEngine;
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 e4ec8d725..9fe167e59 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.habu.R;
+import com.chwl.app.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 f03bbea5d..7229c34b6 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
@@ -33,9 +33,9 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
 import androidx.viewpager.widget.ViewPager;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.base.TitleBar;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.base.TitleBar;
+import com.chwl.library.utils.ResUtil;
 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 4dfd543f9..2154f92c4 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
@@ -27,7 +27,7 @@ import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.yizhuan.habu.R;
+import com.chwl.app.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 559fd6333..7fb3cf274 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.ViewGroup;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
+import com.chwl.app.R;
+import com.chwl.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 709a5f5cf..dddf59eef 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
@@ -27,7 +27,7 @@ import android.widget.ImageView;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.yizhuan.habu.R;
+import com.chwl.app.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 5798bd257..134387616 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.habu.R;
+import com.chwl.app.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 221ceea42..71778de34 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
@@ -28,7 +28,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.ListPopupWindow;
 
-import com.yizhuan.habu.R;
+import com.chwl.app.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 ffc0ad00f..900b12b72 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
@@ -8,7 +8,7 @@ import android.util.AttributeSet;
 import androidx.appcompat.widget.AppCompatImageView;
 import androidx.core.content.res.ResourcesCompat;
 
-import com.yizhuan.habu.R;
+import com.chwl.app.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 7ac284fa6..aa982d0d2 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
@@ -33,7 +33,7 @@ import android.view.View;
 
 import androidx.core.content.res.ResourcesCompat;
 
-import com.yizhuan.habu.R;
+import com.chwl.app.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 f903c3d27..e733f689e 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.habu.R;
-import com.yizhuan.habu.common.widget.dialog.BaseAlertDialogBuilder;
+import com.chwl.app.R;
+import com.chwl.app.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 8cd525361..9f2d07439 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
@@ -26,7 +26,7 @@ import android.widget.TextView;
 
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.yizhuan.habu.R;
+import com.chwl.app.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/PathUtils.java b/app/src/module_album/java/com/zhihu/matisse/internal/utils/PathUtils.java
index 1effed946..2cbd79866 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/utils/PathUtils.java
+++ b/app/src/module_album/java/com/zhihu/matisse/internal/utils/PathUtils.java
@@ -7,7 +7,7 @@ import android.net.Uri;
 import android.provider.DocumentsContract;
 import android.provider.MediaStore;
 
-import com.yizhuan.xchat_android_library.common.file.FileHelper;
+import com.chwl.library.common.file.FileHelper;
 
 /**
  * http://stackoverflow.com/a/27271131/4739220
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 4781c279c..cf7c9ca48 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
@@ -28,7 +28,7 @@ import android.provider.MediaStore;
 import android.util.DisplayMetrics;
 import android.util.Log;
 
-import com.yizhuan.habu.R;
+import com.chwl.app.R;
 import com.zhihu.matisse.MimeType;
 import com.zhihu.matisse.filter.Filter;
 import com.zhihu.matisse.internal.entity.IncapableCause;
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 9011d19c4..8c45b012b 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,8 +46,8 @@ import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 
 import com.netease.nim.uikit.common.util.log.LogUtil;
-import com.yizhuan.habu.R;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.library.utils.ResUtil;
 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 7c457fa83..1ff90c877 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
@@ -8,8 +8,8 @@ import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil;
+import com.chwl.app.R;
+import com.chwl.app.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 1491669dc..ae624aa96 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_association.xml b/app/src/module_bank_card/res/layout/item_association.xml
index 84a8d166a..5bf370504 100644
--- a/app/src/module_bank_card/res/layout/item_association.xml
+++ b/app/src/module_bank_card/res/layout/item_association.xml
@@ -40,7 +40,7 @@
 
     
 
-    
 
-    
 
-     {
+
+
+
+}
diff --git a/app/src/module_community/java/com/yizhuan/habu/community/dynamic/view/DynamicDetailActivity.java b/app/src/module_community/java/com/chwl/app/community/dynamic/view/DynamicDetailActivity.java
similarity index 93%
rename from app/src/module_community/java/com/yizhuan/habu/community/dynamic/view/DynamicDetailActivity.java
rename to app/src/module_community/java/com/chwl/app/community/dynamic/view/DynamicDetailActivity.java
index bd60b3198..eead2614a 100644
--- a/app/src/module_community/java/com/yizhuan/habu/community/dynamic/view/DynamicDetailActivity.java
+++ b/app/src/module_community/java/com/chwl/app/community/dynamic/view/DynamicDetailActivity.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.community.dynamic.view;
+package com.chwl.app.community.dynamic.view;
 
 import android.content.ClipboardManager;
 import android.content.Context;
@@ -27,55 +27,55 @@ import com.netease.nim.uikit.StatusBarUtil;
 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.habu.R;
-import com.yizhuan.habu.UIHelper;
-import com.yizhuan.habu.avroom.ButtonItemFactory;
-import com.yizhuan.habu.base.BaseViewBindingActivity;
-import com.yizhuan.habu.common.widget.CircleImageView;
-import com.yizhuan.habu.common.widget.dialog.DialogManager;
-import com.yizhuan.habu.community.dynamic.adapter.CommentAdapter;
-import com.yizhuan.habu.community.helper.CalcSize;
-import com.yizhuan.habu.community.helper.DynamicUiHelper;
-import com.yizhuan.habu.community.helper.ImageUiHelper;
-import com.yizhuan.habu.community.helper.ShareDynamicHelper;
-import com.yizhuan.habu.community.photo.BigPhotoActivity;
-import com.yizhuan.habu.community.photo.DynamicImageAdapter;
-import com.yizhuan.habu.community.photo.PagerOption;
-import com.yizhuan.habu.community.utils.ObjectTypeHelper;
-import com.yizhuan.habu.community.widget.DynamicNickDetailWidget;
-import com.yizhuan.habu.community.widget.ExpandableTextView;
-import com.yizhuan.habu.databinding.ActivityDynamicDetailBinding;
-import com.yizhuan.habu.miniworld.activity.TopicMainActivity;
-import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2;
-import com.yizhuan.habu.ui.widget.ButtonItem;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil;
-import com.yizhuan.habu.utils.RegexUtil;
-import com.yizhuan.habu.utils.SpannableBuilder;
-import com.yizhuan.habu.utils.TimeUiUtils;
+import com.chwl.app.R;
+import com.chwl.app.UIHelper;
+import com.chwl.app.avroom.ButtonItemFactory;
+import com.chwl.app.base.BaseViewBindingActivity;
+import com.chwl.app.common.widget.CircleImageView;
+import com.chwl.app.common.widget.dialog.DialogManager;
+import com.chwl.app.community.dynamic.adapter.CommentAdapter;
+import com.chwl.app.community.helper.CalcSize;
+import com.chwl.app.community.helper.DynamicUiHelper;
+import com.chwl.app.community.helper.ImageUiHelper;
+import com.chwl.app.community.helper.ShareDynamicHelper;
+import com.chwl.app.community.photo.BigPhotoActivity;
+import com.chwl.app.community.photo.DynamicImageAdapter;
+import com.chwl.app.community.photo.PagerOption;
+import com.chwl.app.community.utils.ObjectTypeHelper;
+import com.chwl.app.community.widget.DynamicNickDetailWidget;
+import com.chwl.app.community.widget.ExpandableTextView;
+import com.chwl.app.databinding.ActivityDynamicDetailBinding;
+import com.chwl.app.miniworld.activity.TopicMainActivity;
+import com.chwl.app.ui.utils.ImageLoadUtilsV2;
+import com.chwl.app.ui.widget.ButtonItem;
+import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
+import com.chwl.app.utils.RegexUtil;
+import com.chwl.app.utils.SpannableBuilder;
+import com.chwl.app.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.community.event.DynamicRefreshEvent;
-import com.yizhuan.xchat_android_core.noble.NobleUtil;
-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.ListUtils;
-import com.yizhuan.xchat_android_library.utils.LogUtil;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
-import com.yizhuan.xchat_android_library.utils.keyboard.KeyboardVisibilityEvent;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.community.bean.Comment;
+import com.chwl.core.community.bean.CommentResult;
+import com.chwl.core.community.bean.DynamicMedia;
+import com.chwl.core.community.bean.WorldDynamicBean;
+import com.chwl.core.community.bean.comment.PopupParams;
+import com.chwl.core.community.bean.comment.Reply;
+import com.chwl.core.community.bean.comment.ReplyResult;
+import com.chwl.core.community.dynamic.DynamicDetailModel;
+import com.chwl.core.community.dynamic.DynamicModel;
+import com.chwl.core.community.event.DynamicDetailFinishEvent;
+import com.chwl.core.community.event.DynamicRefreshEvent;
+import com.chwl.core.noble.NobleUtil;
+import com.chwl.core.user.UserModel;
+import com.chwl.core.user.bean.UserInfo;
+import com.chwl.core.utils.net.BeanObserver;
+import com.chwl.core.utils.net.DontWarnObserver;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.utils.ListUtils;
+import com.chwl.library.utils.LogUtil;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SingleToastUtil;
+import com.chwl.library.utils.keyboard.KeyboardVisibilityEvent;
 
 import org.greenrobot.eventbus.EventBus;
 
@@ -249,7 +249,7 @@ public class DynamicDetailActivity extends BaseViewBindingActivity {
 
diff --git a/app/src/module_community/java/com/yizhuan/habu/community/publish/view/WorldsChooseFrg.java b/app/src/module_community/java/com/chwl/app/community/publish/view/WorldsChooseFrg.java
similarity index 88%
rename from app/src/module_community/java/com/yizhuan/habu/community/publish/view/WorldsChooseFrg.java
rename to app/src/module_community/java/com/chwl/app/community/publish/view/WorldsChooseFrg.java
index 498fb377a..eb366d2c8 100644
--- a/app/src/module_community/java/com/yizhuan/habu/community/publish/view/WorldsChooseFrg.java
+++ b/app/src/module_community/java/com/chwl/app/community/publish/view/WorldsChooseFrg.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.community.publish.view;
+package com.chwl.app.community.publish.view;
 
 import android.os.Bundle;
 import android.view.View;
@@ -8,14 +8,14 @@ import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.base.BaseMvpFragment;
-import com.yizhuan.habu.community.publish.presenter.WorldChoosePresenter;
-import com.yizhuan.habu.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.chwl.app.R;
+import com.chwl.app.base.BaseMvpFragment;
+import com.chwl.app.community.publish.presenter.WorldChoosePresenter;
+import com.chwl.app.ui.widget.recyclerview.decoration.HorizontalDecoration;
+import com.chwl.core.Constants;
+import com.chwl.core.community.bean.MiniWorldChooseInfo;
+import com.chwl.library.base.factory.CreatePresenter;
+import com.chwl.library.utils.SizeUtils;
 
 import java.util.List;
 
diff --git a/app/src/module_community/java/com/yizhuan/habu/community/square/SquareDynamicFragment.java b/app/src/module_community/java/com/chwl/app/community/square/SquareDynamicFragment.java
similarity index 89%
rename from app/src/module_community/java/com/yizhuan/habu/community/square/SquareDynamicFragment.java
rename to app/src/module_community/java/com/chwl/app/community/square/SquareDynamicFragment.java
index e9157a0b1..e96f953fd 100644
--- a/app/src/module_community/java/com/yizhuan/habu/community/square/SquareDynamicFragment.java
+++ b/app/src/module_community/java/com/chwl/app/community/square/SquareDynamicFragment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.community.square;
+package com.chwl.app.community.square;
 
 import android.os.Bundle;
 import android.util.SparseArray;
@@ -18,37 +18,37 @@ import androidx.viewpager.widget.ViewPager;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.trello.rxlifecycle3.android.FragmentEvent;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.UIHelper;
-import com.yizhuan.habu.avroom.ButtonItemFactory;
-import com.yizhuan.habu.avroom.activity.AVRoomActivity;
-import com.yizhuan.habu.base.BaseMvpFragment;
-import com.yizhuan.habu.common.EmptyViewHelper;
-import com.yizhuan.habu.common.widget.dialog.DialogManager;
-import com.yizhuan.habu.community.helper.ShareDynamicHelper;
-import com.yizhuan.habu.community.square.adapter.SquareDynamicAdapter;
-import com.yizhuan.habu.community.square.adapter.SquareTopicAdapter;
-import com.yizhuan.habu.miniworld.activity.TopicMainActivity;
-import com.yizhuan.habu.miniworld.listener.DoubleClickCheckListener;
-import com.yizhuan.habu.miniworld.presenter.MiniWorldCategoryPresenter;
-import com.yizhuan.habu.miniworld.view.IMiniWorldCategoryView;
-import com.yizhuan.habu.ui.widget.ButtonItem;
+import com.chwl.app.R;
+import com.chwl.app.UIHelper;
+import com.chwl.app.avroom.ButtonItemFactory;
+import com.chwl.app.avroom.activity.AVRoomActivity;
+import com.chwl.app.base.BaseMvpFragment;
+import com.chwl.app.common.EmptyViewHelper;
+import com.chwl.app.common.widget.dialog.DialogManager;
+import com.chwl.app.community.helper.ShareDynamicHelper;
+import com.chwl.app.community.square.adapter.SquareDynamicAdapter;
+import com.chwl.app.community.square.adapter.SquareTopicAdapter;
+import com.chwl.app.miniworld.activity.TopicMainActivity;
+import com.chwl.app.miniworld.listener.DoubleClickCheckListener;
+import com.chwl.app.miniworld.presenter.MiniWorldCategoryPresenter;
+import com.chwl.app.miniworld.view.IMiniWorldCategoryView;
+import com.chwl.app.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.event.DynamicRefreshEvent;
-import com.yizhuan.xchat_android_core.community.square.SquareModel;
-import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo;
-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.BeanObserver;
-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.ResUtil;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.community.CommunityConstant;
+import com.chwl.core.community.bean.WorldDynamicBean;
+import com.chwl.core.community.bean.WorldDynamicListResult;
+import com.chwl.core.community.dynamic.DynamicModel;
+import com.chwl.core.community.event.DynamicPublishEvent;
+import com.chwl.core.community.event.DynamicRefreshEvent;
+import com.chwl.core.community.square.SquareModel;
+import com.chwl.core.miniworld.bean.MiniWorldInfo;
+import com.chwl.core.user.UserModel;
+import com.chwl.core.user.event.LoadLoginUserInfoEvent;
+import com.chwl.core.utils.net.BeanObserver;
+import com.chwl.core.utils.net.DontWarnObserver;
+import com.chwl.library.base.factory.CreatePresenter;
+import com.chwl.library.utils.ResUtil;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
diff --git a/app/src/module_community/java/com/yizhuan/habu/community/square/SquareFragment.java b/app/src/module_community/java/com/chwl/app/community/square/SquareFragment.java
similarity index 86%
rename from app/src/module_community/java/com/yizhuan/habu/community/square/SquareFragment.java
rename to app/src/module_community/java/com/chwl/app/community/square/SquareFragment.java
index 510532da6..2b9b0c999 100644
--- a/app/src/module_community/java/com/yizhuan/habu/community/square/SquareFragment.java
+++ b/app/src/module_community/java/com/chwl/app/community/square/SquareFragment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.community.square;
+package com.chwl.app.community.square;
 
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
@@ -15,20 +15,20 @@ import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.viewpager.widget.ViewPager;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.base.BaseFragment;
-import com.yizhuan.habu.common.widget.DragLayout;
-import com.yizhuan.habu.community.publish.view.PublishActivity;
-import com.yizhuan.habu.home.activity.CommunityNoticeAct;
-import com.yizhuan.habu.home.adapter.TopMagicIndicatorAdapter;
-import com.yizhuan.habu.ui.user.adapter.UserInfoPagerAdapter;
-import com.yizhuan.habu.ui.widget.magicindicator.MagicIndicator;
-import com.yizhuan.habu.ui.widget.magicindicator.ViewPagerHelper;
-import com.yizhuan.habu.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.user.event.LoadLoginUserInfoEvent;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseFragment;
+import com.chwl.app.common.widget.DragLayout;
+import com.chwl.app.community.publish.view.PublishActivity;
+import com.chwl.app.home.activity.CommunityNoticeAct;
+import com.chwl.app.home.adapter.TopMagicIndicatorAdapter;
+import com.chwl.app.ui.user.adapter.UserInfoPagerAdapter;
+import com.chwl.app.ui.widget.magicindicator.MagicIndicator;
+import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper;
+import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.community.event.UnReadCountEvent;
+import com.chwl.core.home.model.HomeModel;
+import com.chwl.core.user.event.LoadLoginUserInfoEvent;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
diff --git a/app/src/module_community/java/com/yizhuan/habu/community/square/adapter/SquareDynamicAdapter.java b/app/src/module_community/java/com/chwl/app/community/square/adapter/SquareDynamicAdapter.java
similarity index 87%
rename from app/src/module_community/java/com/yizhuan/habu/community/square/adapter/SquareDynamicAdapter.java
rename to app/src/module_community/java/com/chwl/app/community/square/adapter/SquareDynamicAdapter.java
index 0b5f10db0..cdac2094a 100644
--- a/app/src/module_community/java/com/yizhuan/habu/community/square/adapter/SquareDynamicAdapter.java
+++ b/app/src/module_community/java/com/chwl/app/community/square/adapter/SquareDynamicAdapter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.community.square.adapter;
+package com.chwl.app.community.square.adapter;
 
 import android.content.Context;
 import android.text.TextUtils;
@@ -13,28 +13,28 @@ 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.habu.R;
-import com.yizhuan.habu.UIHelper;
-import com.yizhuan.habu.community.dynamic.view.DynamicDetailActivity;
-import com.yizhuan.habu.community.helper.DynamicUiHelper;
-import com.yizhuan.habu.community.utils.TopicUpTextWrapper;
-import com.yizhuan.habu.community.widget.DynamicNickDetailWidget;
-import com.yizhuan.habu.community.widget.ExpandableTextView;
-import com.yizhuan.habu.community.widget.GridImageWidget;
-import com.yizhuan.habu.community.widget.TopicLabelWidget;
-import com.yizhuan.habu.miniworld.activity.TopicMainActivity;
-import com.yizhuan.habu.miniworld.presenter.MiniWorldCategoryPresenter;
-import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil;
-import com.yizhuan.habu.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.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.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
+import com.chwl.app.R;
+import com.chwl.app.UIHelper;
+import com.chwl.app.community.dynamic.view.DynamicDetailActivity;
+import com.chwl.app.community.helper.DynamicUiHelper;
+import com.chwl.app.community.utils.TopicUpTextWrapper;
+import com.chwl.app.community.widget.DynamicNickDetailWidget;
+import com.chwl.app.community.widget.ExpandableTextView;
+import com.chwl.app.community.widget.GridImageWidget;
+import com.chwl.app.community.widget.TopicLabelWidget;
+import com.chwl.app.miniworld.activity.TopicMainActivity;
+import com.chwl.app.miniworld.presenter.MiniWorldCategoryPresenter;
+import com.chwl.app.ui.utils.ImageLoadUtilsV2;
+import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
+import com.chwl.app.utils.TimeUiUtils;
+import com.chwl.core.community.bean.WorldDynamicBean;
+import com.chwl.core.community.dynamic.DynamicModel;
+import com.chwl.core.noble.NobleUtil;
+import com.chwl.core.utils.net.DontWarnObserver;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.base.factory.CreatePresenter;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SingleToastUtil;
 
 import java.util.List;
 
diff --git a/app/src/module_community/java/com/yizhuan/habu/community/square/adapter/SquareTopicAdapter.java b/app/src/module_community/java/com/chwl/app/community/square/adapter/SquareTopicAdapter.java
similarity index 78%
rename from app/src/module_community/java/com/yizhuan/habu/community/square/adapter/SquareTopicAdapter.java
rename to app/src/module_community/java/com/chwl/app/community/square/adapter/SquareTopicAdapter.java
index e93ab508a..f78455b4f 100644
--- a/app/src/module_community/java/com/yizhuan/habu/community/square/adapter/SquareTopicAdapter.java
+++ b/app/src/module_community/java/com/chwl/app/community/square/adapter/SquareTopicAdapter.java
@@ -1,10 +1,10 @@
-package com.yizhuan.habu.community.square.adapter;
+package com.chwl.app.community.square.adapter;
 
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.yizhuan.habu.R;
-import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo;
+import com.chwl.app.R;
+import com.chwl.core.miniworld.bean.MiniWorldInfo;
 
 /**
  * create by lvzebiao @2019/11/13
diff --git a/app/src/module_community/java/com/yizhuan/habu/community/user_dynamic/IUserDynamicView.java b/app/src/module_community/java/com/chwl/app/community/user_dynamic/IUserDynamicView.java
similarity index 65%
rename from app/src/module_community/java/com/yizhuan/habu/community/user_dynamic/IUserDynamicView.java
rename to app/src/module_community/java/com/chwl/app/community/user_dynamic/IUserDynamicView.java
index 6daee91f4..e03531daf 100644
--- a/app/src/module_community/java/com/yizhuan/habu/community/user_dynamic/IUserDynamicView.java
+++ b/app/src/module_community/java/com/chwl/app/community/user_dynamic/IUserDynamicView.java
@@ -1,7 +1,7 @@
-package com.yizhuan.habu.community.user_dynamic;
+package com.chwl.app.community.user_dynamic;
 
-import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean;
-import com.yizhuan.xchat_android_library.base.IMvpBaseView;
+import com.chwl.core.community.bean.WorldDynamicBean;
+import com.chwl.library.base.IMvpBaseView;
 
 import java.util.List;
 
diff --git a/app/src/module_community/java/com/yizhuan/habu/community/user_dynamic/UserDynamicAdapter.java b/app/src/module_community/java/com/chwl/app/community/user_dynamic/UserDynamicAdapter.java
similarity index 89%
rename from app/src/module_community/java/com/yizhuan/habu/community/user_dynamic/UserDynamicAdapter.java
rename to app/src/module_community/java/com/chwl/app/community/user_dynamic/UserDynamicAdapter.java
index 9d4035e25..30bd66a8f 100644
--- a/app/src/module_community/java/com/yizhuan/habu/community/user_dynamic/UserDynamicAdapter.java
+++ b/app/src/module_community/java/com/chwl/app/community/user_dynamic/UserDynamicAdapter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.community.user_dynamic;
+package com.chwl.app.community.user_dynamic;
 
 import android.app.Activity;
 import android.content.Context;
@@ -18,26 +18,26 @@ import androidx.recyclerview.widget.RecyclerView;
 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.habu.R;
-import com.yizhuan.habu.community.helper.CalcSize;
-import com.yizhuan.habu.community.helper.ImageUiHelper;
-import com.yizhuan.habu.community.photo.BigPhotoActivity;
-import com.yizhuan.habu.community.photo.DynamicImageAdapter;
-import com.yizhuan.habu.community.photo.PagerOption;
-import com.yizhuan.habu.community.utils.ObjectTypeHelper;
-import com.yizhuan.habu.community.widget.ExpandableTextView;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil;
-import com.yizhuan.habu.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.ResUtil;
-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.chwl.app.R;
+import com.chwl.app.community.helper.CalcSize;
+import com.chwl.app.community.helper.ImageUiHelper;
+import com.chwl.app.community.photo.BigPhotoActivity;
+import com.chwl.app.community.photo.DynamicImageAdapter;
+import com.chwl.app.community.photo.PagerOption;
+import com.chwl.app.community.utils.ObjectTypeHelper;
+import com.chwl.app.community.widget.ExpandableTextView;
+import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
+import com.chwl.app.ui.widget.recyclerview.decoration.GridSpacingItemDecoration;
+import com.chwl.core.community.bean.DynamicMedia;
+import com.chwl.core.community.bean.UserDynamicItem;
+import com.chwl.core.community.bean.WorldDynamicBean;
+import com.chwl.core.community.dynamic.DynamicModel;
+import com.chwl.core.utils.net.DontWarnObserver;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.ScreenUtils;
+import com.chwl.library.utils.SingleToastUtil;
+import com.chwl.library.utils.TimeUtils;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/module_community/java/com/yizhuan/habu/community/user_dynamic/UserDynamicFrg.java b/app/src/module_community/java/com/chwl/app/community/user_dynamic/UserDynamicFrg.java
similarity index 92%
rename from app/src/module_community/java/com/yizhuan/habu/community/user_dynamic/UserDynamicFrg.java
rename to app/src/module_community/java/com/chwl/app/community/user_dynamic/UserDynamicFrg.java
index 94fc3693c..d850439c0 100644
--- a/app/src/module_community/java/com/yizhuan/habu/community/user_dynamic/UserDynamicFrg.java
+++ b/app/src/module_community/java/com/chwl/app/community/user_dynamic/UserDynamicFrg.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.community.user_dynamic;
+package com.chwl.app.community.user_dynamic;
 
 import android.os.Bundle;
 import android.view.View;
@@ -8,20 +8,20 @@ import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.UIHelper;
-import com.yizhuan.habu.base.BaseMvpFragment;
-import com.yizhuan.habu.common.widget.dialog.DialogManager;
-import com.yizhuan.habu.community.dynamic.view.DynamicDetailActivity;
-import com.yizhuan.habu.community.helper.ShareDynamicHelper;
-import com.yizhuan.habu.miniworld.activity.TopicMainActivity;
-import com.yizhuan.habu.ui.widget.ButtonItem;
+import com.chwl.app.R;
+import com.chwl.app.UIHelper;
+import com.chwl.app.base.BaseMvpFragment;
+import com.chwl.app.common.widget.dialog.DialogManager;
+import com.chwl.app.community.dynamic.view.DynamicDetailActivity;
+import com.chwl.app.community.helper.ShareDynamicHelper;
+import com.chwl.app.miniworld.activity.TopicMainActivity;
+import com.chwl.app.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_library.base.factory.CreatePresenter;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.community.bean.UserDynamicItem;
+import com.chwl.core.community.bean.WorldDynamicBean;
+import com.chwl.library.base.factory.CreatePresenter;
+import com.chwl.library.utils.ResUtil;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/module_community/java/com/yizhuan/habu/community/user_dynamic/UserDynamicPresenter.java b/app/src/module_community/java/com/chwl/app/community/user_dynamic/UserDynamicPresenter.java
similarity index 90%
rename from app/src/module_community/java/com/yizhuan/habu/community/user_dynamic/UserDynamicPresenter.java
rename to app/src/module_community/java/com/chwl/app/community/user_dynamic/UserDynamicPresenter.java
index ebd513cab..824f0beff 100644
--- a/app/src/module_community/java/com/yizhuan/habu/community/user_dynamic/UserDynamicPresenter.java
+++ b/app/src/module_community/java/com/chwl/app/community/user_dynamic/UserDynamicPresenter.java
@@ -1,15 +1,15 @@
-package com.yizhuan.habu.community.user_dynamic;
+package com.chwl.app.community.user_dynamic;
 
 import android.annotation.SuppressLint;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.xchat_android_core.Constants;
-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.user.UserDynamicModel;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseMvpPresenter;
+import com.chwl.core.Constants;
+import com.chwl.core.community.bean.UserDynamicItem;
+import com.chwl.core.community.bean.WorldDynamicBean;
+import com.chwl.core.community.dynamic.DynamicModel;
+import com.chwl.core.user.UserDynamicModel;
+import com.chwl.library.utils.ResUtil;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/module_community/java/com/yizhuan/habu/community/utils/Glide4Engine.java b/app/src/module_community/java/com/chwl/app/community/utils/Glide4Engine.java
similarity index 98%
rename from app/src/module_community/java/com/yizhuan/habu/community/utils/Glide4Engine.java
rename to app/src/module_community/java/com/chwl/app/community/utils/Glide4Engine.java
index 2bd880481..3ee22438a 100644
--- a/app/src/module_community/java/com/yizhuan/habu/community/utils/Glide4Engine.java
+++ b/app/src/module_community/java/com/chwl/app/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.habu.community.utils;
+package com.chwl.app.community.utils;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
diff --git a/app/src/module_community/java/com/yizhuan/habu/community/utils/ObjectTypeHelper.java b/app/src/module_community/java/com/chwl/app/community/utils/ObjectTypeHelper.java
similarity index 94%
rename from app/src/module_community/java/com/yizhuan/habu/community/utils/ObjectTypeHelper.java
rename to app/src/module_community/java/com/chwl/app/community/utils/ObjectTypeHelper.java
index 150357909..023840b61 100644
--- a/app/src/module_community/java/com/yizhuan/habu/community/utils/ObjectTypeHelper.java
+++ b/app/src/module_community/java/com/chwl/app/community/utils/ObjectTypeHelper.java
@@ -1,6 +1,6 @@
-package com.yizhuan.habu.community.utils;
+package com.chwl.app.community.utils;
 
-import com.yizhuan.xchat_android_core.community.bean.DynamicMedia;
+import com.chwl.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/habu/community/utils/TopicUpTextWrapper.kt b/app/src/module_community/java/com/chwl/app/community/utils/TopicUpTextWrapper.kt
similarity index 81%
rename from app/src/module_community/java/com/yizhuan/habu/community/utils/TopicUpTextWrapper.kt
rename to app/src/module_community/java/com/chwl/app/community/utils/TopicUpTextWrapper.kt
index 35cd99bdd..2e92fffb2 100644
--- a/app/src/module_community/java/com/yizhuan/habu/community/utils/TopicUpTextWrapper.kt
+++ b/app/src/module_community/java/com/chwl/app/community/utils/TopicUpTextWrapper.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.community.utils
+package com.chwl.app.community.utils
 
 import android.content.Context
 import android.graphics.Color
@@ -6,10 +6,10 @@ import android.graphics.drawable.Drawable
 import android.text.SpannableStringBuilder
 import android.text.Spanned
 import android.text.style.ForegroundColorSpan
-import com.yizhuan.habu.R
-import com.yizhuan.habu.common.widget.CustomImageSpan
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil
-import com.yizhuan.xchat_android_library.utils.ResUtil
+import com.chwl.app.R
+import com.chwl.app.common.widget.CustomImageSpan
+import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil
+import com.chwl.library.utils.ResUtil
 
 object TopicUpTextWrapper {
 
diff --git a/app/src/module_community/java/com/yizhuan/habu/community/widget/DynamicNickDetailWidget.java b/app/src/module_community/java/com/chwl/app/community/widget/DynamicNickDetailWidget.java
similarity index 88%
rename from app/src/module_community/java/com/yizhuan/habu/community/widget/DynamicNickDetailWidget.java
rename to app/src/module_community/java/com/chwl/app/community/widget/DynamicNickDetailWidget.java
index 04faaa99d..0b3f0c7c9 100644
--- a/app/src/module_community/java/com/yizhuan/habu/community/widget/DynamicNickDetailWidget.java
+++ b/app/src/module_community/java/com/chwl/app/community/widget/DynamicNickDetailWidget.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.community.widget;
+package com.chwl.app.community.widget;
 
 import android.content.Context;
 import android.text.TextUtils;
@@ -12,14 +12,14 @@ import androidx.annotation.ColorInt;
 import androidx.constraintlayout.widget.ConstraintLayout;
 
 import com.netease.nim.uikit.support.glide.GlideApp;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.ui.utils.ImageLoadUtils;
-import com.yizhuan.habu.utils.RegexUtil;
-import com.yizhuan.habu.utils.TimeUiUtils;
-import com.yizhuan.habu.view.GenderAgeTextView;
-import com.yizhuan.habu.vip.util.VipHelper;
-import com.yizhuan.xchat_android_core.user.bean.BaseUserInfo;
-import com.yizhuan.xchat_android_library.widget.ShapeConstrainLayout;
+import com.chwl.app.R;
+import com.chwl.app.ui.utils.ImageLoadUtils;
+import com.chwl.app.utils.RegexUtil;
+import com.chwl.app.utils.TimeUiUtils;
+import com.chwl.app.view.GenderAgeTextView;
+import com.chwl.app.vip.util.VipHelper;
+import com.chwl.core.user.bean.BaseUserInfo;
+import com.chwl.library.widget.ShapeConstrainLayout;
 
 /**
  * create by lvzebiao @2019/11/26
diff --git a/app/src/module_community/java/com/yizhuan/habu/community/widget/ExpandableTextView.java b/app/src/module_community/java/com/chwl/app/community/widget/ExpandableTextView.java
similarity index 99%
rename from app/src/module_community/java/com/yizhuan/habu/community/widget/ExpandableTextView.java
rename to app/src/module_community/java/com/chwl/app/community/widget/ExpandableTextView.java
index bda03e19a..b47bff879 100644
--- a/app/src/module_community/java/com/yizhuan/habu/community/widget/ExpandableTextView.java
+++ b/app/src/module_community/java/com/chwl/app/community/widget/ExpandableTextView.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.yizhuan.habu.community.widget;
+package com.chwl.app.community.widget;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -43,8 +43,8 @@ import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.library.utils.ResUtil;
 
 import lombok.Setter;
 
diff --git a/app/src/module_community/java/com/yizhuan/habu/community/widget/GridImageWidget.java b/app/src/module_community/java/com/chwl/app/community/widget/GridImageWidget.java
similarity index 84%
rename from app/src/module_community/java/com/yizhuan/habu/community/widget/GridImageWidget.java
rename to app/src/module_community/java/com/chwl/app/community/widget/GridImageWidget.java
index 4706ff46c..9f5dc79d6 100644
--- a/app/src/module_community/java/com/yizhuan/habu/community/widget/GridImageWidget.java
+++ b/app/src/module_community/java/com/chwl/app/community/widget/GridImageWidget.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.community.widget;
+package com.chwl.app.community.widget;
 
 import android.app.Activity;
 import android.content.Context;
@@ -12,18 +12,18 @@ import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.community.helper.CalcSize;
-import com.yizhuan.habu.community.helper.ImageUiHelper;
-import com.yizhuan.habu.community.photo.BigPhotoActivity;
-import com.yizhuan.habu.community.photo.DynamicImageAdapter;
-import com.yizhuan.habu.community.photo.PagerOption;
-import com.yizhuan.habu.community.utils.ObjectTypeHelper;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil;
-import com.yizhuan.habu.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.chwl.app.R;
+import com.chwl.app.community.helper.CalcSize;
+import com.chwl.app.community.helper.ImageUiHelper;
+import com.chwl.app.community.photo.BigPhotoActivity;
+import com.chwl.app.community.photo.DynamicImageAdapter;
+import com.chwl.app.community.photo.PagerOption;
+import com.chwl.app.community.utils.ObjectTypeHelper;
+import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
+import com.chwl.app.ui.widget.recyclerview.decoration.GridVItemDecoration;
+import com.chwl.core.community.bean.DynamicMedia;
+import com.chwl.core.community.bean.WorldDynamicBean;
+import com.chwl.library.utils.ListUtils;
 
 import java.util.List;
 
diff --git a/app/src/module_community/java/com/yizhuan/habu/community/widget/TopicLabelWidget.kt b/app/src/module_community/java/com/chwl/app/community/widget/TopicLabelWidget.kt
similarity index 91%
rename from app/src/module_community/java/com/yizhuan/habu/community/widget/TopicLabelWidget.kt
rename to app/src/module_community/java/com/chwl/app/community/widget/TopicLabelWidget.kt
index 0e98de496..868fcc4eb 100644
--- a/app/src/module_community/java/com/yizhuan/habu/community/widget/TopicLabelWidget.kt
+++ b/app/src/module_community/java/com/chwl/app/community/widget/TopicLabelWidget.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.community.widget
+package com.chwl.app.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.habu.ui.utils.ImageLoadUtilsV2
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil
+import com.chwl.app.ui.utils.ImageLoadUtilsV2
+import com.chwl.app.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/habu/community/widget/TouchHideKeyboardView.java b/app/src/module_community/java/com/chwl/app/community/widget/TouchHideKeyboardView.java
similarity index 88%
rename from app/src/module_community/java/com/yizhuan/habu/community/widget/TouchHideKeyboardView.java
rename to app/src/module_community/java/com/chwl/app/community/widget/TouchHideKeyboardView.java
index 1d9569d51..ce1a93411 100644
--- a/app/src/module_community/java/com/yizhuan/habu/community/widget/TouchHideKeyboardView.java
+++ b/app/src/module_community/java/com/chwl/app/community/widget/TouchHideKeyboardView.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.community.widget;
+package com.chwl.app.community.widget;
 
 import android.app.Activity;
 import android.content.Context;
@@ -7,7 +7,7 @@ import android.view.MotionEvent;
 
 import androidx.constraintlayout.widget.ConstraintLayout;
 
-import com.yizhuan.xchat_android_library.utils.keyboard.KeyboardUtil;
+import com.chwl.library.utils.keyboard.KeyboardUtil;
 
 /**
  * create by lvzebiao @2019/11/28
diff --git a/app/src/module_community/java/com/yizhuan/habu/community/widget/ZoomImageView.java b/app/src/module_community/java/com/chwl/app/community/widget/ZoomImageView.java
similarity index 99%
rename from app/src/module_community/java/com/yizhuan/habu/community/widget/ZoomImageView.java
rename to app/src/module_community/java/com/chwl/app/community/widget/ZoomImageView.java
index 295e7cfdc..40cbf8bca 100644
--- a/app/src/module_community/java/com/yizhuan/habu/community/widget/ZoomImageView.java
+++ b/app/src/module_community/java/com/chwl/app/community/widget/ZoomImageView.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.community.widget;
+package com.chwl.app.community.widget;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
diff --git a/app/src/module_community/java/com/yizhuan/habu/community/dynamic/presenter/WorldDynamicPresenter.java b/app/src/module_community/java/com/yizhuan/habu/community/dynamic/presenter/WorldDynamicPresenter.java
deleted file mode 100644
index c95ee61ed..000000000
--- a/app/src/module_community/java/com/yizhuan/habu/community/dynamic/presenter/WorldDynamicPresenter.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.yizhuan.habu.community.dynamic.presenter;
-
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.habu.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/habu/community/dynamic/view/IWorldDynamicView.java b/app/src/module_community/java/com/yizhuan/habu/community/dynamic/view/IWorldDynamicView.java
deleted file mode 100644
index c1744c182..000000000
--- a/app/src/module_community/java/com/yizhuan/habu/community/dynamic/view/IWorldDynamicView.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.yizhuan.habu.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 1e63fe788..0bc23f99a 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 cf2c5fc08..9e5337efd 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/white"
     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 9ed71eb93..40c89e28f 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 a249166e7..2b42dc392 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 9c5d884c3..981e5ce04 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_square_dynamic.xml b/app/src/module_community/res/layout/item_square_dynamic.xml
index 7b9230ae9..89024bb09 100644
--- a/app/src/module_community/res/layout/item_square_dynamic.xml
+++ b/app/src/module_community/res/layout/item_square_dynamic.xml
@@ -24,7 +24,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-            
         
 
-        
 
-        
 
-    
 
-    
+    
 
     
 
-    
 
-        
 
-        
+        
 
         
 
-    
 
-    
+    
 
     
 
-        
-            
 
-    
 
-    
+    
 
-    
 
-    
 
-     {
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/activity/HallNameSettingActivity.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/HallNameSettingActivity.java
similarity index 85%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/activity/HallNameSettingActivity.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/HallNameSettingActivity.java
index e8452c2d0..b813bfbf0 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/activity/HallNameSettingActivity.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/HallNameSettingActivity.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.hall.activity;
+package com.chwl.app.module_hall.hall.activity;
 
 import android.content.Context;
 import android.content.Intent;
@@ -9,15 +9,15 @@ import android.view.View;
 import androidx.core.content.ContextCompat;
 
 import com.netease.nim.uikit.StatusBarUtil;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.base.BaseMvpActivity;
-import com.yizhuan.habu.base.TitleBar;
-import com.yizhuan.habu.common.widget.LimitEditText;
-import com.yizhuan.habu.module_hall.hall.presenter.HallNamePresenter;
-import com.yizhuan.habu.module_hall.hall.view.IHallNameView;
-import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseMvpActivity;
+import com.chwl.app.base.TitleBar;
+import com.chwl.app.common.widget.LimitEditText;
+import com.chwl.app.module_hall.hall.presenter.HallNamePresenter;
+import com.chwl.app.module_hall.hall.view.IHallNameView;
+import com.chwl.library.base.factory.CreatePresenter;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SingleToastUtil;
 
 @CreatePresenter(HallNamePresenter.class)
 public class HallNameSettingActivity extends BaseMvpActivity
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/activity/HallSearchActivity.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/HallSearchActivity.java
similarity index 74%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/activity/HallSearchActivity.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/HallSearchActivity.java
index 91ab94593..f6b71f420 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/activity/HallSearchActivity.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/HallSearchActivity.java
@@ -1,13 +1,13 @@
-package com.yizhuan.habu.module_hall.hall.activity;
+package com.chwl.app.module_hall.hall.activity;
 
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.friend.action.AbstractSelectFriendAction;
-import com.yizhuan.habu.ui.search.SearchHallActivity;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.friend.action.AbstractSelectFriendAction;
+import com.chwl.app.ui.search.SearchHallActivity;
+import com.chwl.library.utils.ResUtil;
 
 /**
  * 模厅搜索
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/activity/IncomeStatisticsActivity.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/IncomeStatisticsActivity.java
similarity index 94%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/activity/IncomeStatisticsActivity.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/IncomeStatisticsActivity.java
index ca3834956..e6e834a2e 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/activity/IncomeStatisticsActivity.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/IncomeStatisticsActivity.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.hall.activity;
+package com.chwl.app.module_hall.hall.activity;
 
 import android.content.Context;
 import android.content.Intent;
@@ -15,20 +15,20 @@ import androidx.viewpager.widget.ViewPager;
 
 import com.jzxiang.pickerview.data.Type;
 import com.netease.nim.uikit.StatusBarUtil;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.base.BaseMvpActivity;
-import com.yizhuan.habu.module_hall.hall.view.dialog.TimePickerDialog;
-import com.yizhuan.habu.module_hall.hall.view.indicator.StatisticsIndicatorAdapter;
-import com.yizhuan.habu.module_hall.income.DayIncomeFragment;
-import com.yizhuan.habu.module_hall.income.GoldRecordFragment;
-import com.yizhuan.habu.module_hall.income.presenter.IncomeStatisticsPresenter;
-import com.yizhuan.habu.module_hall.income.view.IIncomeStatisticsView;
-import com.yizhuan.habu.ui.widget.magicindicator.MagicIndicator;
-import com.yizhuan.habu.ui.widget.magicindicator.ViewPagerHelper;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator;
-import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
-import com.yizhuan.xchat_android_library.utils.CommonUtils;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseMvpActivity;
+import com.chwl.app.module_hall.hall.view.dialog.TimePickerDialog;
+import com.chwl.app.module_hall.hall.view.indicator.StatisticsIndicatorAdapter;
+import com.chwl.app.module_hall.income.DayIncomeFragment;
+import com.chwl.app.module_hall.income.GoldRecordFragment;
+import com.chwl.app.module_hall.income.presenter.IncomeStatisticsPresenter;
+import com.chwl.app.module_hall.income.view.IIncomeStatisticsView;
+import com.chwl.app.ui.widget.magicindicator.MagicIndicator;
+import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper;
+import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator;
+import com.chwl.library.base.factory.CreatePresenter;
+import com.chwl.library.utils.CommonUtils;
+import com.chwl.library.utils.ResUtil;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/activity/MemberSearchActivity.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/MemberSearchActivity.java
similarity index 85%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/activity/MemberSearchActivity.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/MemberSearchActivity.java
index 05e7ba31f..a416f5036 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/activity/MemberSearchActivity.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/MemberSearchActivity.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.hall.activity;
+package com.chwl.app.module_hall.hall.activity;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -9,16 +9,16 @@ import android.view.View;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.netease.nim.uikit.StatusBarUtil;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.UIHelper;
-import com.yizhuan.habu.base.BaseViewBindingActivity;
-import com.yizhuan.habu.common.EmptyViewHelper;
-import com.yizhuan.habu.databinding.ActivityAddMemberBinding;
-import com.yizhuan.habu.module_hall.hall.adapter.GroupMemberListAdapter;
-import com.yizhuan.habu.ui.utils.RVDelegate;
-import com.yizhuan.xchat_android_core.module_hall.hall.HallModel;
-import com.yizhuan.xchat_android_core.module_hall.hall.bean.MemberInfo;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.UIHelper;
+import com.chwl.app.base.BaseViewBindingActivity;
+import com.chwl.app.common.EmptyViewHelper;
+import com.chwl.app.databinding.ActivityAddMemberBinding;
+import com.chwl.app.module_hall.hall.adapter.GroupMemberListAdapter;
+import com.chwl.app.ui.utils.RVDelegate;
+import com.chwl.core.module_hall.hall.HallModel;
+import com.chwl.core.module_hall.hall.bean.MemberInfo;
+import com.chwl.library.utils.ResUtil;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/activity/ModuleClanActivity.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/ModuleClanActivity.java
similarity index 91%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/activity/ModuleClanActivity.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/ModuleClanActivity.java
index 18930bdf3..bef5049aa 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/activity/ModuleClanActivity.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/ModuleClanActivity.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.hall.activity;
+package com.chwl.app.module_hall.hall.activity;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -12,24 +12,24 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import com.netease.nim.uikit.StatusBarUtil;
 import com.netease.nim.uikit.common.util.sys.ScreenUtil;
 import com.orhanobut.logger.Logger;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.UIHelper;
-import com.yizhuan.habu.base.BaseActivity;
-import com.yizhuan.habu.databinding.ActivityModuleClanBinding;
-import com.yizhuan.habu.module_hall.HallDataManager;
-import com.yizhuan.habu.module_hall.hall.adapter.GroupMemberListAdapter;
-import com.yizhuan.habu.module_hall.hall.adapter.HallListAdapter;
-import com.yizhuan.habu.ui.user.activity.UserInfoActivity;
-import com.yizhuan.habu.ui.utils.ImageLoadUtils;
-import com.yizhuan.habu.ui.utils.RVDelegate;
-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.ClanInfo;
-import com.yizhuan.xchat_android_core.module_hall.hall.bean.HallInfo;
-import com.yizhuan.xchat_android_core.module_hall.hall.bean.MemberInfo;
-import com.yizhuan.xchat_android_core.utils.net.RxHelper;
-import com.yizhuan.xchat_android_library.utils.ListUtils;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.UIHelper;
+import com.chwl.app.base.BaseActivity;
+import com.chwl.app.databinding.ActivityModuleClanBinding;
+import com.chwl.app.module_hall.HallDataManager;
+import com.chwl.app.module_hall.hall.adapter.GroupMemberListAdapter;
+import com.chwl.app.module_hall.hall.adapter.HallListAdapter;
+import com.chwl.app.ui.user.activity.UserInfoActivity;
+import com.chwl.app.ui.utils.ImageLoadUtils;
+import com.chwl.app.ui.utils.RVDelegate;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.module_hall.hall.HallModel;
+import com.chwl.core.module_hall.hall.bean.ClanInfo;
+import com.chwl.core.module_hall.hall.bean.HallInfo;
+import com.chwl.core.module_hall.hall.bean.MemberInfo;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.utils.ListUtils;
+import com.chwl.library.utils.ResUtil;
 
 import org.greenrobot.eventbus.EventBus;
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/activity/ModuleHallActivity.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/ModuleHallActivity.java
similarity index 92%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/activity/ModuleHallActivity.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/ModuleHallActivity.java
index efcb67e92..602f59969 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/activity/ModuleHallActivity.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/ModuleHallActivity.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.hall.activity;
+package com.chwl.app.module_hall.hall.activity;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -14,33 +14,33 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import com.netease.nim.uikit.StatusBarUtil;
 import com.netease.nim.uikit.support.glide.GlideApp;
 import com.orhanobut.logger.Logger;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.UIHelper;
-import com.yizhuan.habu.base.BaseMvpActivity;
-import com.yizhuan.habu.common.widget.dialog.DialogManager;
-import com.yizhuan.habu.databinding.ActivityModuleHallBinding;
-import com.yizhuan.habu.friend.action.AbstractSelectFriendAction;
-import com.yizhuan.habu.home.activity.AssociationActivity;
-import com.yizhuan.habu.module_hall.HallDataManager;
-import com.yizhuan.habu.module_hall.hall.adapter.GroupMemberListAdapter;
-import com.yizhuan.habu.module_hall.hall.presenter.ModuleHallPresenter;
-import com.yizhuan.habu.module_hall.hall.view.IModuleHallView;
-import com.yizhuan.habu.ui.im.avtivity.NimP2PMessageActivity;
-import com.yizhuan.habu.ui.user.activity.UserInfoActivity;
-import com.yizhuan.habu.ui.utils.ImageLoadUtils;
-import com.yizhuan.habu.ui.widget.ButtonItem;
-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.AuthInfo;
-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.JoinRoomInfo;
-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.utils.net.BeanObserver;
-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.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.UIHelper;
+import com.chwl.app.base.BaseMvpActivity;
+import com.chwl.app.common.widget.dialog.DialogManager;
+import com.chwl.app.databinding.ActivityModuleHallBinding;
+import com.chwl.app.friend.action.AbstractSelectFriendAction;
+import com.chwl.app.home.activity.AssociationActivity;
+import com.chwl.app.module_hall.HallDataManager;
+import com.chwl.app.module_hall.hall.adapter.GroupMemberListAdapter;
+import com.chwl.app.module_hall.hall.presenter.ModuleHallPresenter;
+import com.chwl.app.module_hall.hall.view.IModuleHallView;
+import com.chwl.app.ui.im.avtivity.NimP2PMessageActivity;
+import com.chwl.app.ui.user.activity.UserInfoActivity;
+import com.chwl.app.ui.utils.ImageLoadUtils;
+import com.chwl.app.ui.widget.ButtonItem;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.module_hall.hall.HallModel;
+import com.chwl.core.module_hall.hall.bean.AuthInfo;
+import com.chwl.core.module_hall.hall.bean.ClanInfo;
+import com.chwl.core.module_hall.hall.bean.HallInfo;
+import com.chwl.core.module_hall.hall.bean.JoinRoomInfo;
+import com.chwl.core.module_hall.hall.bean.MemberInfo;
+import com.chwl.core.module_hall.hall.bean.RoleType;
+import com.chwl.core.utils.net.BeanObserver;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.base.factory.CreatePresenter;
+import com.chwl.library.utils.ResUtil;
 
 import org.greenrobot.eventbus.EventBus;
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/activity/RemoveMemberListActivity.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/RemoveMemberListActivity.java
similarity index 88%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/activity/RemoveMemberListActivity.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/RemoveMemberListActivity.java
index 90feb17be..25b8d8a1b 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/activity/RemoveMemberListActivity.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/RemoveMemberListActivity.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.hall.activity;
+package com.chwl.app.module_hall.hall.activity;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -17,25 +17,25 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.netease.nim.uikit.StatusBarUtil;
 import com.orhanobut.logger.Logger;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.UIHelper;
-import com.yizhuan.habu.base.BaseMvpActivity;
-import com.yizhuan.habu.common.EmptyViewHelper;
-import com.yizhuan.habu.common.widget.dialog.DialogManager;
-import com.yizhuan.habu.module_hall.hall.adapter.GroupMemberListAdapter;
-import com.yizhuan.habu.module_hall.hall.presenter.RemoveMemberPresenter;
-import com.yizhuan.habu.module_hall.hall.view.IRemoveMemberView;
-import com.yizhuan.habu.ui.utils.RVDelegate;
-import com.yizhuan.habu.ui.widget.TextWatcherSimple;
-import com.yizhuan.xchat_android_core.module_hall.hall.HallModel;
-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.module_hall.income.event.UpdateMemberListEvent;
-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.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
+import com.chwl.app.R;
+import com.chwl.app.UIHelper;
+import com.chwl.app.base.BaseMvpActivity;
+import com.chwl.app.common.EmptyViewHelper;
+import com.chwl.app.common.widget.dialog.DialogManager;
+import com.chwl.app.module_hall.hall.adapter.GroupMemberListAdapter;
+import com.chwl.app.module_hall.hall.presenter.RemoveMemberPresenter;
+import com.chwl.app.module_hall.hall.view.IRemoveMemberView;
+import com.chwl.app.ui.utils.RVDelegate;
+import com.chwl.app.ui.widget.TextWatcherSimple;
+import com.chwl.core.module_hall.hall.HallModel;
+import com.chwl.core.module_hall.hall.bean.MemberInfo;
+import com.chwl.core.module_hall.hall.bean.RoleType;
+import com.chwl.core.module_hall.income.event.UpdateMemberListEvent;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.base.factory.CreatePresenter;
+import com.chwl.library.utils.ListUtils;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SingleToastUtil;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/activity/RoomIncomeActivity.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/RoomIncomeActivity.java
similarity index 90%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/activity/RoomIncomeActivity.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/RoomIncomeActivity.java
index ccc0fe27c..021a86e4e 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/activity/RoomIncomeActivity.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/RoomIncomeActivity.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.hall.activity;
+package com.chwl.app.module_hall.hall.activity;
 
 import android.content.Context;
 import android.content.Intent;
@@ -15,21 +15,21 @@ import androidx.viewpager.widget.ViewPager;
 
 import com.jzxiang.pickerview.data.Type;
 import com.netease.nim.uikit.StatusBarUtil;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.base.BaseMvpActivity;
-import com.yizhuan.habu.common.widget.CircleImageView;
-import com.yizhuan.habu.module_hall.hall.view.dialog.TimePickerDialog;
-import com.yizhuan.habu.module_hall.hall.view.indicator.StatisticsIndicatorAdapter;
-import com.yizhuan.habu.module_hall.income.HallIncomeFragment;
-import com.yizhuan.habu.module_hall.income.presenter.RoomIncomePresenter;
-import com.yizhuan.habu.module_hall.income.view.IIncomeStatisticsView;
-import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2;
-import com.yizhuan.habu.ui.widget.magicindicator.MagicIndicator;
-import com.yizhuan.habu.ui.widget.magicindicator.ViewPagerHelper;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator;
-import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
-import com.yizhuan.xchat_android_library.utils.CommonUtils;
-import com.yizhuan.xchat_android_library.utils.TimeUtils;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseMvpActivity;
+import com.chwl.app.common.widget.CircleImageView;
+import com.chwl.app.module_hall.hall.view.dialog.TimePickerDialog;
+import com.chwl.app.module_hall.hall.view.indicator.StatisticsIndicatorAdapter;
+import com.chwl.app.module_hall.income.HallIncomeFragment;
+import com.chwl.app.module_hall.income.presenter.RoomIncomePresenter;
+import com.chwl.app.module_hall.income.view.IIncomeStatisticsView;
+import com.chwl.app.ui.utils.ImageLoadUtilsV2;
+import com.chwl.app.ui.widget.magicindicator.MagicIndicator;
+import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper;
+import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator;
+import com.chwl.library.base.factory.CreatePresenter;
+import com.chwl.library.utils.CommonUtils;
+import com.chwl.library.utils.TimeUtils;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/activity/SingleRoomIncomeActivity.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/SingleRoomIncomeActivity.java
similarity index 91%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/activity/SingleRoomIncomeActivity.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/SingleRoomIncomeActivity.java
index 54444a1c1..1eda292a6 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/activity/SingleRoomIncomeActivity.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/SingleRoomIncomeActivity.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.hall.activity;
+package com.chwl.app.module_hall.hall.activity;
 
 import android.content.Context;
 import android.content.Intent;
@@ -14,20 +14,20 @@ import androidx.viewpager.widget.ViewPager;
 
 import com.jzxiang.pickerview.data.Type;
 import com.netease.nim.uikit.StatusBarUtil;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.base.BaseMvpActivity;
-import com.yizhuan.habu.module_hall.hall.view.dialog.TimePickerDialog;
-import com.yizhuan.habu.module_hall.hall.view.indicator.StatisticsIndicatorAdapter;
-import com.yizhuan.habu.module_hall.income.SingleRoomIncomeFragment;
-import com.yizhuan.habu.module_hall.income.presenter.SingleRoomIncomePresenter;
-import com.yizhuan.habu.module_hall.income.view.IIncomeStatisticsView;
-import com.yizhuan.habu.ui.widget.magicindicator.MagicIndicator;
-import com.yizhuan.habu.ui.widget.magicindicator.ViewPagerHelper;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator;
-import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
-import com.yizhuan.xchat_android_library.utils.CommonUtils;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.TimeUtils;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseMvpActivity;
+import com.chwl.app.module_hall.hall.view.dialog.TimePickerDialog;
+import com.chwl.app.module_hall.hall.view.indicator.StatisticsIndicatorAdapter;
+import com.chwl.app.module_hall.income.SingleRoomIncomeFragment;
+import com.chwl.app.module_hall.income.presenter.SingleRoomIncomePresenter;
+import com.chwl.app.module_hall.income.view.IIncomeStatisticsView;
+import com.chwl.app.ui.widget.magicindicator.MagicIndicator;
+import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper;
+import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator;
+import com.chwl.library.base.factory.CreatePresenter;
+import com.chwl.library.utils.CommonUtils;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.TimeUtils;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/activity/SuperAdminAddActivity.kt b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/SuperAdminAddActivity.kt
similarity index 82%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/activity/SuperAdminAddActivity.kt
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/SuperAdminAddActivity.kt
index cbf3abf6a..0d6a9b8b1 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/activity/SuperAdminAddActivity.kt
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/SuperAdminAddActivity.kt
@@ -1,20 +1,20 @@
-package com.yizhuan.habu.module_hall.hall.activity
+package com.chwl.app.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.habu.R
-import com.yizhuan.habu.base.BaseViewBindingActivity
-import com.yizhuan.habu.common.EmptyViewHelper
-import com.yizhuan.habu.databinding.ActivitySuperAdminAddBinding
-import com.yizhuan.habu.module_hall.hall.adapter.SearchAdminAdapter
-import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil
+import com.chwl.app.R
+import com.chwl.app.base.BaseViewBindingActivity
+import com.chwl.app.common.EmptyViewHelper
+import com.chwl.app.databinding.ActivitySuperAdminAddBinding
+import com.chwl.app.module_hall.hall.adapter.SearchAdminAdapter
+import com.chwl.app.ui.utils.RVDelegate
+import com.chwl.core.module_hall.hall.HallModel
+import com.chwl.core.module_hall.hall.bean.SuperAdminInfo
+import com.chwl.core.utils.toast
+import com.chwl.library.utils.ResUtil
 
 class SuperAdminAddActivity : BaseViewBindingActivity() {
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/activity/SuperAdminManageActivity.kt b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/SuperAdminManageActivity.kt
similarity index 87%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/activity/SuperAdminManageActivity.kt
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/SuperAdminManageActivity.kt
index 34bc7a2c9..9ce87a9cc 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/activity/SuperAdminManageActivity.kt
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/SuperAdminManageActivity.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.hall.activity
+package com.chwl.app.module_hall.hall.activity
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -12,16 +12,16 @@ 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.habu.R
-import com.yizhuan.habu.base.BaseViewBindingActivity
-import com.yizhuan.habu.common.EmptyViewHelper
-import com.yizhuan.habu.databinding.ActivitySuperAdminManegeBinding
-import com.yizhuan.habu.module_hall.hall.adapter.ManageSuperAdminAdapter
-import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil
+import com.chwl.app.R
+import com.chwl.app.base.BaseViewBindingActivity
+import com.chwl.app.common.EmptyViewHelper
+import com.chwl.app.databinding.ActivitySuperAdminManegeBinding
+import com.chwl.app.module_hall.hall.adapter.ManageSuperAdminAdapter
+import com.chwl.app.ui.utils.RVDelegate
+import com.chwl.core.module_hall.hall.HallModel
+import com.chwl.core.module_hall.hall.bean.SuperAdminInfo
+import com.chwl.core.utils.toast
+import com.chwl.library.utils.ResUtil
 
 class SuperAdminManageActivity : BaseViewBindingActivity() {
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/activity/SuperAdminRoomSetActivity.kt b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/SuperAdminRoomSetActivity.kt
similarity index 85%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/activity/SuperAdminRoomSetActivity.kt
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/SuperAdminRoomSetActivity.kt
index 0a322b98d..7e67a8613 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/activity/SuperAdminRoomSetActivity.kt
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/SuperAdminRoomSetActivity.kt
@@ -1,20 +1,20 @@
-package com.yizhuan.habu.module_hall.hall.activity
+package com.chwl.app.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.habu.R
-import com.yizhuan.habu.base.BaseViewBindingActivity
-import com.yizhuan.habu.common.EmptyViewHelper
-import com.yizhuan.habu.databinding.ActivitySuperAdminRoomSetBinding
-import com.yizhuan.habu.module_hall.hall.adapter.ManageRoomSetAdapter
-import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil
+import com.chwl.app.R
+import com.chwl.app.base.BaseViewBindingActivity
+import com.chwl.app.common.EmptyViewHelper
+import com.chwl.app.databinding.ActivitySuperAdminRoomSetBinding
+import com.chwl.app.module_hall.hall.adapter.ManageRoomSetAdapter
+import com.chwl.app.ui.utils.RVDelegate
+import com.chwl.core.module_hall.hall.HallModel
+import com.chwl.core.module_hall.hall.bean.SuperAdminHall
+import com.chwl.core.utils.toast
+import com.chwl.library.utils.ResUtil
 
 class SuperAdminRoomSetActivity : BaseViewBindingActivity() {
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/AssociationAdapter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/AssociationAdapter.java
similarity index 92%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/AssociationAdapter.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/AssociationAdapter.java
index 38e3b82c2..40158c115 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/AssociationAdapter.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/AssociationAdapter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.hall.adapter;
+package com.chwl.app.module_hall.hall.adapter;
 
 import android.view.View;
 import android.widget.ImageView;
@@ -6,9 +6,9 @@ import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2;
-import com.yizhuan.xchat_android_core.association.bean.ClanListInfo;
+import com.chwl.app.R;
+import com.chwl.app.ui.utils.ImageLoadUtilsV2;
+import com.chwl.core.association.bean.ClanListInfo;
 
 /**
  * Created by yudi
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/AssociationRoomAdapter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/AssociationRoomAdapter.java
similarity index 94%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/AssociationRoomAdapter.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/AssociationRoomAdapter.java
index 3282bc7f6..17a8ab50d 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/AssociationRoomAdapter.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/AssociationRoomAdapter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.hall.adapter;
+package com.chwl.app.module_hall.hall.adapter;
 
 import android.view.View;
 import android.widget.TextView;
@@ -7,9 +7,9 @@ import androidx.core.content.ContextCompat;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2;
-import com.yizhuan.xchat_android_core.association.bean.HallListInfo;
+import com.chwl.app.R;
+import com.chwl.app.ui.utils.ImageLoadUtilsV2;
+import com.chwl.core.association.bean.HallListInfo;
 
 /**
  * Created by yudi
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/AuthSettingAdapter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/AuthSettingAdapter.java
similarity index 88%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/AuthSettingAdapter.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/AuthSettingAdapter.java
index 18cf14bac..fcc831971 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/AuthSettingAdapter.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/AuthSettingAdapter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.hall.adapter;
+package com.chwl.app.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.habu.R;
-import com.yizhuan.xchat_android_core.module_hall.hall.bean.AuthInfo;
-import com.yizhuan.xchat_android_library.widget.IOSSwitchView;
+import com.chwl.app.R;
+import com.chwl.core.module_hall.hall.bean.AuthInfo;
+import com.chwl.library.widget.IOSSwitchView;
 
 public class AuthSettingAdapter {
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/EnableExchangeAdapter.kt b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/EnableExchangeAdapter.kt
similarity index 90%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/EnableExchangeAdapter.kt
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/EnableExchangeAdapter.kt
index 21231c9e9..609fcd221 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/EnableExchangeAdapter.kt
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/EnableExchangeAdapter.kt
@@ -1,12 +1,12 @@
-package com.yizhuan.habu.module_hall.hall.adapter
+package com.chwl.app.module_hall.hall.adapter
 
 import androidx.appcompat.widget.AppCompatTextView
 import androidx.core.content.ContextCompat
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.BaseViewHolder
-import com.yizhuan.habu.R
-import com.yizhuan.habu.ui.utils.ImageLoadUtils
-import com.yizhuan.xchat_android_core.association.bean.MemberExchangeInfo
+import com.chwl.app.R
+import com.chwl.app.ui.utils.ImageLoadUtils
+import com.chwl.core.association.bean.MemberExchangeInfo
 
 /**
  * 可兑换
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/GroupListAdapter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/GroupListAdapter.java
similarity index 75%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/GroupListAdapter.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/GroupListAdapter.java
index 35ca65126..adcaabfd6 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/GroupListAdapter.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/GroupListAdapter.java
@@ -1,10 +1,10 @@
-package com.yizhuan.habu.module_hall.hall.adapter;
+package com.chwl.app.module_hall.hall.adapter;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.ui.utils.ImageLoadUtils;
-import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamInfo;
+import com.chwl.app.R;
+import com.chwl.app.ui.utils.ImageLoadUtils;
+import com.chwl.core.module_hall.hall.bean.HTeamInfo;
 
 public class GroupListAdapter extends BaseQuickAdapter {
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/GroupMemberListAdapter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/GroupMemberListAdapter.java
similarity index 94%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/GroupMemberListAdapter.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/GroupMemberListAdapter.java
index 86f421fc7..2fba35ea1 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/GroupMemberListAdapter.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/GroupMemberListAdapter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.hall.adapter;
+package com.chwl.app.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.habu.R;
-import com.yizhuan.habu.ui.utils.ImageLoadUtils;
-import com.yizhuan.habu.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.chwl.app.R;
+import com.chwl.app.ui.utils.ImageLoadUtils;
+import com.chwl.app.utils.RegexUtil;
+import com.chwl.core.level.UserLevelVo;
+import com.chwl.core.module_hall.hall.bean.MemberInfo;
+import com.chwl.core.module_hall.hall.bean.RoleType;
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/HallListAdapter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/HallListAdapter.java
similarity index 76%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/HallListAdapter.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/HallListAdapter.java
index 73f66c99e..d9039e436 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/HallListAdapter.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/HallListAdapter.java
@@ -1,11 +1,11 @@
-package com.yizhuan.habu.module_hall.hall.adapter;
+package com.chwl.app.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.habu.R;
-import com.yizhuan.habu.ui.utils.ImageLoadUtils;
-import com.yizhuan.xchat_android_core.module_hall.hall.bean.HallInfo;
+import com.chwl.app.R;
+import com.chwl.app.ui.utils.ImageLoadUtils;
+import com.chwl.core.module_hall.hall.bean.HallInfo;
 
 public class HallListAdapter extends BaseQuickAdapter {
     public HallListAdapter() {
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/ManageRoomAdapter.kt b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/ManageRoomAdapter.kt
similarity index 76%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/ManageRoomAdapter.kt
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/ManageRoomAdapter.kt
index 964f96150..4ef573eac 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/ManageRoomAdapter.kt
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/ManageRoomAdapter.kt
@@ -1,11 +1,11 @@
-package com.yizhuan.habu.module_hall.hall.adapter
+package com.chwl.app.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.habu.R
-import com.yizhuan.habu.ui.utils.ImageLoadUtils
-import com.yizhuan.xchat_android_core.module_hall.hall.bean.SuperAdminHall
+import com.chwl.app.R
+import com.chwl.app.ui.utils.ImageLoadUtils
+import com.chwl.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/habu/module_hall/hall/adapter/ManageRoomSetAdapter.kt b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/ManageRoomSetAdapter.kt
similarity index 78%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/ManageRoomSetAdapter.kt
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/ManageRoomSetAdapter.kt
index 4a99c8449..6c1bcb2c1 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/ManageRoomSetAdapter.kt
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/ManageRoomSetAdapter.kt
@@ -1,10 +1,10 @@
-package com.yizhuan.habu.module_hall.hall.adapter
+package com.chwl.app.module_hall.hall.adapter
 
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.BaseViewHolder
-import com.yizhuan.habu.R
-import com.yizhuan.habu.ui.utils.ImageLoadUtils
-import com.yizhuan.xchat_android_core.module_hall.hall.bean.SuperAdminHall
+import com.chwl.app.R
+import com.chwl.app.ui.utils.ImageLoadUtils
+import com.chwl.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/habu/module_hall/hall/adapter/ManageSuperAdminAdapter.kt b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/ManageSuperAdminAdapter.kt
similarity index 78%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/ManageSuperAdminAdapter.kt
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/ManageSuperAdminAdapter.kt
index 9fbf800aa..040515ecd 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/ManageSuperAdminAdapter.kt
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/ManageSuperAdminAdapter.kt
@@ -1,15 +1,15 @@
-package com.yizhuan.habu.module_hall.hall.adapter
+package com.chwl.app.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.habu.R
-import com.yizhuan.habu.common.EmptyViewHelper
-import com.yizhuan.habu.ui.utils.ImageLoadUtils
-import com.yizhuan.habu.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.chwl.app.R
+import com.chwl.app.common.EmptyViewHelper
+import com.chwl.app.ui.utils.ImageLoadUtils
+import com.chwl.app.ui.utils.RVDelegate
+import com.chwl.core.module_hall.hall.bean.SuperAdminHall
+import com.chwl.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/habu/module_hall/hall/adapter/MemberViewHolder.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/MemberViewHolder.java
similarity index 95%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/MemberViewHolder.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/MemberViewHolder.java
index 9dba04233..299238b3b 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/MemberViewHolder.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/MemberViewHolder.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.hall.adapter;
+package com.chwl.app.module_hall.hall.adapter;
 
 import android.view.View;
 import android.widget.ImageView;
@@ -8,7 +8,7 @@ import android.widget.TextView;
 import androidx.appcompat.widget.AppCompatImageView;
 
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.yizhuan.habu.R;
+import com.chwl.app.R;
 
 public class MemberViewHolder extends BaseViewHolder {
     TextView userName;
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/NoExchangeAdapter.kt b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/NoExchangeAdapter.kt
similarity index 86%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/NoExchangeAdapter.kt
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/NoExchangeAdapter.kt
index d881607f1..c25803385 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/NoExchangeAdapter.kt
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/NoExchangeAdapter.kt
@@ -1,10 +1,10 @@
-package com.yizhuan.habu.module_hall.hall.adapter
+package com.chwl.app.module_hall.hall.adapter
 
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.BaseViewHolder
-import com.yizhuan.habu.R
-import com.yizhuan.habu.ui.utils.ImageLoadUtils
-import com.yizhuan.xchat_android_core.association.bean.MemberExchangeInfo
+import com.chwl.app.R
+import com.chwl.app.ui.utils.ImageLoadUtils
+import com.chwl.core.association.bean.MemberExchangeInfo
 
 /**
  * 不可兑换
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/OptionAdapter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/OptionAdapter.java
similarity index 87%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/OptionAdapter.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/OptionAdapter.java
index a6b38118b..af55a7052 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/OptionAdapter.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/OptionAdapter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.hall.adapter;
+package com.chwl.app.module_hall.hall.adapter;
 
 import android.content.Context;
 import android.widget.ImageView;
@@ -8,8 +8,8 @@ import androidx.annotation.Nullable;
 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.habu.R;
-import com.yizhuan.xchat_android_core.module_hall.hall.bean.OptionInfo;
+import com.chwl.app.R;
+import com.chwl.core.module_hall.hall.bean.OptionInfo;
 
 import java.util.List;
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/SearchAdminAdapter.kt b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/SearchAdminAdapter.kt
similarity index 78%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/SearchAdminAdapter.kt
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/SearchAdminAdapter.kt
index dbc0085a6..149afcc98 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/adapter/SearchAdminAdapter.kt
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/SearchAdminAdapter.kt
@@ -1,11 +1,11 @@
-package com.yizhuan.habu.module_hall.hall.adapter
+package com.chwl.app.module_hall.hall.adapter
 
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.BaseViewHolder
-import com.yizhuan.habu.R
-import com.yizhuan.habu.ui.utils.ImageLoadUtils
-import com.yizhuan.xchat_android_core.module_hall.hall.bean.SuperAdminInfo
-import com.yizhuan.xchat_android_library.utils.ResUtil
+import com.chwl.app.R
+import com.chwl.app.ui.utils.ImageLoadUtils
+import com.chwl.core.module_hall.hall.bean.SuperAdminInfo
+import com.chwl.library.utils.ResUtil
 
 class SearchAdminAdapter :
     BaseQuickAdapter(R.layout.item_search_admin) {
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/fragment/AssociationFragment.kt b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/fragment/AssociationFragment.kt
similarity index 78%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/fragment/AssociationFragment.kt
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/fragment/AssociationFragment.kt
index a16120ebf..9f6477940 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/fragment/AssociationFragment.kt
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/fragment/AssociationFragment.kt
@@ -1,23 +1,23 @@
-package com.yizhuan.habu.module_hall.hall.fragment
+package com.chwl.app.module_hall.hall.fragment
 
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.chad.library.adapter.base.BaseQuickAdapter
-import com.yizhuan.habu.R
-import com.yizhuan.habu.module_hall.viewmodel.AssociationViewModel
-import com.yizhuan.habu.module_hall.hall.adapter.AssociationAdapter
-import com.yizhuan.habu.base.BaseViewBindingFragment
-import com.yizhuan.habu.common.EmptyViewHelper
-import com.yizhuan.habu.databinding.FragmentAssociationBinding
-import com.yizhuan.habu.module_hall.hall.activity.ModuleClanActivity
-import com.yizhuan.habu.ui.utils.RVDelegate
-import com.yizhuan.xchat_android_core.association.bean.ClanListInfo
-import com.yizhuan.xchat_android_core.module_hall.hall.HallModel
-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.ResUtil
+import com.chwl.app.R
+import com.chwl.app.module_hall.viewmodel.AssociationViewModel
+import com.chwl.app.module_hall.hall.adapter.AssociationAdapter
+import com.chwl.app.base.BaseViewBindingFragment
+import com.chwl.app.common.EmptyViewHelper
+import com.chwl.app.databinding.FragmentAssociationBinding
+import com.chwl.app.module_hall.hall.activity.ModuleClanActivity
+import com.chwl.app.ui.utils.RVDelegate
+import com.chwl.core.association.bean.ClanListInfo
+import com.chwl.core.module_hall.hall.HallModel
+import com.chwl.core.utils.net.BeanObserver
+import com.chwl.core.utils.net.RxHelper
+import com.chwl.library.utils.ResUtil
 
 /**
  * 公会榜单
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/fragment/AssociationRoomFragment.kt b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/fragment/AssociationRoomFragment.kt
similarity index 89%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/fragment/AssociationRoomFragment.kt
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/fragment/AssociationRoomFragment.kt
index b8e661809..1b2380d85 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/fragment/AssociationRoomFragment.kt
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/fragment/AssociationRoomFragment.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.hall.fragment
+package com.chwl.app.module_hall.hall.fragment
 
 import android.content.Context
 import android.os.Bundle
@@ -14,21 +14,21 @@ import android.widget.TextView
 import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.chad.library.adapter.base.BaseQuickAdapter
-import com.yizhuan.habu.R
-import com.yizhuan.habu.base.BaseViewBindingFragment
-import com.yizhuan.habu.common.EmptyViewHelper
-import com.yizhuan.habu.common.widget.dialog.DialogManager
-import com.yizhuan.habu.databinding.FragmentAssociationRoomBinding
-import com.yizhuan.habu.module_hall.hall.activity.ModuleHallActivity
-import com.yizhuan.habu.module_hall.hall.adapter.AssociationRoomAdapter
-import com.yizhuan.habu.module_hall.viewmodel.AssociationViewModel
-import com.yizhuan.habu.ui.im.avtivity.NimP2PMessageActivity
-import com.yizhuan.habu.ui.utils.RVDelegate
-import com.yizhuan.xchat_android_core.association.bean.HallListInfo
-import com.yizhuan.xchat_android_core.module_hall.hall.HallModel
-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.ResUtil
+import com.chwl.app.R
+import com.chwl.app.base.BaseViewBindingFragment
+import com.chwl.app.common.EmptyViewHelper
+import com.chwl.app.common.widget.dialog.DialogManager
+import com.chwl.app.databinding.FragmentAssociationRoomBinding
+import com.chwl.app.module_hall.hall.activity.ModuleHallActivity
+import com.chwl.app.module_hall.hall.adapter.AssociationRoomAdapter
+import com.chwl.app.module_hall.viewmodel.AssociationViewModel
+import com.chwl.app.ui.im.avtivity.NimP2PMessageActivity
+import com.chwl.app.ui.utils.RVDelegate
+import com.chwl.core.association.bean.HallListInfo
+import com.chwl.core.module_hall.hall.HallModel
+import com.chwl.core.utils.net.BeanObserver
+import com.chwl.core.utils.net.RxHelper
+import com.chwl.library.utils.ResUtil
 
 class AssociationRoomFragment : BaseViewBindingFragment() {
 
diff --git a/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/presenter/AddMemberPresenter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/presenter/AddMemberPresenter.java
new file mode 100644
index 000000000..2df7884bc
--- /dev/null
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/presenter/AddMemberPresenter.java
@@ -0,0 +1,7 @@
+package com.chwl.app.module_hall.hall.presenter;
+
+import com.chwl.app.base.BaseMvpPresenter;
+import com.chwl.app.module_hall.hall.view.IAddMemberView;
+
+public class AddMemberPresenter extends BaseMvpPresenter {
+}
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/presenter/AdminAddPresenter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/presenter/AdminAddPresenter.java
similarity index 88%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/presenter/AdminAddPresenter.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/presenter/AdminAddPresenter.java
index 7347a1a41..bb8877fe8 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/presenter/AdminAddPresenter.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/presenter/AdminAddPresenter.java
@@ -1,8 +1,8 @@
-package com.yizhuan.habu.module_hall.hall.presenter;
+package com.chwl.app.module_hall.hall.presenter;
 
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.habu.module_hall.hall.view.IAdminAddView;
-import com.yizhuan.xchat_android_core.module_hall.hall.HallModel;
+import com.chwl.app.base.BaseMvpPresenter;
+import com.chwl.app.module_hall.hall.view.IAdminAddView;
+import com.chwl.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/habu/module_hall/hall/presenter/AdminListPresenter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/presenter/AdminListPresenter.java
similarity index 69%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/presenter/AdminListPresenter.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/presenter/AdminListPresenter.java
index 38547762e..1587173cf 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/presenter/AdminListPresenter.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/presenter/AdminListPresenter.java
@@ -1,11 +1,11 @@
-package com.yizhuan.habu.module_hall.hall.presenter;
+package com.chwl.app.module_hall.hall.presenter;
 
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.habu.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.chwl.app.base.BaseMvpPresenter;
+import com.chwl.app.module_hall.hall.view.IAdminListView;
+import com.chwl.core.module_hall.hall.HallModel;
+import com.chwl.core.module_hall.hall.bean.ListMemberInfo;
+import com.chwl.core.utils.net.BeanObserver;
+import com.chwl.library.utils.ListUtils;
 
 public class AdminListPresenter extends BaseMvpPresenter {
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/presenter/AuthSettingPresenter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/presenter/AuthSettingPresenter.java
similarity index 86%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/presenter/AuthSettingPresenter.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/presenter/AuthSettingPresenter.java
index 115422c96..2935df93f 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/presenter/AuthSettingPresenter.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/presenter/AuthSettingPresenter.java
@@ -1,9 +1,9 @@
-package com.yizhuan.habu.module_hall.hall.presenter;
+package com.chwl.app.module_hall.hall.presenter;
 
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.habu.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.chwl.app.base.BaseMvpPresenter;
+import com.chwl.app.module_hall.hall.view.IAuthSettingView;
+import com.chwl.core.module_hall.hall.HallModel;
+import com.chwl.core.module_hall.hall.bean.AuthInfo;
 
 import java.util.List;
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/presenter/HallNamePresenter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/presenter/HallNamePresenter.java
similarity index 80%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/presenter/HallNamePresenter.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/presenter/HallNamePresenter.java
index 897a30152..2234ddaf6 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/presenter/HallNamePresenter.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/presenter/HallNamePresenter.java
@@ -1,8 +1,8 @@
-package com.yizhuan.habu.module_hall.hall.presenter;
+package com.chwl.app.module_hall.hall.presenter;
 
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.habu.module_hall.hall.view.IHallNameView;
-import com.yizhuan.xchat_android_core.module_hall.hall.HallNameModel;
+import com.chwl.app.base.BaseMvpPresenter;
+import com.chwl.app.module_hall.hall.view.IHallNameView;
+import com.chwl.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/habu/module_hall/hall/presenter/ModuleHallPresenter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/presenter/ModuleHallPresenter.java
similarity index 91%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/presenter/ModuleHallPresenter.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/presenter/ModuleHallPresenter.java
index 9a68454fe..cdeabb469 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/presenter/ModuleHallPresenter.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/presenter/ModuleHallPresenter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.hall.presenter;
+package com.chwl.app.module_hall.hall.presenter;
 
 import android.content.Context;
 import android.text.SpannableString;
@@ -7,15 +7,15 @@ import android.text.style.ForegroundColorSpan;
 
 import androidx.core.content.ContextCompat;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.avroom.widget.MessageView;
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.habu.module_hall.HallDataManager;
-import com.yizhuan.habu.module_hall.hall.view.IModuleHallView;
-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.AuthInfo;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.avroom.widget.MessageView;
+import com.chwl.app.base.BaseMvpPresenter;
+import com.chwl.app.module_hall.HallDataManager;
+import com.chwl.app.module_hall.hall.view.IModuleHallView;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.module_hall.hall.HallModel;
+import com.chwl.core.module_hall.hall.bean.AuthInfo;
+import com.chwl.library.utils.ResUtil;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/presenter/RemoveMemberPresenter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/presenter/RemoveMemberPresenter.java
similarity index 88%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/presenter/RemoveMemberPresenter.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/presenter/RemoveMemberPresenter.java
index 426ad7691..db886ad25 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/presenter/RemoveMemberPresenter.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/presenter/RemoveMemberPresenter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.hall.presenter;
+package com.chwl.app.module_hall.hall.presenter;
 
 import android.content.Context;
 import android.text.SpannableString;
@@ -7,12 +7,12 @@ import android.text.style.ForegroundColorSpan;
 
 import androidx.core.content.ContextCompat;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.habu.module_hall.hall.view.IRemoveMemberView;
-import com.yizhuan.xchat_android_core.module_hall.hall.HallModel;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseMvpPresenter;
+import com.chwl.app.module_hall.hall.view.IRemoveMemberView;
+import com.chwl.core.module_hall.hall.HallModel;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SingleToastUtil;
 
 import io.reactivex.SingleObserver;
 import io.reactivex.disposables.Disposable;
diff --git a/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/IAddMemberView.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/IAddMemberView.java
new file mode 100644
index 000000000..e79e948c9
--- /dev/null
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/IAddMemberView.java
@@ -0,0 +1,6 @@
+package com.chwl.app.module_hall.hall.view;
+
+import com.chwl.library.base.IMvpBaseView;
+
+public interface IAddMemberView extends IMvpBaseView {
+}
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/IAdminAddView.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/IAdminAddView.java
similarity index 67%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/IAdminAddView.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/IAdminAddView.java
index 143a5ba10..07a59132f 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/IAdminAddView.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/IAdminAddView.java
@@ -1,7 +1,7 @@
-package com.yizhuan.habu.module_hall.hall.view;
+package com.chwl.app.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.chwl.core.module_hall.hall.bean.MemberInfo;
+import com.chwl.library.base.IMvpBaseView;
 
 import java.util.List;
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/IAdminListView.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/IAdminListView.java
similarity index 51%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/IAdminListView.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/IAdminListView.java
index 7305f1775..51cc0c7ec 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/IAdminListView.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/IAdminListView.java
@@ -1,7 +1,7 @@
-package com.yizhuan.habu.module_hall.hall.view;
+package com.chwl.app.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.chwl.core.module_hall.hall.bean.MemberInfo;
+import com.chwl.library.base.IMvpBaseView;
 
 import java.util.List;
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/IAuthSettingView.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/IAuthSettingView.java
similarity index 60%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/IAuthSettingView.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/IAuthSettingView.java
index 025152d6c..4c15cc18c 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/IAuthSettingView.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/IAuthSettingView.java
@@ -1,7 +1,7 @@
-package com.yizhuan.habu.module_hall.hall.view;
+package com.chwl.app.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.chwl.core.module_hall.hall.bean.AuthInfo;
+import com.chwl.library.base.IMvpBaseView;
 
 import java.util.List;
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/IHallNameView.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/IHallNameView.java
similarity index 58%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/IHallNameView.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/IHallNameView.java
index ea278e79f..f850a722b 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/IHallNameView.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/IHallNameView.java
@@ -1,6 +1,6 @@
-package com.yizhuan.habu.module_hall.hall.view;
+package com.chwl.app.module_hall.hall.view;
 
-import com.yizhuan.xchat_android_library.base.IMvpBaseView;
+import com.chwl.library.base.IMvpBaseView;
 
 public interface IHallNameView extends IMvpBaseView {
     void updateHallNameSuccess(String message);
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/IMemberSearchView.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/IMemberSearchView.java
similarity index 51%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/IMemberSearchView.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/IMemberSearchView.java
index 504a4a8fc..f0931f130 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/IMemberSearchView.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/IMemberSearchView.java
@@ -1,7 +1,7 @@
-package com.yizhuan.habu.module_hall.hall.view;
+package com.chwl.app.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.chwl.core.module_hall.hall.bean.MemberInfo;
+import com.chwl.library.base.IMvpBaseView;
 
 import java.util.List;
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/IModuleHallView.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/IModuleHallView.java
similarity index 67%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/IModuleHallView.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/IModuleHallView.java
index 765c28449..b2a6dbc7a 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/IModuleHallView.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/IModuleHallView.java
@@ -1,8 +1,8 @@
-package com.yizhuan.habu.module_hall.hall.view;
+package com.chwl.app.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_library.base.IMvpBaseView;
+import com.chwl.core.module_hall.hall.bean.AuthInfo;
+import com.chwl.core.module_hall.hall.bean.MemberInfo;
+import com.chwl.library.base.IMvpBaseView;
 
 import java.util.List;
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/IRemoveMemberView.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/IRemoveMemberView.java
similarity index 56%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/IRemoveMemberView.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/IRemoveMemberView.java
index 6286187b1..241057143 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/IRemoveMemberView.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/IRemoveMemberView.java
@@ -1,6 +1,6 @@
-package com.yizhuan.habu.module_hall.hall.view;
+package com.chwl.app.module_hall.hall.view;
 
-import com.yizhuan.xchat_android_library.base.IMvpBaseView;
+import com.chwl.library.base.IMvpBaseView;
 
 public interface IRemoveMemberView extends IMvpBaseView {
     void removeSuccess(String message);
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/dialog/CloseExchangeTipDialog.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/dialog/CloseExchangeTipDialog.java
similarity index 94%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/dialog/CloseExchangeTipDialog.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/dialog/CloseExchangeTipDialog.java
index f71307288..f418f2486 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/dialog/CloseExchangeTipDialog.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/dialog/CloseExchangeTipDialog.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.hall.view.dialog;
+package com.chwl.app.module_hall.hall.view.dialog;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -10,8 +10,8 @@ import android.widget.TextView;
 
 import androidx.core.content.ContextCompat;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.ui.widget.dialog.BaseDialog;
+import com.chwl.app.R;
+import com.chwl.app.ui.widget.dialog.BaseDialog;
 
 /**
  * @author wushaocheng
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/dialog/HallMenuDialog.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/dialog/HallMenuDialog.java
similarity index 96%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/dialog/HallMenuDialog.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/dialog/HallMenuDialog.java
index 09e613391..9ed8d3618 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/dialog/HallMenuDialog.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/dialog/HallMenuDialog.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.hall.view.dialog;
+package com.chwl.app.module_hall.hall.view.dialog;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -14,9 +14,9 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.xchat_android_core.module_hall.hall.bean.AuthInfo;
-import com.yizhuan.xchat_android_library.utils.SizeUtils;
+import com.chwl.app.R;
+import com.chwl.core.module_hall.hall.bean.AuthInfo;
+import com.chwl.library.utils.SizeUtils;
 
 import java.util.List;
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/dialog/TimePickerClanDialog.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/dialog/TimePickerClanDialog.java
similarity index 98%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/dialog/TimePickerClanDialog.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/dialog/TimePickerClanDialog.java
index a54b562d3..ce0f1d70e 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/dialog/TimePickerClanDialog.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/dialog/TimePickerClanDialog.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.hall.view.dialog;
+package com.chwl.app.module_hall.hall.view.dialog;
 
 import android.app.Activity;
 import android.app.Dialog;
@@ -21,10 +21,10 @@ 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.habu.R;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
-import com.yizhuan.xchat_android_library.utils.TimeUtils;
+import com.chwl.app.R;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SingleToastUtil;
+import com.chwl.library.utils.TimeUtils;
 
 import java.util.Calendar;
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/dialog/TimePickerDialog.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/dialog/TimePickerDialog.java
similarity index 98%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/dialog/TimePickerDialog.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/dialog/TimePickerDialog.java
index 0670b4866..9fa5f9f50 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/dialog/TimePickerDialog.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/dialog/TimePickerDialog.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.hall.view.dialog;
+package com.chwl.app.module_hall.hall.view.dialog;
 
 import android.app.Activity;
 import android.app.Dialog;
@@ -21,10 +21,10 @@ 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.habu.R;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
-import com.yizhuan.xchat_android_library.utils.TimeUtils;
+import com.chwl.app.R;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SingleToastUtil;
+import com.chwl.library.utils.TimeUtils;
 
 import java.util.Calendar;
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/dialog/TimePickerGoldDialog.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/dialog/TimePickerGoldDialog.java
similarity index 98%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/dialog/TimePickerGoldDialog.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/dialog/TimePickerGoldDialog.java
index 055c2c869..922d5a30e 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/dialog/TimePickerGoldDialog.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/dialog/TimePickerGoldDialog.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.hall.view.dialog;
+package com.chwl.app.module_hall.hall.view.dialog;
 
 import android.app.Activity;
 import android.app.Dialog;
@@ -21,10 +21,10 @@ 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.habu.R;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
-import com.yizhuan.xchat_android_library.utils.TimeUtils;
+import com.chwl.app.R;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SingleToastUtil;
+import com.chwl.library.utils.TimeUtils;
 
 import java.util.Calendar;
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/dialog/TimeWheel.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/dialog/TimeWheel.java
similarity index 99%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/dialog/TimeWheel.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/dialog/TimeWheel.java
index 40109ded6..2a4781e68 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/dialog/TimeWheel.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/dialog/TimeWheel.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.hall.view.dialog;
+package com.chwl.app.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.habu.R;
+import com.chwl.app.R;
 
 import java.util.Calendar;
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/indicator/StatisticsIndicatorAdapter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/indicator/StatisticsIndicatorAdapter.java
similarity index 81%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/indicator/StatisticsIndicatorAdapter.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/indicator/StatisticsIndicatorAdapter.java
index cc9e6abee..ec6e33451 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/indicator/StatisticsIndicatorAdapter.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/view/indicator/StatisticsIndicatorAdapter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.hall.view.indicator;
+package com.chwl.app.module_hall.hall.view.indicator;
 
 import android.content.Context;
 import android.view.ViewGroup;
@@ -6,13 +6,13 @@ import android.widget.FrameLayout;
 
 import androidx.core.content.ContextCompat;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator;
+import com.chwl.app.R;
+import com.chwl.app.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView;
+import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
+import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter;
+import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator;
+import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView;
+import com.chwl.app.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/habu/module_hall/im/NimHelper.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/im/NimHelper.java
similarity index 88%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/im/NimHelper.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/im/NimHelper.java
index 49cacb638..ac892bbc8 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/im/NimHelper.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/im/NimHelper.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.im;
+package com.chwl.app.module_hall.im;
 
 import android.text.TextUtils;
 
@@ -8,11 +8,11 @@ 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.yizhuan.habu.R;
-import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
-import com.yizhuan.xchat_android_core.module_hall.im.ClanImMsgInfo;
-import com.yizhuan.xchat_android_core.module_hall.im.HallImMsgInfo;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.module_hall.im.ClanImMsgInfo;
+import com.chwl.core.module_hall.im.HallImMsgInfo;
+import com.chwl.library.utils.ResUtil;
 
 import java.util.Map;
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/im/dialog/AgreeApplyDialog.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/im/dialog/AgreeApplyDialog.java
similarity index 94%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/im/dialog/AgreeApplyDialog.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/im/dialog/AgreeApplyDialog.java
index 08d121905..4870c66b3 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/im/dialog/AgreeApplyDialog.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/im/dialog/AgreeApplyDialog.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.im.dialog;
+package com.chwl.app.module_hall.im.dialog;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -11,8 +11,8 @@ import android.widget.TextView;
 import androidx.appcompat.widget.AppCompatTextView;
 import androidx.core.content.ContextCompat;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.ui.widget.dialog.BaseDialog;
+import com.chwl.app.R;
+import com.chwl.app.ui.widget.dialog.BaseDialog;
 
 /**
  * @author wushaocheng
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/im/dialog/RefuseApplyDialog.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/im/dialog/RefuseApplyDialog.java
similarity index 96%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/im/dialog/RefuseApplyDialog.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/im/dialog/RefuseApplyDialog.java
index 273ea0d9f..54de893d1 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/im/dialog/RefuseApplyDialog.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/im/dialog/RefuseApplyDialog.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.im.dialog;
+package com.chwl.app.module_hall.im.dialog;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -15,8 +15,8 @@ import android.widget.TextView;
 import androidx.appcompat.widget.AppCompatTextView;
 import androidx.core.content.ContextCompat;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.ui.widget.dialog.BaseDialog;
+import com.chwl.app.R;
+import com.chwl.app.ui.widget.dialog.BaseDialog;
 
 /**
  * @author wushaocheng
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/im/msgholder/ClanMsgViewHolder.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/im/msgholder/ClanMsgViewHolder.java
similarity index 90%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/im/msgholder/ClanMsgViewHolder.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/im/msgholder/ClanMsgViewHolder.java
index e64306a86..e8490c555 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/im/msgholder/ClanMsgViewHolder.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/im/msgholder/ClanMsgViewHolder.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.im.msgholder;
+package com.chwl.app.module_hall.im.msgholder;
 
 import android.graphics.Color;
 import android.text.SpannableStringBuilder;
@@ -20,22 +20,22 @@ 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.habu.R;
-import com.yizhuan.habu.module_hall.im.NimHelper;
-import com.yizhuan.habu.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.hall.HallModel;
-import com.yizhuan.xchat_android_core.module_hall.hall.bean.ApplyResult;
-import com.yizhuan.xchat_android_core.module_hall.im.ClanAttachment;
-import com.yizhuan.xchat_android_core.module_hall.im.ClanImMsgInfo;
-import com.yizhuan.xchat_android_core.module_hall.im.HallImMsgInfo;
-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.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
+import com.chwl.app.R;
+import com.chwl.app.module_hall.im.NimHelper;
+import com.chwl.app.ui.im.RouterHandler;
+import com.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.manager.event.HallInfoChangeEvent;
+import com.chwl.core.module_hall.hall.HallModel;
+import com.chwl.core.module_hall.hall.bean.ApplyResult;
+import com.chwl.core.module_hall.im.ClanAttachment;
+import com.chwl.core.module_hall.im.ClanImMsgInfo;
+import com.chwl.core.module_hall.im.HallImMsgInfo;
+import com.chwl.core.module_hall.im.bean.HallMsgComponent;
+import com.chwl.core.module_hall.im.bean.HallMsgLayout;
+import com.chwl.core.utils.net.BeanObserver;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SingleToastUtil;
 
 import org.greenrobot.eventbus.EventBus;
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/im/msgholder/HallMsgViewHolder.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/im/msgholder/HallMsgViewHolder.java
similarity index 92%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/im/msgholder/HallMsgViewHolder.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/im/msgholder/HallMsgViewHolder.java
index c33ff2b67..784b179f6 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/im/msgholder/HallMsgViewHolder.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/im/msgholder/HallMsgViewHolder.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.im.msgholder;
+package com.chwl.app.module_hall.im.msgholder;
 
 import android.graphics.Color;
 import android.text.SpannableStringBuilder;
@@ -21,23 +21,23 @@ 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.habu.R;
-import com.yizhuan.habu.module_hall.im.NimHelper;
-import com.yizhuan.habu.module_hall.im.dialog.AgreeApplyDialog;
-import com.yizhuan.habu.module_hall.im.dialog.RefuseApplyDialog;
-import com.yizhuan.habu.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.hall.HallModel;
-import com.yizhuan.xchat_android_core.module_hall.hall.bean.ApplyResult;
-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.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.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
+import com.chwl.app.R;
+import com.chwl.app.module_hall.im.NimHelper;
+import com.chwl.app.module_hall.im.dialog.AgreeApplyDialog;
+import com.chwl.app.module_hall.im.dialog.RefuseApplyDialog;
+import com.chwl.app.ui.im.RouterHandler;
+import com.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.manager.event.HallInfoChangeEvent;
+import com.chwl.core.module_hall.hall.HallModel;
+import com.chwl.core.module_hall.hall.bean.ApplyResult;
+import com.chwl.core.module_hall.im.HallAttachment;
+import com.chwl.core.module_hall.im.HallImMsgInfo;
+import com.chwl.core.module_hall.im.bean.HallMsgComponent;
+import com.chwl.core.module_hall.im.bean.HallMsgLayout;
+import com.chwl.core.utils.net.BeanObserver;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SingleToastUtil;
 
 import org.greenrobot.eventbus.EventBus;
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/ClanIncomeFragment.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/ClanIncomeFragment.java
similarity index 82%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/ClanIncomeFragment.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/income/ClanIncomeFragment.java
index d8cf9fad1..e7d6f5f07 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/ClanIncomeFragment.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/ClanIncomeFragment.java
@@ -1,19 +1,19 @@
-package com.yizhuan.habu.module_hall.income;
+package com.chwl.app.module_hall.income;
 
 import android.os.Bundle;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.base.BaseMvpFragment;
-import com.yizhuan.habu.module_hall.income.adapter.ClanIncomeAdapter;
-import com.yizhuan.habu.module_hall.income.presenter.ClanIncomeFragmentPresenter;
-import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseMvpFragment;
+import com.chwl.app.module_hall.income.adapter.ClanIncomeAdapter;
+import com.chwl.app.module_hall.income.presenter.ClanIncomeFragmentPresenter;
+import com.chwl.app.module_hall.income.view.IClanIncomeView;
+import com.chwl.core.module_hall.income.bean.ClanTotalIncomeInfo;
+import com.chwl.library.base.factory.CreatePresenter;
+import com.chwl.library.utils.ListUtils;
+import com.chwl.library.utils.ResUtil;
 
 /**
  * 日收入统计
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/DayIncomeFragment.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/DayIncomeFragment.java
similarity index 87%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/DayIncomeFragment.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/income/DayIncomeFragment.java
index 46acfe970..89e3b85fd 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/DayIncomeFragment.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/DayIncomeFragment.java
@@ -1,18 +1,18 @@
-package com.yizhuan.habu.module_hall.income;
+package com.chwl.app.module_hall.income;
 
 import android.os.Bundle;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.base.BaseMvpFragment;
-import com.yizhuan.habu.module_hall.income.adapter.IncomeAdapter;
-import com.yizhuan.habu.module_hall.income.presenter.IncomePresenter;
-import com.yizhuan.habu.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.chwl.app.R;
+import com.chwl.app.base.BaseMvpFragment;
+import com.chwl.app.module_hall.income.adapter.IncomeAdapter;
+import com.chwl.app.module_hall.income.presenter.IncomePresenter;
+import com.chwl.app.module_hall.income.view.IIncomeView;
+import com.chwl.core.module_hall.income.bean.IncomeInfo;
+import com.chwl.core.module_hall.income.bean.IncomeTotalInfo;
+import com.chwl.library.base.factory.CreatePresenter;
 
 import java.util.List;
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/GoldRecordFragment.kt b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/GoldRecordFragment.kt
similarity index 85%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/GoldRecordFragment.kt
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/income/GoldRecordFragment.kt
index 2b587c010..94e07284c 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/GoldRecordFragment.kt
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/GoldRecordFragment.kt
@@ -1,17 +1,17 @@
-package com.yizhuan.habu.module_hall.income
+package com.chwl.app.module_hall.income
 
 import android.os.Bundle
 import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.yizhuan.habu.R
-import com.yizhuan.habu.base.BaseViewBindingFragment
-import com.yizhuan.habu.common.EmptyViewHelper
-import com.yizhuan.habu.databinding.FragmentAssociationBinding
-import com.yizhuan.habu.earn.EarnRecordViewModel
-import com.yizhuan.habu.earn.adapter.GoldRecordAdapter
-import com.yizhuan.habu.ui.utils.RVDelegate
-import com.yizhuan.xchat_android_core.earn.bean.HallMemberGoldFlowInfo
-import com.yizhuan.xchat_android_library.utils.ResUtil
+import com.chwl.app.R
+import com.chwl.app.base.BaseViewBindingFragment
+import com.chwl.app.common.EmptyViewHelper
+import com.chwl.app.databinding.FragmentAssociationBinding
+import com.chwl.app.earn.EarnRecordViewModel
+import com.chwl.app.earn.adapter.GoldRecordAdapter
+import com.chwl.app.ui.utils.RVDelegate
+import com.chwl.core.earn.bean.HallMemberGoldFlowInfo
+import com.chwl.library.utils.ResUtil
 
 /**
  * 金币明细
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/HallIncomeFragment.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/HallIncomeFragment.java
similarity index 80%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/HallIncomeFragment.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/income/HallIncomeFragment.java
index a48991899..66e6dc7cf 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/HallIncomeFragment.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/HallIncomeFragment.java
@@ -1,19 +1,19 @@
-package com.yizhuan.habu.module_hall.income;
+package com.chwl.app.module_hall.income;
 
 import android.os.Bundle;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.base.BaseMvpFragment;
-import com.yizhuan.habu.module_hall.income.adapter.HallIncomeAdapter;
-import com.yizhuan.habu.module_hall.income.presenter.HallIncomeFragmentPresenter;
-import com.yizhuan.habu.module_hall.income.view.IHallIncomeView;
-import com.yizhuan.xchat_android_core.module_hall.income.bean.HallIncomeInfo;
-import com.yizhuan.xchat_android_core.module_hall.income.bean.HallTotalIncomeInfo;
-import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
-import com.yizhuan.xchat_android_library.utils.ListUtils;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseMvpFragment;
+import com.chwl.app.module_hall.income.adapter.HallIncomeAdapter;
+import com.chwl.app.module_hall.income.presenter.HallIncomeFragmentPresenter;
+import com.chwl.app.module_hall.income.view.IHallIncomeView;
+import com.chwl.core.module_hall.income.bean.HallIncomeInfo;
+import com.chwl.core.module_hall.income.bean.HallTotalIncomeInfo;
+import com.chwl.library.base.factory.CreatePresenter;
+import com.chwl.library.utils.ListUtils;
 
 /**
  * 日收入统计
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/IncomeDetailActivity.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/IncomeDetailActivity.java
similarity index 83%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/IncomeDetailActivity.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/income/IncomeDetailActivity.java
index 22f22123c..3944d7742 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/IncomeDetailActivity.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/IncomeDetailActivity.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.income;
+package com.chwl.app.module_hall.income;
 
 import android.content.Context;
 import android.content.Intent;
@@ -10,18 +10,18 @@ import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.netease.nim.uikit.StatusBarUtil;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.base.BaseMvpActivity;
-import com.yizhuan.habu.common.util.Utils;
-import com.yizhuan.habu.module_hall.income.adapter.IncomeDetailAdapter;
-import com.yizhuan.habu.module_hall.income.presenter.IncomeDetailPresenter;
-import com.yizhuan.habu.module_hall.income.view.IIncomeDetailView;
-import com.yizhuan.habu.ui.utils.ImageLoadUtils;
-import com.yizhuan.habu.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_library.base.factory.CreatePresenter;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseMvpActivity;
+import com.chwl.app.common.util.Utils;
+import com.chwl.app.module_hall.income.adapter.IncomeDetailAdapter;
+import com.chwl.app.module_hall.income.presenter.IncomeDetailPresenter;
+import com.chwl.app.module_hall.income.view.IIncomeDetailView;
+import com.chwl.app.ui.utils.ImageLoadUtils;
+import com.chwl.app.ui.widget.recyclerview.decoration.SpacingDecoration;
+import com.chwl.core.module_hall.income.bean.IncomeGiftInfo;
+import com.chwl.core.module_hall.income.bean.IncomeInfo;
+import com.chwl.library.base.factory.CreatePresenter;
+import com.chwl.library.utils.ResUtil;
 
 import java.util.List;
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/SingleRoomIncomeFragment.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/SingleRoomIncomeFragment.java
similarity index 83%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/SingleRoomIncomeFragment.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/income/SingleRoomIncomeFragment.java
index 6006ea487..236221043 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/SingleRoomIncomeFragment.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/SingleRoomIncomeFragment.java
@@ -1,19 +1,19 @@
-package com.yizhuan.habu.module_hall.income;
+package com.chwl.app.module_hall.income;
 
 import android.os.Bundle;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.base.BaseMvpFragment;
-import com.yizhuan.habu.module_hall.income.adapter.SingleRoomIncomeAdapter;
-import com.yizhuan.habu.module_hall.income.presenter.SingRoomIncomeFragmentPresenter;
-import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseMvpFragment;
+import com.chwl.app.module_hall.income.adapter.SingleRoomIncomeAdapter;
+import com.chwl.app.module_hall.income.presenter.SingRoomIncomeFragmentPresenter;
+import com.chwl.app.module_hall.income.view.ISingRoomIncomeView;
+import com.chwl.core.module_hall.income.bean.SingleRoomTotalIncomeInfo;
+import com.chwl.library.base.factory.CreatePresenter;
+import com.chwl.library.utils.ListUtils;
+import com.chwl.library.utils.ResUtil;
 
 /**
  * 日收入统计
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/adapter/ClanIncomeAdapter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/adapter/ClanIncomeAdapter.java
similarity index 86%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/adapter/ClanIncomeAdapter.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/income/adapter/ClanIncomeAdapter.java
index 1f696bb4c..9ddb88498 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/adapter/ClanIncomeAdapter.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/adapter/ClanIncomeAdapter.java
@@ -1,11 +1,11 @@
-package com.yizhuan.habu.module_hall.income.adapter;
+package com.chwl.app.module_hall.income.adapter;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.ui.utils.ImageLoadUtils;
-import com.yizhuan.xchat_android_core.module_hall.income.bean.ClanIncomeInfo;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.ui.utils.ImageLoadUtils;
+import com.chwl.core.module_hall.income.bean.ClanIncomeInfo;
+import com.chwl.library.utils.ResUtil;
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/adapter/HallIncomeAdapter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/adapter/HallIncomeAdapter.java
similarity index 85%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/adapter/HallIncomeAdapter.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/income/adapter/HallIncomeAdapter.java
index 183c94f24..d4160d0a3 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/adapter/HallIncomeAdapter.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/adapter/HallIncomeAdapter.java
@@ -1,10 +1,10 @@
-package com.yizhuan.habu.module_hall.income.adapter;
+package com.chwl.app.module_hall.income.adapter;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2;
-import com.yizhuan.xchat_android_core.module_hall.income.bean.HallIncomeInfo;
+import com.chwl.app.R;
+import com.chwl.app.ui.utils.ImageLoadUtilsV2;
+import com.chwl.core.module_hall.income.bean.HallIncomeInfo;
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/adapter/IncomeAdapter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/adapter/IncomeAdapter.java
similarity index 84%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/adapter/IncomeAdapter.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/income/adapter/IncomeAdapter.java
index 71940c030..e5425e6b2 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/adapter/IncomeAdapter.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/adapter/IncomeAdapter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.income.adapter;
+package com.chwl.app.module_hall.income.adapter;
 
 import android.content.Context;
 import android.text.TextUtils;
@@ -7,10 +7,10 @@ import androidx.annotation.Nullable;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.ui.utils.ImageLoadUtils;
-import com.yizhuan.xchat_android_core.module_hall.income.bean.IncomeInfo;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.ui.utils.ImageLoadUtils;
+import com.chwl.core.module_hall.income.bean.IncomeInfo;
+import com.chwl.library.utils.ResUtil;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/adapter/IncomeDetailAdapter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/adapter/IncomeDetailAdapter.java
similarity index 90%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/adapter/IncomeDetailAdapter.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/income/adapter/IncomeDetailAdapter.java
index c9a1d3164..0aac962c7 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/adapter/IncomeDetailAdapter.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/adapter/IncomeDetailAdapter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.income.adapter;
+package com.chwl.app.module_hall.income.adapter;
 
 import android.text.SpannableString;
 import android.text.style.ForegroundColorSpan;
@@ -8,10 +8,10 @@ import androidx.core.content.ContextCompat;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.ui.utils.ImageLoadUtils;
-import com.yizhuan.xchat_android_core.module_hall.income.bean.IncomeGiftInfo;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.ui.utils.ImageLoadUtils;
+import com.chwl.core.module_hall.income.bean.IncomeGiftInfo;
+import com.chwl.library.utils.ResUtil;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/adapter/LiveIncomeAdapter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/adapter/LiveIncomeAdapter.java
similarity index 73%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/adapter/LiveIncomeAdapter.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/income/adapter/LiveIncomeAdapter.java
index a730a138f..3c1f3ef76 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/adapter/LiveIncomeAdapter.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/adapter/LiveIncomeAdapter.java
@@ -1,13 +1,13 @@
-package com.yizhuan.habu.module_hall.income.adapter;
+package com.chwl.app.module_hall.income.adapter;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.ui.utils.ImageLoadUtils;
-import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2;
-import com.yizhuan.xchat_android_core.module_hall.income.bean.ClanIncomeInfo;
-import com.yizhuan.xchat_android_core.module_hall.income.bean.LiveIncomeInfo;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.ui.utils.ImageLoadUtils;
+import com.chwl.app.ui.utils.ImageLoadUtilsV2;
+import com.chwl.core.module_hall.income.bean.ClanIncomeInfo;
+import com.chwl.core.module_hall.income.bean.LiveIncomeInfo;
+import com.chwl.library.utils.ResUtil;
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/adapter/SingleRoomIncomeAdapter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/adapter/SingleRoomIncomeAdapter.java
similarity index 83%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/adapter/SingleRoomIncomeAdapter.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/income/adapter/SingleRoomIncomeAdapter.java
index 219caa64d..4fe070b7e 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/adapter/SingleRoomIncomeAdapter.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/adapter/SingleRoomIncomeAdapter.java
@@ -1,11 +1,11 @@
-package com.yizhuan.habu.module_hall.income.adapter;
+package com.chwl.app.module_hall.income.adapter;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.ui.utils.ImageLoadUtils;
-import com.yizhuan.xchat_android_core.module_hall.income.bean.SingleRoomIncomeInfo;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.ui.utils.ImageLoadUtils;
+import com.chwl.core.module_hall.income.bean.SingleRoomIncomeInfo;
+import com.chwl.library.utils.ResUtil;
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/presenter/ClanIncomeFragmentPresenter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/presenter/ClanIncomeFragmentPresenter.java
similarity index 78%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/presenter/ClanIncomeFragmentPresenter.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/income/presenter/ClanIncomeFragmentPresenter.java
index 2a454b961..361eeaf76 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/presenter/ClanIncomeFragmentPresenter.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/presenter/ClanIncomeFragmentPresenter.java
@@ -1,9 +1,9 @@
-package com.yizhuan.habu.module_hall.income.presenter;
+package com.chwl.app.module_hall.income.presenter;
 
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.habu.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.chwl.app.base.BaseMvpPresenter;
+import com.chwl.app.module_hall.income.view.IClanIncomeView;
+import com.chwl.core.module_hall.income.IncomeModel;
+import com.chwl.core.module_hall.income.bean.ClanTotalIncomeInfo;
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/presenter/ClanIncomePresenter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/presenter/ClanIncomePresenter.java
similarity index 90%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/presenter/ClanIncomePresenter.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/income/presenter/ClanIncomePresenter.java
index 53c4fb236..4eeab56dc 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/presenter/ClanIncomePresenter.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/presenter/ClanIncomePresenter.java
@@ -1,13 +1,13 @@
-package com.yizhuan.habu.module_hall.income.presenter;
+package com.chwl.app.module_hall.income.presenter;
 
 import android.text.SpannableString;
 import android.text.style.RelativeSizeSpan;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.habu.module_hall.income.view.IIncomeStatisticsView;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.TimeUtils;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseMvpPresenter;
+import com.chwl.app.module_hall.income.view.IIncomeStatisticsView;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.TimeUtils;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/presenter/HallIncomeFragmentPresenter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/presenter/HallIncomeFragmentPresenter.java
similarity index 78%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/presenter/HallIncomeFragmentPresenter.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/income/presenter/HallIncomeFragmentPresenter.java
index 75a3295ff..b3b57421b 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/presenter/HallIncomeFragmentPresenter.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/presenter/HallIncomeFragmentPresenter.java
@@ -1,9 +1,9 @@
-package com.yizhuan.habu.module_hall.income.presenter;
+package com.chwl.app.module_hall.income.presenter;
 
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.habu.module_hall.income.view.IHallIncomeView;
-import com.yizhuan.xchat_android_core.module_hall.income.IncomeModel;
-import com.yizhuan.xchat_android_core.module_hall.income.bean.HallTotalIncomeInfo;
+import com.chwl.app.base.BaseMvpPresenter;
+import com.chwl.app.module_hall.income.view.IHallIncomeView;
+import com.chwl.core.module_hall.income.IncomeModel;
+import com.chwl.core.module_hall.income.bean.HallTotalIncomeInfo;
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/presenter/IncomeDetailPresenter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/presenter/IncomeDetailPresenter.java
similarity index 78%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/presenter/IncomeDetailPresenter.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/income/presenter/IncomeDetailPresenter.java
index 1d27d6320..bf6c167a9 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/presenter/IncomeDetailPresenter.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/presenter/IncomeDetailPresenter.java
@@ -1,9 +1,9 @@
-package com.yizhuan.habu.module_hall.income.presenter;
+package com.chwl.app.module_hall.income.presenter;
 
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.habu.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.chwl.app.base.BaseMvpPresenter;
+import com.chwl.app.module_hall.income.view.IIncomeDetailView;
+import com.chwl.core.module_hall.income.IncomeModel;
+import com.chwl.core.module_hall.income.bean.IncomeGiftInfo;
 
 import java.util.List;
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/presenter/IncomePresenter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/presenter/IncomePresenter.java
similarity index 78%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/presenter/IncomePresenter.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/income/presenter/IncomePresenter.java
index e03ff2b56..ae25dbc5c 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/presenter/IncomePresenter.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/presenter/IncomePresenter.java
@@ -1,9 +1,9 @@
-package com.yizhuan.habu.module_hall.income.presenter;
+package com.chwl.app.module_hall.income.presenter;
 
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.habu.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.chwl.app.base.BaseMvpPresenter;
+import com.chwl.app.module_hall.income.view.IIncomeView;
+import com.chwl.core.module_hall.income.IncomeModel;
+import com.chwl.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/habu/module_hall/income/presenter/IncomeStatisticsPresenter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/presenter/IncomeStatisticsPresenter.java
similarity index 91%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/presenter/IncomeStatisticsPresenter.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/income/presenter/IncomeStatisticsPresenter.java
index 2faceb325..fff80537f 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/presenter/IncomeStatisticsPresenter.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/presenter/IncomeStatisticsPresenter.java
@@ -1,13 +1,13 @@
-package com.yizhuan.habu.module_hall.income.presenter;
+package com.chwl.app.module_hall.income.presenter;
 
 import android.text.SpannableString;
 import android.text.style.RelativeSizeSpan;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.habu.module_hall.income.view.IIncomeStatisticsView;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.TimeUtils;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseMvpPresenter;
+import com.chwl.app.module_hall.income.view.IIncomeStatisticsView;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.TimeUtils;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/presenter/LiveIncomeFragmentPresenter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/presenter/LiveIncomeFragmentPresenter.java
similarity index 71%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/presenter/LiveIncomeFragmentPresenter.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/income/presenter/LiveIncomeFragmentPresenter.java
index c538ccbcf..fa9c0e2b5 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/presenter/LiveIncomeFragmentPresenter.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/presenter/LiveIncomeFragmentPresenter.java
@@ -1,11 +1,11 @@
-package com.yizhuan.habu.module_hall.income.presenter;
+package com.chwl.app.module_hall.income.presenter;
 
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.habu.module_hall.income.view.IClanIncomeView;
-import com.yizhuan.habu.module_hall.income.view.ILiveIncomeView;
-import com.yizhuan.xchat_android_core.module_hall.income.IncomeModel;
-import com.yizhuan.xchat_android_core.module_hall.income.bean.ClanTotalIncomeInfo;
-import com.yizhuan.xchat_android_core.module_hall.income.bean.LiveTotalIncomeInfo;
+import com.chwl.app.base.BaseMvpPresenter;
+import com.chwl.app.module_hall.income.view.IClanIncomeView;
+import com.chwl.app.module_hall.income.view.ILiveIncomeView;
+import com.chwl.core.module_hall.income.IncomeModel;
+import com.chwl.core.module_hall.income.bean.ClanTotalIncomeInfo;
+import com.chwl.core.module_hall.income.bean.LiveTotalIncomeInfo;
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/presenter/RoomIncomePresenter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/presenter/RoomIncomePresenter.java
similarity index 93%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/presenter/RoomIncomePresenter.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/income/presenter/RoomIncomePresenter.java
index 0177e4bcf..9e32f1d1d 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/presenter/RoomIncomePresenter.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/presenter/RoomIncomePresenter.java
@@ -1,11 +1,11 @@
-package com.yizhuan.habu.module_hall.income.presenter;
+package com.chwl.app.module_hall.income.presenter;
 
 import android.text.SpannableString;
 import android.text.style.RelativeSizeSpan;
 
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.habu.module_hall.income.view.IIncomeStatisticsView;
-import com.yizhuan.xchat_android_library.utils.TimeUtils;
+import com.chwl.app.base.BaseMvpPresenter;
+import com.chwl.app.module_hall.income.view.IIncomeStatisticsView;
+import com.chwl.library.utils.TimeUtils;
 
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/presenter/SingRoomIncomeFragmentPresenter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/presenter/SingRoomIncomeFragmentPresenter.java
similarity index 79%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/presenter/SingRoomIncomeFragmentPresenter.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/income/presenter/SingRoomIncomeFragmentPresenter.java
index 5cf36d481..393b83908 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/presenter/SingRoomIncomeFragmentPresenter.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/presenter/SingRoomIncomeFragmentPresenter.java
@@ -1,9 +1,9 @@
-package com.yizhuan.habu.module_hall.income.presenter;
+package com.chwl.app.module_hall.income.presenter;
 
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.habu.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.chwl.app.base.BaseMvpPresenter;
+import com.chwl.app.module_hall.income.view.ISingRoomIncomeView;
+import com.chwl.core.module_hall.income.IncomeModel;
+import com.chwl.core.module_hall.income.bean.SingleRoomTotalIncomeInfo;
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/presenter/SingleRoomIncomePresenter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/presenter/SingleRoomIncomePresenter.java
similarity index 92%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/presenter/SingleRoomIncomePresenter.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/income/presenter/SingleRoomIncomePresenter.java
index 41a250049..3e68715e1 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/presenter/SingleRoomIncomePresenter.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/presenter/SingleRoomIncomePresenter.java
@@ -1,13 +1,13 @@
-package com.yizhuan.habu.module_hall.income.presenter;
+package com.chwl.app.module_hall.income.presenter;
 
 import android.text.SpannableString;
 import android.text.style.RelativeSizeSpan;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.habu.module_hall.income.view.IIncomeStatisticsView;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.TimeUtils;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseMvpPresenter;
+import com.chwl.app.module_hall.income.view.IIncomeStatisticsView;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.TimeUtils;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
diff --git a/app/src/module_labour_union/java/com/chwl/app/module_hall/income/view/IClanIncomeView.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/view/IClanIncomeView.java
new file mode 100644
index 000000000..8c155993f
--- /dev/null
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/view/IClanIncomeView.java
@@ -0,0 +1,10 @@
+package com.chwl.app.module_hall.income.view;
+
+import com.chwl.core.module_hall.income.bean.ClanTotalIncomeInfo;
+import com.chwl.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/chwl/app/module_hall/income/view/IHallIncomeView.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/view/IHallIncomeView.java
new file mode 100644
index 000000000..14ddaec57
--- /dev/null
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/view/IHallIncomeView.java
@@ -0,0 +1,10 @@
+package com.chwl.app.module_hall.income.view;
+
+import com.chwl.core.module_hall.income.bean.HallTotalIncomeInfo;
+import com.chwl.library.base.IMvpBaseView;
+
+public interface IHallIncomeView extends IMvpBaseView {
+
+    void incomeTotalSuccess(HallTotalIncomeInfo hallTotalIncomeInfo);
+    void incomeTotalFail(String message);
+}
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/view/IIncomeDetailView.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/view/IIncomeDetailView.java
similarity index 51%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/view/IIncomeDetailView.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/income/view/IIncomeDetailView.java
index a83030c74..961c428ef 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/view/IIncomeDetailView.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/view/IIncomeDetailView.java
@@ -1,7 +1,7 @@
-package com.yizhuan.habu.module_hall.income.view;
+package com.chwl.app.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.chwl.core.module_hall.income.bean.IncomeGiftInfo;
+import com.chwl.library.base.IMvpBaseView;
 
 import java.util.List;
 
diff --git a/app/src/module_labour_union/java/com/chwl/app/module_hall/income/view/IIncomeStatisticsView.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/view/IIncomeStatisticsView.java
new file mode 100644
index 000000000..c92850a67
--- /dev/null
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/view/IIncomeStatisticsView.java
@@ -0,0 +1,6 @@
+package com.chwl.app.module_hall.income.view;
+
+import com.chwl.library.base.IMvpBaseView;
+
+public interface IIncomeStatisticsView extends IMvpBaseView {
+}
diff --git a/app/src/module_labour_union/java/com/chwl/app/module_hall/income/view/IIncomeView.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/view/IIncomeView.java
new file mode 100644
index 000000000..1bb3303e7
--- /dev/null
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/view/IIncomeView.java
@@ -0,0 +1,10 @@
+package com.chwl.app.module_hall.income.view;
+
+import com.chwl.core.module_hall.income.bean.IncomeTotalInfo;
+import com.chwl.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/chwl/app/module_hall/income/view/ILiveIncomeView.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/view/ILiveIncomeView.java
new file mode 100644
index 000000000..3bff6fcc5
--- /dev/null
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/view/ILiveIncomeView.java
@@ -0,0 +1,11 @@
+package com.chwl.app.module_hall.income.view;
+
+import com.chwl.core.module_hall.income.bean.LiveTotalIncomeInfo;
+import com.chwl.library.base.IMvpBaseView;
+
+public interface ILiveIncomeView extends IMvpBaseView {
+
+    void incomeTotalSuccess(LiveTotalIncomeInfo liveTotalIncomeInfo);
+
+    void incomeTotalFail(String message);
+}
diff --git a/app/src/module_labour_union/java/com/chwl/app/module_hall/income/view/ISingRoomIncomeView.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/view/ISingRoomIncomeView.java
new file mode 100644
index 000000000..63f60c760
--- /dev/null
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/view/ISingRoomIncomeView.java
@@ -0,0 +1,10 @@
+package com.chwl.app.module_hall.income.view;
+
+import com.chwl.core.module_hall.income.bean.SingleRoomTotalIncomeInfo;
+import com.chwl.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/habu/module_hall/income/view/LiveIncomeFragment.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/view/LiveIncomeFragment.java
similarity index 83%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/view/LiveIncomeFragment.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/income/view/LiveIncomeFragment.java
index cebe5e5bf..d64924d43 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/view/LiveIncomeFragment.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/view/LiveIncomeFragment.java
@@ -1,18 +1,18 @@
-package com.yizhuan.habu.module_hall.income.view;
+package com.chwl.app.module_hall.income.view;
 
 import android.os.Bundle;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.base.BaseMvpFragment;
-import com.yizhuan.habu.module_hall.income.adapter.LiveIncomeAdapter;
-import com.yizhuan.habu.module_hall.income.presenter.LiveIncomeFragmentPresenter;
-import com.yizhuan.xchat_android_core.module_hall.income.bean.LiveTotalIncomeInfo;
-import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
-import com.yizhuan.xchat_android_library.utils.ListUtils;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseMvpFragment;
+import com.chwl.app.module_hall.income.adapter.LiveIncomeAdapter;
+import com.chwl.app.module_hall.income.presenter.LiveIncomeFragmentPresenter;
+import com.chwl.core.module_hall.income.bean.LiveTotalIncomeInfo;
+import com.chwl.library.base.factory.CreatePresenter;
+import com.chwl.library.utils.ListUtils;
+import com.chwl.library.utils.ResUtil;
 
 /**
  * 主播收入統計
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/secretcode/PwdCodeMgr.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/secretcode/PwdCodeMgr.java
similarity index 86%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/secretcode/PwdCodeMgr.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/secretcode/PwdCodeMgr.java
index 3cf9bfec1..f5208d44f 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/secretcode/PwdCodeMgr.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/secretcode/PwdCodeMgr.java
@@ -1,10 +1,10 @@
-package com.yizhuan.habu.module_hall.secretcode;
+package com.chwl.app.module_hall.secretcode;
 
 import android.text.TextUtils;
 
 import com.google.gson.Gson;
-import com.yizhuan.xchat_android_core.module_hall.secretcode.bean.SecretCodeInfo;
-import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils;
+import com.chwl.core.module_hall.secretcode.bean.SecretCodeInfo;
+import com.chwl.core.utils.SharedPreferenceUtils;
 
 /**
  * emoji 暗号的一个缓存处理，24小时刷新
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/HTeamDataManager.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/team/HTeamDataManager.java
similarity index 89%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/HTeamDataManager.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/team/HTeamDataManager.java
index bf95eaad4..3672b1b62 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/HTeamDataManager.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/team/HTeamDataManager.java
@@ -1,10 +1,10 @@
-package com.yizhuan.habu.module_hall.team;
+package com.chwl.app.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.chwl.core.module_hall.hall.bean.HTeamInfo;
 
 /**
  * 厅群信息的管理，只针对单个群信息
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/activity/CreateHallTeamActivity.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/team/activity/CreateHallTeamActivity.java
similarity index 88%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/activity/CreateHallTeamActivity.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/team/activity/CreateHallTeamActivity.java
index 71fb63a86..a9505c0d5 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/activity/CreateHallTeamActivity.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/team/activity/CreateHallTeamActivity.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.team.activity;
+package com.chwl.app.module_hall.team.activity;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -17,22 +17,22 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.coorchice.library.SuperTextView;
 import com.netease.nim.uikit.support.glide.GlideApp;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.base.BaseMvpTakePhotoActivity;
-import com.yizhuan.habu.base.list.BaseViewHolder;
-import com.yizhuan.habu.base.list.CommonAdapter;
-import com.yizhuan.habu.common.widget.CircleImageView;
-import com.yizhuan.habu.module_hall.team.presenter.CreateHallTeamPresenter;
-import com.yizhuan.habu.module_hall.team.view.ICreateHallTeamView;
-import com.yizhuan.habu.ui.utils.ImageLoadUtils;
-import com.yizhuan.habu.utils.KeyBoardUtils;
-import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamInfo;
-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.RxHelper;
-import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.widget.decoration.RowColumnDifItemDecoration;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseMvpTakePhotoActivity;
+import com.chwl.app.base.list.BaseViewHolder;
+import com.chwl.app.base.list.CommonAdapter;
+import com.chwl.app.common.widget.CircleImageView;
+import com.chwl.app.module_hall.team.presenter.CreateHallTeamPresenter;
+import com.chwl.app.module_hall.team.view.ICreateHallTeamView;
+import com.chwl.app.ui.utils.ImageLoadUtils;
+import com.chwl.app.utils.KeyBoardUtils;
+import com.chwl.core.module_hall.hall.bean.HTeamInfo;
+import com.chwl.core.module_hall.hall.bean.MemberInfo;
+import com.chwl.core.module_hall.team.HTeamModel;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.base.factory.CreatePresenter;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.widget.decoration.RowColumnDifItemDecoration;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/activity/HTeamMemberListActivity.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/team/activity/HTeamMemberListActivity.java
similarity index 93%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/activity/HTeamMemberListActivity.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/team/activity/HTeamMemberListActivity.java
index e39f62253..53d4054c6 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/activity/HTeamMemberListActivity.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/team/activity/HTeamMemberListActivity.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.team.activity;
+package com.chwl.app.module_hall.team.activity;
 
 import android.app.Activity;
 import android.content.Context;
@@ -11,26 +11,26 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.netease.nim.uikit.business.ait.AitContactType;
 import com.netease.nim.uikit.business.ait.selector.AitContactSelectorActivity;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.UIHelper;
-import com.yizhuan.habu.avroom.widget.MessageView;
-import com.yizhuan.habu.base.BaseViewBindingActivity;
-import com.yizhuan.habu.base.TitleBar;
-import com.yizhuan.habu.base.list.BaseViewHolder;
-import com.yizhuan.habu.base.list.CommonAdapter;
-import com.yizhuan.habu.base.list.IRecyclerListener;
-import com.yizhuan.habu.base.list.LineColorDecoration;
-import com.yizhuan.habu.common.widget.dialog.DialogManager;
-import com.yizhuan.habu.databinding.ActivityHteamMemberListBinding;
-import com.yizhuan.habu.module_hall.HallConstant;
-import com.yizhuan.habu.module_hall.team.adapter.HTeamMemberListAdapter;
-import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.UIHelper;
+import com.chwl.app.avroom.widget.MessageView;
+import com.chwl.app.base.BaseViewBindingActivity;
+import com.chwl.app.base.TitleBar;
+import com.chwl.app.base.list.BaseViewHolder;
+import com.chwl.app.base.list.CommonAdapter;
+import com.chwl.app.base.list.IRecyclerListener;
+import com.chwl.app.base.list.LineColorDecoration;
+import com.chwl.app.common.widget.dialog.DialogManager;
+import com.chwl.app.databinding.ActivityHteamMemberListBinding;
+import com.chwl.app.module_hall.HallConstant;
+import com.chwl.app.module_hall.team.adapter.HTeamMemberListAdapter;
+import com.chwl.app.team.bean.NimTeamMember;
+import com.chwl.core.module_hall.hall.bean.HTeamInfo;
+import com.chwl.core.module_hall.hall.bean.HTeamMember;
+import com.chwl.core.module_hall.team.HTeamModel;
+import com.chwl.core.module_hall.team.event.HteamMemberNumChangeEvent;
+import com.chwl.core.utils.net.BeanObserver;
+import com.chwl.library.utils.ResUtil;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/activity/HallTeamMessageActivity.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/team/activity/HallTeamMessageActivity.java
similarity index 91%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/activity/HallTeamMessageActivity.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/team/activity/HallTeamMessageActivity.java
index 2fd843687..ea8dea0c6 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/activity/HallTeamMessageActivity.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/team/activity/HallTeamMessageActivity.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.team.activity;
+package com.chwl.app.module_hall.team.activity;
 
 import android.content.Context;
 import android.content.Intent;
@@ -26,23 +26,23 @@ 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.habu.R;
-import com.yizhuan.habu.module_hall.team.HTeamDataManager;
-import com.yizhuan.habu.module_hall.team.adapter.HTeamMemberListAdapter;
-import com.yizhuan.habu.team.view.NimTeamManagementActivity;
-import com.yizhuan.habu.team.view.NimTeamMessageFragment;
-import com.yizhuan.habu.team.viewmodel.TeamVM;
-import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.module_hall.team.HTeamDataManager;
+import com.chwl.app.module_hall.team.adapter.HTeamMemberListAdapter;
+import com.chwl.app.team.view.NimTeamManagementActivity;
+import com.chwl.app.team.view.NimTeamMessageFragment;
+import com.chwl.app.team.viewmodel.TeamVM;
+import com.chwl.app.ui.im.avtivity.BaseMessageActivity;
+import com.chwl.core.initial.InitialModel;
+import com.chwl.core.initial.bean.InitInfo;
+import com.chwl.core.level.UserLevelVo;
+import com.chwl.core.module_hall.hall.bean.HTeamInfo;
+import com.chwl.core.module_hall.team.HTeamModel;
+import com.chwl.core.team.bean.TeamEvent;
+import com.chwl.core.user.UserModel;
+import com.chwl.core.user.bean.UserInfo;
+import com.chwl.library.rxbus.RxBus;
+import com.chwl.library.utils.ResUtil;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/activity/SelectTeamMemberActivity.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/team/activity/SelectTeamMemberActivity.java
similarity index 86%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/activity/SelectTeamMemberActivity.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/team/activity/SelectTeamMemberActivity.java
index c022c9748..12b1a52d1 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/activity/SelectTeamMemberActivity.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/team/activity/SelectTeamMemberActivity.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.team.activity;
+package com.chwl.app.module_hall.team.activity;
 
 import android.content.Context;
 import android.content.Intent;
@@ -9,23 +9,23 @@ import android.widget.ImageView;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.base.BaseViewBindingActivity;
-import com.yizhuan.habu.base.TitleBar;
-import com.yizhuan.habu.base.list.BaseViewHolder;
-import com.yizhuan.habu.base.list.CommonAdapter;
-import com.yizhuan.habu.base.list.IRecyclerListener;
-import com.yizhuan.habu.base.list.LineColorDecoration;
-import com.yizhuan.habu.databinding.ActivitySelectGroupMemberBinding;
-import com.yizhuan.habu.module_hall.HallConstant;
-import com.yizhuan.habu.module_hall.HallDataManager;
-import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseViewBindingActivity;
+import com.chwl.app.base.TitleBar;
+import com.chwl.app.base.list.BaseViewHolder;
+import com.chwl.app.base.list.CommonAdapter;
+import com.chwl.app.base.list.IRecyclerListener;
+import com.chwl.app.base.list.LineColorDecoration;
+import com.chwl.app.databinding.ActivitySelectGroupMemberBinding;
+import com.chwl.app.module_hall.HallConstant;
+import com.chwl.app.module_hall.HallDataManager;
+import com.chwl.app.module_hall.team.adapter.SelectTeamMemberAdapter;
+import com.chwl.core.module_hall.hall.HallModel;
+import com.chwl.core.module_hall.hall.bean.ListMemberInfo;
+import com.chwl.core.module_hall.hall.bean.MemberInfo;
+import com.chwl.core.module_hall.team.HTeamModel;
+import com.chwl.core.utils.net.BeanObserver;
+import com.chwl.library.utils.ResUtil;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/activity/TeamEditActivity.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/team/activity/TeamEditActivity.java
similarity index 87%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/activity/TeamEditActivity.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/team/activity/TeamEditActivity.java
index 49e459b92..b0a2c6def 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/activity/TeamEditActivity.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/team/activity/TeamEditActivity.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.team.activity;
+package com.chwl.app.module_hall.team.activity;
 
 import android.content.Context;
 import android.content.Intent;
@@ -6,17 +6,17 @@ import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.View;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.base.BaseViewBindingActivity;
-import com.yizhuan.habu.base.TitleBar;
-import com.yizhuan.habu.databinding.ActivityTeamEditBinding;
-import com.yizhuan.habu.module_hall.HallConstant;
-import com.yizhuan.habu.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.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseViewBindingActivity;
+import com.chwl.app.base.TitleBar;
+import com.chwl.app.databinding.ActivityTeamEditBinding;
+import com.chwl.app.module_hall.HallConstant;
+import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
+import com.chwl.core.module_hall.hall.bean.HTeamInfo;
+import com.chwl.core.module_hall.team.HTeamModel;
+import com.chwl.core.utils.net.BeanObserver;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.utils.ResUtil;
 
 /**
  * 群公告，群名称编辑
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/activity/TeamInfoShowActivity.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/team/activity/TeamInfoShowActivity.java
similarity index 91%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/activity/TeamInfoShowActivity.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/team/activity/TeamInfoShowActivity.java
index 4b02b3cc3..5a4b8c945 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/activity/TeamInfoShowActivity.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/team/activity/TeamInfoShowActivity.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.module_hall.team.activity;
+package com.chwl.app.module_hall.team.activity;
 
 import android.content.Context;
 import android.content.Intent;
@@ -13,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.habu.R;
-import com.yizhuan.habu.base.BaseMvpTakePhotoActivity;
-import com.yizhuan.habu.common.widget.CircleImageView;
-import com.yizhuan.habu.common.widget.TutuSwitchView;
-import com.yizhuan.habu.common.widget.dialog.DialogManager;
-import com.yizhuan.habu.module_hall.team.adapter.HTeamMemberListAdapter;
-import com.yizhuan.habu.module_hall.team.presenter.TeamInfoShowPresenter;
-import com.yizhuan.habu.module_hall.team.view.ITeamInfoShowView;
-import com.yizhuan.habu.module_hall.team.view.widget.GridMemberView;
-import com.yizhuan.habu.ui.utils.ImageLoadUtils;
-import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseMvpTakePhotoActivity;
+import com.chwl.app.common.widget.CircleImageView;
+import com.chwl.app.common.widget.TutuSwitchView;
+import com.chwl.app.common.widget.dialog.DialogManager;
+import com.chwl.app.module_hall.team.adapter.HTeamMemberListAdapter;
+import com.chwl.app.module_hall.team.presenter.TeamInfoShowPresenter;
+import com.chwl.app.module_hall.team.view.ITeamInfoShowView;
+import com.chwl.app.module_hall.team.view.widget.GridMemberView;
+import com.chwl.app.ui.utils.ImageLoadUtils;
+import com.chwl.app.ui.widget.ButtonItem;
+import com.chwl.core.module_hall.hall.bean.HTeamInfo;
+import com.chwl.core.module_hall.hall.bean.HTeamMember;
+import com.chwl.core.module_hall.hall.bean.RoleType;
+import com.chwl.core.module_hall.team.HTeamModel;
+import com.chwl.core.module_hall.team.bean.HTeamType;
+import com.chwl.core.module_hall.team.event.HteamInfoUpdateInfoEvent;
+import com.chwl.core.utils.net.BeanObserver;
+import com.chwl.library.base.factory.CreatePresenter;
+import com.chwl.library.utils.ResUtil;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/adapter/HTeamMemberListAdapter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/team/adapter/HTeamMemberListAdapter.java
similarity index 90%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/adapter/HTeamMemberListAdapter.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/team/adapter/HTeamMemberListAdapter.java
index 3a983c757..1254b272b 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/adapter/HTeamMemberListAdapter.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/team/adapter/HTeamMemberListAdapter.java
@@ -1,15 +1,15 @@
-package com.yizhuan.habu.module_hall.team.adapter;
+package com.chwl.app.module_hall.team.adapter;
 
 import android.view.View;
 import android.widget.ImageView;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.base.list.BaseViewHolder;
-import com.yizhuan.habu.base.list.CommonAdapter;
-import com.yizhuan.habu.ui.utils.ImageLoadUtils;
-import com.yizhuan.habu.ui.widget.UserInfoView;
-import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamMember;
-import com.yizhuan.xchat_android_core.user.UserModel;
+import com.chwl.app.R;
+import com.chwl.app.base.list.BaseViewHolder;
+import com.chwl.app.base.list.CommonAdapter;
+import com.chwl.app.ui.utils.ImageLoadUtils;
+import com.chwl.app.ui.widget.UserInfoView;
+import com.chwl.core.module_hall.hall.bean.HTeamMember;
+import com.chwl.core.user.UserModel;
 
 /**
  * 厅群成员列表
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/adapter/SelectTeamMemberAdapter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/team/adapter/SelectTeamMemberAdapter.java
similarity index 74%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/adapter/SelectTeamMemberAdapter.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/team/adapter/SelectTeamMemberAdapter.java
index 55ae21d2e..5f1ea1da1 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/adapter/SelectTeamMemberAdapter.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/team/adapter/SelectTeamMemberAdapter.java
@@ -1,16 +1,16 @@
-package com.yizhuan.habu.module_hall.team.adapter;
+package com.chwl.app.module_hall.team.adapter;
 
 import android.view.View;
 import android.widget.ImageView;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.base.list.BaseViewHolder;
-import com.yizhuan.habu.base.list.CommonAdapter;
-import com.yizhuan.habu.ui.utils.ImageLoadUtils;
-import com.yizhuan.habu.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.chwl.app.R;
+import com.chwl.app.base.list.BaseViewHolder;
+import com.chwl.app.base.list.CommonAdapter;
+import com.chwl.app.ui.utils.ImageLoadUtils;
+import com.chwl.app.ui.widget.UserInfoView;
+import com.chwl.core.module_hall.hall.bean.MemberInfo;
+import com.chwl.core.module_hall.hall.bean.RoleType;
+import com.chwl.core.user.UserModel;
 
 /**
  * 选择厅成员
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/presenter/CreateHallTeamPresenter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/team/presenter/CreateHallTeamPresenter.java
similarity index 69%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/presenter/CreateHallTeamPresenter.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/team/presenter/CreateHallTeamPresenter.java
index 3b3e785f7..1db457d65 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/presenter/CreateHallTeamPresenter.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/team/presenter/CreateHallTeamPresenter.java
@@ -1,13 +1,13 @@
-package com.yizhuan.habu.module_hall.team.presenter;
+package com.chwl.app.module_hall.team.presenter;
 
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.habu.module_hall.HallDataManager;
-import com.yizhuan.habu.module_hall.team.view.ICreateHallTeamView;
-import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamInfo;
-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.yizhuan.xchat_android_library.base.PresenterEvent;
+import com.chwl.app.base.BaseMvpPresenter;
+import com.chwl.app.module_hall.HallDataManager;
+import com.chwl.app.module_hall.team.view.ICreateHallTeamView;
+import com.chwl.core.module_hall.hall.bean.HTeamInfo;
+import com.chwl.core.module_hall.hall.bean.MemberInfo;
+import com.chwl.core.module_hall.team.HTeamModel;
+import com.chwl.core.utils.net.BeanObserver;
+import com.chwl.library.base.PresenterEvent;
 
 import java.util.List;
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/presenter/TeamInfoShowPresenter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/team/presenter/TeamInfoShowPresenter.java
similarity index 78%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/presenter/TeamInfoShowPresenter.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/team/presenter/TeamInfoShowPresenter.java
index 4e7178df0..78f254067 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/presenter/TeamInfoShowPresenter.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/team/presenter/TeamInfoShowPresenter.java
@@ -1,11 +1,11 @@
-package com.yizhuan.habu.module_hall.team.presenter;
+package com.chwl.app.module_hall.team.presenter;
 
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.habu.module_hall.team.view.ITeamInfoShowView;
-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_library.base.PresenterEvent;
+import com.chwl.app.base.BaseMvpPresenter;
+import com.chwl.app.module_hall.team.view.ITeamInfoShowView;
+import com.chwl.core.module_hall.hall.bean.HTeamInfo;
+import com.chwl.core.module_hall.team.HTeamModel;
+import com.chwl.core.utils.net.BeanObserver;
+import com.chwl.library.base.PresenterEvent;
 
 /**
  *
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/view/ICreateHallTeamView.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/team/view/ICreateHallTeamView.java
similarity index 53%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/view/ICreateHallTeamView.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/team/view/ICreateHallTeamView.java
index 397c9aa3e..bb77c5347 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/view/ICreateHallTeamView.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/team/view/ICreateHallTeamView.java
@@ -1,7 +1,7 @@
-package com.yizhuan.habu.module_hall.team.view;
+package com.chwl.app.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.chwl.core.module_hall.hall.bean.HTeamInfo;
+import com.chwl.library.base.IMvpBaseView;
 
 /**
  *
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/view/ITeamInfoShowView.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/team/view/ITeamInfoShowView.java
similarity index 62%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/view/ITeamInfoShowView.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/team/view/ITeamInfoShowView.java
index 72b5fe529..c11537805 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/view/ITeamInfoShowView.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/team/view/ITeamInfoShowView.java
@@ -1,7 +1,7 @@
-package com.yizhuan.habu.module_hall.team.view;
+package com.chwl.app.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.chwl.core.module_hall.hall.bean.HTeamInfo;
+import com.chwl.library.base.IMvpBaseView;
 
 /**
  * Created by lvzebiao on 2019/1/3.
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/view/widget/GridMemberView.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/team/view/widget/GridMemberView.java
similarity index 86%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/view/widget/GridMemberView.java
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/team/view/widget/GridMemberView.java
index fe8c4aa39..1d02bb4f5 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/team/view/widget/GridMemberView.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/team/view/widget/GridMemberView.java
@@ -1,13 +1,13 @@
-package com.yizhuan.habu.module_hall.team.view.widget;
+package com.chwl.app.module_hall.team.view.widget;
 
 import android.content.Context;
 import android.util.AttributeSet;
 
 import com.google.android.flexbox.FlexboxLayout;
-import com.yizhuan.habu.common.widget.CircleImageView;
-import com.yizhuan.habu.ui.utils.ImageLoadUtils;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil;
-import com.yizhuan.xchat_android_library.utils.ListUtils;
+import com.chwl.app.common.widget.CircleImageView;
+import com.chwl.app.ui.utils.ImageLoadUtils;
+import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
+import com.chwl.library.utils.ListUtils;
 
 import java.util.List;
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/viewmodel/AssociationViewModel.kt b/app/src/module_labour_union/java/com/chwl/app/module_hall/viewmodel/AssociationViewModel.kt
similarity index 82%
rename from app/src/module_labour_union/java/com/yizhuan/habu/module_hall/viewmodel/AssociationViewModel.kt
rename to app/src/module_labour_union/java/com/chwl/app/module_hall/viewmodel/AssociationViewModel.kt
index 41613a69d..96756b866 100644
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/viewmodel/AssociationViewModel.kt
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/viewmodel/AssociationViewModel.kt
@@ -1,11 +1,11 @@
-package com.yizhuan.habu.module_hall.viewmodel
+package com.chwl.app.module_hall.viewmodel
 
 import androidx.lifecycle.MutableLiveData
-import com.yizhuan.habu.base.BaseViewModel
-import com.yizhuan.xchat_android_core.association.bean.ClanListInfo
-import com.yizhuan.xchat_android_core.association.bean.HallListInfo
-import com.yizhuan.xchat_android_core.association.bean.MemberExchangeInfo
-import com.yizhuan.xchat_android_core.association.model.AssociationModel
+import com.chwl.app.base.BaseViewModel
+import com.chwl.core.association.bean.ClanListInfo
+import com.chwl.core.association.bean.HallListInfo
+import com.chwl.core.association.bean.MemberExchangeInfo
+import com.chwl.core.association.model.AssociationModel
 
 class AssociationViewModel : BaseViewModel() {
 
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/presenter/AddMemberPresenter.java b/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/presenter/AddMemberPresenter.java
deleted file mode 100644
index 764bde8a9..000000000
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/presenter/AddMemberPresenter.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.yizhuan.habu.module_hall.hall.presenter;
-
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.habu.module_hall.hall.view.IAddMemberView;
-
-public class AddMemberPresenter extends BaseMvpPresenter {
-}
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/IAddMemberView.java b/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/IAddMemberView.java
deleted file mode 100644
index 1ed0f2282..000000000
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/hall/view/IAddMemberView.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.yizhuan.habu.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/habu/module_hall/income/view/IClanIncomeView.java b/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/view/IClanIncomeView.java
deleted file mode 100644
index 7c119e95f..000000000
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/view/IClanIncomeView.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.yizhuan.habu.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/habu/module_hall/income/view/IHallIncomeView.java b/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/view/IHallIncomeView.java
deleted file mode 100644
index 1e9b37366..000000000
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/view/IHallIncomeView.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.yizhuan.habu.module_hall.income.view;
-
-import com.yizhuan.xchat_android_core.module_hall.income.bean.HallTotalIncomeInfo;
-import com.yizhuan.xchat_android_library.base.IMvpBaseView;
-
-public interface IHallIncomeView extends IMvpBaseView {
-
-    void incomeTotalSuccess(HallTotalIncomeInfo hallTotalIncomeInfo);
-    void incomeTotalFail(String message);
-}
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/view/IIncomeStatisticsView.java b/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/view/IIncomeStatisticsView.java
deleted file mode 100644
index 400b2e1b4..000000000
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/view/IIncomeStatisticsView.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.yizhuan.habu.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/habu/module_hall/income/view/IIncomeView.java b/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/view/IIncomeView.java
deleted file mode 100644
index 524204952..000000000
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/view/IIncomeView.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.yizhuan.habu.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/habu/module_hall/income/view/ILiveIncomeView.java b/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/view/ILiveIncomeView.java
deleted file mode 100644
index e94b3274b..000000000
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/view/ILiveIncomeView.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.yizhuan.habu.module_hall.income.view;
-
-import com.yizhuan.xchat_android_core.module_hall.income.bean.LiveTotalIncomeInfo;
-import com.yizhuan.xchat_android_library.base.IMvpBaseView;
-
-public interface ILiveIncomeView extends IMvpBaseView {
-
-    void incomeTotalSuccess(LiveTotalIncomeInfo liveTotalIncomeInfo);
-
-    void incomeTotalFail(String message);
-}
diff --git a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/view/ISingRoomIncomeView.java b/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/view/ISingRoomIncomeView.java
deleted file mode 100644
index 46d0a04b1..000000000
--- a/app/src/module_labour_union/java/com/yizhuan/habu/module_hall/income/view/ISingRoomIncomeView.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.yizhuan.habu.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 0b0e2e202..04acc43b9 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 20ea28790..b89248205 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 7141433ea..81645819f 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 b52187dc9..c6483de7a 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 3d3d3ec7c..fc0164770 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 d9839bf2a..90e24a791 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.chwl.app.module_hall.hall.activity.ModuleHallActivity">
 
     
+        tools:context="com.chwl.app.module_hall.hall.activity.ModuleHallActivity">
 
         
 
 
-                
+    tools:context="com.chwl.app.module_hall.hall.activity.ModuleHallActivity">
 
     
+        tools:context="com.chwl.app.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_room_income.xml b/app/src/module_labour_union/res/layout/activity_room_income.xml
index 3cd2cff27..a559ecfc7 100644
--- a/app/src/module_labour_union/res/layout/activity_room_income.xml
+++ b/app/src/module_labour_union/res/layout/activity_room_income.xml
@@ -7,13 +7,13 @@
     android:background="@color/bg_normal_1c1b22"
     android:orientation="vertical">
 
-    
 
-    
 
-    
@@ -22,7 +22,7 @@
         android:layout_height="@dimen/dp_30"
         tools:text="@string/layout_activity_select_group_member_01" />
 
-    
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 a7a80e34b..48845ab43 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" />
 
-                
             
 
-            
             
 
-            
 
-                
 
-    
 
-    
 
-    
 
-            
 
-    
 
-    
 
-    
@@ -15,6 +15,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/fragment_day_income_old.xml b/app/src/module_labour_union/res/layout/fragment_day_income_old.xml
index 36ef2fd2e..c14347f62 100644
--- a/app/src/module_labour_union/res/layout/fragment_day_income_old.xml
+++ b/app/src/module_labour_union/res/layout/fragment_day_income_old.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/module_labour_union/res/layout/fragment_hall_income.xml b/app/src/module_labour_union/res/layout/fragment_hall_income.xml
index 4eae36b6f..63102c1b5 100644
--- a/app/src/module_labour_union/res/layout/fragment_hall_income.xml
+++ b/app/src/module_labour_union/res/layout/fragment_hall_income.xml
@@ -32,7 +32,7 @@
 
     
 
-    
@@ -42,6 +42,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/item_auth_setting.xml b/app/src/module_labour_union/res/layout/item_auth_setting.xml
index 5ee809d4f..6230442aa 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 87c7056a5..49947cace 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.chwl.core.user.bean.LiveTagInfo.LiveSkillVoListBean" />
     
 
     
 
-    
 
-    
 
-    
 
-        
 
-    
 
-     {
 
diff --git a/app/src/module_mentoring_relationship/java/com/yizhuan/habu/mentoring_relationship/adapter/ResultMarqueeAdapter.java b/app/src/module_mentoring_relationship/java/com/chwl/app/mentoring_relationship/adapter/ResultMarqueeAdapter.java
similarity index 90%
rename from app/src/module_mentoring_relationship/java/com/yizhuan/habu/mentoring_relationship/adapter/ResultMarqueeAdapter.java
rename to app/src/module_mentoring_relationship/java/com/chwl/app/mentoring_relationship/adapter/ResultMarqueeAdapter.java
index ef4070bc9..6ac261dd2 100644
--- a/app/src/module_mentoring_relationship/java/com/yizhuan/habu/mentoring_relationship/adapter/ResultMarqueeAdapter.java
+++ b/app/src/module_mentoring_relationship/java/com/chwl/app/mentoring_relationship/adapter/ResultMarqueeAdapter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.mentoring_relationship.adapter;
+package com.chwl.app.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.habu.R;
-import com.yizhuan.habu.ui.widget.marqueeview.BetterMarqueeView;
-import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MentoringResultMarqueeInfo;
+import com.chwl.app.R;
+import com.chwl.app.ui.widget.marqueeview.BetterMarqueeView;
+import com.chwl.core.mentoring_relationship.bean.MentoringResultMarqueeInfo;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/module_mentoring_relationship/java/com/yizhuan/habu/mentoring_relationship/dialog/BuildMentoringRelationshipSuccessDialog.java b/app/src/module_mentoring_relationship/java/com/chwl/app/mentoring_relationship/dialog/BuildMentoringRelationshipSuccessDialog.java
similarity index 91%
rename from app/src/module_mentoring_relationship/java/com/yizhuan/habu/mentoring_relationship/dialog/BuildMentoringRelationshipSuccessDialog.java
rename to app/src/module_mentoring_relationship/java/com/chwl/app/mentoring_relationship/dialog/BuildMentoringRelationshipSuccessDialog.java
index bcfaad65b..323b6b5ee 100644
--- a/app/src/module_mentoring_relationship/java/com/yizhuan/habu/mentoring_relationship/dialog/BuildMentoringRelationshipSuccessDialog.java
+++ b/app/src/module_mentoring_relationship/java/com/chwl/app/mentoring_relationship/dialog/BuildMentoringRelationshipSuccessDialog.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.mentoring_relationship.dialog;
+package com.chwl.app.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.habu.R;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil;
+import com.chwl.app.R;
+import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
 
 public class BuildMentoringRelationshipSuccessDialog extends DialogFragment {
 
diff --git a/app/src/module_mentoring_relationship/java/com/yizhuan/habu/mentoring_relationship/dialog/GrabApprenticesNoticeDialog.java b/app/src/module_mentoring_relationship/java/com/chwl/app/mentoring_relationship/dialog/GrabApprenticesNoticeDialog.java
similarity index 93%
rename from app/src/module_mentoring_relationship/java/com/yizhuan/habu/mentoring_relationship/dialog/GrabApprenticesNoticeDialog.java
rename to app/src/module_mentoring_relationship/java/com/chwl/app/mentoring_relationship/dialog/GrabApprenticesNoticeDialog.java
index cf6cd5910..2336964f9 100644
--- a/app/src/module_mentoring_relationship/java/com/yizhuan/habu/mentoring_relationship/dialog/GrabApprenticesNoticeDialog.java
+++ b/app/src/module_mentoring_relationship/java/com/chwl/app/mentoring_relationship/dialog/GrabApprenticesNoticeDialog.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.mentoring_relationship.dialog;
+package com.chwl.app.mentoring_relationship.dialog;
 
 import android.annotation.SuppressLint;
 import android.app.Dialog;
@@ -22,11 +22,11 @@ import androidx.fragment.app.FragmentManager;
 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.habu.MainActivity;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.avroom.activity.AVRoomActivity;
-import com.yizhuan.habu.common.permission.StatusBarCompat;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil;
+import com.chwl.app.MainActivity;
+import com.chwl.app.R;
+import com.chwl.app.avroom.activity.AVRoomActivity;
+import com.chwl.app.common.permission.StatusBarCompat;
+import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/app/src/module_mentoring_relationship/java/com/yizhuan/habu/mentoring_relationship/dialog/ReleaseMentoringRelationshipSuccessDialog.java b/app/src/module_mentoring_relationship/java/com/chwl/app/mentoring_relationship/dialog/ReleaseMentoringRelationshipSuccessDialog.java
similarity index 92%
rename from app/src/module_mentoring_relationship/java/com/yizhuan/habu/mentoring_relationship/dialog/ReleaseMentoringRelationshipSuccessDialog.java
rename to app/src/module_mentoring_relationship/java/com/chwl/app/mentoring_relationship/dialog/ReleaseMentoringRelationshipSuccessDialog.java
index d9c168a8c..b8f0c0640 100644
--- a/app/src/module_mentoring_relationship/java/com/yizhuan/habu/mentoring_relationship/dialog/ReleaseMentoringRelationshipSuccessDialog.java
+++ b/app/src/module_mentoring_relationship/java/com/chwl/app/mentoring_relationship/dialog/ReleaseMentoringRelationshipSuccessDialog.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.mentoring_relationship.dialog;
+package com.chwl.app.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.habu.R;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil;
+import com.chwl.app.R;
+import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
 
 public class ReleaseMentoringRelationshipSuccessDialog extends DialogFragment implements View.OnClickListener {
 
diff --git a/app/src/module_mentoring_relationship/java/com/yizhuan/habu/mentoring_relationship/presenter/MentoringRelationshipPresenter.java b/app/src/module_mentoring_relationship/java/com/chwl/app/mentoring_relationship/presenter/MentoringRelationshipPresenter.java
similarity index 89%
rename from app/src/module_mentoring_relationship/java/com/yizhuan/habu/mentoring_relationship/presenter/MentoringRelationshipPresenter.java
rename to app/src/module_mentoring_relationship/java/com/chwl/app/mentoring_relationship/presenter/MentoringRelationshipPresenter.java
index c8dbb6970..21592a1eb 100644
--- a/app/src/module_mentoring_relationship/java/com/yizhuan/habu/mentoring_relationship/presenter/MentoringRelationshipPresenter.java
+++ b/app/src/module_mentoring_relationship/java/com/chwl/app/mentoring_relationship/presenter/MentoringRelationshipPresenter.java
@@ -1,15 +1,15 @@
-package com.yizhuan.habu.mentoring_relationship.presenter;
+package com.chwl.app.mentoring_relationship.presenter;
 
 import android.annotation.SuppressLint;
 
-import com.yizhuan.habu.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.chwl.app.base.BaseMvpPresenter;
+import com.chwl.core.Constants;
+import com.chwl.core.exception.FailReasonException;
+import com.chwl.core.mentoring_relationship.bean.MentoringRankingDataInfo;
+import com.chwl.core.mentoring_relationship.model.MentoringRelationshipModel;
+import com.chwl.core.mentoring_relationship.view.IMentoringRelationshipView;
+import com.chwl.library.base.PresenterEvent;
+import com.chwl.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 6ce72c010..5b1fd532f 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/habu/miniworld/activity/AllTopicActivity.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/activity/AllTopicActivity.java
similarity index 81%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/activity/AllTopicActivity.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/activity/AllTopicActivity.java
index f2e053d37..57f81a9b9 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/activity/AllTopicActivity.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/activity/AllTopicActivity.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.miniworld.activity;
+package com.chwl.app.miniworld.activity;
 
 import android.content.Context;
 import android.content.Intent;
@@ -11,25 +11,25 @@ import androidx.fragment.app.Fragment;
 import androidx.viewpager.widget.ViewPager;
 
 import com.netease.nim.uikit.StatusBarUtil;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.avroom.adapter.RoomContributeListAdapter;
-import com.yizhuan.habu.base.BaseMvpActivity;
-import com.yizhuan.habu.miniworld.fragment.MiniWorldCategoryFragment;
-import com.yizhuan.habu.miniworld.presenter.MiniWorldPresenter;
-import com.yizhuan.habu.miniworld.view.IMiniWorldView;
-import com.yizhuan.habu.ui.widget.magicindicator.MagicIndicator;
-import com.yizhuan.habu.ui.widget.magicindicator.ViewPagerHelper;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator;
-import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.avroom.adapter.RoomContributeListAdapter;
+import com.chwl.app.base.BaseMvpActivity;
+import com.chwl.app.miniworld.fragment.MiniWorldCategoryFragment;
+import com.chwl.app.miniworld.presenter.MiniWorldPresenter;
+import com.chwl.app.miniworld.view.IMiniWorldView;
+import com.chwl.app.ui.widget.magicindicator.MagicIndicator;
+import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper;
+import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
+import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator;
+import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter;
+import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator;
+import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView;
+import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator;
+import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.titles.SimplePagerTitleView;
+import com.chwl.core.miniworld.bean.MiniWorldCategoryInfo;
+import com.chwl.library.base.factory.CreatePresenter;
+import com.chwl.library.utils.ListUtils;
+import com.chwl.library.utils.ResUtil;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/activity/AudioPartyDialog.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/activity/AudioPartyDialog.java
similarity index 92%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/activity/AudioPartyDialog.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/activity/AudioPartyDialog.java
index 3abcddb73..9d4fd3598 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/activity/AudioPartyDialog.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/activity/AudioPartyDialog.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.miniworld.activity;
+package com.chwl.app.miniworld.activity;
 
 import android.app.Activity;
 import android.app.Dialog;
@@ -22,19 +22,19 @@ import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.avroom.activity.AVRoomActivity;
-import com.yizhuan.habu.miniworld.adapter.AudioPartyAdapter;
-import com.yizhuan.habu.miniworld.presenter.AudioPartyDialogPresenter;
-import com.yizhuan.habu.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.super_admin.util.SuperAdminUtil;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
+import com.chwl.app.R;
+import com.chwl.app.avroom.activity.AVRoomActivity;
+import com.chwl.app.miniworld.adapter.AudioPartyAdapter;
+import com.chwl.app.miniworld.presenter.AudioPartyDialogPresenter;
+import com.chwl.app.miniworld.view.IAudioPartyDialogView;
+import com.chwl.core.Constants;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.miniworld.bean.AudioPartyInfo;
+import com.chwl.core.miniworld.bean.AudioPartyItem;
+import com.chwl.core.miniworld.model.MiniWorldHelper;
+import com.chwl.core.super_admin.util.SuperAdminUtil;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SingleToastUtil;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/activity/MWTeamRoomMessageAct.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/activity/MWTeamRoomMessageAct.java
similarity index 91%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/activity/MWTeamRoomMessageAct.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/activity/MWTeamRoomMessageAct.java
index 33c8e3bd5..103dfff2d 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/activity/MWTeamRoomMessageAct.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/activity/MWTeamRoomMessageAct.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.miniworld.activity;
+package com.chwl.app.miniworld.activity;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -29,47 +29,47 @@ 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.habu.R;
-import com.yizhuan.habu.avroom.ButtonItemFactory;
-import com.yizhuan.habu.avroom.activity.AVRoomActivity;
-import com.yizhuan.habu.avroom.widget.EditRoomTitleDialog;
-import com.yizhuan.habu.avroom.widget.ViewItem;
-import com.yizhuan.habu.common.widget.dialog.DialogManager;
-import com.yizhuan.habu.home.presenter.MainFragmentPresenter;
-import com.yizhuan.habu.miniworld.presenter.MWTeamMessagePresenter;
-import com.yizhuan.habu.miniworld.view.IMWTeamMessageView;
-import com.yizhuan.habu.team.view.NimTeamMessageFragment;
-import com.yizhuan.habu.ui.gift.callback.OnGiftDialogBtnClickListenerWrapper;
-import com.yizhuan.habu.ui.im.avtivity.BaseMessageActivity;
-import com.yizhuan.habu.ui.widget.GiftDialog;
-import com.yizhuan.habu.ui.widget.UserInfoDialog;
-import com.yizhuan.habu.ui.widget.dialog.OpenNobleDialog;
-import com.yizhuan.habu.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.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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.avroom.ButtonItemFactory;
+import com.chwl.app.avroom.activity.AVRoomActivity;
+import com.chwl.app.avroom.widget.EditRoomTitleDialog;
+import com.chwl.app.avroom.widget.ViewItem;
+import com.chwl.app.common.widget.dialog.DialogManager;
+import com.chwl.app.home.presenter.MainFragmentPresenter;
+import com.chwl.app.miniworld.presenter.MWTeamMessagePresenter;
+import com.chwl.app.miniworld.view.IMWTeamMessageView;
+import com.chwl.app.team.view.NimTeamMessageFragment;
+import com.chwl.app.ui.gift.callback.OnGiftDialogBtnClickListenerWrapper;
+import com.chwl.app.ui.im.avtivity.BaseMessageActivity;
+import com.chwl.app.ui.widget.GiftDialog;
+import com.chwl.app.ui.widget.UserInfoDialog;
+import com.chwl.app.ui.widget.dialog.OpenNobleDialog;
+import com.chwl.app.utils.CertificateHelper;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.gift.GiftModel;
+import com.chwl.core.gift.bean.GiftInfo;
+import com.chwl.core.gift.toolbox.GiftToolbox;
+import com.chwl.core.initial.InitialModel;
+import com.chwl.core.initial.bean.InitInfo;
+import com.chwl.core.level.UserLevelVo;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.miniworld.bean.MWChatInfo;
+import com.chwl.core.miniworld.bean.OpenAudioPartyAttachment;
+import com.chwl.core.miniworld.event.MWChatTopicEvent;
+import com.chwl.core.miniworld.model.MiniWorldHelper;
+import com.chwl.core.room.bean.RoomInfo;
+import com.chwl.core.room.model.AvRoomModel;
+import com.chwl.core.room.model.RoomSettingModel;
+import com.chwl.core.room.queue.bean.MicMemberInfo;
+import com.chwl.core.team.bean.TeamEvent;
+import com.chwl.core.user.UserModel;
+import com.chwl.core.user.bean.UserInfo;
+import com.chwl.core.utils.ActivityUtil;
+import com.chwl.core.utils.SharedPreferenceUtils;
+import com.chwl.core.utils.net.BeanObserver;
+import com.chwl.library.net.rxnet.callback.CallBack;
+import com.chwl.library.rxbus.RxBus;
+import com.chwl.library.utils.ResUtil;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/activity/MiniWorldActivity.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/activity/MiniWorldActivity.java
similarity index 83%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/activity/MiniWorldActivity.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/activity/MiniWorldActivity.java
index 836fde81e..2fe41bf94 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/activity/MiniWorldActivity.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/activity/MiniWorldActivity.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.miniworld.activity;
+package com.chwl.app.miniworld.activity;
 
 import android.content.Context;
 import android.content.Intent;
@@ -10,25 +10,25 @@ import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.viewpager.widget.ViewPager;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.avroom.adapter.RoomContributeListAdapter;
-import com.yizhuan.habu.base.BaseMvpActivity;
-import com.yizhuan.habu.miniworld.fragment.MiniWorldCategoryFragment;
-import com.yizhuan.habu.miniworld.presenter.MiniWorldPresenter;
-import com.yizhuan.habu.miniworld.view.IMiniWorldView;
-import com.yizhuan.habu.ui.widget.magicindicator.MagicIndicator;
-import com.yizhuan.habu.ui.widget.magicindicator.ViewPagerHelper;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator;
-import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.avroom.adapter.RoomContributeListAdapter;
+import com.chwl.app.base.BaseMvpActivity;
+import com.chwl.app.miniworld.fragment.MiniWorldCategoryFragment;
+import com.chwl.app.miniworld.presenter.MiniWorldPresenter;
+import com.chwl.app.miniworld.view.IMiniWorldView;
+import com.chwl.app.ui.widget.magicindicator.MagicIndicator;
+import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper;
+import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
+import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator;
+import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter;
+import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator;
+import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView;
+import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator;
+import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.titles.SimplePagerTitleView;
+import com.chwl.core.miniworld.bean.MiniWorldCategoryInfo;
+import com.chwl.library.base.factory.CreatePresenter;
+import com.chwl.library.utils.ListUtils;
+import com.chwl.library.utils.ResUtil;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/activity/MiniWorldEditActivity.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/activity/MiniWorldEditActivity.java
similarity index 95%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/activity/MiniWorldEditActivity.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/activity/MiniWorldEditActivity.java
index 347369d6d..869cc9174 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/activity/MiniWorldEditActivity.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/activity/MiniWorldEditActivity.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.miniworld.activity;
+package com.chwl.app.miniworld.activity;
 
 import android.Manifest;
 import android.app.Activity;
@@ -18,19 +18,19 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 
 import com.jph.takephoto.model.TResult;
 import com.netease.nim.uikit.common.util.sys.ScreenUtil;
-import com.yizhuan.habu.ErbanTakePhotoActivity;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.base.BaseMvpActivity;
-import com.yizhuan.habu.miniworld.presenter.MiniWorldEditPresenter;
-import com.yizhuan.habu.miniworld.view.IMiniWorldEditView;
-import com.yizhuan.habu.miniworld.viewmodel.MiniWorldEditableInfoVM;
-import com.yizhuan.habu.miniworld.widget.MiniWorldEditChooseClassifyDialog;
-import com.yizhuan.habu.ui.utils.ImageLoadUtils;
-import com.yizhuan.habu.ui.widget.ButtonItem;
-import com.yizhuan.xchat_android_core.file.FileModel;
-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.ResUtil;
+import com.chwl.app.ErbanTakePhotoActivity;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseMvpActivity;
+import com.chwl.app.miniworld.presenter.MiniWorldEditPresenter;
+import com.chwl.app.miniworld.view.IMiniWorldEditView;
+import com.chwl.app.miniworld.viewmodel.MiniWorldEditableInfoVM;
+import com.chwl.app.miniworld.widget.MiniWorldEditChooseClassifyDialog;
+import com.chwl.app.ui.utils.ImageLoadUtils;
+import com.chwl.app.ui.widget.ButtonItem;
+import com.chwl.core.file.FileModel;
+import com.chwl.core.utils.net.DontWarnObserver;
+import com.chwl.library.base.factory.CreatePresenter;
+import com.chwl.library.utils.ResUtil;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/activity/MiniWorldGroupThemeActivity.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/activity/MiniWorldGroupThemeActivity.java
similarity index 90%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/activity/MiniWorldGroupThemeActivity.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/activity/MiniWorldGroupThemeActivity.java
index 77377f18c..fb47a0dcf 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/activity/MiniWorldGroupThemeActivity.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/activity/MiniWorldGroupThemeActivity.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.miniworld.activity;
+package com.chwl.app.miniworld.activity;
 
 import android.content.Context;
 import android.content.Intent;
@@ -10,14 +10,14 @@ import android.view.View;
 import android.widget.EditText;
 import android.widget.TextView;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.base.BaseMvpActivity;
-import com.yizhuan.habu.common.widget.dialog.DialogManager;
-import com.yizhuan.habu.miniworld.presenter.MWThemePresenter;
-import com.yizhuan.habu.miniworld.view.IMWThemeView;
-import com.yizhuan.xchat_android_core.miniworld.bean.TopicInfo;
-import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseMvpActivity;
+import com.chwl.app.common.widget.dialog.DialogManager;
+import com.chwl.app.miniworld.presenter.MWThemePresenter;
+import com.chwl.app.miniworld.view.IMWThemeView;
+import com.chwl.core.miniworld.bean.TopicInfo;
+import com.chwl.library.base.factory.CreatePresenter;
+import com.chwl.library.utils.ResUtil;
 
 import java.util.List;
 
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/activity/MiniWorldGuestPageActivity.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/activity/MiniWorldGuestPageActivity.java
similarity index 92%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/activity/MiniWorldGuestPageActivity.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/activity/MiniWorldGuestPageActivity.java
index bdd0ac5c3..ce786686a 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/activity/MiniWorldGuestPageActivity.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/activity/MiniWorldGuestPageActivity.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.miniworld.activity;
+package com.chwl.app.miniworld.activity;
 
 import android.content.Context;
 import android.content.Intent;
@@ -34,54 +34,54 @@ 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.habu.R;
-import com.yizhuan.habu.UIHelper;
-import com.yizhuan.habu.avroom.activity.AVRoomActivity;
-import com.yizhuan.habu.base.BaseMvpActivity;
-import com.yizhuan.habu.base.TitleBar;
-import com.yizhuan.habu.common.widget.CircleImageView;
-import com.yizhuan.habu.community.dynamic.view.WorldDynamicFragment;
-import com.yizhuan.habu.community.publish.view.PublishActivity;
-import com.yizhuan.habu.friend.view.SelectFriendActivity;
-import com.yizhuan.habu.miniworld.adapter.GuestAudioPartyAdapter;
-import com.yizhuan.habu.miniworld.fragment.MiniWorldNoticeFrg;
-import com.yizhuan.habu.miniworld.presenter.MiniWorldGuestPagePresenter;
-import com.yizhuan.habu.miniworld.view.IMiniWorldGuestPage;
-import com.yizhuan.habu.miniworld.viewmodel.MiniWorldDetailInfoVM;
-import com.yizhuan.habu.miniworld.viewmodel.MiniWorldEditableInfoVM;
-import com.yizhuan.habu.miniworld.widget.MWMagicIndicator;
-import com.yizhuan.habu.ui.utils.ImageLoadUtils;
-import com.yizhuan.habu.ui.webview.CommonWebViewActivity;
-import com.yizhuan.habu.ui.widget.ShareDialog;
-import com.yizhuan.habu.ui.widget.higuide.TuTuGuideHelper;
-import com.yizhuan.habu.ui.widget.magicindicator.MagicIndicator;
-import com.yizhuan.habu.ui.widget.magicindicator.ViewPagerHelper;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator;
-import com.yizhuan.habu.ui.widget.recyclerview.decoration.VerticalDecoration;
-import com.yizhuan.habu.utils.AppBarStateChangeListener;
+import com.chwl.app.R;
+import com.chwl.app.UIHelper;
+import com.chwl.app.avroom.activity.AVRoomActivity;
+import com.chwl.app.base.BaseMvpActivity;
+import com.chwl.app.base.TitleBar;
+import com.chwl.app.common.widget.CircleImageView;
+import com.chwl.app.community.dynamic.view.WorldDynamicFragment;
+import com.chwl.app.community.publish.view.PublishActivity;
+import com.chwl.app.friend.view.SelectFriendActivity;
+import com.chwl.app.miniworld.adapter.GuestAudioPartyAdapter;
+import com.chwl.app.miniworld.fragment.MiniWorldNoticeFrg;
+import com.chwl.app.miniworld.presenter.MiniWorldGuestPagePresenter;
+import com.chwl.app.miniworld.view.IMiniWorldGuestPage;
+import com.chwl.app.miniworld.viewmodel.MiniWorldDetailInfoVM;
+import com.chwl.app.miniworld.viewmodel.MiniWorldEditableInfoVM;
+import com.chwl.app.miniworld.widget.MWMagicIndicator;
+import com.chwl.app.ui.utils.ImageLoadUtils;
+import com.chwl.app.ui.webview.CommonWebViewActivity;
+import com.chwl.app.ui.widget.ShareDialog;
+import com.chwl.app.ui.widget.higuide.TuTuGuideHelper;
+import com.chwl.app.ui.widget.magicindicator.MagicIndicator;
+import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper;
+import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
+import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator;
+import com.chwl.app.ui.widget.recyclerview.decoration.VerticalDecoration;
+import com.chwl.app.utils.AppBarStateChangeListener;
 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.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.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.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
-import com.yizhuan.xchat_android_library.utils.SizeUtils;
+import com.chwl.core.UriProvider;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.home.bean.TabInfo;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.miniworld.bean.AudioPartyInfo;
+import com.chwl.core.miniworld.bean.MiniWorldDetailInfo;
+import com.chwl.core.miniworld.event.MiniWorldJoinVerifiedEvent;
+import com.chwl.core.miniworld.event.MiniWorldStateChangedEvent;
+import com.chwl.core.miniworld.event.MiniWorldTeamExitEvent;
+import com.chwl.core.miniworld.event.OpenedMyMiniWorldEvent;
+import com.chwl.core.miniworld.model.MiniWorldModel;
+import com.chwl.core.share.ShareModel;
+import com.chwl.core.share.bean.SessionType;
+import com.chwl.core.utils.ActivityUtil;
+import com.chwl.core.utils.SharedPreferenceUtils;
+import com.chwl.core.utils.net.DontWarnObserver;
+import com.chwl.library.base.factory.CreatePresenter;
+import com.chwl.library.utils.JavaUtil;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SingleToastUtil;
+import com.chwl.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/habu/miniworld/activity/MiniWorldMainActivity.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/activity/MiniWorldMainActivity.java
similarity index 89%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/activity/MiniWorldMainActivity.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/activity/MiniWorldMainActivity.java
index 213f29be1..80104ed9b 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/activity/MiniWorldMainActivity.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/activity/MiniWorldMainActivity.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.miniworld.activity;
+package com.chwl.app.miniworld.activity;
 
 import android.content.Context;
 import android.content.Intent;
@@ -17,27 +17,27 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.netease.nim.uikit.common.util.sys.ScreenUtil;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.base.BaseMvpActivity;
-import com.yizhuan.habu.home.adapter.BannerAdapter;
-import com.yizhuan.habu.miniworld.adapter.MiniWorldMainAdapter;
-import com.yizhuan.habu.miniworld.listener.DoubleClickCheckListener;
-import com.yizhuan.habu.miniworld.presenter.MiniWorldMainPresenter;
-import com.yizhuan.habu.miniworld.view.IMiniWorldMainView;
-import com.yizhuan.habu.ui.widget.higuide.TuTuGuideHelper;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil;
-import com.yizhuan.habu.ui.widget.rollviewpager.RollPagerView;
-import com.yizhuan.habu.ui.widget.rollviewpager.Util;
-import com.yizhuan.habu.ui.widget.rollviewpager.hintview.ColorPointHintView;
-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_library.base.factory.CreatePresenter;
-import com.yizhuan.xchat_android_library.utils.ListUtils;
-import com.yizhuan.xchat_android_library.utils.SizeUtils;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseMvpActivity;
+import com.chwl.app.home.adapter.BannerAdapter;
+import com.chwl.app.miniworld.adapter.MiniWorldMainAdapter;
+import com.chwl.app.miniworld.listener.DoubleClickCheckListener;
+import com.chwl.app.miniworld.presenter.MiniWorldMainPresenter;
+import com.chwl.app.miniworld.view.IMiniWorldMainView;
+import com.chwl.app.ui.widget.higuide.TuTuGuideHelper;
+import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
+import com.chwl.app.ui.widget.rollviewpager.RollPagerView;
+import com.chwl.app.ui.widget.rollviewpager.Util;
+import com.chwl.app.ui.widget.rollviewpager.hintview.ColorPointHintView;
+import com.chwl.core.home.bean.BannerInfo;
+import com.chwl.core.miniworld.bean.MiniWorldCategoryInfo;
+import com.chwl.core.miniworld.bean.MiniWorldInfo;
+import com.chwl.core.miniworld.bean.MiniWorldMainItemInfo;
+import com.chwl.core.miniworld.event.MiniWorldStateChangedEvent;
+import com.chwl.core.miniworld.event.OpenedMyMiniWorldEvent;
+import com.chwl.library.base.factory.CreatePresenter;
+import com.chwl.library.utils.ListUtils;
+import com.chwl.library.utils.SizeUtils;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/activity/MiniWorldMemberListActivity.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/activity/MiniWorldMemberListActivity.java
similarity index 91%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/activity/MiniWorldMemberListActivity.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/activity/MiniWorldMemberListActivity.java
index 1ff2da45b..7f80ba6dd 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/activity/MiniWorldMemberListActivity.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/activity/MiniWorldMemberListActivity.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.miniworld.activity;
+package com.chwl.app.miniworld.activity;
 
 import android.content.Context;
 import android.content.Intent;
@@ -14,19 +14,19 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.UIHelper;
-import com.yizhuan.habu.avroom.activity.AVRoomActivity;
-import com.yizhuan.habu.base.BaseMvpActivity;
-import com.yizhuan.habu.miniworld.adapter.MiniWorldMemberListAdapter;
-import com.yizhuan.habu.miniworld.presenter.MiniWorldMemberListPresenter;
-import com.yizhuan.habu.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_library.base.factory.CreatePresenter;
-import com.yizhuan.xchat_android_library.utils.ListUtils;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.UIHelper;
+import com.chwl.app.avroom.activity.AVRoomActivity;
+import com.chwl.app.base.BaseMvpActivity;
+import com.chwl.app.miniworld.adapter.MiniWorldMemberListAdapter;
+import com.chwl.app.miniworld.presenter.MiniWorldMemberListPresenter;
+import com.chwl.app.miniworld.view.IMiniWorldMemberListView;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.miniworld.bean.MiniWorldMemberListMemberInfo;
+import com.chwl.core.room.bean.RoomInfo;
+import com.chwl.library.base.factory.CreatePresenter;
+import com.chwl.library.utils.ListUtils;
+import com.chwl.library.utils.ResUtil;
 
 import java.util.List;
 
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/activity/MiniWorldSearchActivity.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/activity/MiniWorldSearchActivity.java
similarity index 91%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/activity/MiniWorldSearchActivity.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/activity/MiniWorldSearchActivity.java
index dfd83d6b1..5a626f054 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/activity/MiniWorldSearchActivity.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/activity/MiniWorldSearchActivity.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.miniworld.activity;
+package com.chwl.app.miniworld.activity;
 
 import android.content.Context;
 import android.content.Intent;
@@ -20,18 +20,18 @@ import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.base.BaseMvpActivity;
-import com.yizhuan.habu.miniworld.adapter.MiniWorldListAdapter;
-import com.yizhuan.habu.miniworld.listener.DoubleClickCheckListener;
-import com.yizhuan.habu.miniworld.presenter.MiniWorldSearchPresenter;
-import com.yizhuan.habu.miniworld.view.IMiniWorldSearchView;
-import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo;
-import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
-import com.yizhuan.xchat_android_library.utils.ImeUtil;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
-import com.yizhuan.xchat_android_library.utils.SizeUtils;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseMvpActivity;
+import com.chwl.app.miniworld.adapter.MiniWorldListAdapter;
+import com.chwl.app.miniworld.listener.DoubleClickCheckListener;
+import com.chwl.app.miniworld.presenter.MiniWorldSearchPresenter;
+import com.chwl.app.miniworld.view.IMiniWorldSearchView;
+import com.chwl.core.miniworld.bean.MiniWorldInfo;
+import com.chwl.library.base.factory.CreatePresenter;
+import com.chwl.library.utils.ImeUtil;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SingleToastUtil;
+import com.chwl.library.utils.SizeUtils;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/activity/MiniWorldTeamMessageActivity.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/activity/MiniWorldTeamMessageActivity.java
similarity index 92%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/activity/MiniWorldTeamMessageActivity.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/activity/MiniWorldTeamMessageActivity.java
index ec20718b6..7cfb9f49c 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/activity/MiniWorldTeamMessageActivity.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/activity/MiniWorldTeamMessageActivity.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.miniworld.activity;
+package com.chwl.app.miniworld.activity;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -32,56 +32,56 @@ 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.habu.R;
-import com.yizhuan.habu.avroom.ButtonItemFactory;
-import com.yizhuan.habu.avroom.activity.AVRoomActivity;
-import com.yizhuan.habu.avroom.widget.EditRoomTitleDialog;
-import com.yizhuan.habu.avroom.widget.ViewItem;
-import com.yizhuan.habu.common.widget.dialog.DialogManager;
-import com.yizhuan.habu.home.presenter.MainFragmentPresenter;
-import com.yizhuan.habu.miniworld.presenter.MWTeamMessagePresenter;
-import com.yizhuan.habu.miniworld.view.IMWTeamMessageView;
-import com.yizhuan.habu.team.view.NimTeamMessageFragment;
-import com.yizhuan.habu.ui.gift.callback.OnGiftDialogBtnClickListenerWrapper;
-import com.yizhuan.habu.ui.im.avtivity.BaseMessageActivity;
-import com.yizhuan.habu.ui.patriarch.help.LimitEnterRoomHelper;
-import com.yizhuan.habu.ui.widget.ButtonItem;
-import com.yizhuan.habu.ui.widget.GiftDialog;
-import com.yizhuan.habu.ui.widget.UserInfoDialog;
-import com.yizhuan.habu.ui.widget.dialog.OpenNobleDialog;
-import com.yizhuan.habu.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.event.MiniWorldTeamExitEvent;
-import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldHelper;
-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.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.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
+import com.chwl.app.R;
+import com.chwl.app.avroom.ButtonItemFactory;
+import com.chwl.app.avroom.activity.AVRoomActivity;
+import com.chwl.app.avroom.widget.EditRoomTitleDialog;
+import com.chwl.app.avroom.widget.ViewItem;
+import com.chwl.app.common.widget.dialog.DialogManager;
+import com.chwl.app.home.presenter.MainFragmentPresenter;
+import com.chwl.app.miniworld.presenter.MWTeamMessagePresenter;
+import com.chwl.app.miniworld.view.IMWTeamMessageView;
+import com.chwl.app.team.view.NimTeamMessageFragment;
+import com.chwl.app.ui.gift.callback.OnGiftDialogBtnClickListenerWrapper;
+import com.chwl.app.ui.im.avtivity.BaseMessageActivity;
+import com.chwl.app.ui.patriarch.help.LimitEnterRoomHelper;
+import com.chwl.app.ui.widget.ButtonItem;
+import com.chwl.app.ui.widget.GiftDialog;
+import com.chwl.app.ui.widget.UserInfoDialog;
+import com.chwl.app.ui.widget.dialog.OpenNobleDialog;
+import com.chwl.app.utils.CertificateHelper;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.gift.GiftModel;
+import com.chwl.core.gift.bean.GiftInfo;
+import com.chwl.core.gift.toolbox.GiftToolbox;
+import com.chwl.core.initial.InitialModel;
+import com.chwl.core.initial.bean.InitInfo;
+import com.chwl.core.level.UserLevelVo;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.miniworld.bean.MWChatInfo;
+import com.chwl.core.miniworld.bean.OpenAudioPartyAttachment;
+import com.chwl.core.miniworld.event.AudioPartyOpenEvent;
+import com.chwl.core.miniworld.event.MWChatTopicEvent;
+import com.chwl.core.miniworld.event.MWGroupChatMemberEvent;
+import com.chwl.core.miniworld.event.MiniWorldTeamExitEvent;
+import com.chwl.core.miniworld.model.MiniWorldHelper;
+import com.chwl.core.miniworld.model.MiniWorldModel;
+import com.chwl.core.room.bean.RoomInfo;
+import com.chwl.core.room.model.AvRoomModel;
+import com.chwl.core.room.model.RoomSettingModel;
+import com.chwl.core.room.queue.bean.MicMemberInfo;
+import com.chwl.core.team.bean.TeamEvent;
+import com.chwl.core.user.UserModel;
+import com.chwl.core.user.bean.UserInfo;
+import com.chwl.core.utils.ActivityUtil;
+import com.chwl.core.utils.SharedPreferenceUtils;
+import com.chwl.core.utils.net.BeanObserver;
+import com.chwl.core.utils.net.DontWarnObserver;
+import com.chwl.library.net.rxnet.callback.CallBack;
+import com.chwl.library.rxbus.RxBus;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SingleToastUtil;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/activity/TopicMainActivity.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/activity/TopicMainActivity.java
similarity index 91%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/activity/TopicMainActivity.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/activity/TopicMainActivity.java
index fb4a37f32..b51521701 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/activity/TopicMainActivity.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/activity/TopicMainActivity.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.miniworld.activity;
+package com.chwl.app.miniworld.activity;
 
 import android.content.Context;
 import android.content.Intent;
@@ -26,41 +26,41 @@ 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.habu.R;
-import com.yizhuan.habu.UIHelper;
-import com.yizhuan.habu.base.BaseMvpActivity;
-import com.yizhuan.habu.community.dynamic.view.WorldDynamicFragment;
-import com.yizhuan.habu.community.publish.view.PublishActivity;
-import com.yizhuan.habu.friend.view.SelectFriendActivity;
-import com.yizhuan.habu.miniworld.presenter.MiniWorldGuestPagePresenter;
-import com.yizhuan.habu.miniworld.view.IMiniWorldGuestPage;
-import com.yizhuan.habu.miniworld.viewmodel.MiniWorldDetailInfoVM;
-import com.yizhuan.habu.miniworld.viewmodel.MiniWorldEditableInfoVM;
-import com.yizhuan.habu.miniworld.widget.MWMagicIndicator;
-import com.yizhuan.habu.ui.utils.ImageLoadUtils;
-import com.yizhuan.habu.ui.widget.ShareDialog;
-import com.yizhuan.habu.ui.widget.magicindicator.MagicIndicator;
-import com.yizhuan.habu.ui.widget.magicindicator.ViewPagerHelper;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator;
+import com.chwl.app.R;
+import com.chwl.app.UIHelper;
+import com.chwl.app.base.BaseMvpActivity;
+import com.chwl.app.community.dynamic.view.WorldDynamicFragment;
+import com.chwl.app.community.publish.view.PublishActivity;
+import com.chwl.app.friend.view.SelectFriendActivity;
+import com.chwl.app.miniworld.presenter.MiniWorldGuestPagePresenter;
+import com.chwl.app.miniworld.view.IMiniWorldGuestPage;
+import com.chwl.app.miniworld.viewmodel.MiniWorldDetailInfoVM;
+import com.chwl.app.miniworld.viewmodel.MiniWorldEditableInfoVM;
+import com.chwl.app.miniworld.widget.MWMagicIndicator;
+import com.chwl.app.ui.utils.ImageLoadUtils;
+import com.chwl.app.ui.widget.ShareDialog;
+import com.chwl.app.ui.widget.magicindicator.MagicIndicator;
+import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper;
+import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
+import com.chwl.app.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.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.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.home.bean.TabInfo;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.miniworld.bean.AudioPartyInfo;
+import com.chwl.core.miniworld.bean.MiniWorldDetailInfo;
+import com.chwl.core.miniworld.event.MiniWorldJoinVerifiedEvent;
+import com.chwl.core.miniworld.event.MiniWorldStateChangedEvent;
+import com.chwl.core.miniworld.event.MiniWorldTeamExitEvent;
+import com.chwl.core.miniworld.model.MiniWorldModel;
+import com.chwl.core.share.ShareModel;
+import com.chwl.core.share.bean.SessionType;
+import com.chwl.core.utils.SharedPreferenceUtils;
+import com.chwl.core.utils.net.DontWarnObserver;
+import com.chwl.library.base.factory.CreatePresenter;
+import com.chwl.library.utils.JavaUtil;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SingleToastUtil;
 import com.zyyoona7.lib.EasyPopup;
 
 import org.greenrobot.eventbus.EventBus;
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/adapter/AllTopicListAdapter.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/adapter/AllTopicListAdapter.java
similarity index 83%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/adapter/AllTopicListAdapter.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/adapter/AllTopicListAdapter.java
index a8256db70..4c3392d04 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/adapter/AllTopicListAdapter.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/adapter/AllTopicListAdapter.java
@@ -1,11 +1,11 @@
-package com.yizhuan.habu.miniworld.adapter;
+package com.chwl.app.miniworld.adapter;
 
 import androidx.annotation.Nullable;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.yizhuan.habu.R;
-import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo;
+import com.chwl.app.R;
+import com.chwl.core.miniworld.bean.MiniWorldInfo;
 
 import java.util.List;
 
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/adapter/AudioPartyAdapter.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/adapter/AudioPartyAdapter.java
similarity index 89%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/adapter/AudioPartyAdapter.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/adapter/AudioPartyAdapter.java
index 749afdb6a..869410a9a 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/adapter/AudioPartyAdapter.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/adapter/AudioPartyAdapter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.miniworld.adapter;
+package com.chwl.app.miniworld.adapter;
 
 import android.content.Context;
 import android.widget.ImageView;
@@ -7,11 +7,11 @@ import androidx.core.content.ContextCompat;
 
 import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.ui.utils.ImageLoadUtils;
-import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyInfo;
-import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyItem;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.ui.utils.ImageLoadUtils;
+import com.chwl.core.miniworld.bean.AudioPartyInfo;
+import com.chwl.core.miniworld.bean.AudioPartyItem;
+import com.chwl.library.utils.ResUtil;
 
 import java.util.List;
 
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/adapter/GuestAudioPartyAdapter.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/adapter/GuestAudioPartyAdapter.java
similarity index 73%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/adapter/GuestAudioPartyAdapter.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/adapter/GuestAudioPartyAdapter.java
index f878d4e4c..f9cb44c45 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/adapter/GuestAudioPartyAdapter.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/adapter/GuestAudioPartyAdapter.java
@@ -1,11 +1,11 @@
-package com.yizhuan.habu.miniworld.adapter;
+package com.chwl.app.miniworld.adapter;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.common.widget.CircleImageView;
-import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2;
-import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyInfo;
+import com.chwl.app.R;
+import com.chwl.app.common.widget.CircleImageView;
+import com.chwl.app.ui.utils.ImageLoadUtilsV2;
+import com.chwl.core.miniworld.bean.AudioPartyInfo;
 
 public class GuestAudioPartyAdapter extends BaseQuickAdapter {
 
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/adapter/MiniWorldEditClassifyAdapter.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/adapter/MiniWorldEditClassifyAdapter.java
similarity index 89%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/adapter/MiniWorldEditClassifyAdapter.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/adapter/MiniWorldEditClassifyAdapter.java
index 95877210e..f1cd3807f 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/adapter/MiniWorldEditClassifyAdapter.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/adapter/MiniWorldEditClassifyAdapter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.miniworld.adapter;
+package com.chwl.app.miniworld.adapter;
 
 import android.content.Context;
 import android.view.ViewGroup;
@@ -10,9 +10,9 @@ import androidx.annotation.Nullable;
 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.habu.R;
-import com.yizhuan.habu.ui.utils.ImageLoadUtils;
-import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldEditClassifyInfo;
+import com.chwl.app.R;
+import com.chwl.app.ui.utils.ImageLoadUtils;
+import com.chwl.core.miniworld.bean.MiniWorldEditClassifyInfo;
 
 import java.util.List;
 
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/adapter/MiniWorldListAdapter.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/adapter/MiniWorldListAdapter.java
similarity index 89%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/adapter/MiniWorldListAdapter.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/adapter/MiniWorldListAdapter.java
index 3eb1b7cc1..8046361e0 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/adapter/MiniWorldListAdapter.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/adapter/MiniWorldListAdapter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.miniworld.adapter;
+package com.chwl.app.miniworld.adapter;
 
 import android.text.TextUtils;
 import android.widget.ImageView;
@@ -9,11 +9,11 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.ui.utils.ImageLoadUtils;
-import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo;
-import com.yizhuan.xchat_android_core.user.bean.UserInfo;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.ui.utils.ImageLoadUtils;
+import com.chwl.core.miniworld.bean.MiniWorldInfo;
+import com.chwl.core.user.bean.UserInfo;
+import com.chwl.library.utils.ResUtil;
 
 import java.util.List;
 import java.util.Locale;
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/adapter/MiniWorldMainAdapter.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/adapter/MiniWorldMainAdapter.java
similarity index 75%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/adapter/MiniWorldMainAdapter.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/adapter/MiniWorldMainAdapter.java
index 26941e016..5f229748d 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/adapter/MiniWorldMainAdapter.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/adapter/MiniWorldMainAdapter.java
@@ -1,12 +1,12 @@
-package com.yizhuan.habu.miniworld.adapter;
+package com.chwl.app.miniworld.adapter;
 
-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_DIVIDER;
-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.chwl.core.miniworld.bean.MiniWorldMainItemInfo.TYPE_BANNER;
+import static com.chwl.core.miniworld.bean.MiniWorldMainItemInfo.TYPE_BOTTOM_PADDING;
+import static com.chwl.core.miniworld.bean.MiniWorldMainItemInfo.TYPE_DIVIDER;
+import static com.chwl.core.miniworld.bean.MiniWorldMainItemInfo.TYPE_FIND;
+import static com.chwl.core.miniworld.bean.MiniWorldMainItemInfo.TYPE_ITEM;
+import static com.chwl.core.miniworld.bean.MiniWorldMainItemInfo.TYPE_PLACEHOLDER;
+import static com.chwl.core.miniworld.bean.MiniWorldMainItemInfo.TYPE_TITLE;
 
 import android.text.TextUtils;
 import android.widget.ImageView;
@@ -16,14 +16,14 @@ import androidx.recyclerview.widget.GridLayoutManager;
 
 import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.avroom.widget.MessageView;
-import com.yizhuan.habu.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.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SizeUtils;
+import com.chwl.app.R;
+import com.chwl.app.avroom.widget.MessageView;
+import com.chwl.app.ui.utils.ImageLoadUtils;
+import com.chwl.core.miniworld.bean.MiniWorldCategoryInfo;
+import com.chwl.core.miniworld.bean.MiniWorldInfo;
+import com.chwl.core.miniworld.bean.MiniWorldMainItemInfo;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SizeUtils;
 
 import java.util.List;
 
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/adapter/MiniWorldMemberListAdapter.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/adapter/MiniWorldMemberListAdapter.java
similarity index 94%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/adapter/MiniWorldMemberListAdapter.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/adapter/MiniWorldMemberListAdapter.java
index f9c5c8347..cb6c279f3 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/adapter/MiniWorldMemberListAdapter.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/adapter/MiniWorldMemberListAdapter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.miniworld.adapter;
+package com.chwl.app.miniworld.adapter;
 
 
 import android.content.Context;
@@ -14,11 +14,11 @@ import androidx.core.content.ContextCompat;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.common.widget.CircleImageView;
-import com.yizhuan.habu.ui.utils.ImageLoadUtils;
-import com.yizhuan.xchat_android_core.level.UserLevelVo;
-import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMemberListMemberInfo;
+import com.chwl.app.R;
+import com.chwl.app.common.widget.CircleImageView;
+import com.chwl.app.ui.utils.ImageLoadUtils;
+import com.chwl.core.level.UserLevelVo;
+import com.chwl.core.miniworld.bean.MiniWorldMemberListMemberInfo;
 
 import java.util.List;
 
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/adapter/RecommendTopicListAdapter.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/adapter/RecommendTopicListAdapter.java
similarity index 81%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/adapter/RecommendTopicListAdapter.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/adapter/RecommendTopicListAdapter.java
index 533bff784..c14aede50 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/adapter/RecommendTopicListAdapter.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/adapter/RecommendTopicListAdapter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.miniworld.adapter;
+package com.chwl.app.miniworld.adapter;
 
 import android.widget.ImageView;
 
@@ -6,9 +6,9 @@ import androidx.annotation.Nullable;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.ui.utils.ImageLoadUtils;
-import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo;
+import com.chwl.app.R;
+import com.chwl.app.ui.utils.ImageLoadUtils;
+import com.chwl.core.miniworld.bean.MiniWorldInfo;
 
 import java.util.List;
 
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/fragment/MiniWorldCategoryFragment.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/fragment/MiniWorldCategoryFragment.java
similarity index 87%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/fragment/MiniWorldCategoryFragment.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/fragment/MiniWorldCategoryFragment.java
index 6d24afc9d..0ad867705 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/fragment/MiniWorldCategoryFragment.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/fragment/MiniWorldCategoryFragment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.miniworld.fragment;
+package com.chwl.app.miniworld.fragment;
 
 import android.app.Activity;
 import android.graphics.Rect;
@@ -11,23 +11,23 @@ import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.base.BaseMvpFragment;
-import com.yizhuan.habu.common.NoDataFragment;
-import com.yizhuan.habu.miniworld.activity.MiniWorldActivity;
-import com.yizhuan.habu.miniworld.activity.TopicMainActivity;
-import com.yizhuan.habu.miniworld.adapter.AllTopicListAdapter;
-import com.yizhuan.habu.miniworld.listener.DoubleClickCheckListener;
-import com.yizhuan.habu.miniworld.presenter.MiniWorldCategoryPresenter;
-import com.yizhuan.habu.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_library.base.factory.CreatePresenter;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SizeUtils;
-import com.yizhuan.xchat_android_library.utils.log.MLog;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseMvpFragment;
+import com.chwl.app.common.NoDataFragment;
+import com.chwl.app.miniworld.activity.MiniWorldActivity;
+import com.chwl.app.miniworld.activity.TopicMainActivity;
+import com.chwl.app.miniworld.adapter.AllTopicListAdapter;
+import com.chwl.app.miniworld.listener.DoubleClickCheckListener;
+import com.chwl.app.miniworld.presenter.MiniWorldCategoryPresenter;
+import com.chwl.app.miniworld.view.IMiniWorldCategoryView;
+import com.chwl.core.miniworld.bean.MiniWorldCategoryInfo;
+import com.chwl.core.miniworld.bean.MiniWorldInfo;
+import com.chwl.core.miniworld.event.MiniWorldStateChangedEvent;
+import com.chwl.core.miniworld.event.OpenedMyMiniWorldEvent;
+import com.chwl.library.base.factory.CreatePresenter;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SizeUtils;
+import com.chwl.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/habu/miniworld/fragment/MiniWorldNoticeFrg.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/fragment/MiniWorldNoticeFrg.java
similarity index 87%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/fragment/MiniWorldNoticeFrg.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/fragment/MiniWorldNoticeFrg.java
index d308ca668..5cdbfe55c 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/fragment/MiniWorldNoticeFrg.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/fragment/MiniWorldNoticeFrg.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.miniworld.fragment;
+package com.chwl.app.miniworld.fragment;
 
 import android.graphics.drawable.Drawable;
 import android.text.TextUtils;
@@ -8,15 +8,15 @@ import android.widget.TextView;
 
 import androidx.core.content.ContextCompat;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.UIHelper;
-import com.yizhuan.habu.base.BaseMvpFragment;
-import com.yizhuan.habu.common.widget.CircleImageView;
-import com.yizhuan.habu.miniworld.presenter.MiniWorldNoticePresenter;
-import com.yizhuan.habu.miniworld.view.IMiniWorldNoticeView;
-import com.yizhuan.habu.miniworld.viewmodel.MiniWorldDetailInfoVM;
-import com.yizhuan.habu.ui.utils.ImageLoadUtils;
-import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
+import com.chwl.app.R;
+import com.chwl.app.UIHelper;
+import com.chwl.app.base.BaseMvpFragment;
+import com.chwl.app.common.widget.CircleImageView;
+import com.chwl.app.miniworld.presenter.MiniWorldNoticePresenter;
+import com.chwl.app.miniworld.view.IMiniWorldNoticeView;
+import com.chwl.app.miniworld.viewmodel.MiniWorldDetailInfoVM;
+import com.chwl.app.ui.utils.ImageLoadUtils;
+import com.chwl.library.base.factory.CreatePresenter;
 
 @CreatePresenter(MiniWorldNoticePresenter.class)
 public class MiniWorldNoticeFrg extends BaseMvpFragment
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/listener/DoubleClickCheckListener.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/listener/DoubleClickCheckListener.java
similarity index 95%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/listener/DoubleClickCheckListener.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/listener/DoubleClickCheckListener.java
index bbd65c595..c61abfbd0 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/listener/DoubleClickCheckListener.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/listener/DoubleClickCheckListener.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.miniworld.listener;
+package com.chwl.app.miniworld.listener;
 
 
 import android.view.View;
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/presenter/AudioPartyDialogPresenter.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/AudioPartyDialogPresenter.java
similarity index 90%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/presenter/AudioPartyDialogPresenter.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/AudioPartyDialogPresenter.java
index 896276586..84544815a 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/presenter/AudioPartyDialogPresenter.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/AudioPartyDialogPresenter.java
@@ -1,11 +1,11 @@
-package com.yizhuan.habu.miniworld.presenter;
+package com.chwl.app.miniworld.presenter;
 
-import com.yizhuan.habu.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.chwl.app.miniworld.view.IAudioPartyDialogView;
+import com.chwl.core.Constants;
+import com.chwl.core.miniworld.bean.AudioPartyInfo;
+import com.chwl.core.miniworld.bean.AudioPartyItem;
+import com.chwl.core.miniworld.bean.AudioPartyListInfo;
+import com.chwl.core.miniworld.model.MiniWorldModel;
 
 import java.util.ArrayList;
 
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/presenter/MWTeamMessagePresenter.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MWTeamMessagePresenter.java
similarity index 86%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/presenter/MWTeamMessagePresenter.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MWTeamMessagePresenter.java
index d2713ae50..f7d05b333 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/presenter/MWTeamMessagePresenter.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MWTeamMessagePresenter.java
@@ -1,27 +1,27 @@
-package com.yizhuan.habu.miniworld.presenter;
+package com.chwl.app.miniworld.presenter;
 
-import static com.yizhuan.habu.home.presenter.MainFragmentPresenter.OPEN_ROOM_FAIL;
-import static com.yizhuan.habu.home.presenter.MainFragmentPresenter.OPEN_ROOM_FAIL_ALREADY_OPENED_ROOM;
-import static com.yizhuan.habu.home.presenter.MainFragmentPresenter.OPEN_ROOM_FAIL_PM_LIMIT_TIME;
-import static com.yizhuan.habu.home.presenter.MainFragmentPresenter.OPEN_ROOM_SUCCESS;
+import static com.chwl.app.home.presenter.MainFragmentPresenter.OPEN_ROOM_FAIL;
+import static com.chwl.app.home.presenter.MainFragmentPresenter.OPEN_ROOM_FAIL_ALREADY_OPENED_ROOM;
+import static com.chwl.app.home.presenter.MainFragmentPresenter.OPEN_ROOM_FAIL_PM_LIMIT_TIME;
+import static com.chwl.app.home.presenter.MainFragmentPresenter.OPEN_ROOM_SUCCESS;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
 
 import com.trello.rxlifecycle3.LifecycleProvider;
 import com.trello.rxlifecycle3.android.ActivityEvent;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.miniworld.view.IMWTeamMessageView;
-import com.yizhuan.xchat_android_core.auth.AuthModel;
-import com.yizhuan.xchat_android_core.miniworld.bean.MWChatInfo;
-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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.miniworld.view.IMWTeamMessageView;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.miniworld.bean.MWChatInfo;
+import com.chwl.core.miniworld.model.MiniWorldModel;
+import com.chwl.core.patriarch.exception.PmRoomLimitException;
+import com.chwl.core.room.bean.RoomInfo;
+import com.chwl.core.room.model.AvRoomModel;
+import com.chwl.core.utils.net.BeanObserver;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.callback.CallBack;
+import com.chwl.library.utils.ResUtil;
 
 public class MWTeamMessagePresenter {
     private IMWTeamMessageView mView;
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/presenter/MWThemePresenter.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MWThemePresenter.java
similarity index 79%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/presenter/MWThemePresenter.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MWThemePresenter.java
index 7a155218d..fe9e04211 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/presenter/MWThemePresenter.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MWThemePresenter.java
@@ -1,10 +1,10 @@
-package com.yizhuan.habu.miniworld.presenter;
+package com.chwl.app.miniworld.presenter;
 
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.habu.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.chwl.app.base.BaseMvpPresenter;
+import com.chwl.app.miniworld.view.IMWThemeView;
+import com.chwl.core.miniworld.bean.TopicInfo;
+import com.chwl.core.miniworld.model.MiniWorldModel;
+import com.chwl.core.utils.net.BeanObserver;
 
 import java.util.List;
 
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/presenter/MiniWorldCategoryPresenter.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MiniWorldCategoryPresenter.java
similarity index 85%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/presenter/MiniWorldCategoryPresenter.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MiniWorldCategoryPresenter.java
index 7356d265b..d3f83c1d9 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/presenter/MiniWorldCategoryPresenter.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MiniWorldCategoryPresenter.java
@@ -1,14 +1,14 @@
-package com.yizhuan.habu.miniworld.presenter;
+package com.chwl.app.miniworld.presenter;
 
 import android.annotation.SuppressLint;
 
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.habu.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.chwl.app.base.BaseMvpPresenter;
+import com.chwl.app.miniworld.view.IMiniWorldCategoryView;
+import com.chwl.core.miniworld.bean.MiniWorldInfo;
+import com.chwl.core.miniworld.model.MiniWorldModel;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.base.PresenterEvent;
+import com.chwl.library.utils.ListUtils;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/presenter/MiniWorldEditPresenter.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MiniWorldEditPresenter.java
similarity index 91%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/presenter/MiniWorldEditPresenter.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MiniWorldEditPresenter.java
index 1ccfd538e..74db53465 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/presenter/MiniWorldEditPresenter.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MiniWorldEditPresenter.java
@@ -1,15 +1,15 @@
-package com.yizhuan.habu.miniworld.presenter;
+package com.chwl.app.miniworld.presenter;
 
 import android.text.TextUtils;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.habu.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.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseMvpPresenter;
+import com.chwl.app.miniworld.view.IMiniWorldEditView;
+import com.chwl.core.miniworld.model.MiniWorldModel;
+import com.chwl.core.utils.net.DontWarnObserver;
+import com.chwl.library.base.PresenterEvent;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SingleToastUtil;
 
 /**
  * 编辑世界资料页面
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/presenter/MiniWorldGuestPagePresenter.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MiniWorldGuestPagePresenter.java
similarity index 88%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/presenter/MiniWorldGuestPagePresenter.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MiniWorldGuestPagePresenter.java
index 5f71ffbcb..6de56016e 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/presenter/MiniWorldGuestPagePresenter.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MiniWorldGuestPagePresenter.java
@@ -1,29 +1,29 @@
-package com.yizhuan.habu.miniworld.presenter;
+package com.chwl.app.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.habu.R;
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.habu.miniworld.view.IMiniWorldGuestPage;
-import com.yizhuan.habu.miniworld.viewmodel.MiniWorldDetailInfoVM;
-import com.yizhuan.habu.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.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.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseMvpPresenter;
+import com.chwl.app.miniworld.view.IMiniWorldGuestPage;
+import com.chwl.app.miniworld.viewmodel.MiniWorldDetailInfoVM;
+import com.chwl.app.miniworld.viewmodel.MiniWorldEditableInfoVM;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.exception.FailReasonException;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.miniworld.bean.AudioPartyInfo;
+import com.chwl.core.miniworld.bean.MiniWorldDetailInfo;
+import com.chwl.core.miniworld.event.MiniWorldStateChangedEvent;
+import com.chwl.core.miniworld.model.MiniWorldModel;
+import com.chwl.core.room.bean.RoomInfo;
+import com.chwl.core.utils.net.BeanObserver;
+import com.chwl.core.utils.net.DontWarnObserver;
+import com.chwl.library.base.PresenterEvent;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SingleToastUtil;
 
 import org.greenrobot.eventbus.EventBus;
 
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/presenter/MiniWorldMainPresenter.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MiniWorldMainPresenter.java
similarity index 85%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/presenter/MiniWorldMainPresenter.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MiniWorldMainPresenter.java
index d4b61cf13..18588bb74 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/presenter/MiniWorldMainPresenter.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MiniWorldMainPresenter.java
@@ -1,21 +1,21 @@
-package com.yizhuan.habu.miniworld.presenter;
+package com.chwl.app.miniworld.presenter;
 
 import android.annotation.SuppressLint;
 import android.text.TextUtils;
 import android.util.Pair;
 
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.habu.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.chwl.app.base.BaseMvpPresenter;
+import com.chwl.app.miniworld.view.IMiniWorldMainView;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.home.bean.BannerInfo;
+import com.chwl.core.miniworld.bean.MiniWorldCategoryInfo;
+import com.chwl.core.miniworld.bean.MiniWorldInfo;
+import com.chwl.core.miniworld.bean.MiniWorldMainInfo;
+import com.chwl.core.miniworld.bean.MiniWorldMainItemInfo;
+import com.chwl.core.miniworld.model.MiniWorldModel;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.base.PresenterEvent;
+import com.chwl.library.utils.ListUtils;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/presenter/MiniWorldMemberListPresenter.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MiniWorldMemberListPresenter.java
similarity index 93%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/presenter/MiniWorldMemberListPresenter.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MiniWorldMemberListPresenter.java
index 8d0503a21..f2fb9bc15 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/presenter/MiniWorldMemberListPresenter.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MiniWorldMemberListPresenter.java
@@ -1,17 +1,17 @@
-package com.yizhuan.habu.miniworld.presenter;
+package com.chwl.app.miniworld.presenter;
 
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.habu.miniworld.activity.MiniWorldMemberListActivity;
-import com.yizhuan.habu.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.chwl.app.base.BaseMvpPresenter;
+import com.chwl.app.miniworld.activity.MiniWorldMemberListActivity;
+import com.chwl.app.miniworld.view.IMiniWorldMemberListView;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.miniworld.bean.MiniWorldMemberListInfo;
+import com.chwl.core.miniworld.bean.MiniWorldMemberListMemberInfo;
+import com.chwl.core.miniworld.model.MiniWorldModel;
+import com.chwl.core.utils.net.DontWarnObserver;
+import com.chwl.library.base.PresenterEvent;
 
 import java.util.List;
 
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/presenter/MiniWorldNoticePresenter.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MiniWorldNoticePresenter.java
similarity index 79%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/presenter/MiniWorldNoticePresenter.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MiniWorldNoticePresenter.java
index d17112544..8637993e9 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/presenter/MiniWorldNoticePresenter.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MiniWorldNoticePresenter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.miniworld.presenter;
+package com.chwl.app.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.habu.R;
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.habu.common.widget.CustomImageSpan;
-import com.yizhuan.habu.miniworld.view.IMiniWorldNoticeView;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseMvpPresenter;
+import com.chwl.app.common.widget.CustomImageSpan;
+import com.chwl.app.miniworld.view.IMiniWorldNoticeView;
 
 public class MiniWorldNoticePresenter extends BaseMvpPresenter {
 
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/presenter/MiniWorldPresenter.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MiniWorldPresenter.java
similarity index 76%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/presenter/MiniWorldPresenter.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MiniWorldPresenter.java
index be40aa57b..28f28f8b2 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/presenter/MiniWorldPresenter.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MiniWorldPresenter.java
@@ -1,15 +1,15 @@
-package com.yizhuan.habu.miniworld.presenter;
+package com.chwl.app.miniworld.presenter;
 
 import android.annotation.SuppressLint;
 
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.habu.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.chwl.app.base.BaseMvpPresenter;
+import com.chwl.app.miniworld.view.IMiniWorldView;
+import com.chwl.core.miniworld.bean.MiniWorldCategoryInfo;
+import com.chwl.core.miniworld.model.MiniWorldModel;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.core.utils.net.ServerException;
+import com.chwl.library.base.PresenterEvent;
+import com.chwl.library.utils.ListUtils;
 
 import java.util.List;
 
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/presenter/MiniWorldSearchPresenter.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MiniWorldSearchPresenter.java
similarity index 80%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/presenter/MiniWorldSearchPresenter.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MiniWorldSearchPresenter.java
index efa04e3a1..ed78b6dd8 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/presenter/MiniWorldSearchPresenter.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/presenter/MiniWorldSearchPresenter.java
@@ -1,14 +1,14 @@
-package com.yizhuan.habu.miniworld.presenter;
+package com.chwl.app.miniworld.presenter;
 
 import android.annotation.SuppressLint;
 
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.habu.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.chwl.app.base.BaseMvpPresenter;
+import com.chwl.app.miniworld.view.IMiniWorldSearchView;
+import com.chwl.core.miniworld.bean.MiniWorldInfo;
+import com.chwl.core.miniworld.model.MiniWorldModel;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.base.PresenterEvent;
+import com.chwl.library.utils.ListUtils;
 
 import java.util.List;
 
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/view/IAudioPartyDialogView.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/view/IAudioPartyDialogView.java
similarity index 65%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/view/IAudioPartyDialogView.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/view/IAudioPartyDialogView.java
index 8b156052f..e3f87e6cc 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/view/IAudioPartyDialogView.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/view/IAudioPartyDialogView.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.miniworld.view;
+package com.chwl.app.miniworld.view;
 
 public interface IAudioPartyDialogView {
     void worldRoomListSuccess();
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/view/IMWTeamMessageView.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMWTeamMessageView.java
similarity index 73%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/view/IMWTeamMessageView.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMWTeamMessageView.java
index 5b741bc24..528c93d2c 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/view/IMWTeamMessageView.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMWTeamMessageView.java
@@ -1,7 +1,7 @@
-package com.yizhuan.habu.miniworld.view;
+package com.chwl.app.miniworld.view;
 
-import com.yizhuan.xchat_android_core.miniworld.bean.MWChatInfo;
-import com.yizhuan.xchat_android_library.base.IMvpBaseView;
+import com.chwl.core.miniworld.bean.MWChatInfo;
+import com.chwl.library.base.IMvpBaseView;
 
 public interface IMWTeamMessageView extends IMvpBaseView {
 
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/view/IMWThemeView.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMWThemeView.java
similarity index 60%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/view/IMWThemeView.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMWThemeView.java
index 32ac02b7a..c4af887ba 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/view/IMWThemeView.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMWThemeView.java
@@ -1,7 +1,7 @@
-package com.yizhuan.habu.miniworld.view;
+package com.chwl.app.miniworld.view;
 
-import com.yizhuan.xchat_android_core.miniworld.bean.TopicInfo;
-import com.yizhuan.xchat_android_library.base.IMvpBaseView;
+import com.chwl.core.miniworld.bean.TopicInfo;
+import com.chwl.library.base.IMvpBaseView;
 
 import java.util.List;
 
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/view/IMiniWorldCategoryView.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMiniWorldCategoryView.java
similarity index 69%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/view/IMiniWorldCategoryView.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMiniWorldCategoryView.java
index 9ba3ba0e6..b407c9423 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/view/IMiniWorldCategoryView.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMiniWorldCategoryView.java
@@ -1,7 +1,7 @@
-package com.yizhuan.habu.miniworld.view;
+package com.chwl.app.miniworld.view;
 
-import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo;
-import com.yizhuan.xchat_android_library.base.IMvpBaseView;
+import com.chwl.core.miniworld.bean.MiniWorldInfo;
+import com.chwl.library.base.IMvpBaseView;
 
 import java.util.List;
 
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/view/IMiniWorldEditView.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMiniWorldEditView.java
similarity index 79%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/view/IMiniWorldEditView.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMiniWorldEditView.java
index c9321c9d5..4106ddb35 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/view/IMiniWorldEditView.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMiniWorldEditView.java
@@ -1,6 +1,6 @@
-package com.yizhuan.habu.miniworld.view;
+package com.chwl.app.miniworld.view;
 
-import com.yizhuan.xchat_android_library.base.IMvpBaseView;
+import com.chwl.library.base.IMvpBaseView;
 
 /**
  * 编辑世界资料页面
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/view/IMiniWorldGuestPage.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMiniWorldGuestPage.java
similarity index 82%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/view/IMiniWorldGuestPage.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMiniWorldGuestPage.java
index d7d864638..a6b26d84b 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/view/IMiniWorldGuestPage.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMiniWorldGuestPage.java
@@ -1,10 +1,10 @@
-package com.yizhuan.habu.miniworld.view;
+package com.chwl.app.miniworld.view;
 
 import androidx.annotation.NonNull;
 
-import com.yizhuan.habu.miniworld.viewmodel.MiniWorldDetailInfoVM;
-import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyInfo;
-import com.yizhuan.xchat_android_library.base.IMvpBaseView;
+import com.chwl.app.miniworld.viewmodel.MiniWorldDetailInfoVM;
+import com.chwl.core.miniworld.bean.AudioPartyInfo;
+import com.chwl.library.base.IMvpBaseView;
 
 import java.util.List;
 
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/view/IMiniWorldMainView.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMiniWorldMainView.java
similarity index 51%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/view/IMiniWorldMainView.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMiniWorldMainView.java
index b19085922..e70329f3a 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/view/IMiniWorldMainView.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMiniWorldMainView.java
@@ -1,8 +1,8 @@
-package com.yizhuan.habu.miniworld.view;
+package com.chwl.app.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.chwl.core.home.bean.BannerInfo;
+import com.chwl.core.miniworld.bean.MiniWorldMainItemInfo;
+import com.chwl.library.base.IMvpBaseView;
 
 import java.util.List;
 
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/view/IMiniWorldMemberListView.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMiniWorldMemberListView.java
similarity index 84%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/view/IMiniWorldMemberListView.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMiniWorldMemberListView.java
index b7f556ea3..5ee4ca1b1 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/view/IMiniWorldMemberListView.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMiniWorldMemberListView.java
@@ -1,7 +1,7 @@
-package com.yizhuan.habu.miniworld.view;
+package com.chwl.app.miniworld.view;
 
-import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMemberListMemberInfo;
-import com.yizhuan.xchat_android_library.base.IMvpBaseView;
+import com.chwl.core.miniworld.bean.MiniWorldMemberListMemberInfo;
+import com.chwl.library.base.IMvpBaseView;
 
 import java.util.List;
 
diff --git a/app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMiniWorldNoticeView.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMiniWorldNoticeView.java
new file mode 100644
index 000000000..3186a22b1
--- /dev/null
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMiniWorldNoticeView.java
@@ -0,0 +1,6 @@
+package com.chwl.app.miniworld.view;
+
+import com.chwl.library.base.IMvpBaseView;
+
+public interface IMiniWorldNoticeView extends IMvpBaseView {
+}
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/view/IMiniWorldSearchView.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMiniWorldSearchView.java
similarity index 61%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/view/IMiniWorldSearchView.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMiniWorldSearchView.java
index 97ae622f7..c017c25b4 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/view/IMiniWorldSearchView.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMiniWorldSearchView.java
@@ -1,7 +1,7 @@
-package com.yizhuan.habu.miniworld.view;
+package com.chwl.app.miniworld.view;
 
-import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo;
-import com.yizhuan.xchat_android_library.base.IMvpBaseView;
+import com.chwl.core.miniworld.bean.MiniWorldInfo;
+import com.chwl.library.base.IMvpBaseView;
 
 import java.util.List;
 
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/view/IMiniWorldView.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMiniWorldView.java
similarity index 70%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/view/IMiniWorldView.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMiniWorldView.java
index 1b503c55a..18a1df1bb 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/view/IMiniWorldView.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/view/IMiniWorldView.java
@@ -1,7 +1,7 @@
-package com.yizhuan.habu.miniworld.view;
+package com.chwl.app.miniworld.view;
 
-import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldCategoryInfo;
-import com.yizhuan.xchat_android_library.base.IMvpBaseView;
+import com.chwl.core.miniworld.bean.MiniWorldCategoryInfo;
+import com.chwl.library.base.IMvpBaseView;
 
 import java.util.List;
 
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/viewmodel/MiniWorldDetailInfoVM.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/viewmodel/MiniWorldDetailInfoVM.java
similarity index 93%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/viewmodel/MiniWorldDetailInfoVM.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/viewmodel/MiniWorldDetailInfoVM.java
index 269ee3e85..8c415c569 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/viewmodel/MiniWorldDetailInfoVM.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/viewmodel/MiniWorldDetailInfoVM.java
@@ -1,14 +1,14 @@
-package com.yizhuan.habu.miniworld.viewmodel;
+package com.chwl.app.miniworld.viewmodel;
 
 import android.text.TextUtils;
 
-import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.miniworld.bean.MiniWorldDetailInfo;
+import com.chwl.core.miniworld.bean.MiniWorldDetailInfoWithCurrentMember;
+import com.chwl.core.miniworld.bean.MiniWorldDetailInfoWithMemberInfo;
+import com.chwl.library.utils.ListUtils;
+import com.chwl.library.utils.ResUtil;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/viewmodel/MiniWorldEditableInfoVM.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/viewmodel/MiniWorldEditableInfoVM.java
similarity index 98%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/viewmodel/MiniWorldEditableInfoVM.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/viewmodel/MiniWorldEditableInfoVM.java
index ee2e538cc..cd0772c58 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/viewmodel/MiniWorldEditableInfoVM.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/viewmodel/MiniWorldEditableInfoVM.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.miniworld.viewmodel;
+package com.chwl.app.miniworld.viewmodel;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/widget/MWMagicIndicator.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/widget/MWMagicIndicator.java
similarity index 79%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/widget/MWMagicIndicator.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/widget/MWMagicIndicator.java
index 24f0e72fb..7453e3816 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/widget/MWMagicIndicator.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/widget/MWMagicIndicator.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.miniworld.widget;
+package com.chwl.app.miniworld.widget;
 
 import android.content.Context;
 import android.os.Build;
@@ -6,12 +6,12 @@ import android.os.Build;
 import androidx.annotation.RequiresApi;
 import androidx.core.content.ContextCompat;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView;
-import com.yizhuan.xchat_android_core.home.bean.TabInfo;
+import com.chwl.app.R;
+import com.chwl.app.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView;
+import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter;
+import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator;
+import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView;
+import com.chwl.core.home.bean.TabInfo;
 
 import java.util.List;
 
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/widget/MiniWorldEditChooseClassifyDialog.java b/app/src/module_mini_world/java/com/chwl/app/miniworld/widget/MiniWorldEditChooseClassifyDialog.java
similarity index 89%
rename from app/src/module_mini_world/java/com/yizhuan/habu/miniworld/widget/MiniWorldEditChooseClassifyDialog.java
rename to app/src/module_mini_world/java/com/chwl/app/miniworld/widget/MiniWorldEditChooseClassifyDialog.java
index 67302f95c..82f96d250 100644
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/widget/MiniWorldEditChooseClassifyDialog.java
+++ b/app/src/module_mini_world/java/com/chwl/app/miniworld/widget/MiniWorldEditChooseClassifyDialog.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.miniworld.widget;
+package com.chwl.app.miniworld.widget;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -15,13 +15,13 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 import com.netease.nim.uikit.common.util.sys.ScreenUtil;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.miniworld.adapter.MiniWorldEditClassifyAdapter;
-import com.yizhuan.habu.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.chwl.app.R;
+import com.chwl.app.miniworld.adapter.MiniWorldEditClassifyAdapter;
+import com.chwl.app.ui.widget.recyclerview.decoration.SpacingDecoration;
+import com.chwl.core.miniworld.bean.MiniWorldEditClassifyInfo;
+import com.chwl.core.miniworld.model.MiniWorldModel;
+import com.chwl.core.utils.net.DontWarnObserver;
+import com.chwl.library.utils.SingleToastUtil;
 
 import java.util.List;
 
diff --git a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/view/IMiniWorldNoticeView.java b/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/view/IMiniWorldNoticeView.java
deleted file mode 100644
index 292aee443..000000000
--- a/app/src/module_mini_world/java/com/yizhuan/habu/miniworld/view/IMiniWorldNoticeView.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.yizhuan.habu.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 12a753337..cfab4a481 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 3a7d0c53d..766c400c2 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
@@ -5,20 +5,20 @@
     android:layout_height="match_parent"
     android:background="@color/bg_normal_1c1b22"
     android:orientation="vertical"
-    tools:context="com.yizhuan.habu.miniworld.activity.MiniWorldActivity">
+    tools:context="com.chwl.app.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 c60b6646d..38aa47b45 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
@@ -5,19 +5,19 @@
     android:layout_height="match_parent"
     android:background="@color/white"
     android:orientation="vertical"
-    tools:context="com.yizhuan.habu.miniworld.activity.MiniWorldActivity">
+    tools:context="com.chwl.app.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 15e0ef8a4..f733d3ea5 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.chwl.app.miniworld.activity.MiniWorldMainActivity">
 
     
 
-        
 
@@ -83,6 +83,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 a9358baba..7d241c8fa 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 ef38f3540..b91bd0602 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
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:background="@color/white"
     android:orientation="vertical"
-    tools:context="com.yizhuan.habu.miniworld.activity.MiniWorldSearchActivity">
+    tools:context="com.chwl.app.miniworld.activity.MiniWorldSearchActivity">
 
     
 
-    
 
@@ -95,5 +95,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 b53044b01..dabd3f564 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.habu.ui.widget.AppBarLayoutBehavior">
+            app:layout_behavior="com.chwl.app.ui.widget.AppBarLayoutBehavior">
 
             
 
-            
 
-            
+    tools:context="com.chwl.app.avroom.fragment.HomePartyRoomFragment">
 
     
 
@@ -12,7 +12,7 @@
 
         
+            type="com.chwl.core.room.bean.RoomInfo" />
 
         
 
-        
 
-        
 
-        
 
-        
 
-        
 
-        
 
-        
 
-        
+    tools:context="com.chwl.app.avroom.fragment.HomePartyRoomFragment">
 
     
 
@@ -12,7 +12,7 @@
 
         
+            type="com.chwl.core.room.bean.RoomInfo" />
 
         
 
-                
@@ -121,14 +121,14 @@
         
 
 
-        
 
-        
 
-        
 
-        
 
-        
+    tools:context="com.chwl.app.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 d48801fc7..cb29f10e3 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.chwl.app.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 6c01b276c..8cb1a2712 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/habu/music/fragment/LocalMusicListFragment.java b/app/src/module_music/java/com/chwl/app/music/fragment/LocalMusicListFragment.java
similarity index 90%
rename from app/src/module_music/java/com/yizhuan/habu/music/fragment/LocalMusicListFragment.java
rename to app/src/module_music/java/com/chwl/app/music/fragment/LocalMusicListFragment.java
index 33b2b131a..31320a7f8 100644
--- a/app/src/module_music/java/com/yizhuan/habu/music/fragment/LocalMusicListFragment.java
+++ b/app/src/module_music/java/com/chwl/app/music/fragment/LocalMusicListFragment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.music.fragment;
+package com.chwl.app.music.fragment;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -16,25 +16,25 @@ 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.habu.R;
-import com.yizhuan.habu.base.BaseMvpFragment;
-import com.yizhuan.habu.music.activity.AddLocalMusicListActivity;
-import com.yizhuan.habu.music.activity.MusicListActivity;
-import com.yizhuan.habu.music.adapter.LocalMusicListAdapter;
-import com.yizhuan.habu.music.presenter.LocalMusicListPresenter;
-import com.yizhuan.habu.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_library.base.factory.CreatePresenter;
-import com.yizhuan.xchat_android_library.utils.ListUtils;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseMvpFragment;
+import com.chwl.app.music.activity.AddLocalMusicListActivity;
+import com.chwl.app.music.activity.MusicListActivity;
+import com.chwl.app.music.adapter.LocalMusicListAdapter;
+import com.chwl.app.music.presenter.LocalMusicListPresenter;
+import com.chwl.app.music.widget.VoiceSeekDialog;
+import com.chwl.core.Constants;
+import com.chwl.core.music.db.bean.LocalMusicBean;
+import com.chwl.core.music.event.CurrentMusicUpdateEvent;
+import com.chwl.core.music.event.MusicPauseEvent;
+import com.chwl.core.music.event.MusicPlayingEvent;
+import com.chwl.core.music.event.MusicStopEvent;
+import com.chwl.core.music.model.IPlayerModel;
+import com.chwl.core.music.model.PlayerModel;
+import com.chwl.core.music.view.ILocalMusicListView;
+import com.chwl.library.base.factory.CreatePresenter;
+import com.chwl.library.utils.ListUtils;
+import com.chwl.library.utils.ResUtil;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
diff --git a/app/src/module_music/java/com/yizhuan/habu/music/fragment/ShareMusicListFragment.java b/app/src/module_music/java/com/chwl/app/music/fragment/ShareMusicListFragment.java
similarity index 91%
rename from app/src/module_music/java/com/yizhuan/habu/music/fragment/ShareMusicListFragment.java
rename to app/src/module_music/java/com/chwl/app/music/fragment/ShareMusicListFragment.java
index 44db03d15..2a0a218eb 100644
--- a/app/src/module_music/java/com/yizhuan/habu/music/fragment/ShareMusicListFragment.java
+++ b/app/src/module_music/java/com/chwl/app/music/fragment/ShareMusicListFragment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.music.fragment;
+package com.chwl.app.music.fragment;
 
 import android.text.Editable;
 import android.text.SpannableStringBuilder;
@@ -17,20 +17,20 @@ 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.habu.R;
-import com.yizhuan.habu.base.BaseMvpFragment;
-import com.yizhuan.habu.utils.KeyBoardUtils;
-import com.yizhuan.habu.music.activity.MusicListActivity;
-import com.yizhuan.habu.music.adapter.ShareMusicListAdapter;
-import com.yizhuan.habu.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_library.base.factory.CreatePresenter;
-import com.yizhuan.xchat_android_library.utils.ListUtils;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.TextWatcherWrapper;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseMvpFragment;
+import com.chwl.app.utils.KeyBoardUtils;
+import com.chwl.app.music.activity.MusicListActivity;
+import com.chwl.app.music.adapter.ShareMusicListAdapter;
+import com.chwl.app.music.presenter.ShareMusicListPresenter;
+import com.chwl.core.Constants;
+import com.chwl.core.music.bean.ShareMusicInfo;
+import com.chwl.core.music.db.bean.LocalMusicBean;
+import com.chwl.core.music.view.IShareMusicListView;
+import com.chwl.library.base.factory.CreatePresenter;
+import com.chwl.library.utils.ListUtils;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.TextWatcherWrapper;
 
 import java.util.List;
 import java.util.Objects;
diff --git a/app/src/module_music/java/com/yizhuan/habu/music/presenter/AddLocalMusicListPresenter.kt b/app/src/module_music/java/com/chwl/app/music/presenter/AddLocalMusicListPresenter.kt
similarity index 88%
rename from app/src/module_music/java/com/yizhuan/habu/music/presenter/AddLocalMusicListPresenter.kt
rename to app/src/module_music/java/com/chwl/app/music/presenter/AddLocalMusicListPresenter.kt
index 2ff2b667f..938ba6bb5 100644
--- a/app/src/module_music/java/com/yizhuan/habu/music/presenter/AddLocalMusicListPresenter.kt
+++ b/app/src/module_music/java/com/chwl/app/music/presenter/AddLocalMusicListPresenter.kt
@@ -1,16 +1,16 @@
-package com.yizhuan.habu.music.presenter
+package com.chwl.app.music.presenter
 
 import android.net.Uri
 import android.os.Build
 import android.os.Environment
-import com.yizhuan.habu.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.Logger
-import com.yizhuan.xchat_android_core.utils.net.RxHelper
-import com.yizhuan.xchat_android_library.base.PresenterEvent
-import com.yizhuan.xchat_android_library.common.file.FileHelper
+import com.chwl.app.base.BaseMvpPresenter
+import com.chwl.core.music.db.bean.LocalMusicBean
+import com.chwl.core.music.db.model.LocalMusicDbModel
+import com.chwl.core.music.view.IAddLocalMusicListView
+import com.chwl.core.utils.Logger
+import com.chwl.core.utils.net.RxHelper
+import com.chwl.library.base.PresenterEvent
+import com.chwl.library.common.file.FileHelper
 import io.reactivex.disposables.Disposable
 import kotlinx.coroutines.*
 import java.io.File
diff --git a/app/src/module_music/java/com/yizhuan/habu/music/presenter/LocalMusicListPresenter.java b/app/src/module_music/java/com/chwl/app/music/presenter/LocalMusicListPresenter.java
similarity index 85%
rename from app/src/module_music/java/com/yizhuan/habu/music/presenter/LocalMusicListPresenter.java
rename to app/src/module_music/java/com/chwl/app/music/presenter/LocalMusicListPresenter.java
index 33be33c78..e6ae57d80 100644
--- a/app/src/module_music/java/com/yizhuan/habu/music/presenter/LocalMusicListPresenter.java
+++ b/app/src/module_music/java/com/chwl/app/music/presenter/LocalMusicListPresenter.java
@@ -1,17 +1,17 @@
-package com.yizhuan.habu.music.presenter;
+package com.chwl.app.music.presenter;
 
 import android.annotation.SuppressLint;
 
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.habu.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.chwl.app.base.BaseMvpPresenter;
+import com.chwl.tutu.database.AppDataBase;
+import com.chwl.core.Constants;
+import com.chwl.core.music.db.bean.LocalMusicBean;
+import com.chwl.core.music.db.model.LocalMusicDbModel;
+import com.chwl.core.music.model.PlayerModel;
+import com.chwl.core.music.view.ILocalMusicListView;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.base.PresenterEvent;
+import com.chwl.library.utils.ListUtils;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
diff --git a/app/src/module_music/java/com/chwl/app/music/presenter/MusicListPresenter.java b/app/src/module_music/java/com/chwl/app/music/presenter/MusicListPresenter.java
new file mode 100644
index 000000000..d28cc4ca4
--- /dev/null
+++ b/app/src/module_music/java/com/chwl/app/music/presenter/MusicListPresenter.java
@@ -0,0 +1,7 @@
+package com.chwl.app.music.presenter;
+
+import com.chwl.app.base.BaseMvpPresenter;
+import com.chwl.core.music.view.IMusicListView;
+
+public class MusicListPresenter extends BaseMvpPresenter {
+}
diff --git a/app/src/module_music/java/com/yizhuan/habu/music/presenter/ShareMusicListPresenter.java b/app/src/module_music/java/com/chwl/app/music/presenter/ShareMusicListPresenter.java
similarity index 89%
rename from app/src/module_music/java/com/yizhuan/habu/music/presenter/ShareMusicListPresenter.java
rename to app/src/module_music/java/com/chwl/app/music/presenter/ShareMusicListPresenter.java
index bb7d1b86d..628539970 100644
--- a/app/src/module_music/java/com/yizhuan/habu/music/presenter/ShareMusicListPresenter.java
+++ b/app/src/module_music/java/com/chwl/app/music/presenter/ShareMusicListPresenter.java
@@ -1,17 +1,17 @@
-package com.yizhuan.habu.music.presenter;
+package com.chwl.app.music.presenter;
 
 import android.annotation.SuppressLint;
 
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.habu.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.chwl.app.base.BaseMvpPresenter;
+import com.chwl.tutu.database.AppDataBase;
+import com.chwl.core.Constants;
+import com.chwl.core.music.bean.ShareMusicInfo;
+import com.chwl.core.music.db.bean.LocalMusicBean;
+import com.chwl.core.music.model.ShareMusicListModel;
+import com.chwl.core.music.view.IShareMusicListView;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.base.PresenterEvent;
+import com.chwl.library.utils.ListUtils;
 
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/app/src/module_music/java/com/yizhuan/habu/music/widget/MusicPlayerView.java b/app/src/module_music/java/com/chwl/app/music/widget/MusicPlayerView.java
similarity index 92%
rename from app/src/module_music/java/com/yizhuan/habu/music/widget/MusicPlayerView.java
rename to app/src/module_music/java/com/chwl/app/music/widget/MusicPlayerView.java
index d148a0769..5000dd464 100644
--- a/app/src/module_music/java/com/yizhuan/habu/music/widget/MusicPlayerView.java
+++ b/app/src/module_music/java/com/chwl/app/music/widget/MusicPlayerView.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.music.widget;
+package com.chwl.app.music.widget;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -18,20 +18,20 @@ import android.widget.RelativeLayout;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.base.BaseMvpActivity;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil;
-import com.yizhuan.habu.music.activity.MusicListActivity;
-import com.yizhuan.xchat_android_core.DemoCache;
-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_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseMvpActivity;
+import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
+import com.chwl.app.music.activity.MusicListActivity;
+import com.chwl.core.DemoCache;
+import com.chwl.core.music.db.bean.LocalMusicBean;
+import com.chwl.core.music.event.CurrentMusicUpdateEvent;
+import com.chwl.core.music.event.MusicPauseEvent;
+import com.chwl.core.music.event.MusicPlayingEvent;
+import com.chwl.core.music.event.MusicStopEvent;
+import com.chwl.core.music.model.IPlayerModel;
+import com.chwl.core.music.model.PlayerModel;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SingleToastUtil;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
diff --git a/app/src/module_music/java/com/yizhuan/habu/music/widget/VoiceSeekDialog.java b/app/src/module_music/java/com/chwl/app/music/widget/VoiceSeekDialog.java
similarity index 94%
rename from app/src/module_music/java/com/yizhuan/habu/music/widget/VoiceSeekDialog.java
rename to app/src/module_music/java/com/chwl/app/music/widget/VoiceSeekDialog.java
index 6ca879011..60797c505 100644
--- a/app/src/module_music/java/com/yizhuan/habu/music/widget/VoiceSeekDialog.java
+++ b/app/src/module_music/java/com/chwl/app/music/widget/VoiceSeekDialog.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.music.widget;
+package com.chwl.app.music.widget;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -11,9 +11,9 @@ import androidx.annotation.NonNull;
 
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.common.util.Utils;
-import com.yizhuan.xchat_android_core.music.model.PlayerModel;
+import com.chwl.app.R;
+import com.chwl.app.common.util.Utils;
+import com.chwl.core.music.model.PlayerModel;
 
 
 /**
diff --git a/app/src/module_music/java/com/yizhuan/habu/music/presenter/MusicListPresenter.java b/app/src/module_music/java/com/yizhuan/habu/music/presenter/MusicListPresenter.java
deleted file mode 100644
index 1f9ef3283..000000000
--- a/app/src/module_music/java/com/yizhuan/habu/music/presenter/MusicListPresenter.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.yizhuan.habu.music.presenter;
-
-import com.yizhuan.habu.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 3eacbdeb0..e4bc81456 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.chwl.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 204ed0fd6..21f465283 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 134344a55..f76b75a33 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 a7ac5970a..26b3d0bf6 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 fa157bcd4..aa0dcb369 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_room_chat/java/com/yizhuan/habu/room_chat/adapter/RoomMsgTeamRecentViewHolder.java b/app/src/module_room_chat/java/com/chwl/app/room_chat/adapter/RoomMsgTeamRecentViewHolder.java
similarity index 96%
rename from app/src/module_room_chat/java/com/yizhuan/habu/room_chat/adapter/RoomMsgTeamRecentViewHolder.java
rename to app/src/module_room_chat/java/com/chwl/app/room_chat/adapter/RoomMsgTeamRecentViewHolder.java
index 7fec4eb42..d63e9e3d2 100644
--- a/app/src/module_room_chat/java/com/yizhuan/habu/room_chat/adapter/RoomMsgTeamRecentViewHolder.java
+++ b/app/src/module_room_chat/java/com/chwl/app/room_chat/adapter/RoomMsgTeamRecentViewHolder.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.room_chat.adapter;
+package com.chwl.app.room_chat.adapter;
 
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
@@ -24,10 +24,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.habu.R;
-import com.yizhuan.habu.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.chwl.app.R;
+import com.chwl.app.ui.im.recent.TeamExt;
+import com.chwl.core.im.custom.bean.LuckyMoneyAttachment;
+import com.chwl.core.im.custom.bean.LuckyMoneyTipsAttachment;
 
 public class RoomMsgTeamRecentViewHolder extends RoomMsgRecentViewHolder {
 
diff --git a/app/src/module_room_chat/java/com/yizhuan/habu/room_chat/adapter/RoomNewbieListAdapter.java b/app/src/module_room_chat/java/com/chwl/app/room_chat/adapter/RoomNewbieListAdapter.java
similarity index 91%
rename from app/src/module_room_chat/java/com/yizhuan/habu/room_chat/adapter/RoomNewbieListAdapter.java
rename to app/src/module_room_chat/java/com/chwl/app/room_chat/adapter/RoomNewbieListAdapter.java
index a64b7a10c..b826bbacc 100644
--- a/app/src/module_room_chat/java/com/yizhuan/habu/room_chat/adapter/RoomNewbieListAdapter.java
+++ b/app/src/module_room_chat/java/com/chwl/app/room_chat/adapter/RoomNewbieListAdapter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.room_chat.adapter;
+package com.chwl.app.room_chat.adapter;
 
 import android.graphics.drawable.GradientDrawable;
 import android.text.TextUtils;
@@ -9,11 +9,11 @@ import androidx.appcompat.widget.AppCompatImageView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.ui.user.activity.UserInfoActivity;
-import com.yizhuan.habu.ui.utils.ImageLoadUtils;
-import com.yizhuan.xchat_android_core.bean.RoomNewbieInfo;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.ui.user.activity.UserInfoActivity;
+import com.chwl.app.ui.utils.ImageLoadUtils;
+import com.chwl.core.bean.RoomNewbieInfo;
+import com.chwl.library.utils.ResUtil;
 
 /**
  * @author jack
diff --git a/app/src/module_room_chat/java/com/yizhuan/habu/room_chat/adapter/RoomNewbieMessageAdapter.java b/app/src/module_room_chat/java/com/chwl/app/room_chat/adapter/RoomNewbieMessageAdapter.java
similarity index 90%
rename from app/src/module_room_chat/java/com/yizhuan/habu/room_chat/adapter/RoomNewbieMessageAdapter.java
rename to app/src/module_room_chat/java/com/chwl/app/room_chat/adapter/RoomNewbieMessageAdapter.java
index 27e79d5ed..564d03f5f 100644
--- a/app/src/module_room_chat/java/com/yizhuan/habu/room_chat/adapter/RoomNewbieMessageAdapter.java
+++ b/app/src/module_room_chat/java/com/chwl/app/room_chat/adapter/RoomNewbieMessageAdapter.java
@@ -1,11 +1,11 @@
-package com.yizhuan.habu.room_chat.adapter;
+package com.chwl.app.room_chat.adapter;
 
 import android.widget.RadioButton;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.yizhuan.habu.R;
-import com.yizhuan.xchat_android_core.bean.RoomNewbieMessageInfo;
+import com.chwl.app.R;
+import com.chwl.core.bean.RoomNewbieMessageInfo;
 
 /**
  * @author jack
diff --git a/app/src/module_room_chat/java/com/yizhuan/habu/room_chat/event/ChangeNewbieMessageEvent.java b/app/src/module_room_chat/java/com/chwl/app/room_chat/event/ChangeNewbieMessageEvent.java
similarity index 50%
rename from app/src/module_room_chat/java/com/yizhuan/habu/room_chat/event/ChangeNewbieMessageEvent.java
rename to app/src/module_room_chat/java/com/chwl/app/room_chat/event/ChangeNewbieMessageEvent.java
index edb6a07d9..092911bcb 100644
--- a/app/src/module_room_chat/java/com/yizhuan/habu/room_chat/event/ChangeNewbieMessageEvent.java
+++ b/app/src/module_room_chat/java/com/chwl/app/room_chat/event/ChangeNewbieMessageEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.room_chat.event;
+package com.chwl.app.room_chat.event;
 
 public class ChangeNewbieMessageEvent {
 }
diff --git a/app/src/module_room_chat/java/com/chwl/app/room_chat/event/ClickRootViewEvent.java b/app/src/module_room_chat/java/com/chwl/app/room_chat/event/ClickRootViewEvent.java
new file mode 100644
index 000000000..e2bcf5094
--- /dev/null
+++ b/app/src/module_room_chat/java/com/chwl/app/room_chat/event/ClickRootViewEvent.java
@@ -0,0 +1,4 @@
+package com.chwl.app.room_chat.event;
+
+public class ClickRootViewEvent {
+}
diff --git a/app/src/module_room_chat/java/com/chwl/app/room_chat/event/SendHelloEvent.java b/app/src/module_room_chat/java/com/chwl/app/room_chat/event/SendHelloEvent.java
new file mode 100644
index 000000000..33022f1f3
--- /dev/null
+++ b/app/src/module_room_chat/java/com/chwl/app/room_chat/event/SendHelloEvent.java
@@ -0,0 +1,4 @@
+package com.chwl.app.room_chat.event;
+
+public class SendHelloEvent {
+}
diff --git a/app/src/module_room_chat/java/com/chwl/app/room_chat/event/SendHelloSuccessEvent.java b/app/src/module_room_chat/java/com/chwl/app/room_chat/event/SendHelloSuccessEvent.java
new file mode 100644
index 000000000..d24d6f20d
--- /dev/null
+++ b/app/src/module_room_chat/java/com/chwl/app/room_chat/event/SendHelloSuccessEvent.java
@@ -0,0 +1,4 @@
+package com.chwl.app.room_chat.event;
+
+public class SendHelloSuccessEvent {
+}
diff --git a/app/src/module_room_chat/java/com/yizhuan/habu/room_chat/fragment/NewbieFilterDialog.kt b/app/src/module_room_chat/java/com/chwl/app/room_chat/fragment/NewbieFilterDialog.kt
similarity index 88%
rename from app/src/module_room_chat/java/com/yizhuan/habu/room_chat/fragment/NewbieFilterDialog.kt
rename to app/src/module_room_chat/java/com/chwl/app/room_chat/fragment/NewbieFilterDialog.kt
index 10878c01f..bcfc42c2d 100644
--- a/app/src/module_room_chat/java/com/yizhuan/habu/room_chat/fragment/NewbieFilterDialog.kt
+++ b/app/src/module_room_chat/java/com/chwl/app/room_chat/fragment/NewbieFilterDialog.kt
@@ -1,10 +1,10 @@
-package com.yizhuan.habu.room_chat.fragment
+package com.chwl.app.room_chat.fragment
 
 import android.view.Gravity
 import android.view.WindowManager
-import com.yizhuan.habu.R
-import com.yizhuan.habu.base.BaseDialog
-import com.yizhuan.habu.databinding.DialogNewbieFilterBinding
+import com.chwl.app.R
+import com.chwl.app.base.BaseDialog
+import com.chwl.app.databinding.DialogNewbieFilterBinding
 
 class NewbieFilterDialog : BaseDialog() {
 
diff --git a/app/src/module_room_chat/java/com/yizhuan/habu/room_chat/fragment/RoomMsgAttentionFragment.java b/app/src/module_room_chat/java/com/chwl/app/room_chat/fragment/RoomMsgAttentionFragment.java
similarity index 87%
rename from app/src/module_room_chat/java/com/yizhuan/habu/room_chat/fragment/RoomMsgAttentionFragment.java
rename to app/src/module_room_chat/java/com/chwl/app/room_chat/fragment/RoomMsgAttentionFragment.java
index a8bb43d94..15cfa7f23 100644
--- a/app/src/module_room_chat/java/com/yizhuan/habu/room_chat/fragment/RoomMsgAttentionFragment.java
+++ b/app/src/module_room_chat/java/com/chwl/app/room_chat/fragment/RoomMsgAttentionFragment.java
@@ -1,6 +1,6 @@
-package com.yizhuan.habu.room_chat.fragment;
+package com.chwl.app.room_chat.fragment;
 
-import static com.yizhuan.habu.R.id.swipe_refresh;
+import static com.chwl.app.R.id.swipe_refresh;
 
 import android.os.Bundle;
 
@@ -10,19 +10,19 @@ import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.base.BaseFragment;
-import com.yizhuan.habu.friend.view.SelectFriendActivity;
-import com.yizhuan.habu.room_chat.activity.NimRoomP2PMessageActivity;
-import com.yizhuan.habu.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.chwl.app.R;
+import com.chwl.app.base.BaseFragment;
+import com.chwl.app.friend.view.SelectFriendActivity;
+import com.chwl.app.room_chat.activity.NimRoomP2PMessageActivity;
+import com.chwl.app.room_chat.adapter.RoomMsgAttentionListAdapter;
+import com.chwl.core.Constants;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.praise.event.PraiseEvent;
+import com.chwl.core.user.AttentionModel;
+import com.chwl.core.user.bean.AttentionInfo;
+import com.chwl.core.user.event.LoginUserInfoUpdateEvent;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.utils.ListUtils;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
diff --git a/app/src/module_room_chat/java/com/yizhuan/habu/room_chat/fragment/RoomMsgFansListFragment.java b/app/src/module_room_chat/java/com/chwl/app/room_chat/fragment/RoomMsgFansListFragment.java
similarity index 89%
rename from app/src/module_room_chat/java/com/yizhuan/habu/room_chat/fragment/RoomMsgFansListFragment.java
rename to app/src/module_room_chat/java/com/chwl/app/room_chat/fragment/RoomMsgFansListFragment.java
index 17bcd5dc1..1992a8bdc 100644
--- a/app/src/module_room_chat/java/com/yizhuan/habu/room_chat/fragment/RoomMsgFansListFragment.java
+++ b/app/src/module_room_chat/java/com/chwl/app/room_chat/fragment/RoomMsgFansListFragment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.room_chat.fragment;
+package com.chwl.app.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.habu.R;
-import com.yizhuan.habu.base.BaseFragment;
-import com.yizhuan.habu.common.NoDataFragment;
-import com.yizhuan.habu.room_chat.activity.NimRoomP2PMessageActivity;
-import com.yizhuan.habu.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.chwl.app.R;
+import com.chwl.app.base.BaseFragment;
+import com.chwl.app.common.NoDataFragment;
+import com.chwl.app.room_chat.activity.NimRoomP2PMessageActivity;
+import com.chwl.app.room_chat.adapter.RoomMsgFansViewAdapter;
+import com.chwl.core.Constants;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.praise.event.PraiseEvent;
+import com.chwl.core.user.AttentionModel;
+import com.chwl.core.user.bean.FansInfo;
+import com.chwl.core.user.bean.FansListInfo;
+import com.chwl.core.user.event.LoginUserInfoUpdateEvent;
+import com.chwl.core.utils.SystemUidUtil;
+import com.chwl.library.utils.ListUtils;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
diff --git a/app/src/module_room_chat/java/com/yizhuan/habu/room_chat/fragment/RoomMsgFriendListFragment.java b/app/src/module_room_chat/java/com/chwl/app/room_chat/fragment/RoomMsgFriendListFragment.java
similarity index 89%
rename from app/src/module_room_chat/java/com/yizhuan/habu/room_chat/fragment/RoomMsgFriendListFragment.java
rename to app/src/module_room_chat/java/com/chwl/app/room_chat/fragment/RoomMsgFriendListFragment.java
index 18348ea86..7bfbf0ea8 100644
--- a/app/src/module_room_chat/java/com/yizhuan/habu/room_chat/fragment/RoomMsgFriendListFragment.java
+++ b/app/src/module_room_chat/java/com/chwl/app/room_chat/fragment/RoomMsgFriendListFragment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.room_chat.fragment;
+package com.chwl.app.room_chat.fragment;
 
 import android.os.Bundle;
 import android.view.View;
@@ -9,19 +9,19 @@ import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import com.orhanobut.logger.Logger;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.base.BaseFragment;
-import com.yizhuan.habu.common.NoDataFragment;
-import com.yizhuan.habu.room_chat.activity.NimRoomP2PMessageActivity;
-import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseFragment;
+import com.chwl.app.common.NoDataFragment;
+import com.chwl.app.room_chat.activity.NimRoomP2PMessageActivity;
+import com.chwl.app.room_chat.adapter.RoomMsgFriendListAdapter;
+import com.chwl.core.im.friend.IMFriendModel;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.manager.RelationShipEvent;
+import com.chwl.core.user.UserModel;
+import com.chwl.core.user.bean.UserInfo;
+import com.chwl.core.user.event.LoginUserInfoUpdateEvent;
+import com.chwl.library.utils.ListUtils;
+import com.chwl.library.utils.ResUtil;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
diff --git a/app/src/module_room_chat/java/com/yizhuan/habu/room_chat/fragment/RoomMsgRecentContactsFragment.java b/app/src/module_room_chat/java/com/chwl/app/room_chat/fragment/RoomMsgRecentContactsFragment.java
similarity index 99%
rename from app/src/module_room_chat/java/com/yizhuan/habu/room_chat/fragment/RoomMsgRecentContactsFragment.java
rename to app/src/module_room_chat/java/com/chwl/app/room_chat/fragment/RoomMsgRecentContactsFragment.java
index ef4ab6047..6cb488a54 100644
--- a/app/src/module_room_chat/java/com/yizhuan/habu/room_chat/fragment/RoomMsgRecentContactsFragment.java
+++ b/app/src/module_room_chat/java/com/chwl/app/room_chat/fragment/RoomMsgRecentContactsFragment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.room_chat.fragment;
+package com.chwl.app.room_chat.fragment;
 
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -39,9 +39,9 @@ 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.habu.R;
-import com.yizhuan.habu.room_chat.adapter.RoomMsgRecentContactAdapter;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.room_chat.adapter.RoomMsgRecentContactAdapter;
+import com.chwl.library.utils.ResUtil;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/app/src/module_room_chat/java/com/yizhuan/habu/room_chat/fragment/RoomMsgRecentListFragment.java b/app/src/module_room_chat/java/com/chwl/app/room_chat/fragment/RoomMsgRecentListFragment.java
similarity index 85%
rename from app/src/module_room_chat/java/com/yizhuan/habu/room_chat/fragment/RoomMsgRecentListFragment.java
rename to app/src/module_room_chat/java/com/chwl/app/room_chat/fragment/RoomMsgRecentListFragment.java
index 8811b4beb..189978d68 100644
--- a/app/src/module_room_chat/java/com/yizhuan/habu/room_chat/fragment/RoomMsgRecentListFragment.java
+++ b/app/src/module_room_chat/java/com/chwl/app/room_chat/fragment/RoomMsgRecentListFragment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.room_chat.fragment;
+package com.chwl.app.room_chat.fragment;
 
 import android.annotation.SuppressLint;
 import android.os.Bundle;
@@ -15,23 +15,23 @@ import com.google.gson.Gson;
 import com.netease.nim.uikit.business.recent.RecentContactsCallback;
 import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
 import com.netease.nimlib.sdk.msg.model.RecentContact;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.base.BaseFragment;
-import com.yizhuan.habu.miniworld.activity.MWTeamRoomMessageAct;
-import com.yizhuan.habu.module_hall.im.NimHelper;
-import com.yizhuan.habu.ui.im.recent.TeamExt;
-import com.yizhuan.habu.room_chat.activity.NimHallTeamRoomMessageActivity;
-import com.yizhuan.habu.room_chat.activity.NimRoomP2PMessageActivity;
-import com.yizhuan.habu.room_chat.activity.NimTeamRoomMessageActivity;
-import com.yizhuan.habu.room_chat.activity.RoomNewbieActivity;
-import com.yizhuan.xchat_android_core.auth.event.LoginEvent;
-import com.yizhuan.xchat_android_core.initial.InitialModel;
-import com.yizhuan.xchat_android_core.level.UserLevelVo;
-import com.yizhuan.xchat_android_core.user.UserModel;
-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.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseFragment;
+import com.chwl.app.miniworld.activity.MWTeamRoomMessageAct;
+import com.chwl.app.module_hall.im.NimHelper;
+import com.chwl.app.ui.im.recent.TeamExt;
+import com.chwl.app.room_chat.activity.NimHallTeamRoomMessageActivity;
+import com.chwl.app.room_chat.activity.NimRoomP2PMessageActivity;
+import com.chwl.app.room_chat.activity.NimTeamRoomMessageActivity;
+import com.chwl.app.room_chat.activity.RoomNewbieActivity;
+import com.chwl.core.auth.event.LoginEvent;
+import com.chwl.core.initial.InitialModel;
+import com.chwl.core.level.UserLevelVo;
+import com.chwl.core.user.UserModel;
+import com.chwl.core.user.event.LoadLoginUserInfoEvent;
+import com.chwl.core.utils.SharedPreferenceUtils;
+import com.chwl.core.utils.net.BeanObserver;
+import com.chwl.library.utils.ResUtil;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
diff --git a/app/src/module_room_chat/java/com/yizhuan/habu/room_chat/fragment/RoomNewbieListFragment.java b/app/src/module_room_chat/java/com/chwl/app/room_chat/fragment/RoomNewbieListFragment.java
similarity index 89%
rename from app/src/module_room_chat/java/com/yizhuan/habu/room_chat/fragment/RoomNewbieListFragment.java
rename to app/src/module_room_chat/java/com/chwl/app/room_chat/fragment/RoomNewbieListFragment.java
index 9cbb0ff38..c7c0743ef 100644
--- a/app/src/module_room_chat/java/com/yizhuan/habu/room_chat/fragment/RoomNewbieListFragment.java
+++ b/app/src/module_room_chat/java/com/chwl/app/room_chat/fragment/RoomNewbieListFragment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.room_chat.fragment;
+package com.chwl.app.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.habu.R;
-import com.yizhuan.habu.avroom.presenter.RoomNewbiePresenter;
-import com.yizhuan.habu.base.BaseMvpFragment;
-import com.yizhuan.habu.module.IRoomNewbieView;
-import com.yizhuan.habu.room_chat.activity.RoomNewbieMessageActivity;
-import com.yizhuan.habu.room_chat.adapter.RoomNewbieListAdapter;
-import com.yizhuan.habu.room_chat.event.SendHelloSuccessEvent;
-import com.yizhuan.xchat_android_core.bean.RoomNewbieInfo;
-import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
-import com.yizhuan.xchat_android_library.utils.ListUtils;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
+import com.chwl.app.R;
+import com.chwl.app.avroom.presenter.RoomNewbiePresenter;
+import com.chwl.app.base.BaseMvpFragment;
+import com.chwl.app.module.IRoomNewbieView;
+import com.chwl.app.room_chat.activity.RoomNewbieMessageActivity;
+import com.chwl.app.room_chat.adapter.RoomNewbieListAdapter;
+import com.chwl.app.room_chat.event.SendHelloSuccessEvent;
+import com.chwl.core.bean.RoomNewbieInfo;
+import com.chwl.library.base.factory.CreatePresenter;
+import com.chwl.library.utils.ListUtils;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SingleToastUtil;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
diff --git a/app/src/module_room_chat/java/com/yizhuan/habu/room_chat/fragment/RoomNewbieMessageFragment.java b/app/src/module_room_chat/java/com/chwl/app/room_chat/fragment/RoomNewbieMessageFragment.java
similarity index 89%
rename from app/src/module_room_chat/java/com/yizhuan/habu/room_chat/fragment/RoomNewbieMessageFragment.java
rename to app/src/module_room_chat/java/com/chwl/app/room_chat/fragment/RoomNewbieMessageFragment.java
index 14b62539f..ee170f5c0 100644
--- a/app/src/module_room_chat/java/com/yizhuan/habu/room_chat/fragment/RoomNewbieMessageFragment.java
+++ b/app/src/module_room_chat/java/com/chwl/app/room_chat/fragment/RoomNewbieMessageFragment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.room_chat.fragment;
+package com.chwl.app.room_chat.fragment;
 
 import android.os.Bundle;
 import android.view.View;
@@ -9,19 +9,19 @@ import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.avroom.presenter.RoomNewbieHellowWordPresenter;
-import com.yizhuan.habu.base.BaseMvpFragment;
-import com.yizhuan.habu.module.IRoomNewbieMessageView;
-import com.yizhuan.habu.module.RoomNewbieModel;
-import com.yizhuan.habu.room_chat.adapter.RoomNewbieMessageAdapter;
-import com.yizhuan.habu.room_chat.event.ChangeNewbieMessageEvent;
-import com.yizhuan.habu.room_chat.event.SendHelloEvent;
-import com.yizhuan.habu.room_chat.event.SendHelloSuccessEvent;
-import com.yizhuan.xchat_android_core.bean.RoomNewbieMessageInfo;
-import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
+import com.chwl.app.R;
+import com.chwl.app.avroom.presenter.RoomNewbieHellowWordPresenter;
+import com.chwl.app.base.BaseMvpFragment;
+import com.chwl.app.module.IRoomNewbieMessageView;
+import com.chwl.app.module.RoomNewbieModel;
+import com.chwl.app.room_chat.adapter.RoomNewbieMessageAdapter;
+import com.chwl.app.room_chat.event.ChangeNewbieMessageEvent;
+import com.chwl.app.room_chat.event.SendHelloEvent;
+import com.chwl.app.room_chat.event.SendHelloSuccessEvent;
+import com.chwl.core.bean.RoomNewbieMessageInfo;
+import com.chwl.library.base.factory.CreatePresenter;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SingleToastUtil;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
diff --git a/app/src/module_room_chat/java/com/yizhuan/habu/room_chat/utils/InViteFansTimer.java b/app/src/module_room_chat/java/com/chwl/app/room_chat/utils/InViteFansTimer.java
similarity index 93%
rename from app/src/module_room_chat/java/com/yizhuan/habu/room_chat/utils/InViteFansTimer.java
rename to app/src/module_room_chat/java/com/chwl/app/room_chat/utils/InViteFansTimer.java
index 10f5d4c1c..66391cf2b 100644
--- a/app/src/module_room_chat/java/com/yizhuan/habu/room_chat/utils/InViteFansTimer.java
+++ b/app/src/module_room_chat/java/com/chwl/app/room_chat/utils/InViteFansTimer.java
@@ -1,12 +1,12 @@
-package com.yizhuan.habu.room_chat.utils;
+package com.chwl.app.room_chat.utils;
 
 import android.content.Context;
 import android.os.CountDownTimer;
 import android.text.Html;
 import android.widget.TextView;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.library.utils.ResUtil;
 
 
 /**
diff --git a/app/src/module_room_chat/java/com/yizhuan/habu/room_chat/TEMP.java b/app/src/module_room_chat/java/com/yizhuan/habu/room_chat/TEMP.java
deleted file mode 100644
index bf1a26cbe..000000000
--- a/app/src/module_room_chat/java/com/yizhuan/habu/room_chat/TEMP.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.yizhuan.habu.room_chat;
-
-public class TEMP {
-}
diff --git a/app/src/module_room_chat/java/com/yizhuan/habu/room_chat/event/ClickRootViewEvent.java b/app/src/module_room_chat/java/com/yizhuan/habu/room_chat/event/ClickRootViewEvent.java
deleted file mode 100644
index bb0baeb02..000000000
--- a/app/src/module_room_chat/java/com/yizhuan/habu/room_chat/event/ClickRootViewEvent.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.yizhuan.habu.room_chat.event;
-
-public class ClickRootViewEvent {
-}
diff --git a/app/src/module_room_chat/java/com/yizhuan/habu/room_chat/event/SendHelloEvent.java b/app/src/module_room_chat/java/com/yizhuan/habu/room_chat/event/SendHelloEvent.java
deleted file mode 100644
index 5d82c765f..000000000
--- a/app/src/module_room_chat/java/com/yizhuan/habu/room_chat/event/SendHelloEvent.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.yizhuan.habu.room_chat.event;
-
-public class SendHelloEvent {
-}
diff --git a/app/src/module_room_chat/java/com/yizhuan/habu/room_chat/event/SendHelloSuccessEvent.java b/app/src/module_room_chat/java/com/yizhuan/habu/room_chat/event/SendHelloSuccessEvent.java
deleted file mode 100644
index f8e1716a8..000000000
--- a/app/src/module_room_chat/java/com/yizhuan/habu/room_chat/event/SendHelloSuccessEvent.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.yizhuan.habu.room_chat.event;
-
-public class SendHelloSuccessEvent {
-}
diff --git a/app/src/module_super_admin/java/com/yizhuan/habu/sadmin/RoomSAdminManagerActivity.java b/app/src/module_super_admin/java/com/chwl/app/sadmin/RoomSAdminManagerActivity.java
similarity index 85%
rename from app/src/module_super_admin/java/com/yizhuan/habu/sadmin/RoomSAdminManagerActivity.java
rename to app/src/module_super_admin/java/com/chwl/app/sadmin/RoomSAdminManagerActivity.java
index c454ac47b..d44ad23a4 100644
--- a/app/src/module_super_admin/java/com/yizhuan/habu/sadmin/RoomSAdminManagerActivity.java
+++ b/app/src/module_super_admin/java/com/chwl/app/sadmin/RoomSAdminManagerActivity.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.sadmin;
+package com.chwl.app.sadmin;
 
 import android.content.Context;
 import android.content.Intent;
@@ -6,23 +6,23 @@ import android.view.View;
 
 import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage;
 import com.trello.rxlifecycle3.android.ActivityEvent;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.avroom.activity.RoomBlackListActivity;
-import com.yizhuan.habu.base.BaseViewBindingActivity;
-import com.yizhuan.habu.common.widget.dialog.DialogManager;
-import com.yizhuan.habu.databinding.ActivityRoomSAdminManagerBinding;
-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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.avroom.activity.RoomBlackListActivity;
+import com.chwl.app.base.BaseViewBindingActivity;
+import com.chwl.app.common.widget.dialog.DialogManager;
+import com.chwl.app.databinding.ActivityRoomSAdminManagerBinding;
+import com.chwl.core.base.CancelNoToastException;
+import com.chwl.core.kick.KickModel;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.room.bean.RoomInfo;
+import com.chwl.core.room.model.AvRoomModel;
+import com.chwl.core.super_admin.model.ISuperAdminModel;
+import com.chwl.core.super_admin.model.SuperAdminModel;
+import com.chwl.core.super_admin.util.SaAttachmentFactory;
+import com.chwl.core.utils.net.DontWarnObserver;
+import com.chwl.library.net.rxnet.callback.CallBack;
+import com.chwl.library.utils.ResUtil;
 
 import io.reactivex.Single;
 import io.reactivex.SingleOnSubscribe;
diff --git a/app/src/module_super_admin/java/com/yizhuan/habu/sadmin/utils/SaAttachmentToMsgUtil.java b/app/src/module_super_admin/java/com/chwl/app/sadmin/utils/SaAttachmentToMsgUtil.java
similarity index 88%
rename from app/src/module_super_admin/java/com/yizhuan/habu/sadmin/utils/SaAttachmentToMsgUtil.java
rename to app/src/module_super_admin/java/com/chwl/app/sadmin/utils/SaAttachmentToMsgUtil.java
index 6834b94c0..1ac2b7726 100644
--- a/app/src/module_super_admin/java/com/yizhuan/habu/sadmin/utils/SaAttachmentToMsgUtil.java
+++ b/app/src/module_super_admin/java/com/chwl/app/sadmin/utils/SaAttachmentToMsgUtil.java
@@ -1,16 +1,16 @@
-package com.yizhuan.habu.sadmin.utils;
+package com.chwl.app.sadmin.utils;
 
 import android.text.TextUtils;
 import android.text.style.ForegroundColorSpan;
 import android.widget.TextView;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.avroom.widget.MessageView;
+import com.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.super_admin.attachment.SuperAdminOpAttachment;
+import com.chwl.core.super_admin.bean.SaOpInfo;
+import com.chwl.library.utils.ResUtil;
 
 /**
  * 超管自定义消息 to 公屏消息
diff --git a/app/src/module_super_admin/java/com/yizhuan/habu/sadmin/utils/SuperAdminUiHelper.java b/app/src/module_super_admin/java/com/chwl/app/sadmin/utils/SuperAdminUiHelper.java
similarity index 66%
rename from app/src/module_super_admin/java/com/yizhuan/habu/sadmin/utils/SuperAdminUiHelper.java
rename to app/src/module_super_admin/java/com/chwl/app/sadmin/utils/SuperAdminUiHelper.java
index 9a01f2527..dca494079 100644
--- a/app/src/module_super_admin/java/com/yizhuan/habu/sadmin/utils/SuperAdminUiHelper.java
+++ b/app/src/module_super_admin/java/com/chwl/app/sadmin/utils/SuperAdminUiHelper.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.sadmin.utils;
+package com.chwl.app.sadmin.utils;
 
 /**
  * create by lvzebiao @2019/8/26
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 db8f2dda3..ae3e9e9c1 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/habu/shipantics/RadishRankingActivity.java b/app/src/module_treasure_box/java/com/chwl/app/shipantics/RadishRankingActivity.java
similarity index 81%
rename from app/src/module_treasure_box/java/com/yizhuan/habu/shipantics/RadishRankingActivity.java
rename to app/src/module_treasure_box/java/com/chwl/app/shipantics/RadishRankingActivity.java
index 5043df7a6..1f0445cad 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/habu/shipantics/RadishRankingActivity.java
+++ b/app/src/module_treasure_box/java/com/chwl/app/shipantics/RadishRankingActivity.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.shipantics;
+package com.chwl.app.shipantics;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -7,16 +7,16 @@ import android.view.View;
 
 import androidx.fragment.app.Fragment;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.base.BaseViewBindingActivity;
-import com.yizhuan.habu.common.ViewPagerAdapter;
-import com.yizhuan.habu.databinding.ActivityRadishRankingBinding;
-import com.yizhuan.habu.decoration.view.widgets.CarMagicIndicator;
-import com.yizhuan.habu.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_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseViewBindingActivity;
+import com.chwl.app.common.ViewPagerAdapter;
+import com.chwl.app.databinding.ActivityRadishRankingBinding;
+import com.chwl.app.decoration.view.widgets.CarMagicIndicator;
+import com.chwl.app.room_chat.event.ClickRootViewEvent;
+import com.chwl.core.home.bean.TabInfo;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.manager.RoomEvent;
+import com.chwl.library.utils.ResUtil;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
diff --git a/app/src/module_treasure_box/java/com/yizhuan/habu/shipantics/RadishRankingFragment.java b/app/src/module_treasure_box/java/com/chwl/app/shipantics/RadishRankingFragment.java
similarity index 91%
rename from app/src/module_treasure_box/java/com/yizhuan/habu/shipantics/RadishRankingFragment.java
rename to app/src/module_treasure_box/java/com/chwl/app/shipantics/RadishRankingFragment.java
index 5b57fae55..e50d5dfe4 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/habu/shipantics/RadishRankingFragment.java
+++ b/app/src/module_treasure_box/java/com/chwl/app/shipantics/RadishRankingFragment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.shipantics;
+package com.chwl.app.shipantics;
 
 import android.os.Bundle;
 import android.view.View;
@@ -9,13 +9,13 @@ import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.base.BaseMvpFragment;
-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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseMvpFragment;
+import com.chwl.core.room.treasure_box.bean.BoxRankingInfo;
+import com.chwl.core.room.treasure_box.event.RefreshBoxRankingEvent;
+import com.chwl.library.base.factory.CreatePresenter;
+import com.chwl.library.utils.ListUtils;
+import com.chwl.library.utils.ResUtil;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
diff --git a/app/src/module_treasure_box/java/com/yizhuan/habu/shipantics/RadishRankingListAdapter.java b/app/src/module_treasure_box/java/com/chwl/app/shipantics/RadishRankingListAdapter.java
similarity index 91%
rename from app/src/module_treasure_box/java/com/yizhuan/habu/shipantics/RadishRankingListAdapter.java
rename to app/src/module_treasure_box/java/com/chwl/app/shipantics/RadishRankingListAdapter.java
index 36bb3d3b6..152a98f88 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/habu/shipantics/RadishRankingListAdapter.java
+++ b/app/src/module_treasure_box/java/com/chwl/app/shipantics/RadishRankingListAdapter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.shipantics;
+package com.chwl.app.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.habu.R;
-import com.yizhuan.habu.ui.utils.ImageLoadKt;
-import com.yizhuan.xchat_android_core.room.treasure_box.bean.BoxRankingInfo;
+import com.chwl.app.R;
+import com.chwl.app.ui.utils.ImageLoadKt;
+import com.chwl.core.room.treasure_box.bean.BoxRankingInfo;
 
 /**
  * @author jack
diff --git a/app/src/module_treasure_box/java/com/yizhuan/habu/shipantics/RadishRankingPresenter.java b/app/src/module_treasure_box/java/com/chwl/app/shipantics/RadishRankingPresenter.java
similarity index 84%
rename from app/src/module_treasure_box/java/com/yizhuan/habu/shipantics/RadishRankingPresenter.java
rename to app/src/module_treasure_box/java/com/chwl/app/shipantics/RadishRankingPresenter.java
index 83391cd6a..5407b95f1 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/habu/shipantics/RadishRankingPresenter.java
+++ b/app/src/module_treasure_box/java/com/chwl/app/shipantics/RadishRankingPresenter.java
@@ -1,11 +1,11 @@
-package com.yizhuan.habu.shipantics;
+package com.chwl.app.shipantics;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseMvpPresenter;
+import com.chwl.treasure_box.model.RadishModel;
+import com.chwl.core.Constants;
+import com.chwl.core.room.treasure_box.bean.BoxRankingInfo;
+import com.chwl.library.utils.ResUtil;
 
 import io.reactivex.SingleObserver;
 import io.reactivex.disposables.Disposable;
diff --git a/app/src/module_treasure_box/java/com/yizhuan/habu/shipantics/RadishResultDialog.kt b/app/src/module_treasure_box/java/com/chwl/app/shipantics/RadishResultDialog.kt
similarity index 87%
rename from app/src/module_treasure_box/java/com/yizhuan/habu/shipantics/RadishResultDialog.kt
rename to app/src/module_treasure_box/java/com/chwl/app/shipantics/RadishResultDialog.kt
index a9d9f2e06..7f8105c79 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/habu/shipantics/RadishResultDialog.kt
+++ b/app/src/module_treasure_box/java/com/chwl/app/shipantics/RadishResultDialog.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.shipantics
+package com.chwl.app.shipantics
 
 import android.os.Bundle
 import android.widget.ImageView
@@ -7,13 +7,13 @@ 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.habu.R
-import com.yizhuan.habu.base.BaseDialog
-import com.yizhuan.habu.databinding.DialogRadishResultBinding
-import com.yizhuan.habu.ui.utils.RVDelegate
-import com.yizhuan.habu.ui.utils.load
-import com.yizhuan.treasure_box.bean.OpenBoxResult
-import com.yizhuan.treasure_box.bean.PrizeInfo
+import com.chwl.app.R
+import com.chwl.app.base.BaseDialog
+import com.chwl.app.databinding.DialogRadishResultBinding
+import com.chwl.app.ui.utils.RVDelegate
+import com.chwl.app.ui.utils.load
+import com.chwl.treasure_box.bean.OpenBoxResult
+import com.chwl.treasure_box.bean.PrizeInfo
 
 class RadishResultDialog :
     BaseDialog() {
diff --git a/app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/activity/BoxRankingActivity.java b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/activity/BoxRankingActivity.java
similarity index 78%
rename from app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/activity/BoxRankingActivity.java
rename to app/src/module_treasure_box/java/com/chwl/app/treasure_box/activity/BoxRankingActivity.java
index 6b15b973e..371ebe4ad 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/activity/BoxRankingActivity.java
+++ b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/activity/BoxRankingActivity.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.treasure_box.activity;
+package com.chwl.app.treasure_box.activity;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -8,18 +8,18 @@ import android.view.View;
 
 import androidx.fragment.app.Fragment;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.base.BaseViewBindingActivity;
-import com.yizhuan.habu.common.ViewPagerAdapter;
-import com.yizhuan.habu.databinding.ActivityRoomBoxRankingBinding;
-import com.yizhuan.habu.decoration.view.widgets.CarMagicIndicator;
-import com.yizhuan.habu.treasure_box.fragment.BoxRankingFragment;
-import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseViewBindingActivity;
+import com.chwl.app.common.ViewPagerAdapter;
+import com.chwl.app.databinding.ActivityRoomBoxRankingBinding;
+import com.chwl.app.decoration.view.widgets.CarMagicIndicator;
+import com.chwl.app.treasure_box.fragment.BoxRankingFragment;
+import com.chwl.app.room_chat.event.ClickRootViewEvent;
+import com.chwl.core.home.bean.TabInfo;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.manager.RoomEvent;
+import com.chwl.core.room.treasure_box.event.RefreshBoxRankingEvent;
+import com.chwl.library.utils.ResUtil;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
diff --git a/app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/activity/TreasureBoxActivity.java b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/activity/TreasureBoxActivity.java
similarity index 86%
rename from app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/activity/TreasureBoxActivity.java
rename to app/src/module_treasure_box/java/com/chwl/app/treasure_box/activity/TreasureBoxActivity.java
index 756486fe3..ae8b48a22 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/activity/TreasureBoxActivity.java
+++ b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/activity/TreasureBoxActivity.java
@@ -1,14 +1,14 @@
-package com.yizhuan.habu.treasure_box.activity;
+package com.chwl.app.treasure_box.activity;
 
-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_FAIRY;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_ALL;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_NOTIFY;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_SERVER_ALL;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ALL_ROOM_NOTIFY_BY_SVGA;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L5;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_BOX;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_FAIRY;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_ALL;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_NOTIFY;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_SERVER_ALL;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ALL_ROOM_NOTIFY_BY_SVGA;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L5;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -35,44 +35,44 @@ import com.netease.nim.uikit.StatusBarUtil;
 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.yizhuan.habu.R;
-import com.yizhuan.habu.base.BaseBindingActivity;
-import com.yizhuan.habu.databinding.ActivityTreasureBoxBinding;
-import com.yizhuan.habu.treasure_box.widget.dialog.BoxLoveLackDialog;
-import com.yizhuan.habu.treasure_box.widget.dialog.BoxMoreDialog;
-import com.yizhuan.habu.treasure_box.widget.dialog.BuyLoveDialog;
-import com.yizhuan.habu.treasure_box.widget.dialog.TreasureBoxDialog;
-import com.yizhuan.habu.ui.utils.ImageLoadUtils;
-import com.yizhuan.habu.utils.KeyBoardUtils;
-import com.yizhuan.habu.utils.UserUtils;
-import com.yizhuan.treasure_box.bean.PrizeNewInfo;
-import com.yizhuan.treasure_box.bean.UserTicketInfo;
-import com.yizhuan.treasure_box.model.BoxModel;
-import com.yizhuan.xchat_android_core.DemoCache;
-import com.yizhuan.xchat_android_core.auth.AuthModel;
-import com.yizhuan.xchat_android_core.bean.BaseProtocol;
-import com.yizhuan.xchat_android_core.exception.FailReasonException;
-import com.yizhuan.xchat_android_core.gift.bean.LuckyBagNoticeInfo;
-import com.yizhuan.xchat_android_core.im.custom.bean.FairyMsgAttachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.RoomBoxPrizeAttachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.RoomBoxPrizeInfo;
-import com.yizhuan.xchat_android_core.im.custom.bean.RoomLuckySeaAttachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.RoomLuckySeaMsgBean;
-import com.yizhuan.xchat_android_core.im.custom.bean.RoomReceivedLuckyGiftAttachment;
-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.room.bean.FindLoveSwitchVo;
-import com.yizhuan.xchat_android_core.treasurefairy.FairyMsgInfoBean;
-import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
-import com.yizhuan.xchat_android_library.common.SpConstants;
-import com.yizhuan.xchat_android_library.common.util.SPUtils;
-import com.yizhuan.xchat_android_library.utils.FormatUtils;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
-import com.yizhuan.xchat_android_library.utils.TimeUtils;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseBindingActivity;
+import com.chwl.app.databinding.ActivityTreasureBoxBinding;
+import com.chwl.app.treasure_box.widget.dialog.BoxLoveLackDialog;
+import com.chwl.app.treasure_box.widget.dialog.BoxMoreDialog;
+import com.chwl.app.treasure_box.widget.dialog.BuyLoveDialog;
+import com.chwl.app.treasure_box.widget.dialog.TreasureBoxDialog;
+import com.chwl.app.ui.utils.ImageLoadUtils;
+import com.chwl.app.utils.KeyBoardUtils;
+import com.chwl.app.utils.UserUtils;
+import com.chwl.treasure_box.bean.PrizeNewInfo;
+import com.chwl.treasure_box.bean.UserTicketInfo;
+import com.chwl.treasure_box.model.BoxModel;
+import com.chwl.core.DemoCache;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.bean.BaseProtocol;
+import com.chwl.core.exception.FailReasonException;
+import com.chwl.core.gift.bean.LuckyBagNoticeInfo;
+import com.chwl.core.im.custom.bean.FairyMsgAttachment;
+import com.chwl.core.im.custom.bean.RoomBoxPrizeAttachment;
+import com.chwl.core.im.custom.bean.RoomBoxPrizeInfo;
+import com.chwl.core.im.custom.bean.RoomLuckySeaAttachment;
+import com.chwl.core.im.custom.bean.RoomLuckySeaMsgBean;
+import com.chwl.core.im.custom.bean.RoomReceivedLuckyGiftAttachment;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.manager.RoomEvent;
+import com.chwl.core.pay.PayModel;
+import com.chwl.core.pay.bean.WalletInfo;
+import com.chwl.core.room.bean.FindLoveSwitchVo;
+import com.chwl.core.treasurefairy.FairyMsgInfoBean;
+import com.chwl.library.annatation.ActLayoutRes;
+import com.chwl.library.common.SpConstants;
+import com.chwl.library.common.util.SPUtils;
+import com.chwl.library.utils.FormatUtils;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SingleToastUtil;
+import com.chwl.library.utils.TimeUtils;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
diff --git a/app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/activity/TreasureBoxHonourActivity.java b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/activity/TreasureBoxHonourActivity.java
similarity index 90%
rename from app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/activity/TreasureBoxHonourActivity.java
rename to app/src/module_treasure_box/java/com/chwl/app/treasure_box/activity/TreasureBoxHonourActivity.java
index bb7169a0a..0ed7b5276 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/activity/TreasureBoxHonourActivity.java
+++ b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/activity/TreasureBoxHonourActivity.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.treasure_box.activity;
+package com.chwl.app.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.habu.R;
-import com.yizhuan.habu.base.BaseBindingActivity;
-import com.yizhuan.habu.databinding.ActivityTreasureBoxHonourBinding;
-import com.yizhuan.habu.treasure_box.widget.dialog.BoxMoreDialog;
-import com.yizhuan.habu.ui.utils.ImageLoadUtils;
-import com.yizhuan.habu.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.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
-import com.yizhuan.xchat_android_library.utils.TextWatcherWrapper;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseBindingActivity;
+import com.chwl.app.databinding.ActivityTreasureBoxHonourBinding;
+import com.chwl.app.treasure_box.widget.dialog.BoxMoreDialog;
+import com.chwl.app.ui.utils.ImageLoadUtils;
+import com.chwl.app.ui.webview.DialogWebViewActivity;
+import com.chwl.treasure_box.bean.PrizeInfo;
+import com.chwl.treasure_box.model.BoxModel;
+import com.chwl.treasure_box.model.IBoxModel;
+import com.chwl.core.DemoCache;
+import com.chwl.core.UriProvider;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.manager.RoomEvent;
+import com.chwl.core.pay.PayModel;
+import com.chwl.core.pay.bean.WalletInfo;
+import com.chwl.core.utils.StringUtils;
+import com.chwl.library.annatation.ActLayoutRes;
+import com.chwl.library.utils.FormatUtils;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SingleToastUtil;
+import com.chwl.library.utils.TextWatcherWrapper;
 
 import java.util.ArrayList;
 import java.util.concurrent.TimeUnit;
diff --git a/app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/adapter/BoxRankingListAdapter.java b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/adapter/BoxRankingListAdapter.java
similarity index 92%
rename from app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/adapter/BoxRankingListAdapter.java
rename to app/src/module_treasure_box/java/com/chwl/app/treasure_box/adapter/BoxRankingListAdapter.java
index 6c88412cb..e8dc7aec2 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/adapter/BoxRankingListAdapter.java
+++ b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/adapter/BoxRankingListAdapter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.treasure_box.adapter;
+package com.chwl.app.treasure_box.adapter;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -11,9 +11,9 @@ import androidx.core.content.ContextCompat;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.ui.utils.ImageLoadKt;
-import com.yizhuan.xchat_android_core.room.treasure_box.bean.TreasureRankingInfo;
+import com.chwl.app.R;
+import com.chwl.app.ui.utils.ImageLoadKt;
+import com.chwl.core.room.treasure_box.bean.TreasureRankingInfo;
 
 /**
  * @author jack
diff --git a/app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/fragment/BoxRankingFragment.java b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/fragment/BoxRankingFragment.java
similarity index 86%
rename from app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/fragment/BoxRankingFragment.java
rename to app/src/module_treasure_box/java/com/chwl/app/treasure_box/fragment/BoxRankingFragment.java
index 803baeaa0..03a093265 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/fragment/BoxRankingFragment.java
+++ b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/fragment/BoxRankingFragment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.treasure_box.fragment;
+package com.chwl.app.treasure_box.fragment;
 
 import android.os.Bundle;
 import android.view.View;
@@ -10,20 +10,20 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.netease.nim.uikit.common.ui.recyclerview.loadmore.MsgListFetchLoadMoreView;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.base.BaseMvpFragment;
-import com.yizhuan.habu.common.NoDataFragment;
-import com.yizhuan.habu.treasure_box.adapter.BoxRankingListAdapter;
-import com.yizhuan.habu.treasure_box.module.IBoxRankingView;
-import com.yizhuan.habu.treasure_box.presenter.BoxRankingPresenter;
-import com.yizhuan.habu.treasure_box.widget.BoxRankLoadMoreView;
-import com.yizhuan.habu.ui.user.activity.UserInfoActivity;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil;
-import com.yizhuan.habu.ui.widget.recyclerview.decoration.HorizontalDecoration;
-import com.yizhuan.xchat_android_core.room.treasure_box.bean.TreasureRankingInfo;
-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.chwl.app.R;
+import com.chwl.app.base.BaseMvpFragment;
+import com.chwl.app.common.NoDataFragment;
+import com.chwl.app.treasure_box.adapter.BoxRankingListAdapter;
+import com.chwl.app.treasure_box.module.IBoxRankingView;
+import com.chwl.app.treasure_box.presenter.BoxRankingPresenter;
+import com.chwl.app.treasure_box.widget.BoxRankLoadMoreView;
+import com.chwl.app.ui.user.activity.UserInfoActivity;
+import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
+import com.chwl.app.ui.widget.recyclerview.decoration.HorizontalDecoration;
+import com.chwl.core.room.treasure_box.bean.TreasureRankingInfo;
+import com.chwl.core.room.treasure_box.event.RefreshBoxRankingEvent;
+import com.chwl.library.base.factory.CreatePresenter;
+import com.chwl.library.utils.ListUtils;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
diff --git a/app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java
similarity index 93%
rename from app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java
rename to app/src/module_treasure_box/java/com/chwl/app/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java
index ee39e2de9..60a25d231 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java
+++ b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.treasure_box.fragment;
+package com.chwl.app.treasure_box.fragment;
 
 import android.app.Dialog;
 import android.os.Bundle;
@@ -16,11 +16,11 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.fragment.app.DialogFragment;
 
 import com.coorchice.library.utils.LogUtils;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.ui.webview.DialogWebViewActivity;
-import com.yizhuan.xchat_android_core.UriProvider;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.TimeUtils;
+import com.chwl.app.R;
+import com.chwl.app.ui.webview.DialogWebViewActivity;
+import com.chwl.core.UriProvider;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.TimeUtils;
 
 public class ChooseTreasureBoxDialogFragment extends DialogFragment implements View.OnClickListener {
 
diff --git a/app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/module/BoxRankingModel.java b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/module/BoxRankingModel.java
similarity index 76%
rename from app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/module/BoxRankingModel.java
rename to app/src/module_treasure_box/java/com/chwl/app/treasure_box/module/BoxRankingModel.java
index 96fe4fd9b..6cd205c49 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/module/BoxRankingModel.java
+++ b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/module/BoxRankingModel.java
@@ -1,11 +1,11 @@
-package com.yizhuan.habu.treasure_box.module;
+package com.chwl.app.treasure_box.module;
 
-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.room.treasure_box.bean.TreasureRankingInfo;
-import com.yizhuan.xchat_android_core.utils.net.RxHelper;
-import com.yizhuan.xchat_android_library.net.rxnet.RxNet;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.community.CommunityConstant;
+import com.chwl.core.room.treasure_box.bean.TreasureRankingInfo;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
 
 import java.util.List;
 
diff --git a/app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/module/IBoxRankingView.java b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/module/IBoxRankingView.java
similarity index 62%
rename from app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/module/IBoxRankingView.java
rename to app/src/module_treasure_box/java/com/chwl/app/treasure_box/module/IBoxRankingView.java
index 89ef89abf..ea247d407 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/module/IBoxRankingView.java
+++ b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/module/IBoxRankingView.java
@@ -1,7 +1,7 @@
-package com.yizhuan.habu.treasure_box.module;
+package com.chwl.app.treasure_box.module;
 
-import com.yizhuan.xchat_android_core.room.treasure_box.bean.TreasureRankingInfo;
-import com.yizhuan.xchat_android_library.base.IMvpBaseView;
+import com.chwl.core.room.treasure_box.bean.TreasureRankingInfo;
+import com.chwl.library.base.IMvpBaseView;
 
 import java.util.List;
 
diff --git a/app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/presenter/BoxRankingPresenter.java b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/presenter/BoxRankingPresenter.java
similarity index 78%
rename from app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/presenter/BoxRankingPresenter.java
rename to app/src/module_treasure_box/java/com/chwl/app/treasure_box/presenter/BoxRankingPresenter.java
index 9f7e114a5..479c31509 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/presenter/BoxRankingPresenter.java
+++ b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/presenter/BoxRankingPresenter.java
@@ -1,13 +1,13 @@
-package com.yizhuan.habu.treasure_box.presenter;
+package com.chwl.app.treasure_box.presenter;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.habu.treasure_box.module.BoxRankingModel;
-import com.yizhuan.habu.treasure_box.module.IBoxRankingView;
-import com.yizhuan.xchat_android_core.Constants;
-import com.yizhuan.xchat_android_core.room.treasure_box.bean.BoxRankingInfo;
-import com.yizhuan.xchat_android_core.room.treasure_box.bean.TreasureRankingInfo;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.app.base.BaseMvpPresenter;
+import com.chwl.app.treasure_box.module.BoxRankingModel;
+import com.chwl.app.treasure_box.module.IBoxRankingView;
+import com.chwl.core.Constants;
+import com.chwl.core.room.treasure_box.bean.BoxRankingInfo;
+import com.chwl.core.room.treasure_box.bean.TreasureRankingInfo;
+import com.chwl.library.utils.ResUtil;
 
 import java.util.List;
 
diff --git a/app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/widget/BoxRankLoadMoreView.java b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/widget/BoxRankLoadMoreView.java
similarity index 88%
rename from app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/widget/BoxRankLoadMoreView.java
rename to app/src/module_treasure_box/java/com/chwl/app/treasure_box/widget/BoxRankLoadMoreView.java
index 3fc17a9b5..5695a6667 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/widget/BoxRankLoadMoreView.java
+++ b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/widget/BoxRankLoadMoreView.java
@@ -1,7 +1,7 @@
-package com.yizhuan.habu.treasure_box.widget;
+package com.chwl.app.treasure_box.widget;
 
 import com.chad.library.adapter.base.loadmore.LoadMoreView;
-import com.yizhuan.habu.R;
+import com.chwl.app.R;
 
 public final class BoxRankLoadMoreView extends LoadMoreView {
 
diff --git a/app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/widget/GoldBoxHelper.java b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/widget/GoldBoxHelper.java
similarity index 78%
rename from app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/widget/GoldBoxHelper.java
rename to app/src/module_treasure_box/java/com/chwl/app/treasure_box/widget/GoldBoxHelper.java
index d5afdabec..771502da9 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/widget/GoldBoxHelper.java
+++ b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/widget/GoldBoxHelper.java
@@ -1,26 +1,26 @@
-package com.yizhuan.habu.treasure_box.widget;
+package com.chwl.app.treasure_box.widget;
 
 import android.content.Context;
 
 import androidx.annotation.Nullable;
 import androidx.fragment.app.FragmentActivity;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.treasure_box.activity.TreasureBoxActivity;
-import com.yizhuan.habu.treasure_box.activity.TreasureBoxHonourActivity;
-import com.yizhuan.habu.treasure_box.fragment.ChooseTreasureBoxDialogFragment;
-import com.yizhuan.xchat_android_core.initial.InitialModel;
-import com.yizhuan.xchat_android_core.initial.bean.FairyOpenInfo;
-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.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.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
-import com.yizhuan.xchat_android_library.utils.TimeUtils;
+import com.chwl.app.R;
+import com.chwl.app.treasure_box.activity.TreasureBoxActivity;
+import com.chwl.app.treasure_box.activity.TreasureBoxHonourActivity;
+import com.chwl.app.treasure_box.fragment.ChooseTreasureBoxDialogFragment;
+import com.chwl.core.initial.InitialModel;
+import com.chwl.core.initial.bean.FairyOpenInfo;
+import com.chwl.core.initial.bean.InitInfo;
+import com.chwl.core.level.UserLevelVo;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.market_verify.MarketVerifyModel;
+import com.chwl.core.super_admin.util.SuperAdminUtil;
+import com.chwl.core.user.UserModel;
+import com.chwl.core.user.bean.UserInfo;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SingleToastUtil;
+import com.chwl.library.utils.TimeUtils;
 
 import io.reactivex.Single;
 
diff --git a/app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/widget/dialog/BaseBindingDialog.java b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/widget/dialog/BaseBindingDialog.java
similarity index 95%
rename from app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/widget/dialog/BaseBindingDialog.java
rename to app/src/module_treasure_box/java/com/chwl/app/treasure_box/widget/dialog/BaseBindingDialog.java
index fd9e56fb2..636e0a4eb 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/widget/dialog/BaseBindingDialog.java
+++ b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/widget/dialog/BaseBindingDialog.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.treasure_box.widget.dialog;
+package com.chwl.app.treasure_box.widget.dialog;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -15,7 +15,7 @@ import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ViewDataBinding;
 
 import com.netease.nim.uikit.common.util.sys.ScreenUtil;
-import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
+import com.chwl.library.annatation.ActLayoutRes;
 
 /**
  * Created by huangmeng1 on 2018/4/12.
diff --git a/app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/widget/dialog/BoxLoveLackDialog.kt b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/widget/dialog/BoxLoveLackDialog.kt
similarity index 80%
rename from app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/widget/dialog/BoxLoveLackDialog.kt
rename to app/src/module_treasure_box/java/com/chwl/app/treasure_box/widget/dialog/BoxLoveLackDialog.kt
index eccd649cd..25179dd3b 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/widget/dialog/BoxLoveLackDialog.kt
+++ b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/widget/dialog/BoxLoveLackDialog.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.treasure_box.widget.dialog
+package com.chwl.app.treasure_box.widget.dialog
 
 import android.annotation.SuppressLint
 import android.os.Bundle
@@ -6,22 +6,22 @@ import android.text.Editable
 import android.view.Gravity
 import android.view.WindowManager
 import com.hjq.toast.ToastUtils
-import com.yizhuan.habu.R
-import com.yizhuan.habu.base.BaseDialog
-import com.yizhuan.habu.databinding.TreasureBoxDialogLoveLackBinding
-import com.yizhuan.habu.treasure_box.activity.TreasureBoxActivity.MAX_BUY_QUANTITY_LIMIT
-import com.yizhuan.habu.treasure_box.widget.dialog.TreasureBoxDialog.Companion.newInstance
-import com.yizhuan.treasure_box.bean.UserTicketInfo
-import com.yizhuan.treasure_box.model.BoxModel
-import com.yizhuan.xchat_android_core.exception.FailReasonException
-import com.yizhuan.xchat_android_core.utils.StringUtils
-import com.yizhuan.xchat_android_library.common.SpConstants
-import com.yizhuan.xchat_android_library.common.util.SPUtils
-import com.yizhuan.xchat_android_library.common.util.SoftKeyboardStateHelper
-import com.yizhuan.xchat_android_library.common.util.SoftKeyboardStateHelper.SoftKeyboardStateListener
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil
-import com.yizhuan.xchat_android_library.utils.TextWatcherWrapper
-import com.yizhuan.xchat_android_library.utils.TimeUtils
+import com.chwl.app.R
+import com.chwl.app.base.BaseDialog
+import com.chwl.app.databinding.TreasureBoxDialogLoveLackBinding
+import com.chwl.app.treasure_box.activity.TreasureBoxActivity.MAX_BUY_QUANTITY_LIMIT
+import com.chwl.app.treasure_box.widget.dialog.TreasureBoxDialog.Companion.newInstance
+import com.chwl.treasure_box.bean.UserTicketInfo
+import com.chwl.treasure_box.model.BoxModel
+import com.chwl.core.exception.FailReasonException
+import com.chwl.core.utils.StringUtils
+import com.chwl.library.common.SpConstants
+import com.chwl.library.common.util.SPUtils
+import com.chwl.library.common.util.SoftKeyboardStateHelper
+import com.chwl.library.common.util.SoftKeyboardStateHelper.SoftKeyboardStateListener
+import com.chwl.library.utils.SingleToastUtil
+import com.chwl.library.utils.TextWatcherWrapper
+import com.chwl.library.utils.TimeUtils
 import org.greenrobot.eventbus.EventBus
 
 /**
diff --git a/app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/widget/dialog/BoxMoreDialog.java b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/widget/dialog/BoxMoreDialog.java
similarity index 79%
rename from app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/widget/dialog/BoxMoreDialog.java
rename to app/src/module_treasure_box/java/com/chwl/app/treasure_box/widget/dialog/BoxMoreDialog.java
index 700b24367..06e8881fa 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/widget/dialog/BoxMoreDialog.java
+++ b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/widget/dialog/BoxMoreDialog.java
@@ -1,20 +1,20 @@
-package com.yizhuan.habu.treasure_box.widget.dialog;
+package com.chwl.app.treasure_box.widget.dialog;
 
 import android.content.Context;
 import android.view.Gravity;
 import android.view.Window;
 import android.view.WindowManager;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.databinding.DialogBoxMoreBinding;
-import com.yizhuan.habu.ui.webview.DialogWebViewActivity;
-import com.yizhuan.habu.utils.UserUtils;
-import com.yizhuan.xchat_android_core.DemoCache;
-import com.yizhuan.xchat_android_core.UriProvider;
-import com.yizhuan.xchat_android_core.utils.Logger;
-import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
+import com.chwl.app.R;
+import com.chwl.app.databinding.DialogBoxMoreBinding;
+import com.chwl.app.ui.webview.DialogWebViewActivity;
+import com.chwl.app.utils.UserUtils;
+import com.chwl.core.DemoCache;
+import com.chwl.core.UriProvider;
+import com.chwl.core.utils.Logger;
+import com.chwl.library.annatation.ActLayoutRes;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SingleToastUtil;
 
 @ActLayoutRes(R.layout.dialog_box_more)
 public class BoxMoreDialog extends BaseBindingDialog {
diff --git a/app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/widget/dialog/BuyLoveDialog.kt b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/widget/dialog/BuyLoveDialog.kt
similarity index 83%
rename from app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/widget/dialog/BuyLoveDialog.kt
rename to app/src/module_treasure_box/java/com/chwl/app/treasure_box/widget/dialog/BuyLoveDialog.kt
index e8c4e59c4..60a6d7caf 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/widget/dialog/BuyLoveDialog.kt
+++ b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/widget/dialog/BuyLoveDialog.kt
@@ -1,20 +1,20 @@
-package com.yizhuan.habu.treasure_box.widget.dialog
+package com.chwl.app.treasure_box.widget.dialog
 
 import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.Gravity
 import android.view.WindowManager
 import com.hjq.toast.ToastUtils
-import com.yizhuan.habu.R
-import com.yizhuan.habu.base.BaseDialog
-import com.yizhuan.habu.databinding.TreasureBoxDialogBuyLoveBinding
-import com.yizhuan.treasure_box.bean.UserTicketInfo
-import com.yizhuan.treasure_box.model.BoxModel
-import com.yizhuan.xchat_android_core.exception.FailReasonException
-import com.yizhuan.xchat_android_library.common.SpConstants
-import com.yizhuan.xchat_android_library.common.util.SPUtils
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil
-import com.yizhuan.xchat_android_library.utils.TimeUtils
+import com.chwl.app.R
+import com.chwl.app.base.BaseDialog
+import com.chwl.app.databinding.TreasureBoxDialogBuyLoveBinding
+import com.chwl.treasure_box.bean.UserTicketInfo
+import com.chwl.treasure_box.model.BoxModel
+import com.chwl.core.exception.FailReasonException
+import com.chwl.library.common.SpConstants
+import com.chwl.library.common.util.SPUtils
+import com.chwl.library.utils.SingleToastUtil
+import com.chwl.library.utils.TimeUtils
 import org.greenrobot.eventbus.EventBus
 
 /**
diff --git a/app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/widget/dialog/BuyLoveSuccessDialog.kt b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/widget/dialog/BuyLoveSuccessDialog.kt
similarity index 73%
rename from app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/widget/dialog/BuyLoveSuccessDialog.kt
rename to app/src/module_treasure_box/java/com/chwl/app/treasure_box/widget/dialog/BuyLoveSuccessDialog.kt
index 1f2b01187..b14972355 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/widget/dialog/BuyLoveSuccessDialog.kt
+++ b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/widget/dialog/BuyLoveSuccessDialog.kt
@@ -1,17 +1,17 @@
-package com.yizhuan.habu.treasure_box.widget.dialog
+package com.chwl.app.treasure_box.widget.dialog
 
 import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.Gravity
 import android.view.WindowManager
-import com.yizhuan.habu.R
-import com.yizhuan.habu.base.BaseDialog
-import com.yizhuan.habu.databinding.TreasureBoxDialogBuyLoveBinding
-import com.yizhuan.habu.databinding.TreasureBoxDialogBuyLoveSuccessBinding
-import com.yizhuan.treasure_box.bean.UserTicketInfo
-import com.yizhuan.treasure_box.model.BoxModel
-import com.yizhuan.xchat_android_library.common.SpConstants
-import com.yizhuan.xchat_android_library.common.util.SPUtils
+import com.chwl.app.R
+import com.chwl.app.base.BaseDialog
+import com.chwl.app.databinding.TreasureBoxDialogBuyLoveBinding
+import com.chwl.app.databinding.TreasureBoxDialogBuyLoveSuccessBinding
+import com.chwl.treasure_box.bean.UserTicketInfo
+import com.chwl.treasure_box.model.BoxModel
+import com.chwl.library.common.SpConstants
+import com.chwl.library.common.util.SPUtils
 import org.greenrobot.eventbus.EventBus
 
 /**
diff --git a/app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/widget/dialog/TreasureBoxDialog.kt b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/widget/dialog/TreasureBoxDialog.kt
similarity index 60%
rename from app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/widget/dialog/TreasureBoxDialog.kt
rename to app/src/module_treasure_box/java/com/chwl/app/treasure_box/widget/dialog/TreasureBoxDialog.kt
index 26e5f6b22..c133a2c9c 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/widget/dialog/TreasureBoxDialog.kt
+++ b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/widget/dialog/TreasureBoxDialog.kt
@@ -1,13 +1,13 @@
-package com.yizhuan.habu.treasure_box.widget.dialog
+package com.chwl.app.treasure_box.widget.dialog
 
-import com.yizhuan.habu.base.BaseDialog
-import com.yizhuan.habu.databinding.DialogTreasureBoxBinding
-import com.yizhuan.habu.ui.pay.ChargeActivity
-import com.yizhuan.habu.ui.webview.CommonWebViewActivity
-import com.yizhuan.xchat_android_core.Constants
-import com.yizhuan.xchat_android_core.UriProvider
-import com.yizhuan.xchat_android_library.common.util.DeviceUtil.getDeviceId
-import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil
+import com.chwl.app.base.BaseDialog
+import com.chwl.app.databinding.DialogTreasureBoxBinding
+import com.chwl.app.ui.pay.ChargeActivity
+import com.chwl.app.ui.webview.CommonWebViewActivity
+import com.chwl.core.Constants
+import com.chwl.core.UriProvider
+import com.chwl.library.common.util.DeviceUtil.getDeviceId
+import com.chwl.library.utils.AppMetaDataUtil
 
 /**
  * author: wushaocheng
diff --git a/app/src/module_treasure_box/res/layout/activity_treasure_box.xml b/app/src/module_treasure_box/res/layout/activity_treasure_box.xml
index de9b12f6f..8e8fa2f2c 100644
--- a/app/src/module_treasure_box/res/layout/activity_treasure_box.xml
+++ b/app/src/module_treasure_box/res/layout/activity_treasure_box.xml
@@ -327,7 +327,7 @@
             tools:background="@color/white"
             tools:visibility="gone" />
 
-        
diff --git a/app/src/module_upgrade_app/java/com/yizhuan/habu/upgrade/AppUpdateDialog.java b/app/src/module_upgrade_app/java/com/chwl/app/upgrade/AppUpdateDialog.java
similarity index 92%
rename from app/src/module_upgrade_app/java/com/yizhuan/habu/upgrade/AppUpdateDialog.java
rename to app/src/module_upgrade_app/java/com/chwl/app/upgrade/AppUpdateDialog.java
index db9d0da39..a1f31c0e7 100644
--- a/app/src/module_upgrade_app/java/com/yizhuan/habu/upgrade/AppUpdateDialog.java
+++ b/app/src/module_upgrade_app/java/com/chwl/app/upgrade/AppUpdateDialog.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.upgrade;
+package com.chwl.app.upgrade;
 
 import android.content.Intent;
 import android.graphics.Color;
@@ -17,13 +17,13 @@ import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.FragmentManager;
 
 import com.orhanobut.logger.Logger;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil;
+import com.chwl.app.R;
+import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
 import com.yizhuan.xchat_android_constants.XChatConstants;
-import com.yizhuan.xchat_android_core.Constants;
-import com.yizhuan.xchat_android_core.UriHelper;
-import com.yizhuan.xchat_android_core.upgrade.bean.NewestVersionInfo;
-import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil;
+import com.chwl.core.Constants;
+import com.chwl.core.UriHelper;
+import com.chwl.core.upgrade.bean.NewestVersionInfo;
+import com.chwl.library.utils.AppMetaDataUtil;
 
 public class AppUpdateDialog extends DialogFragment implements View.OnClickListener {
 
diff --git a/app/src/module_upgrade_app/java/com/yizhuan/habu/upgrade/AppUpgradeDataMrg.java b/app/src/module_upgrade_app/java/com/chwl/app/upgrade/AppUpgradeDataMrg.java
similarity index 92%
rename from app/src/module_upgrade_app/java/com/yizhuan/habu/upgrade/AppUpgradeDataMrg.java
rename to app/src/module_upgrade_app/java/com/chwl/app/upgrade/AppUpgradeDataMrg.java
index 545f66918..09a83dfb0 100644
--- a/app/src/module_upgrade_app/java/com/yizhuan/habu/upgrade/AppUpgradeDataMrg.java
+++ b/app/src/module_upgrade_app/java/com/chwl/app/upgrade/AppUpgradeDataMrg.java
@@ -1,13 +1,13 @@
-package com.yizhuan.habu.upgrade;
+package com.chwl.app.upgrade;
 
 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.Logger;
-import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils;
-import com.yizhuan.xchat_android_library.utils.TimeUtils;
+import com.chwl.core.upgrade.bean.UpgradeCache;
+import com.chwl.core.utils.Logger;
+import com.chwl.core.utils.SharedPreferenceUtils;
+import com.chwl.library.utils.TimeUtils;
 
 import java.util.Objects;
 
diff --git a/app/src/module_upgrade_app/java/com/yizhuan/habu/upgrade/AppUpgradeHelper.java b/app/src/module_upgrade_app/java/com/chwl/app/upgrade/AppUpgradeHelper.java
similarity index 91%
rename from app/src/module_upgrade_app/java/com/yizhuan/habu/upgrade/AppUpgradeHelper.java
rename to app/src/module_upgrade_app/java/com/chwl/app/upgrade/AppUpgradeHelper.java
index 8116fa66f..8d04b34db 100644
--- a/app/src/module_upgrade_app/java/com/yizhuan/habu/upgrade/AppUpgradeHelper.java
+++ b/app/src/module_upgrade_app/java/com/chwl/app/upgrade/AppUpgradeHelper.java
@@ -1,19 +1,19 @@
-package com.yizhuan.habu.upgrade;
+package com.chwl.app.upgrade;
 
 import android.annotation.SuppressLint;
 
 import com.trello.rxlifecycle3.android.ActivityEvent;
 import com.trello.rxlifecycle3.components.support.RxAppCompatActivity;
-import com.yizhuan.habu.common.widget.dialog.DialogManager;
-import com.yizhuan.xchat_android_core.Constants;
-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_core.utils.Logger;
-import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
-import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
+import com.chwl.app.common.widget.dialog.DialogManager;
+import com.chwl.core.Constants;
+import com.chwl.core.upgrade.bean.NewestVersionInfo;
+import com.chwl.core.upgrade.bean.UpgradeCache;
+import com.chwl.core.upgrade.model.UpgradeModel;
+import com.chwl.core.utils.ActivityUtil;
+import com.chwl.core.utils.Logger;
+import com.chwl.library.utils.AppMetaDataUtil;
+import com.chwl.library.utils.SingleToastUtil;
+import com.chwl.library.utils.config.BasicConfig;
 
 /**
  * @author jack
diff --git a/app/src/module_upgrade_app/java/com/yizhuan/habu/upgrade/AppVersionUtil.java b/app/src/module_upgrade_app/java/com/chwl/app/upgrade/AppVersionUtil.java
similarity index 97%
rename from app/src/module_upgrade_app/java/com/yizhuan/habu/upgrade/AppVersionUtil.java
rename to app/src/module_upgrade_app/java/com/chwl/app/upgrade/AppVersionUtil.java
index 2330cddb6..113722fea 100644
--- a/app/src/module_upgrade_app/java/com/yizhuan/habu/upgrade/AppVersionUtil.java
+++ b/app/src/module_upgrade_app/java/com/chwl/app/upgrade/AppVersionUtil.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.upgrade;
+package com.chwl.app.upgrade;
 
 /**
  * @Author: yangming
diff --git a/app/src/test/java/com/yizhuan/erban/ExampleUnitTest.java b/app/src/test/java/com/chwl/app/ExampleUnitTest.java
similarity index 99%
rename from app/src/test/java/com/yizhuan/erban/ExampleUnitTest.java
rename to app/src/test/java/com/chwl/app/ExampleUnitTest.java
index 5846f00d8..76eedc47d 100644
--- a/app/src/test/java/com/yizhuan/erban/ExampleUnitTest.java
+++ b/app/src/test/java/com/chwl/app/ExampleUnitTest.java
@@ -1,8 +1,8 @@
-package com.yizhuan.habu;
+package com.chwl.app;
 
 import static org.junit.Assert.assertEquals;
 
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.library.utils.ResUtil;
 
 import org.junit.Test;
 
diff --git a/core/src/androidTest/java/com/yizhuan/xchat_android_core/ExampleInstrumentedTest.java b/core/src/androidTest/java/com/chwl/core/ExampleInstrumentedTest.java
similarity index 83%
rename from core/src/androidTest/java/com/yizhuan/xchat_android_core/ExampleInstrumentedTest.java
rename to core/src/androidTest/java/com/chwl/core/ExampleInstrumentedTest.java
index 719995065..21ab97b8f 100644
--- a/core/src/androidTest/java/com/yizhuan/xchat_android_core/ExampleInstrumentedTest.java
+++ b/core/src/androidTest/java/com/chwl/core/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core;
+package com.chwl.core;
 
 import static org.junit.Assert.assertEquals;
 
@@ -22,6 +22,6 @@ public class ExampleInstrumentedTest {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getTargetContext();
 
-        assertEquals("com.yizhuan.xchat_android_core.test", appContext.getPackageName());
+        assertEquals("com.chwl.core.test", appContext.getPackageName());
     }
 }
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriHelper.java b/core/src/diff_src_erban/java/com/chwl/core/UriHelper.java
similarity index 98%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriHelper.java
rename to core/src/diff_src_erban/java/com/chwl/core/UriHelper.java
index f099ee14a..5dda9b1d8 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriHelper.java
+++ b/core/src/diff_src_erban/java/com/chwl/core/UriHelper.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core;
+package com.chwl.core;
 
 import android.net.Uri;
 import android.text.TextUtils;
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriProvider.java b/core/src/diff_src_erban/java/com/chwl/core/UriProvider.java
similarity index 98%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriProvider.java
rename to core/src/diff_src_erban/java/com/chwl/core/UriProvider.java
index 32b43b159..333832bd5 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriProvider.java
+++ b/core/src/diff_src_erban/java/com/chwl/core/UriProvider.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core;
+package com.chwl.core;
 
 import android.text.TextUtils;
 
-import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
-import com.yizhuan.xchat_android_library.common.application.Env;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.library.common.application.Env;
 
 /**
  * 请求接口接口地址
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/bean/ClanListInfo.kt b/core/src/diff_src_erban/java/com/chwl/core/association/bean/ClanListInfo.kt
similarity index 84%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/bean/ClanListInfo.kt
rename to core/src/diff_src_erban/java/com/chwl/core/association/bean/ClanListInfo.kt
index 39c5966d7..c1480daa8 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/bean/ClanListInfo.kt
+++ b/core/src/diff_src_erban/java/com/chwl/core/association/bean/ClanListInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.association.bean
+package com.chwl.core.association.bean
 
 data class ClanListInfo(
     val clanId: Int = 0,
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/bean/HallListInfo.java b/core/src/diff_src_erban/java/com/chwl/core/association/bean/HallListInfo.java
similarity index 90%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/bean/HallListInfo.java
rename to core/src/diff_src_erban/java/com/chwl/core/association/bean/HallListInfo.java
index bc9d7dc68..3dcb19d04 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/bean/HallListInfo.java
+++ b/core/src/diff_src_erban/java/com/chwl/core/association/bean/HallListInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.association.bean;
+package com.chwl.core.association.bean;
 
 import lombok.Data;
 
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/bean/MemberExchangeInfo.kt b/core/src/diff_src_erban/java/com/chwl/core/association/bean/MemberExchangeInfo.kt
similarity index 89%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/bean/MemberExchangeInfo.kt
rename to core/src/diff_src_erban/java/com/chwl/core/association/bean/MemberExchangeInfo.kt
index f19db874d..48a87fb6d 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/bean/MemberExchangeInfo.kt
+++ b/core/src/diff_src_erban/java/com/chwl/core/association/bean/MemberExchangeInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.association.bean
+package com.chwl.core.association.bean
 
 import lombok.Data
 
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/bean/UserLevelInfo.kt b/core/src/diff_src_erban/java/com/chwl/core/association/bean/UserLevelInfo.kt
similarity index 87%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/bean/UserLevelInfo.kt
rename to core/src/diff_src_erban/java/com/chwl/core/association/bean/UserLevelInfo.kt
index a20015a7a..73fe41c12 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/bean/UserLevelInfo.kt
+++ b/core/src/diff_src_erban/java/com/chwl/core/association/bean/UserLevelInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.association.bean
+package com.chwl.core.association.bean
 
 import lombok.Data
 
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/model/AssociationModel.kt b/core/src/diff_src_erban/java/com/chwl/core/association/model/AssociationModel.kt
similarity index 75%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/model/AssociationModel.kt
rename to core/src/diff_src_erban/java/com/chwl/core/association/model/AssociationModel.kt
index 5c03947f8..8d8b53ba0 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/model/AssociationModel.kt
+++ b/core/src/diff_src_erban/java/com/chwl/core/association/model/AssociationModel.kt
@@ -1,12 +1,12 @@
-package com.yizhuan.xchat_android_core.association.model
+package com.chwl.core.association.model
 
-import com.yizhuan.xchat_android_core.association.bean.ClanListInfo
-import com.yizhuan.xchat_android_core.association.bean.HallListInfo
-import com.yizhuan.xchat_android_core.association.bean.MemberExchangeInfo
-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.launchRequest
-import com.yizhuan.xchat_android_library.net.rxnet.RxNet
+import com.chwl.core.association.bean.ClanListInfo
+import com.chwl.core.association.bean.HallListInfo
+import com.chwl.core.association.bean.MemberExchangeInfo
+import com.chwl.core.base.BaseModel
+import com.chwl.core.bean.response.ServiceResult
+import com.chwl.core.utils.net.launchRequest
+import com.chwl.library.net.rxnet.RxNet
 import retrofit2.http.*
 
 object AssociationModel : BaseModel() {
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/chwl/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/chwl/core/audio/AudioModel.java
index 99aca030b..54003d84c 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/AudioModel.java
+++ b/core/src/diff_src_erban/java/com/chwl/core/audio/AudioModel.java
@@ -1,16 +1,16 @@
-package com.yizhuan.xchat_android_core.audio;
+package com.chwl.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.chwl.core.audio.bean.HistoryVoiceInfo;
+import com.chwl.core.audio.bean.SaveVoiceSuccessResultInfo;
+import com.chwl.core.audio.bean.UserVoiceInfo;
+import com.chwl.core.audio.bean.VoiceCardInfo;
+import com.chwl.core.audio.bean.VoiceMatchInfo;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.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/chwl/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/chwl/core/audio/IAudioModel.java
index a37a159a0..85862944b 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/IAudioModel.java
+++ b/core/src/diff_src_erban/java/com/chwl/core/audio/IAudioModel.java
@@ -1,11 +1,11 @@
-package com.yizhuan.xchat_android_core.audio;
+package com.chwl.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.chwl.core.audio.bean.HistoryVoiceInfo;
+import com.chwl.core.audio.bean.SaveVoiceSuccessResultInfo;
+import com.chwl.core.audio.bean.UserVoiceInfo;
+import com.chwl.core.audio.bean.VoiceCardInfo;
+import com.chwl.core.audio.bean.VoiceMatchInfo;
+import com.chwl.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/chwl/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/chwl/core/audio/bean/HistoryVoiceInfo.java
index f2dba8d0e..651b967ad 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/chwl/core/audio/bean/HistoryVoiceInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.audio.bean;
+package com.chwl.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/chwl/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/chwl/core/audio/bean/SaveVoiceSuccessResultInfo.java
index 0e9732abf..d7bceb788 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/chwl/core/audio/bean/SaveVoiceSuccessResultInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.audio.bean;
+package com.chwl.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/chwl/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/chwl/core/audio/bean/UserVoiceInfo.java
index 656bfd303..be2d3b0a6 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/chwl/core/audio/bean/UserVoiceInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.audio.bean;
+package com.chwl.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/chwl/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/chwl/core/audio/bean/VoiceCardInfo.java
index 7483a3559..a0b840026 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/chwl/core/audio/bean/VoiceCardInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.audio.bean;
+package com.chwl.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/chwl/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/chwl/core/audio/bean/VoiceMatchInfo.java
index a7b819472..2b2e96866 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/chwl/core/audio/bean/VoiceMatchInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.audio.bean;
+package com.chwl.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/chwl/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/chwl/core/channel/ChannelModel.java
index 75f388607..12d9ebe1a 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/channel/ChannelModel.java
+++ b/core/src/diff_src_erban/java/com/chwl/core/channel/ChannelModel.java
@@ -1,14 +1,14 @@
-package com.yizhuan.xchat_android_core.channel;
+package com.chwl.core.channel;
 
 import com.orhanobut.logger.Logger;
-import com.yizhuan.xchat_android_core.R;
-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.ResUtil;
+import com.chwl.core.R;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.user.UserModel;
+import com.chwl.core.user.bean.UserInfo;
+import com.chwl.core.user.event.CurrentUserInfoCompleteEvent;
+import com.chwl.library.utils.AppMetaDataUtil;
+import com.chwl.library.utils.ResUtil;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
diff --git a/core/src/diff_src_erban/java/com/chwl/core/channel/IChannelModel.java b/core/src/diff_src_erban/java/com/chwl/core/channel/IChannelModel.java
new file mode 100644
index 000000000..0d8d2689a
--- /dev/null
+++ b/core/src/diff_src_erban/java/com/chwl/core/channel/IChannelModel.java
@@ -0,0 +1,6 @@
+package com.chwl.core.channel;
+
+import com.chwl.core.base.IModel;
+
+public interface IChannelModel extends IModel {
+}
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/ClanHallMemberIncomeTotalInfo.kt b/core/src/diff_src_erban/java/com/chwl/core/earn/bean/ClanHallMemberIncomeTotalInfo.kt
similarity index 87%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/ClanHallMemberIncomeTotalInfo.kt
rename to core/src/diff_src_erban/java/com/chwl/core/earn/bean/ClanHallMemberIncomeTotalInfo.kt
index 7eaf1371c..659b7d92c 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/ClanHallMemberIncomeTotalInfo.kt
+++ b/core/src/diff_src_erban/java/com/chwl/core/earn/bean/ClanHallMemberIncomeTotalInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.earn.bean
+package com.chwl.core.earn.bean
 
 import lombok.Data
 import java.math.BigDecimal
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/ConfigWithdrawInfo.kt b/core/src/diff_src_erban/java/com/chwl/core/earn/bean/ConfigWithdrawInfo.kt
similarity index 88%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/ConfigWithdrawInfo.kt
rename to core/src/diff_src_erban/java/com/chwl/core/earn/bean/ConfigWithdrawInfo.kt
index 1f035a74b..05608ad84 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/ConfigWithdrawInfo.kt
+++ b/core/src/diff_src_erban/java/com/chwl/core/earn/bean/ConfigWithdrawInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.earn.bean
+package com.chwl.core.earn.bean
 
 import lombok.Data
 import java.io.Serializable
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/EarnRecordInfo.kt b/core/src/diff_src_erban/java/com/chwl/core/earn/bean/EarnRecordInfo.kt
similarity index 86%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/EarnRecordInfo.kt
rename to core/src/diff_src_erban/java/com/chwl/core/earn/bean/EarnRecordInfo.kt
index c5733fd74..006fc10e8 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/EarnRecordInfo.kt
+++ b/core/src/diff_src_erban/java/com/chwl/core/earn/bean/EarnRecordInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.earn.bean
+package com.chwl.core.earn.bean
 
 import lombok.Data
 import java.math.BigDecimal
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/GoldRecordInfo.kt b/core/src/diff_src_erban/java/com/chwl/core/earn/bean/GoldRecordInfo.kt
similarity index 75%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/GoldRecordInfo.kt
rename to core/src/diff_src_erban/java/com/chwl/core/earn/bean/GoldRecordInfo.kt
index 972f907b6..75e18af00 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/GoldRecordInfo.kt
+++ b/core/src/diff_src_erban/java/com/chwl/core/earn/bean/GoldRecordInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.earn.bean
+package com.chwl.core.earn.bean
 
 import lombok.Data
 import java.math.BigDecimal
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/GoldToDiamondInfo.kt b/core/src/diff_src_erban/java/com/chwl/core/earn/bean/GoldToDiamondInfo.kt
similarity index 88%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/GoldToDiamondInfo.kt
rename to core/src/diff_src_erban/java/com/chwl/core/earn/bean/GoldToDiamondInfo.kt
index 700005a46..d2ccfabbe 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/GoldToDiamondInfo.kt
+++ b/core/src/diff_src_erban/java/com/chwl/core/earn/bean/GoldToDiamondInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.earn.bean
+package com.chwl.core.earn.bean
 
 import lombok.Data
 import java.io.Serializable
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/HallMemberGoldFlowInfo.kt b/core/src/diff_src_erban/java/com/chwl/core/earn/bean/HallMemberGoldFlowInfo.kt
similarity index 88%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/HallMemberGoldFlowInfo.kt
rename to core/src/diff_src_erban/java/com/chwl/core/earn/bean/HallMemberGoldFlowInfo.kt
index f48cbe56b..82ff8a12b 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/HallMemberGoldFlowInfo.kt
+++ b/core/src/diff_src_erban/java/com/chwl/core/earn/bean/HallMemberGoldFlowInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.earn.bean
+package com.chwl.core.earn.bean
 
 import lombok.Data
 
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/HallMemberGoldFlowTotalInfo.kt b/core/src/diff_src_erban/java/com/chwl/core/earn/bean/HallMemberGoldFlowTotalInfo.kt
similarity index 78%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/HallMemberGoldFlowTotalInfo.kt
rename to core/src/diff_src_erban/java/com/chwl/core/earn/bean/HallMemberGoldFlowTotalInfo.kt
index 318c0b512..7ad03abe9 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/HallMemberGoldFlowTotalInfo.kt
+++ b/core/src/diff_src_erban/java/com/chwl/core/earn/bean/HallMemberGoldFlowTotalInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.earn.bean
+package com.chwl.core.earn.bean
 
 import lombok.Data
 import java.math.BigDecimal
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/HallVo.kt b/core/src/diff_src_erban/java/com/chwl/core/earn/bean/HallVo.kt
similarity index 75%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/HallVo.kt
rename to core/src/diff_src_erban/java/com/chwl/core/earn/bean/HallVo.kt
index c1444890c..f2660ed2d 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/HallVo.kt
+++ b/core/src/diff_src_erban/java/com/chwl/core/earn/bean/HallVo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.earn.bean
+package com.chwl.core.earn.bean
 
 import lombok.Data
 
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/RoomTypeInfo.kt b/core/src/diff_src_erban/java/com/chwl/core/earn/bean/RoomTypeInfo.kt
similarity index 88%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/RoomTypeInfo.kt
rename to core/src/diff_src_erban/java/com/chwl/core/earn/bean/RoomTypeInfo.kt
index 5bcaa93d9..afe55b19f 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/RoomTypeInfo.kt
+++ b/core/src/diff_src_erban/java/com/chwl/core/earn/bean/RoomTypeInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.earn.bean
+package com.chwl.core.earn.bean
 
 import java.math.BigDecimal
 
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/WithdrawAccount.kt b/core/src/diff_src_erban/java/com/chwl/core/earn/bean/WithdrawAccount.kt
similarity index 86%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/WithdrawAccount.kt
rename to core/src/diff_src_erban/java/com/chwl/core/earn/bean/WithdrawAccount.kt
index fec14c024..9b67df94a 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/WithdrawAccount.kt
+++ b/core/src/diff_src_erban/java/com/chwl/core/earn/bean/WithdrawAccount.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.earn.bean
+package com.chwl.core.earn.bean
 
 import lombok.Data
 import java.io.Serializable
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/model/EarnModel.kt b/core/src/diff_src_erban/java/com/chwl/core/earn/model/EarnModel.kt
similarity index 91%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/model/EarnModel.kt
rename to core/src/diff_src_erban/java/com/chwl/core/earn/model/EarnModel.kt
index 26038ee65..969cf77d2 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/model/EarnModel.kt
+++ b/core/src/diff_src_erban/java/com/chwl/core/earn/model/EarnModel.kt
@@ -1,11 +1,11 @@
-package com.yizhuan.xchat_android_core.earn.model
+package com.chwl.core.earn.model
 
-import com.yizhuan.xchat_android_core.base.BaseModel
-import com.yizhuan.xchat_android_core.bean.response.ServiceResult
-import com.yizhuan.xchat_android_core.earn.bean.*
-import com.yizhuan.xchat_android_core.home.bean.*
-import com.yizhuan.xchat_android_core.utils.net.launchRequest
-import com.yizhuan.xchat_android_library.net.rxnet.RxNet
+import com.chwl.core.base.BaseModel
+import com.chwl.core.bean.response.ServiceResult
+import com.chwl.core.earn.bean.*
+import com.chwl.core.home.bean.*
+import com.chwl.core.utils.net.launchRequest
+import com.chwl.library.net.rxnet.RxNet
 import retrofit2.http.GET
 import retrofit2.http.POST
 import retrofit2.http.Query
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/chwl/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/chwl/core/helper/AtProxy.java
index 47b0c0086..8d52f84b3 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/helper/AtProxy.java
+++ b/core/src/diff_src_erban/java/com/chwl/core/helper/AtProxy.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.helper;
+package com.chwl.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/chwl/core/helper/ImHelperUtils.java
similarity index 75%
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/chwl/core/helper/ImHelperUtils.java
index 5ffcb9f5e..d9de75887 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/helper/ImHelperUtils.java
+++ b/core/src/diff_src_erban/java/com/chwl/core/helper/ImHelperUtils.java
@@ -1,26 +1,26 @@
-package com.yizhuan.xchat_android_core.helper;
+package com.chwl.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.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_CAR;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_NOBLE;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ASSISTANT_MSG;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_COMMON_SYSTEM_MSG;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_LOTTERY;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_LUCKY_MONEY;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_NOTICE;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_OPEN_ROOM_NOTI;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_PACKET;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_SHARE_IN_APP;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MODULE_HALL;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_NEWBIE;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_PUBLIC_CHAT_HALL;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RED_PACKAGE;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_FAMILY;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_ROOM;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_TEAM;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHIFT_OUT;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_PUBLIC_CHAT_HALL_AIT_ME;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_RECEIVE_LUCKY_MONEY;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_LUCKY_MONEY;
 
 import androidx.annotation.NonNull;
 
@@ -34,28 +34,28 @@ 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.R;
-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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.community.im.WorldDynamicAttachment;
+import com.chwl.core.im.custom.bean.AssistantAttachment;
+import com.chwl.core.im.custom.bean.CarAttachment;
+import com.chwl.core.im.custom.bean.CarveUpGoldThirdLevelAttachment;
+import com.chwl.core.im.custom.bean.ChatHintAttachment;
+import com.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.core.im.custom.bean.ImTipAttachment;
+import com.chwl.core.im.custom.bean.LuckyMoneyTipsAttachment;
+import com.chwl.core.im.custom.bean.MatchAttachment;
+import com.chwl.core.im.custom.bean.NewbieHelloAttachment;
+import com.chwl.core.im.custom.bean.NobleAttachment;
+import com.chwl.core.im.custom.bean.NoticeAttachment;
+import com.chwl.core.im.custom.bean.RedPacketAttachment;
+import com.chwl.core.im.custom.bean.SysMsgVoiceAttachment;
+import com.chwl.core.luckymoney.LuckyMoneyInfo;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.public_chat_hall.attachment.AitMeAttachment;
+import com.chwl.core.public_chat_hall.bean.AitMeInfo;
+import com.chwl.library.utils.ResUtil;
 
 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/chwl/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/chwl/core/home/IHomeTabMapView.java
index ffc56d351..7aad47101 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/IHomeTabMapView.java
+++ b/core/src/diff_src_erban/java/com/chwl/core/home/IHomeTabMapView.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.home;
+package com.chwl.core.home;
 
-import com.yizhuan.xchat_android_core.home.bean.HomeTabMapInfo;
-import com.yizhuan.xchat_android_library.base.IMvpBaseView;
+import com.chwl.core.home.bean.HomeTabMapInfo;
+import com.chwl.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/chwl/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/chwl/core/home/bean/BannerInfo.java
index b834ddf6c..b8c04a53f 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/chwl/core/home/bean/BannerInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.home.bean;
+package com.chwl.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/chwl/core/home/bean/CollectionRoomInfo.java
similarity index 95%
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/chwl/core/home/bean/CollectionRoomInfo.java
index e2b3bfcf5..68db4f971 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/chwl/core/home/bean/CollectionRoomInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.home.bean;
+package com.chwl.core.home.bean;
 
 import java.util.List;
 
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/CurrentResourceInfo.kt b/core/src/diff_src_erban/java/com/chwl/core/home/bean/CurrentResourceInfo.kt
similarity index 82%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/CurrentResourceInfo.kt
rename to core/src/diff_src_erban/java/com/chwl/core/home/bean/CurrentResourceInfo.kt
index 1ddee3d64..05913cac4 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/CurrentResourceInfo.kt
+++ b/core/src/diff_src_erban/java/com/chwl/core/home/bean/CurrentResourceInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.home.bean
+package com.chwl.core.home.bean
 
 import lombok.Data
 
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/chwl/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/chwl/core/home/bean/HomeConcernsInfo.java
index 859a71544..d966bc345 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/chwl/core/home/bean/HomeConcernsInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.home.bean;
+package com.chwl.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/chwl/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/chwl/core/home/bean/HomeRoomInfo.java
index b037f5f4d..97a25826a 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/chwl/core/home/bean/HomeRoomInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.home.bean;
+package com.chwl.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/chwl/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/chwl/core/home/bean/HomeTabMapInfo.java
index 223aa0608..8d07c3535 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/chwl/core/home/bean/HomeTabMapInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.home.bean;
+package com.chwl.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/chwl/core/home/bean/HomeTagInfo.java
similarity index 93%
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/chwl/core/home/bean/HomeTagInfo.java
index 0899ed0f7..4bd4b36c2 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/chwl/core/home/bean/HomeTagInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.home.bean;
+package com.chwl.core.home.bean;
 
 import lombok.Data;
 
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/chwl/core/home/bean/MainTabInfo.kt
similarity index 81%
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/chwl/core/home/bean/MainTabInfo.kt
index 7c4bc5bcd..a63dba9c2 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/chwl/core/home/bean/MainTabInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.home.bean
+package com.chwl.core.home.bean
 
 import lombok.Data
 
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/chwl/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/chwl/core/home/bean/MainTabType.java
index 56aa7939f..402924525 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/chwl/core/home/bean/MainTabType.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.home.bean;
+package com.chwl.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/chwl/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/chwl/core/home/bean/MicUsersBean.java
index b4d216349..465ac60ec 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/chwl/core/home/bean/MicUsersBean.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.home.bean;
+package com.chwl.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/chwl/core/home/bean/ResourceInfo.kt
similarity index 82%
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/chwl/core/home/bean/ResourceInfo.kt
index f7d7bc529..950a8865c 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/chwl/core/home/bean/ResourceInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.home.bean
+package com.chwl.core.home.bean
 
 import lombok.Data
 
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/chwl/core/home/bean/TabInfo.java
similarity index 94%
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/chwl/core/home/bean/TabInfo.java
index 12aed7b41..74526d38d 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/chwl/core/home/bean/TabInfo.java
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_core.home.bean;
+package com.chwl.core.home.bean;
 
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import com.yizhuan.xchat_android_core.R;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.library.utils.ResUtil;
 
 import java.io.Serializable;
 import java.util.ArrayList;
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/chwl/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/chwl/core/home/bean/TagListInfo.java
index c56f81d47..747195bea 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/chwl/core/home/bean/TagListInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.home.bean;
+package com.chwl.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/chwl/core/home/bean/VisitorInfo.kt
similarity index 82%
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/chwl/core/home/bean/VisitorInfo.kt
index 14b28b2d0..186bdd938 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/chwl/core/home/bean/VisitorInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.home.bean
+package com.chwl.core.home.bean
 
 import lombok.Data
 
diff --git a/core/src/diff_src_erban/java/com/chwl/core/home/event/FollowRoomEvent.java b/core/src/diff_src_erban/java/com/chwl/core/home/event/FollowRoomEvent.java
new file mode 100644
index 000000000..fbbf93b2a
--- /dev/null
+++ b/core/src/diff_src_erban/java/com/chwl/core/home/event/FollowRoomEvent.java
@@ -0,0 +1,4 @@
+package com.chwl.core.home.event;
+
+public class FollowRoomEvent {
+}
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/OpenRoomMessageInputEvent.kt b/core/src/diff_src_erban/java/com/chwl/core/home/event/OpenRoomMessageInputEvent.kt
similarity index 72%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/OpenRoomMessageInputEvent.kt
rename to core/src/diff_src_erban/java/com/chwl/core/home/event/OpenRoomMessageInputEvent.kt
index 985a938ca..8915e62b5 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/OpenRoomMessageInputEvent.kt
+++ b/core/src/diff_src_erban/java/com/chwl/core/home/event/OpenRoomMessageInputEvent.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.home.event
+package com.chwl.core.home.event
 
 /**
  * Created by Max on 2023/10/27 11:56
diff --git a/core/src/diff_src_erban/java/com/chwl/core/home/event/RefreshHomeDataEvent.java b/core/src/diff_src_erban/java/com/chwl/core/home/event/RefreshHomeDataEvent.java
new file mode 100644
index 000000000..3e1431ffa
--- /dev/null
+++ b/core/src/diff_src_erban/java/com/chwl/core/home/event/RefreshHomeDataEvent.java
@@ -0,0 +1,4 @@
+package com.chwl.core.home.event;
+
+public class RefreshHomeDataEvent {
+}
diff --git a/core/src/diff_src_erban/java/com/chwl/core/home/event/ShareRoomEvent.java b/core/src/diff_src_erban/java/com/chwl/core/home/event/ShareRoomEvent.java
new file mode 100644
index 000000000..eea33cc9f
--- /dev/null
+++ b/core/src/diff_src_erban/java/com/chwl/core/home/event/ShareRoomEvent.java
@@ -0,0 +1,4 @@
+package com.chwl.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/chwl/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/chwl/core/home/event/VisitorUnreadCountEvent.java
index d8fd75801..5c7e4b6fd 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/chwl/core/home/event/VisitorUnreadCountEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.home.event;
+package com.chwl.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/chwl/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/chwl/core/home/model/CollectionRoomModel.java
index 9e9aad7e2..c13156a67 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/chwl/core/home/model/CollectionRoomModel.java
@@ -1,11 +1,11 @@
-package com.yizhuan.xchat_android_core.home.model;
+package com.chwl.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.home.bean.CollectionRoomInfo;
-import com.yizhuan.xchat_android_core.utils.net.RxHelper;
-import com.yizhuan.xchat_android_library.net.rxnet.RxNet;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.home.bean.CollectionRoomInfo;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.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/chwl/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/chwl/core/home/model/CommunityNoticeModel.java
index eecf0052b..ccc42413d 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/chwl/core/home/model/CommunityNoticeModel.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.home.model;
+package com.chwl.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.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.community.bean.CommunityNoticeInfo;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.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/chwl/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/chwl/core/home/model/GameHomeModel.java
index 230417359..b82296e9e 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/chwl/core/home/model/GameHomeModel.java
@@ -1,14 +1,14 @@
-package com.yizhuan.xchat_android_core.home.model;
+package com.chwl.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.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.community.CommunityConstant;
+import com.chwl.core.home.bean.BannerInfo;
+import com.chwl.core.home.bean.HomeRoomInfo;
+import com.chwl.core.home.bean.HomeTabMapInfo;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.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/chwl/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/chwl/core/home/model/HomeModel.kt
index b14fa3656..68875ade2 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/chwl/core/home/model/HomeModel.kt
@@ -1,25 +1,25 @@
-package com.yizhuan.xchat_android_core.home.model
+package com.chwl.core.home.model
 
-import com.yizhuan.xchat_android_core.R
-import com.yizhuan.xchat_android_core.auth.AuthModel
-import com.yizhuan.xchat_android_core.base.BaseModel
-import com.yizhuan.xchat_android_core.bean.response.ListResult
-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.DiamondGiveHistoryInfo
-import com.yizhuan.xchat_android_core.user.bean.SearchUserInfo
-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.yizhuan.xchat_android_library.utils.ResUtil
+import com.chwl.core.R
+import com.chwl.core.auth.AuthModel
+import com.chwl.core.base.BaseModel
+import com.chwl.core.bean.response.ListResult
+import com.chwl.core.bean.response.ServiceResult
+import com.chwl.core.community.CommunityConstant
+import com.chwl.core.community.bean.UnReadCountInfo
+import com.chwl.core.home.bean.*
+import com.chwl.core.room.bean.AnchorInfo
+import com.chwl.core.room.bean.HomeLiveTopInfo
+import com.chwl.core.room.bean.MeCenterInfo
+import com.chwl.core.room.bean.SingleRoomSortInfo
+import com.chwl.core.room.game.GameInfo
+import com.chwl.core.user.bean.DiamondGiveHistoryInfo
+import com.chwl.core.user.bean.SearchUserInfo
+import com.chwl.core.user.bean.UserInfo
+import com.chwl.core.utils.net.RxHelper
+import com.chwl.core.utils.net.launchRequest
+import com.chwl.library.net.rxnet.RxNet
+import com.chwl.library.utils.ResUtil
 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/chwl/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/chwl/core/home/model/ICommunityNoticeModel.java
index e5c39e3b6..e7bf48c0c 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/chwl/core/home/model/ICommunityNoticeModel.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.home.model;
+package com.chwl.core.home.model;
 
-import com.yizhuan.xchat_android_core.community.bean.CommunityNoticeInfo;
-import com.yizhuan.xchat_android_library.base.IMvpBaseView;
+import com.chwl.core.community.bean.CommunityNoticeInfo;
+import com.chwl.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/chwl/core/manager/AudioEngineManager.java
similarity index 96%
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/chwl/core/manager/AudioEngineManager.java
index 141e89c90..7018529d7 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/AudioEngineManager.java
+++ b/core/src/diff_src_erban/java/com/chwl/core/manager/AudioEngineManager.java
@@ -1,12 +1,12 @@
-package com.yizhuan.xchat_android_core.manager;
+package com.chwl.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.room.bean.RoomAudioSdkType;
-import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
-import com.yizhuan.xchat_android_core.utils.LogUtils;
+import com.chwl.core.manager.agora.RtcEngineManager;
+import com.chwl.core.manager.trtc.TRtcEngineManager;
+import com.chwl.core.room.bean.RoomAudioSdkType;
+import com.chwl.core.room.bean.RoomInfo;
+import com.chwl.core.utils.LogUtils;
 
 import io.agora.rtc2.Constants;
 import io.agora.rtc2.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/chwl/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/chwl/core/manager/BaseEngine.java
index 8f45a8610..27d113dca 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/BaseEngine.java
+++ b/core/src/diff_src_erban/java/com/chwl/core/manager/BaseEngine.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.manager;
+package com.chwl.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/chwl/core/manager/EngineType.java
similarity index 68%
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/chwl/core/manager/EngineType.java
index dc9444a9c..d79d85db1 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/EngineType.java
+++ b/core/src/diff_src_erban/java/com/chwl/core/manager/EngineType.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.manager;
+package com.chwl.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/chwl/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/chwl/core/manager/IAudioEngine.java
index d550fa1bb..dfbe57854 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IAudioEngine.java
+++ b/core/src/diff_src_erban/java/com/chwl/core/manager/IAudioEngine.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.manager;
+package com.chwl.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/chwl/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/chwl/core/manager/IMNetEaseManager.java
index c9c4bfc33..354ae435a 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java
+++ b/core/src/diff_src_erban/java/com/chwl/core/manager/IMNetEaseManager.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.manager;
+package com.chwl.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.chwl.core.im.custom.bean.CustomAttachment.*;
 
 import android.annotation.SuppressLint;
 import android.graphics.BitmapFactory;
@@ -60,128 +60,128 @@ 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.gift.bean.GiftReceiveInfo;
-import com.yizhuan.xchat_android_core.gift.event.UpdateKnapFreeGiftDataEvent;
-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.NobleAttachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.RedPackageAttachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.RoomBoxPrizeAttachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.RoomFreeGiftAttachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.RoomFreeGiftMsgBean;
-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.RoomLuckySeaAttachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.RoomLuckySeaMsgBean;
-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.TarotAttachment;
-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.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.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.ResUtil;
-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.chwl.core.BuildConfig;
+import com.chwl.core.Constants;
+import com.chwl.core.R;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.bean.RoomMicInfo;
+import com.chwl.core.bean.RoomQueueInfo;
+import com.chwl.core.bean.attachmsg.RoomQueueMsgAttachment;
+import com.chwl.core.decoration.car.bean.CarInfo;
+import com.chwl.core.decoration.headwear.bean.HeadWearInfo;
+import com.chwl.core.exception.ErrorThrowable;
+import com.chwl.core.family.bean.FamilyInfo;
+import com.chwl.core.family.event.FamilyMineEvent;
+import com.chwl.core.gift.GiftModel;
+import com.chwl.core.gift.bean.GiftInfo;
+import com.chwl.core.gift.bean.GiftReceiveInfo;
+import com.chwl.core.gift.event.UpdateKnapFreeGiftDataEvent;
+import com.chwl.core.helper.AtProxy;
+import com.chwl.core.im.custom.bean.ActivityTimerAttachment;
+import com.chwl.core.im.custom.bean.AssistantAttachment;
+import com.chwl.core.im.custom.bean.CarAttachment;
+import com.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.core.im.custom.bean.DatingAttachment;
+import com.chwl.core.im.custom.bean.DatingPublishAttachment;
+import com.chwl.core.im.custom.bean.GiftAttachment;
+import com.chwl.core.im.custom.bean.GiftBatchAttachment;
+import com.chwl.core.im.custom.bean.InAppSharingFamilyAttachment;
+import com.chwl.core.im.custom.bean.InAppSharingMiniWorldAttachment;
+import com.chwl.core.im.custom.bean.InAppSharingRoomAttachment;
+import com.chwl.core.im.custom.bean.InAppSharingTeamAttachment;
+import com.chwl.core.im.custom.bean.LuckyMoneyAttachment;
+import com.chwl.core.im.custom.bean.LuckyMoneyTipsAttachment;
+import com.chwl.core.im.custom.bean.MagicAllMicAttachment;
+import com.chwl.core.im.custom.bean.MagicAttachment;
+import com.chwl.core.im.custom.bean.MagicBatchAttachment;
+import com.chwl.core.im.custom.bean.MonsterAttackAttachment;
+import com.chwl.core.im.custom.bean.MonsterHuntingResultAttachment;
+import com.chwl.core.im.custom.bean.MonsterStatusAttachment;
+import com.chwl.core.im.custom.bean.MultiGiftAttachment;
+import com.chwl.core.im.custom.bean.NobleAttachment;
+import com.chwl.core.im.custom.bean.RedPackageAttachment;
+import com.chwl.core.im.custom.bean.RoomBoxPrizeAttachment;
+import com.chwl.core.im.custom.bean.RoomFreeGiftAttachment;
+import com.chwl.core.im.custom.bean.RoomFreeGiftMsgBean;
+import com.chwl.core.im.custom.bean.RoomGiftValueAttachment;
+import com.chwl.core.im.custom.bean.RoomInfoAttachment;
+import com.chwl.core.im.custom.bean.RoomLuckySeaAttachment;
+import com.chwl.core.im.custom.bean.RoomLuckySeaMsgBean;
+import com.chwl.core.im.custom.bean.RoomPKAttachment;
+import com.chwl.core.im.custom.bean.RoomPkBean;
+import com.chwl.core.im.custom.bean.RoomTipAttachment;
+import com.chwl.core.im.custom.bean.RouterType;
+import com.chwl.core.im.custom.bean.SysMsgAttachment;
+import com.chwl.core.im.custom.bean.TarotAttachment;
+import com.chwl.core.im.custom.bean.WelcomeAttachment;
+import com.chwl.core.level.UserLevelVo;
+import com.chwl.core.luckymoney.LuckyMoneyInfo;
+import com.chwl.core.magic.MagicModel;
+import com.chwl.core.magic.bean.MagicInfo;
+import com.chwl.core.magic.toolbox.MagicToolbox;
+import com.chwl.core.miniworld.bean.MiniWorldDetailInfo;
+import com.chwl.core.miniworld.bean.MiniWorldDetailInfoWithCurrentMember;
+import com.chwl.core.miniworld.event.MiniWorldJoinVerifiedEvent;
+import com.chwl.core.monsterhunting.bean.MonsterInfo;
+import com.chwl.core.monsterhunting.bean.MonsterProtocol;
+import com.chwl.core.msg.sys.ErbanSysMsgInfo;
+import com.chwl.core.msg.sys.ErbanSysMsgParamKey;
+import com.chwl.core.msg.sysv2.ErbanSysMsgV2Info;
+import com.chwl.core.noble.NobleInfo;
+import com.chwl.core.noble.NobleResourceType;
+import com.chwl.core.noble.NobleUtil;
+import com.chwl.core.public_chat_hall.manager.PublicChatHallDataManager;
+import com.chwl.core.retry.ImRetryManager;
+import com.chwl.core.retry.ReconnectListener;
+import com.chwl.core.retry.RetryChatRoomMessage;
+import com.chwl.core.room.activitytimer.ActivityTimerEvent;
+import com.chwl.core.room.activitytimer.TimerBean;
+import com.chwl.core.room.auction.bean.AuctionInfo;
+import com.chwl.core.room.bean.LeaveModeAttachment;
+import com.chwl.core.room.bean.RoomInfo;
+import com.chwl.core.room.exception.AntiSpamHitException;
+import com.chwl.core.room.face.DynamicFaceModel;
+import com.chwl.core.room.giftvalue.helper.GiftValueMrg;
+import com.chwl.core.room.model.AvRoomModel;
+import com.chwl.core.room.model.MicQueueModel;
+import com.chwl.core.room.pk.attachment.RoomPkAttachment;
+import com.chwl.core.room.pk.bean.PKTeamInfo;
+import com.chwl.core.room.pk.bean.RoomPKInvitedUpMicMember;
+import com.chwl.core.room.pk.bean.RoomPkData;
+import com.chwl.core.room.pk.model.PkModel;
+import com.chwl.core.room.queue.bean.MicMemberInfo;
+import com.chwl.core.room.queuing_mic.attachment.QueuingMicAttachment;
+import com.chwl.core.room.queuing_mic.bean.QueuingMicInfo;
+import com.chwl.core.room.queuing_mic.event.QueuingMicEmptyEvent;
+import com.chwl.core.room.queuing_mic.event.QueuingMicNotEmptyEvent;
+import com.chwl.core.share.bean.InAppSharingFamilyInfo;
+import com.chwl.core.share.bean.InAppSharingMiniWorldInfo;
+import com.chwl.core.share.bean.InAppSharingRoomInfo;
+import com.chwl.core.share.bean.InAppSharingTeamInfo;
+import com.chwl.core.share.bean.SessionType;
+import com.chwl.core.statistic.StatLogKey;
+import com.chwl.core.super_admin.SuperAdminDataMrg;
+import com.chwl.core.super_admin.attachment.SuperAdminOpAttachment;
+import com.chwl.core.super_admin.bean.SaOpInfo;
+import com.chwl.core.super_admin.util.SuperAdminUtil;
+import com.chwl.core.team.bean.TeamInfo;
+import com.chwl.core.user.UserModel;
+import com.chwl.core.user.bean.BaseInfo;
+import com.chwl.core.user.bean.UserInfo;
+import com.chwl.core.utils.ExtensionUtils;
+import com.chwl.core.utils.LogUtils;
+import com.chwl.core.utils.SharedPreferenceUtils;
+import com.chwl.core.utils.net.DontWarnObserver;
+import com.chwl.core.vip.VipBroadcastMsgEvent;
+import com.chwl.library.net.rxnet.callback.CallBack;
+import com.chwl.library.rxbus.RxBus;
+import com.chwl.library.utils.JavaUtil;
+import com.chwl.library.utils.ListUtils;
+import com.chwl.library.utils.NetworkUtils;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SingleToastUtil;
+import com.chwl.library.utils.config.BasicConfig;
+import com.chwl.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/chwl/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/chwl/core/manager/VolumeSetting.java
index a0c328e92..c80088884 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/VolumeSetting.java
+++ b/core/src/diff_src_erban/java/com/chwl/core/manager/VolumeSetting.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.manager;
+package com.chwl.core.manager;
 
-import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
-import com.yizhuan.xchat_android_library.utils.pref.CommonPref;
+import com.chwl.library.utils.config.BasicConfig;
+import com.chwl.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/chwl/core/manager/agora/EngineEventHandler.java
similarity index 92%
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/chwl/core/manager/agora/EngineEventHandler.java
index f4f30221f..843e60af9 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/chwl/core/manager/agora/EngineEventHandler.java
@@ -1,14 +1,14 @@
-package com.yizhuan.xchat_android_core.manager.agora;
+package com.chwl.core.manager.agora;
 
 import android.os.Message;
 
 import com.orhanobut.logger.Logger;
-import com.yizhuan.xchat_android_core.R;
-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.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
+import com.chwl.core.R;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.manager.RoomEvent;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SingleToastUtil;
 
 import io.agora.rtc2.ClientRoleOptions;
 import io.agora.rtc2.Constants;
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/chwl/core/manager/agora/RtcEngineHandler.java
similarity index 87%
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/chwl/core/manager/agora/RtcEngineHandler.java
index 973a6bf93..1b97f6998 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/chwl/core/manager/agora/RtcEngineHandler.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.manager.agora;
+package com.chwl.core.manager.agora;
 
 import static io.agora.rtc2.Constants.AUDIO_RECORDING_QUALITY_LOW;
 
@@ -6,14 +6,14 @@ 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.common.file.FileHelper;
-import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.manager.AudioEngineManager;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.manager.RoomEvent;
+import com.chwl.core.room.bean.RoomInfo;
+import com.chwl.library.common.file.FileHelper;
+import com.chwl.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/chwl/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/chwl/core/manager/agora/RtcEngineManager.java
index a03abc6eb..e6f3151f5 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/chwl/core/manager/agora/RtcEngineManager.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.manager.agora;
+package com.chwl.core.manager.agora;
 
 import static io.agora.rtc2.Constants.AUDIO_PROFILE_MUSIC_STANDARD;
 import static io.agora.rtc2.Constants.AUDIO_SCENARIO_GAME_STREAMING;
@@ -13,11 +13,11 @@ 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.common.file.FileHelper;
-import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
+import com.chwl.core.manager.BaseEngine;
+import com.chwl.core.music.db.bean.LocalMusicBean;
+import com.chwl.core.music.model.PlayerModel;
+import com.chwl.library.common.file.FileHelper;
+import com.chwl.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/chwl/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/chwl/core/manager/trtc/BaseAdapterImpl.java
index fa82b9f63..3392c8244 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/chwl/core/manager/trtc/BaseAdapterImpl.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.manager.trtc;
+package com.chwl.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/chwl/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/chwl/core/manager/trtc/BaseAgoraHandlerInterface.java
index 2a966385b..5898af4eb 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/chwl/core/manager/trtc/BaseAgoraHandlerInterface.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.manager.trtc;
+package com.chwl.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/chwl/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/chwl/core/manager/trtc/BaseAgoraInterface.java
index e0514284a..6362a7d5d 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/chwl/core/manager/trtc/BaseAgoraInterface.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.manager.trtc;
+package com.chwl.core.manager.trtc;
 
 import io.agora.rtc2.IAudioFrameObserver;
 import io.agora.rtc2.IMetadataObserver;
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/chwl/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/chwl/core/manager/trtc/IRTCEngine.java
index 82ef282cb..16f87fef7 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/chwl/core/manager/trtc/IRTCEngine.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.manager.trtc;
+package com.chwl.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/chwl/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/chwl/core/manager/trtc/IRTCEngineHandler.java
index e27a99c57..0e8ecfff9 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/chwl/core/manager/trtc/IRTCEngineHandler.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.manager.trtc;
+package com.chwl.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/chwl/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/chwl/core/manager/trtc/RoomIdHelper.java
index dcfe1e69b..d4a56c7b7 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/chwl/core/manager/trtc/RoomIdHelper.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.manager.trtc;
+package com.chwl.core.manager.trtc;
 
-import com.yizhuan.xchat_android_core.utils.StringUtils;
+import com.chwl.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/chwl/core/manager/trtc/SDKConfig.java
similarity index 92%
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/chwl/core/manager/trtc/SDKConfig.java
index c74a90250..1896055bb 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/chwl/core/manager/trtc/SDKConfig.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.manager.trtc;
+package com.chwl.core.manager.trtc;
 
-import com.yizhuan.xchat_android_library.utils.codec.DESUtils;
+import com.chwl.library.utils.codec.DESUtils;
 
 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/chwl/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/chwl/core/manager/trtc/TRTCEffectManager.java
index d2acec168..43c8142fe 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/chwl/core/manager/trtc/TRTCEffectManager.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.manager.trtc;
+package com.chwl.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/chwl/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/chwl/core/manager/trtc/TRTCEngineAdapter.java
index db05cfcee..589b2b9f8 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/chwl/core/manager/trtc/TRTCEngineAdapter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.manager.trtc;
+package com.chwl.core.manager.trtc;
 
 import static com.tencent.trtc.TRTCCloudDef.TRTCRoleAnchor;
 import static com.tencent.trtc.TRTCCloudDef.TRTCRoleAudience;
@@ -75,8 +75,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.chwl.core.manager.AvRoomDataManager;
+import com.chwl.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/chwl/core/manager/trtc/TRtcEngineEventHandler.java
similarity index 94%
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/chwl/core/manager/trtc/TRtcEngineEventHandler.java
index 6f39ef82d..28b141425 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/chwl/core/manager/trtc/TRtcEngineEventHandler.java
@@ -1,19 +1,19 @@
-package com.yizhuan.xchat_android_core.manager.trtc;
+package com.chwl.core.manager.trtc;
 
 import android.graphics.Rect;
 import android.os.Message;
 
 import com.orhanobut.logger.Logger;
 import com.tencent.trtc.TRTCCloudDef;
-import com.yizhuan.xchat_android_core.R;
-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.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
+import com.chwl.core.R;
+import com.chwl.core.im.custom.bean.RoomPkBean;
+import com.chwl.core.manager.AudioEngineManager;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.manager.RoomEvent;
+import com.chwl.core.manager.agora.RtcEngineHandler;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SingleToastUtil;
 
 import io.agora.rtc2.Constants;
 import io.agora.rtc2.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/chwl/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/chwl/core/manager/trtc/TRtcEngineHandler.java
index a4d5bfb75..ad0644480 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/chwl/core/manager/trtc/TRtcEngineHandler.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.manager.trtc;
+package com.chwl.core.manager.trtc;
 
 import static io.agora.rtc2.Constants.AUDIO_RECORDING_QUALITY_LOW;
 
@@ -6,14 +6,14 @@ 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.common.file.FileHelper;
-import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.manager.AudioEngineManager;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.manager.RoomEvent;
+import com.chwl.core.room.bean.RoomInfo;
+import com.chwl.library.common.file.FileHelper;
+import com.chwl.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/chwl/core/manager/trtc/TRtcEngineManager.java
similarity index 94%
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/chwl/core/manager/trtc/TRtcEngineManager.java
index 742d8f44c..273a9e6de 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/chwl/core/manager/trtc/TRtcEngineManager.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.manager.trtc;
+package com.chwl.core.manager.trtc;
 
 import static io.agora.rtc2.Constants.AUDIO_PROFILE_MUSIC_STANDARD;
 import static io.agora.rtc2.Constants.AUDIO_SCENARIO_GAME_STREAMING;
@@ -11,13 +11,13 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.orhanobut.logger.Logger;
-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.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.chwl.core.initial.InitialModel;
+import com.chwl.core.initial.bean.InitInfo;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.manager.BaseEngine;
+import com.chwl.core.music.db.bean.LocalMusicBean;
+import com.chwl.core.music.model.PlayerModel;
+import com.chwl.library.utils.config.BasicConfig;
 
 import io.agora.rtc2.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/chwl/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/chwl/core/manager/trtc/Unsupport.java
index f2fa56420..9fbb174bf 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/chwl/core/manager/trtc/Unsupport.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.manager.trtc;
+package com.chwl.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/chwl/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/chwl/core/manager/trtc/Utils.java
index af5a134eb..6ffd189fe 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/chwl/core/manager/trtc/Utils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.manager.trtc;
+package com.chwl.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/chwl/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/chwl/core/manager/trtc/Version.java
index f10b9b9bd..0867c952e 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/chwl/core/manager/trtc/Version.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.manager.trtc;
+package com.chwl.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/market_verify/IMarketVerifyModel.java b/core/src/diff_src_erban/java/com/chwl/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/chwl/core/market_verify/IMarketVerifyModel.java
index b58034c0d..e95c97d26 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/chwl/core/market_verify/IMarketVerifyModel.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.market_verify;
+package com.chwl.core.market_verify;
 
-import com.yizhuan.xchat_android_core.base.IModel;
-import com.yizhuan.xchat_android_core.bean.LoginTipsInfo;
+import com.chwl.core.base.IModel;
+import com.chwl.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/chwl/core/market_verify/MarketVerifyModel.java
similarity index 88%
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/chwl/core/market_verify/MarketVerifyModel.java
index 5cb5e02f1..f6b66df89 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/chwl/core/market_verify/MarketVerifyModel.java
@@ -1,12 +1,12 @@
-package com.yizhuan.xchat_android_core.market_verify;
+package com.chwl.core.market_verify;
 
-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.utils.net.RxHelper;
-import com.yizhuan.xchat_android_library.net.rxnet.RxNet;
+import com.chwl.core.auth.event.LoginEvent;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.LoginTipsInfo;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.market_verify.bean.VersionConfig;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
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/chwl/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/chwl/core/market_verify/bean/VersionConfig.java
index 9a3368d5f..2a91e3db0 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/chwl/core/market_verify/bean/VersionConfig.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.market_verify.bean;
+package com.chwl.core.market_verify.bean;
 
 import lombok.Data;
 
diff --git a/core/src/diff_src_erban/java/com/chwl/core/market_verify/event/MarketVerifyUpdateEvent.java b/core/src/diff_src_erban/java/com/chwl/core/market_verify/event/MarketVerifyUpdateEvent.java
new file mode 100644
index 000000000..8505e64bd
--- /dev/null
+++ b/core/src/diff_src_erban/java/com/chwl/core/market_verify/event/MarketVerifyUpdateEvent.java
@@ -0,0 +1,4 @@
+package com.chwl.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/chwl/core/retry/ImRetryManager.java
similarity index 92%
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/chwl/core/retry/ImRetryManager.java
index af1dccdaf..c71837f06 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/retry/ImRetryManager.java
+++ b/core/src/diff_src_erban/java/com/chwl/core/retry/ImRetryManager.java
@@ -1,12 +1,12 @@
-package com.yizhuan.xchat_android_core.retry;
+package com.chwl.core.retry;
 
 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.R;
-import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.library.utils.ResUtil;
 
 import io.reactivex.Single;
 
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/chwl/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/chwl/core/retry/ReconnectListener.java
index ddf389d2b..0547bc417 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/retry/ReconnectListener.java
+++ b/core/src/diff_src_erban/java/com/chwl/core/retry/ReconnectListener.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.retry;
+package com.chwl.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/chwl/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/chwl/core/retry/RetryChatRoomMessage.java
index 087a8c12c..7ba43ef3e 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/retry/RetryChatRoomMessage.java
+++ b/core/src/diff_src_erban/java/com/chwl/core/retry/RetryChatRoomMessage.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.retry;
+package com.chwl.core.retry;
 
 import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage;
 
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/set/bean/ShieldInfo.kt b/core/src/diff_src_erban/java/com/chwl/core/set/bean/ShieldInfo.kt
similarity index 84%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/set/bean/ShieldInfo.kt
rename to core/src/diff_src_erban/java/com/chwl/core/set/bean/ShieldInfo.kt
index 2410475d4..7ca29d1b4 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/set/bean/ShieldInfo.kt
+++ b/core/src/diff_src_erban/java/com/chwl/core/set/bean/ShieldInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.set.bean
+package com.chwl.core.set.bean
 
 import lombok.Data
 
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/set/model/SetModel.kt b/core/src/diff_src_erban/java/com/chwl/core/set/model/SetModel.kt
similarity index 72%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/set/model/SetModel.kt
rename to core/src/diff_src_erban/java/com/chwl/core/set/model/SetModel.kt
index c4ccb25e6..4fd4bc907 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/set/model/SetModel.kt
+++ b/core/src/diff_src_erban/java/com/chwl/core/set/model/SetModel.kt
@@ -1,11 +1,11 @@
-package com.yizhuan.xchat_android_core.set.model
+package com.chwl.core.set.model
 
-import com.yizhuan.xchat_android_core.base.BaseModel
-import com.yizhuan.xchat_android_core.bean.response.ServiceResult
-import com.yizhuan.xchat_android_core.home.bean.*
-import com.yizhuan.xchat_android_core.set.bean.ShieldInfo
-import com.yizhuan.xchat_android_core.utils.net.launchRequest
-import com.yizhuan.xchat_android_library.net.rxnet.RxNet
+import com.chwl.core.base.BaseModel
+import com.chwl.core.bean.response.ServiceResult
+import com.chwl.core.home.bean.*
+import com.chwl.core.set.bean.ShieldInfo
+import com.chwl.core.utils.net.launchRequest
+import com.chwl.library.net.rxnet.RxNet
 import retrofit2.http.GET
 import retrofit2.http.POST
 import retrofit2.http.Query
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/sound/model/SoundModel.kt b/core/src/diff_src_erban/java/com/chwl/core/sound/model/SoundModel.kt
similarity index 67%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/sound/model/SoundModel.kt
rename to core/src/diff_src_erban/java/com/chwl/core/sound/model/SoundModel.kt
index 27100012e..d38bb8d7c 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/sound/model/SoundModel.kt
+++ b/core/src/diff_src_erban/java/com/chwl/core/sound/model/SoundModel.kt
@@ -1,11 +1,11 @@
-package com.yizhuan.xchat_android_core.sound.model
+package com.chwl.core.sound.model
 
-import com.yizhuan.xchat_android_core.base.BaseModel
-import com.yizhuan.xchat_android_core.bean.response.ServiceResult
-import com.yizhuan.xchat_android_core.earn.bean.*
-import com.yizhuan.xchat_android_core.home.bean.*
-import com.yizhuan.xchat_android_core.utils.net.launchRequest
-import com.yizhuan.xchat_android_library.net.rxnet.RxNet
+import com.chwl.core.base.BaseModel
+import com.chwl.core.bean.response.ServiceResult
+import com.chwl.core.earn.bean.*
+import com.chwl.core.home.bean.*
+import com.chwl.core.utils.net.launchRequest
+import com.chwl.library.net.rxnet.RxNet
 import retrofit2.http.POST
 import retrofit2.http.Query
 
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/Compound.kt b/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/Compound.kt
similarity index 54%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/Compound.kt
rename to core/src/diff_src_erban/java/com/chwl/core/treasurefairy/Compound.kt
index 2c7c43aec..48394335a 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/Compound.kt
+++ b/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/Compound.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.treasurefairy
+package com.chwl.core.treasurefairy
 
 data class Compound(
     val elfId: Long,
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/DrawInfo.kt b/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/DrawInfo.kt
similarity index 67%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/DrawInfo.kt
rename to core/src/diff_src_erban/java/com/chwl/core/treasurefairy/DrawInfo.kt
index 79c7ec6d5..809b0c2a3 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/DrawInfo.kt
+++ b/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/DrawInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.treasurefairy
+package com.chwl.core.treasurefairy
 
 data class DrawInfo(
     var drawTicketNum: Int = 0,
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/ExchangeGiftInfo.kt b/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/ExchangeGiftInfo.kt
similarity index 94%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/ExchangeGiftInfo.kt
rename to core/src/diff_src_erban/java/com/chwl/core/treasurefairy/ExchangeGiftInfo.kt
index cff4e4e91..ebb318ef5 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/ExchangeGiftInfo.kt
+++ b/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/ExchangeGiftInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.treasurefairy
+package com.chwl.core.treasurefairy
 
 data class ExchangeGiftInfo(
     val expendNum: Int = 0,
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/FairyInfo.kt b/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/FairyInfo.kt
similarity index 91%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/FairyInfo.kt
rename to core/src/diff_src_erban/java/com/chwl/core/treasurefairy/FairyInfo.kt
index 87c9bb7c5..e883b0157 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/FairyInfo.kt
+++ b/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/FairyInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.treasurefairy
+package com.chwl.core.treasurefairy
 
 import java.io.Serializable
 
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/FairyMsgInfoBean.java b/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/FairyMsgInfoBean.java
similarity index 88%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/FairyMsgInfoBean.java
rename to core/src/diff_src_erban/java/com/chwl/core/treasurefairy/FairyMsgInfoBean.java
index e6eb38f6e..a62398357 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/FairyMsgInfoBean.java
+++ b/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/FairyMsgInfoBean.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.treasurefairy;
+package com.chwl.core.treasurefairy;
 
 import lombok.Data;
 
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/FairyResolveParam.kt b/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/FairyResolveParam.kt
similarity index 62%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/FairyResolveParam.kt
rename to core/src/diff_src_erban/java/com/chwl/core/treasurefairy/FairyResolveParam.kt
index 346f26a7b..579ca9e2a 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/FairyResolveParam.kt
+++ b/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/FairyResolveParam.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.treasurefairy
+package com.chwl.core.treasurefairy
 
 data class FairyResolveParam(
     val expendList: MutableList = arrayListOf()
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/FairyTestParam.kt b/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/FairyTestParam.kt
similarity index 67%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/FairyTestParam.kt
rename to core/src/diff_src_erban/java/com/chwl/core/treasurefairy/FairyTestParam.kt
index b08420198..94fa259ce 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/FairyTestParam.kt
+++ b/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/FairyTestParam.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.treasurefairy
+package com.chwl.core.treasurefairy
 
 data class FairyTestParam(
     val expendList: MutableList = arrayListOf(),
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/ForestInfo.kt b/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/ForestInfo.kt
similarity index 81%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/ForestInfo.kt
rename to core/src/diff_src_erban/java/com/chwl/core/treasurefairy/ForestInfo.kt
index 7ab08e2c2..3f0782dcb 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/ForestInfo.kt
+++ b/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/ForestInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.treasurefairy
+package com.chwl.core.treasurefairy
 
 data class ForestInfo(
     val avatar: String = "",
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/MyFairyInfo.kt b/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/MyFairyInfo.kt
similarity index 82%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/MyFairyInfo.kt
rename to core/src/diff_src_erban/java/com/chwl/core/treasurefairy/MyFairyInfo.kt
index 7b03a9636..82068aece 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/MyFairyInfo.kt
+++ b/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/MyFairyInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.treasurefairy
+package com.chwl.core.treasurefairy
 
 data class MyFairyInfo(
     val highElves: ArrayList? = null,
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/PrizeInfo.kt b/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/PrizeInfo.kt
similarity index 87%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/PrizeInfo.kt
rename to core/src/diff_src_erban/java/com/chwl/core/treasurefairy/PrizeInfo.kt
index d3989993e..4180fc271 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/PrizeInfo.kt
+++ b/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/PrizeInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.treasurefairy
+package com.chwl.core.treasurefairy
 
 data class PrizeInfo(
     val rewardId: Int = 0,
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/PropItemInfo.kt b/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/PropItemInfo.kt
similarity index 72%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/PropItemInfo.kt
rename to core/src/diff_src_erban/java/com/chwl/core/treasurefairy/PropItemInfo.kt
index 932dcd212..c11f4a00f 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/PropItemInfo.kt
+++ b/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/PropItemInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.treasurefairy
+package com.chwl.core.treasurefairy
 
 data class PropItemInfo(
     val picUrl: String = "",
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/ResolveInfo.kt b/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/ResolveInfo.kt
similarity index 69%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/ResolveInfo.kt
rename to core/src/diff_src_erban/java/com/chwl/core/treasurefairy/ResolveInfo.kt
index 5981d7dce..36d4c1d00 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/ResolveInfo.kt
+++ b/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/ResolveInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.treasurefairy
+package com.chwl.core.treasurefairy
 
 import java.io.Serializable
 
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/SendFairyInfo.kt b/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/SendFairyInfo.kt
similarity index 84%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/SendFairyInfo.kt
rename to core/src/diff_src_erban/java/com/chwl/core/treasurefairy/SendFairyInfo.kt
index e0c282dbc..b90ae1752 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/SendFairyInfo.kt
+++ b/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/SendFairyInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.treasurefairy
+package com.chwl.core.treasurefairy
 
 data class SendFairyInfo(
     val createTime: Long = 0,
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/TestFairyRecordInfo.kt b/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/TestFairyRecordInfo.kt
similarity index 82%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/TestFairyRecordInfo.kt
rename to core/src/diff_src_erban/java/com/chwl/core/treasurefairy/TestFairyRecordInfo.kt
index aa400ce16..59cfeab71 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/TestFairyRecordInfo.kt
+++ b/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/TestFairyRecordInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.treasurefairy
+package com.chwl.core.treasurefairy
 
 data class TestFairyRecordInfo(
     val compoundLevel: Int = 0,
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/TreasureFairyModel.kt b/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/TreasureFairyModel.kt
similarity index 93%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/TreasureFairyModel.kt
rename to core/src/diff_src_erban/java/com/chwl/core/treasurefairy/TreasureFairyModel.kt
index 808d39816..2945afc73 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/TreasureFairyModel.kt
+++ b/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/TreasureFairyModel.kt
@@ -1,13 +1,13 @@
-package com.yizhuan.xchat_android_core.treasurefairy
+package com.chwl.core.treasurefairy
 
-import com.yizhuan.xchat_android_core.bean.response.ServiceResult
-import com.yizhuan.xchat_android_core.gift.bean.SimpleUserInfo
-import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
-import com.yizhuan.xchat_android_core.treasurefairy.FairyInfo.Companion.LEVEL_HIGH
-import com.yizhuan.xchat_android_core.treasurefairy.FairyInfo.Companion.LEVEL_LOW
-import com.yizhuan.xchat_android_core.treasurefairy.FairyInfo.Companion.LEVEL_MIDDLE
-import com.yizhuan.xchat_android_core.utils.net.launchRequest
-import com.yizhuan.xchat_android_library.net.rxnet.RxNet
+import com.chwl.core.bean.response.ServiceResult
+import com.chwl.core.gift.bean.SimpleUserInfo
+import com.chwl.core.manager.AvRoomDataManager
+import com.chwl.core.treasurefairy.FairyInfo.Companion.LEVEL_HIGH
+import com.chwl.core.treasurefairy.FairyInfo.Companion.LEVEL_LOW
+import com.chwl.core.treasurefairy.FairyInfo.Companion.LEVEL_MIDDLE
+import com.chwl.core.utils.net.launchRequest
+import com.chwl.library.net.rxnet.RxNet
 import retrofit2.http.*
 
 object TreasureFairyModel {
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java b/core/src/diff_src_erban/java/com/chwl/xchat_android_constants/XChatConstants.java
similarity index 97%
rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java
rename to core/src/diff_src_erban/java/com/chwl/xchat_android_constants/XChatConstants.java
index 2ca6db191..866fb035d 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java
+++ b/core/src/diff_src_erban/java/com/chwl/xchat_android_constants/XChatConstants.java
@@ -1,9 +1,9 @@
 package com.yizhuan.xchat_android_constants;
 
-import com.yizhuan.xchat_android_core.BuildConfig;
-import com.yizhuan.xchat_android_core.R;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.codec.DESUtils;
+import com.chwl.core.BuildConfig;
+import com.chwl.core.R;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.codec.DESUtils;
 
 /**
  * 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 bd738d384..331e38ebc 100644
--- a/core/src/main/AndroidManifest.xml
+++ b/core/src/main/AndroidManifest.xml
@@ -1,3 +1,3 @@
-
+
 
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/Constants.java b/core/src/main/java/com/chwl/core/Constants.java
similarity index 93%
rename from core/src/main/java/com/yizhuan/xchat_android_core/Constants.java
rename to core/src/main/java/com/chwl/core/Constants.java
index 5cac893dc..c671691e1 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/Constants.java
+++ b/core/src/main/java/com/chwl/core/Constants.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core;
+package com.chwl.core;
 
 import com.yizhuan.xchat_android_constants.XChatConstants;
-import com.yizhuan.xchat_android_library.common.application.Env;
-import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
-import com.yizhuan.xchat_android_library.utils.pref.CommonPref;
+import com.chwl.library.common.application.Env;
+import com.chwl.library.utils.config.BasicConfig;
+import com.chwl.library.utils.pref.CommonPref;
 
 import java.io.File;
 import java.util.Arrays;
@@ -103,7 +103,7 @@ public class Constants {
     //相亲模式男神坑位下标
     public static final List maleIndex = Arrays.asList(0, 1, 4, 5);
 
-    public static final String GOOGLE = com.yizhuan.xchat_android_library.common.Constants.GOOGLE;
+    public static final String GOOGLE = com.chwl.library.common.Constants.GOOGLE;
 
     public static final String ANDROID = "android";
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/DemoCache.java b/core/src/main/java/com/chwl/core/DemoCache.java
similarity index 94%
rename from core/src/main/java/com/yizhuan/xchat_android_core/DemoCache.java
rename to core/src/main/java/com/chwl/core/DemoCache.java
index 81748062a..a57a98fef 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/DemoCache.java
+++ b/core/src/main/java/com/chwl/core/DemoCache.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core;
+package com.chwl.core;
 
 import android.text.TextUtils;
 
@@ -8,18 +8,18 @@ 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.chwl.core.auth.AuthModel;
+import com.chwl.core.auth.entity.AccountInfo;
+import com.chwl.core.auth.entity.TicketInfo;
+import com.chwl.core.home.bean.MainTabInfo;
+import com.chwl.core.initial.SplashComponent;
+import com.chwl.core.initial.bean.InitInfo;
+import com.chwl.core.noble.NobleConfig;
+import com.chwl.core.noble.NobleRight;
+import com.chwl.core.utils.CurrentTimeUtils;
+import com.chwl.core.utils.SharedPreferenceUtils;
+import com.chwl.library.utils.pref.ObjectPref;
+import com.chwl.library.utils.pref.SettingsPref;
 
 import java.util.HashMap;
 import java.util.Iterator;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/OldHttpObserver.java b/core/src/main/java/com/chwl/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/chwl/core/OldHttpObserver.java
index af93c85f9..bd05839fc 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/OldHttpObserver.java
+++ b/core/src/main/java/com/chwl/core/OldHttpObserver.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core;
+package com.chwl.core;
 
-import com.yizhuan.xchat_android_core.bean.response.RequestError;
-import com.yizhuan.xchat_android_core.bean.response.ResponseData;
+import com.chwl.core.bean.response.RequestError;
+import com.chwl.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/chwl/core/PreferencesUtils.java
similarity index 91%
rename from core/src/main/java/com/yizhuan/xchat_android_core/PreferencesUtils.java
rename to core/src/main/java/com/chwl/core/PreferencesUtils.java
index 6acacd483..d45f181ad 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/PreferencesUtils.java
+++ b/core/src/main/java/com/chwl/core/PreferencesUtils.java
@@ -1,14 +1,14 @@
-package com.yizhuan.xchat_android_core;
+package com.chwl.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.chwl.core.auth.entity.AccountInfo;
+import com.chwl.core.auth.entity.TicketInfo;
+import com.chwl.library.utils.config.BasicConfig;
+import com.chwl.library.utils.pref.ObjectPref;
+import com.chwl.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/chwl/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/chwl/core/activity/bean/LotteryInfo.java
index 83b9e81ce..38821111f 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/activity/bean/LotteryInfo.java
+++ b/core/src/main/java/com/chwl/core/activity/bean/LotteryInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.activity.bean;
+package com.chwl.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/chwl/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/chwl/core/activity/event/ActivityEvent.java
index 65a3fa1d6..46c3a1ee9 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/activity/event/ActivityEvent.java
+++ b/core/src/main/java/com/chwl/core/activity/event/ActivityEvent.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.activity.event;
+package com.chwl.core.activity.event;
 
-import com.yizhuan.xchat_android_core.activity.bean.LotteryInfo;
+import com.chwl.core.activity.bean.LotteryInfo;
 
 public class ActivityEvent {
 
diff --git a/core/src/main/java/com/chwl/core/activity/model/ActivityModel.java b/core/src/main/java/com/chwl/core/activity/model/ActivityModel.java
new file mode 100644
index 000000000..9dbd91513
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/activity/model/ActivityModel.java
@@ -0,0 +1,6 @@
+package com.chwl.core.activity.model;
+
+import com.chwl.core.base.BaseModel;
+
+public class ActivityModel extends BaseModel implements IActivityModel {
+}
diff --git a/core/src/main/java/com/chwl/core/activity/model/IActivityModel.java b/core/src/main/java/com/chwl/core/activity/model/IActivityModel.java
new file mode 100644
index 000000000..090b30be5
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/activity/model/IActivityModel.java
@@ -0,0 +1,6 @@
+package com.chwl.core.activity.model;
+
+import com.chwl.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/chwl/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/chwl/core/audio/AudioPlayAndRecordManager.java
index 9da1cde38..70675be7e 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/audio/AudioPlayAndRecordManager.java
+++ b/core/src/main/java/com/chwl/core/audio/AudioPlayAndRecordManager.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.audio;
+package com.chwl.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.chwl.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/chwl/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/chwl/core/audio/bean/SysMsgVoiceInfo.java
index 326ec9a15..c7a8cedf6 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/audio/bean/SysMsgVoiceInfo.java
+++ b/core/src/main/java/com/chwl/core/audio/bean/SysMsgVoiceInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.audio.bean;
+package com.chwl.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/chwl/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/chwl/core/audio/bean/VoiceBottleSayHiInfo.java
index 0e73ff44c..a0bd90d78 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/audio/bean/VoiceBottleSayHiInfo.java
+++ b/core/src/main/java/com/chwl/core/audio/bean/VoiceBottleSayHiInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.audio.bean;
+package com.chwl.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/chwl/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/chwl/core/audio/event/VoiceShakeHeartEvent.java
index 0316bd862..6b0438c4c 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/audio/event/VoiceShakeHeartEvent.java
+++ b/core/src/main/java/com/chwl/core/audio/event/VoiceShakeHeartEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.audio.event;
+package com.chwl.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/chwl/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/chwl/core/auth/AuthModel.java
index c5a979477..76302d276 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java
+++ b/core/src/main/java/com/chwl/core/auth/AuthModel.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.auth;
+package com.chwl.core.auth;
 
 import android.app.Activity;
 import android.text.TextUtils;
@@ -25,42 +25,42 @@ 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.R;
-import com.yizhuan.xchat_android_core.auth.bean.AreaInfoBean;
-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.LoginReportEvent;
-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.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.linked.LinkedModel;
-import com.yizhuan.xchat_android_core.linked.bean.LinkedInfo;
-import com.yizhuan.xchat_android_core.utils.CheckUtils;
-import com.yizhuan.xchat_android_core.utils.LogUtils;
-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.DeviceUtils;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-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.config.BasicConfig;
-import com.yizhuan.xchat_android_library.utils.constant.PackageNameConstants;
-import com.yizhuan.xchat_android_library.utils.json.JsonUtils;
+import com.chwl.core.DemoCache;
+import com.chwl.core.R;
+import com.chwl.core.auth.bean.AreaInfoBean;
+import com.chwl.core.auth.entity.AccountInfo;
+import com.chwl.core.auth.entity.ThirdUserInfo;
+import com.chwl.core.auth.entity.TicketInfo;
+import com.chwl.core.auth.event.GetCurrentUidEvent;
+import com.chwl.core.auth.event.KickOutEvent;
+import com.chwl.core.auth.event.LoginEvent;
+import com.chwl.core.auth.event.LoginReportEvent;
+import com.chwl.core.auth.event.LogoutEvent;
+import com.chwl.core.auth.exception.AccountCancelException;
+import com.chwl.core.auth.exception.BanAccountException;
+import com.chwl.core.auth.exception.IsSuperAdminException;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.bean.response.result.LoginResult;
+import com.chwl.core.bean.response.result.RegisterResult;
+import com.chwl.core.bean.response.result.TicketResult;
+import com.chwl.core.exception.FailReasonException;
+import com.chwl.core.im.custom.bean.CustomAttachParser;
+import com.chwl.core.linked.LinkedModel;
+import com.chwl.core.linked.bean.LinkedInfo;
+import com.chwl.core.utils.CheckUtils;
+import com.chwl.core.utils.LogUtils;
+import com.chwl.core.utils.OldHttpErrorHandleUtil;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.utils.DeviceUtils;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SingleToastUtil;
+import com.chwl.library.utils.VersionUtil;
+import com.chwl.library.utils.codec.DESUtils;
+import com.chwl.library.utils.config.BasicConfig;
+import com.chwl.library.utils.constant.PackageNameConstants;
+import com.chwl.library.utils.json.JsonUtils;
 
 import org.greenrobot.eventbus.EventBus;
 import org.json.JSONObject;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/IAuthModel.java b/core/src/main/java/com/chwl/core/auth/IAuthModel.java
similarity index 95%
rename from core/src/main/java/com/yizhuan/xchat_android_core/auth/IAuthModel.java
rename to core/src/main/java/com/chwl/core/auth/IAuthModel.java
index 435bdd975..6d4f56e14 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/IAuthModel.java
+++ b/core/src/main/java/com/chwl/core/auth/IAuthModel.java
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_core.auth;
+package com.chwl.core.auth;
 
 import android.app.Activity;
 
 import com.example.module_base.support.login.ILoginService;
-import com.yizhuan.xchat_android_core.auth.entity.ThirdUserInfo;
-import com.yizhuan.xchat_android_core.base.IModel;
+import com.chwl.core.auth.entity.ThirdUserInfo;
+import com.chwl.core.base.IModel;
 
 import org.json.JSONObject;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/bean/AreaInfoBean.kt b/core/src/main/java/com/chwl/core/auth/bean/AreaInfoBean.kt
similarity index 85%
rename from core/src/main/java/com/yizhuan/xchat_android_core/auth/bean/AreaInfoBean.kt
rename to core/src/main/java/com/chwl/core/auth/bean/AreaInfoBean.kt
index 4f976b2c6..fe7da3a14 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/bean/AreaInfoBean.kt
+++ b/core/src/main/java/com/chwl/core/auth/bean/AreaInfoBean.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.auth.bean
+package com.chwl.core.auth.bean
 
 import lombok.Data
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/entity/AccountInfo.java b/core/src/main/java/com/chwl/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/chwl/core/auth/entity/AccountInfo.java
index 046c3393a..ac84f4c1c 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/entity/AccountInfo.java
+++ b/core/src/main/java/com/chwl/core/auth/entity/AccountInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.auth.entity;
+package com.chwl.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/chwl/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/chwl/core/auth/entity/ThirdUserInfo.java
index 6d68d6e7f..81c8486a8 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/entity/ThirdUserInfo.java
+++ b/core/src/main/java/com/chwl/core/auth/entity/ThirdUserInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.auth.entity;
+package com.chwl.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/chwl/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/chwl/core/auth/entity/TicketInfo.java
index 200c06cd5..4acb7e33e 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/entity/TicketInfo.java
+++ b/core/src/main/java/com/chwl/core/auth/entity/TicketInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.auth.entity;
+package com.chwl.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/chwl/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/chwl/core/auth/event/BindPhoneEvent.java
index dbcbe3bf4..db4730159 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/event/BindPhoneEvent.java
+++ b/core/src/main/java/com/chwl/core/auth/event/BindPhoneEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.auth.event;
+package com.chwl.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/chwl/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/chwl/core/auth/event/GetCurrentUidEvent.java
index e552b7e5b..edb80baa5 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/event/GetCurrentUidEvent.java
+++ b/core/src/main/java/com/chwl/core/auth/event/GetCurrentUidEvent.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.auth.event;
+package com.chwl.core.auth.event;
 
-import com.yizhuan.xchat_android_core.base.BaseDataEvent;
+import com.chwl.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/chwl/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/chwl/core/auth/event/KickOutEvent.java
index 4c2c0d8be..65a15aae2 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/event/KickOutEvent.java
+++ b/core/src/main/java/com/chwl/core/auth/event/KickOutEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.auth.event;
+package com.chwl.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/chwl/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/chwl/core/auth/event/LoginEvent.java
index 875f2bea9..6ce34d45a 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/event/LoginEvent.java
+++ b/core/src/main/java/com/chwl/core/auth/event/LoginEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.auth.event;
+package com.chwl.core.auth.event;
 
 import lombok.Data;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/event/LoginReportEvent.java b/core/src/main/java/com/chwl/core/auth/event/LoginReportEvent.java
similarity index 80%
rename from core/src/main/java/com/yizhuan/xchat_android_core/auth/event/LoginReportEvent.java
rename to core/src/main/java/com/chwl/core/auth/event/LoginReportEvent.java
index 1f3b6b51c..217967301 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/event/LoginReportEvent.java
+++ b/core/src/main/java/com/chwl/core/auth/event/LoginReportEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.auth.event;
+package com.chwl.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/chwl/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/chwl/core/auth/event/LogoutEvent.java
index 2a23744ad..fd66ec6c4 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/event/LogoutEvent.java
+++ b/core/src/main/java/com/chwl/core/auth/event/LogoutEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.auth.event;
+package com.chwl.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/chwl/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/chwl/core/auth/exception/AccountCancelException.java
index 4501612af..c0806f7e4 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/exception/AccountCancelException.java
+++ b/core/src/main/java/com/chwl/core/auth/exception/AccountCancelException.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.auth.exception;
+package com.chwl.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/chwl/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/chwl/core/auth/exception/BanAccountException.java
index a24d409b9..ccaca9292 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/exception/BanAccountException.java
+++ b/core/src/main/java/com/chwl/core/auth/exception/BanAccountException.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.auth.exception;
+package com.chwl.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/chwl/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/chwl/core/auth/exception/BigHeadPhoneException.java
index 71e76faf9..447ca99fd 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/exception/BigHeadPhoneException.java
+++ b/core/src/main/java/com/chwl/core/auth/exception/BigHeadPhoneException.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.auth.exception;
+package com.chwl.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/chwl/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/chwl/core/auth/exception/IsSuperAdminException.java
index af132b19b..5ff0aba7e 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/exception/IsSuperAdminException.java
+++ b/core/src/main/java/com/chwl/core/auth/exception/IsSuperAdminException.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.auth.exception;
+package com.chwl.core.auth.exception;
 
 public class IsSuperAdminException extends Exception {
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/base/BaseBusEvent.java b/core/src/main/java/com/chwl/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/chwl/core/base/BaseBusEvent.java
index 387d2b270..8160213bc 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/base/BaseBusEvent.java
+++ b/core/src/main/java/com/chwl/core/base/BaseBusEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.base;
+package com.chwl.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/chwl/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/chwl/core/base/BaseDataEvent.java
index 9f5e8b471..34936562c 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/base/BaseDataEvent.java
+++ b/core/src/main/java/com/chwl/core/base/BaseDataEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.base;
+package com.chwl.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/chwl/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/chwl/core/base/BaseErrorEvent.java
index d16d66971..eee88c19d 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/base/BaseErrorEvent.java
+++ b/core/src/main/java/com/chwl/core/base/BaseErrorEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.base;
+package com.chwl.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/chwl/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/chwl/core/base/BaseErrorException.java
index 7a032be86..0b15cfa0b 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/base/BaseErrorException.java
+++ b/core/src/main/java/com/chwl/core/base/BaseErrorException.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.base;
+package com.chwl.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/chwl/core/base/BaseModel.java
similarity index 91%
rename from core/src/main/java/com/yizhuan/xchat_android_core/base/BaseModel.java
rename to core/src/main/java/com/chwl/core/base/BaseModel.java
index a6db1c4e4..135336e79 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/base/BaseModel.java
+++ b/core/src/main/java/com/chwl/core/base/BaseModel.java
@@ -1,13 +1,13 @@
-package com.yizhuan.xchat_android_core.base;
+package com.chwl.core.base;
 
 import android.content.Context;
 
-import com.yizhuan.xchat_android_core.R;
-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.net.rxnet.exception.ExceptionHandle;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
+import com.chwl.core.R;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.library.net.rxnet.callback.CallBack;
+import com.chwl.library.net.rxnet.exception.ExceptionHandle;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.config.BasicConfig;
 
 import java.net.UnknownHostException;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/base/CancelNoToastException.java b/core/src/main/java/com/chwl/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/chwl/core/base/CancelNoToastException.java
index 12e59afeb..47bd8e84b 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/base/CancelNoToastException.java
+++ b/core/src/main/java/com/chwl/core/base/CancelNoToastException.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.base;
+package com.chwl.core.base;
 
 /**
  * 点击取消按钮，但是不需要toast error的情况
diff --git a/core/src/main/java/com/chwl/core/base/IModel.java b/core/src/main/java/com/chwl/core/base/IModel.java
new file mode 100644
index 000000000..94beb52c3
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/base/IModel.java
@@ -0,0 +1,4 @@
+package com.chwl.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/chwl/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/chwl/core/bean/BaseProtocol.java
index 0faf81ae5..795c4cbbc 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/BaseProtocol.java
+++ b/core/src/main/java/com/chwl/core/bean/BaseProtocol.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.bean;
+package com.chwl.core.bean;
 
 /**
  * 广播通用协议
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/CarButtonInfo.java b/core/src/main/java/com/chwl/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/chwl/core/bean/CarButtonInfo.java
index 1964f41e2..212fa02e9 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/CarButtonInfo.java
+++ b/core/src/main/java/com/chwl/core/bean/CarButtonInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.bean;
+package com.chwl.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/chwl/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/chwl/core/bean/GiftTitleInfo.java
index 769a2a3f2..cac48171b 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/GiftTitleInfo.java
+++ b/core/src/main/java/com/chwl/core/bean/GiftTitleInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.bean;
+package com.chwl.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/chwl/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/chwl/core/bean/LoginTipsInfo.java
index b3fc4166f..9c5f02b4c 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/LoginTipsInfo.java
+++ b/core/src/main/java/com/chwl/core/bean/LoginTipsInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.bean;
+package com.chwl.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/chwl/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/chwl/core/bean/PrivateChatLimitInfo.java
index 8796b5bfd..c99eb34f2 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/PrivateChatLimitInfo.java
+++ b/core/src/main/java/com/chwl/core/bean/PrivateChatLimitInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.bean;
+package com.chwl.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/chwl/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/chwl/core/bean/ProgressInfo.java
index 928698d99..af6d98574 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/ProgressInfo.java
+++ b/core/src/main/java/com/chwl/core/bean/ProgressInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.bean;
+package com.chwl.core.bean;
 
 /**
  * 进度信息
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomHistoryInfo.java b/core/src/main/java/com/chwl/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/chwl/core/bean/RoomHistoryInfo.java
index 4b39cd253..cc5a298ee 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomHistoryInfo.java
+++ b/core/src/main/java/com/chwl/core/bean/RoomHistoryInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.bean;
+package com.chwl.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/chwl/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/chwl/core/bean/RoomMicInfo.java
index dd0d12a9d..f0059c0a7 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomMicInfo.java
+++ b/core/src/main/java/com/chwl/core/bean/RoomMicInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.bean;
+package com.chwl.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/chwl/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/chwl/core/bean/RoomNewbieInfo.java
index c5cb1544c..315209ea5 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomNewbieInfo.java
+++ b/core/src/main/java/com/chwl/core/bean/RoomNewbieInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.bean;
+package com.chwl.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/chwl/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/chwl/core/bean/RoomNewbieMessageInfo.java
index 7879c26da..2a0bd4af2 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomNewbieMessageInfo.java
+++ b/core/src/main/java/com/chwl/core/bean/RoomNewbieMessageInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.bean;
+package com.chwl.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/chwl/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/chwl/core/bean/RoomQueueInfo.java
index 277250ca2..b19549f69 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomQueueInfo.java
+++ b/core/src/main/java/com/chwl/core/bean/RoomQueueInfo.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.bean;
+package com.chwl.core.bean;
 
-import com.yizhuan.xchat_android_core.room.giftvalue.bean.GiftValueData;
-import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo;
+import com.chwl.core.room.giftvalue.bean.GiftValueData;
+import com.chwl.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/chwl/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/chwl/core/bean/UserInfoItem.java
index b2d824f7e..45455868b 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/UserInfoItem.java
+++ b/core/src/main/java/com/chwl/core/bean/UserInfoItem.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.bean;
+package com.chwl.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/chwl/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/chwl/core/bean/VersionInfo.java
index 7f47e2c9e..b848e25da 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/VersionInfo.java
+++ b/core/src/main/java/com/chwl/core/bean/VersionInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.bean;
+package com.chwl.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/chwl/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/chwl/core/bean/attachmsg/RoomQueueMsgAttachment.java
index b3fb5534f..dd4c7b3e9 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/attachmsg/RoomQueueMsgAttachment.java
+++ b/core/src/main/java/com/chwl/core/bean/attachmsg/RoomQueueMsgAttachment.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.bean.attachmsg;
+package com.chwl.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.chwl.core.bean.RoomQueueInfo;
+import com.chwl.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/chwl/core/bean/response/BeanResult.kt
similarity index 77%
rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/response/BeanResult.kt
rename to core/src/main/java/com/chwl/core/bean/response/BeanResult.kt
index 38668974f..74a7861b1 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/BeanResult.kt
+++ b/core/src/main/java/com/chwl/core/bean/response/BeanResult.kt
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.bean.response
+package com.chwl.core.bean.response
 
-import com.yizhuan.xchat_android_core.R
-import com.yizhuan.xchat_android_core.utils.net.ServerException
-import com.yizhuan.xchat_android_library.utils.ResUtil
+import com.chwl.core.R
+import com.chwl.core.utils.net.ServerException
+import com.chwl.library.utils.ResUtil
 
 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/chwl/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/chwl/core/bean/response/JsonServiceResult.java
index 88835b638..9b3397424 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/JsonServiceResult.java
+++ b/core/src/main/java/com/chwl/core/bean/response/JsonServiceResult.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.bean.response;
+package com.chwl.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/chwl/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/chwl/core/bean/response/ListResult.kt
index 845284d23..ed505b5bc 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/ListResult.kt
+++ b/core/src/main/java/com/chwl/core/bean/response/ListResult.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.bean.response
+package com.chwl.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/chwl/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/chwl/core/bean/response/RequestError.java
index de230803b..ea8333dd5 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/RequestError.java
+++ b/core/src/main/java/com/chwl/core/bean/response/RequestError.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.bean.response;
+package com.chwl.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/chwl/core/bean/response/ResponseData.java
similarity index 96%
rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/response/ResponseData.java
rename to core/src/main/java/com/chwl/core/bean/response/ResponseData.java
index 398676c98..dc5cd7d90 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/ResponseData.java
+++ b/core/src/main/java/com/chwl/core/bean/response/ResponseData.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.yizhuan.xchat_android_core.bean.response;
+package com.chwl.core.bean.response;
 
 import com.google.gson.Gson;
-import com.yizhuan.xchat_android_core.R;
-import com.yizhuan.xchat_android_library.coremanager.CoreError;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.library.coremanager.CoreError;
+import com.chwl.library.utils.ResUtil;
 
 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/chwl/core/bean/response/ServiceResult.java
similarity index 97%
rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/response/ServiceResult.java
rename to core/src/main/java/com/chwl/core/bean/response/ServiceResult.java
index f27e1474d..7ba2e0e58 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/ServiceResult.java
+++ b/core/src/main/java/com/chwl/core/bean/response/ServiceResult.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.bean.response;
-import com.yizhuan.xchat_android_core.R;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+package com.chwl.core.bean.response;
+import com.chwl.core.R;
+import com.chwl.library.utils.ResUtil;
 
 import java.io.Serializable;
 
diff --git a/core/src/main/java/com/chwl/core/bean/response/result/ActionDialogResult.java b/core/src/main/java/com/chwl/core/bean/response/result/ActionDialogResult.java
new file mode 100644
index 000000000..eddfb8564
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bean/response/result/ActionDialogResult.java
@@ -0,0 +1,14 @@
+package com.chwl.core.bean.response.result;
+
+
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.redPacket.bean.ActionDialogInfo;
+
+import java.util.List;
+
+/**
+ * Created by zhouxiangfeng on 2017/5/28.
+ */
+
+public class ActionDialogResult extends ServiceResult> {
+}
diff --git a/core/src/main/java/com/chwl/core/bean/response/result/AttentionListResult.java b/core/src/main/java/com/chwl/core/bean/response/result/AttentionListResult.java
new file mode 100644
index 000000000..dd6557cce
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bean/response/result/AttentionListResult.java
@@ -0,0 +1,13 @@
+package com.chwl.core.bean.response.result;
+
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.user.bean.AttentionInfo;
+
+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/chwl/core/bean/response/result/AuctionInfoResult.java b/core/src/main/java/com/chwl/core/bean/response/result/AuctionInfoResult.java
new file mode 100644
index 000000000..751645105
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bean/response/result/AuctionInfoResult.java
@@ -0,0 +1,11 @@
+package com.chwl.core.bean.response.result;
+
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.room.auction.bean.AuctionInfo;
+
+/**
+ * Created by zhouxiangfeng on 2017/5/28.
+ */
+
+public class AuctionInfoResult extends ServiceResult {
+}
diff --git a/core/src/main/java/com/chwl/core/bean/response/result/AuctionListUserInfoResult.java b/core/src/main/java/com/chwl/core/bean/response/result/AuctionListUserInfoResult.java
new file mode 100644
index 000000000..342fb2fda
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bean/response/result/AuctionListUserInfoResult.java
@@ -0,0 +1,13 @@
+package com.chwl.core.bean.response.result;
+
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.room.auction.bean.AuctionListUserInfo;
+
+import java.util.List;
+
+/**
+ * Created by chenran on 2017/8/9.
+ */
+
+public class AuctionListUserInfoResult extends ServiceResult> {
+}
diff --git a/core/src/main/java/com/chwl/core/bean/response/result/AuctionUserListResult.java b/core/src/main/java/com/chwl/core/bean/response/result/AuctionUserListResult.java
new file mode 100644
index 000000000..d2dd8896c
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bean/response/result/AuctionUserListResult.java
@@ -0,0 +1,13 @@
+package com.chwl.core.bean.response.result;
+
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.room.auction.bean.AuctionUser;
+
+import java.util.List;
+
+/**
+ * Created by zhouxiangfeng on 2017/5/28.
+ */
+
+public class AuctionUserListResult extends ServiceResult> {
+}
diff --git a/core/src/main/java/com/chwl/core/bean/response/result/AuctionUserResult.java b/core/src/main/java/com/chwl/core/bean/response/result/AuctionUserResult.java
new file mode 100644
index 000000000..916feed9e
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bean/response/result/AuctionUserResult.java
@@ -0,0 +1,11 @@
+package com.chwl.core.bean.response.result;
+
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.room.auction.bean.AuctionUser;
+
+/**
+ * Created by zhouxiangfeng on 2017/5/28.
+ */
+
+public class AuctionUserResult extends ServiceResult {
+}
diff --git a/core/src/main/java/com/chwl/core/bean/response/result/BoolApiResult.java b/core/src/main/java/com/chwl/core/bean/response/result/BoolApiResult.java
new file mode 100644
index 000000000..f32ea0042
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bean/response/result/BoolApiResult.java
@@ -0,0 +1,11 @@
+package com.chwl.core.bean.response.result;
+
+import com.chwl.core.bean.response.ServiceResult;
+
+/**
+ * Created by chenran on 2017/2/16.
+ */
+
+public class BoolApiResult extends ServiceResult{
+
+}
diff --git a/core/src/main/java/com/chwl/core/bean/response/result/BooleanResult.java b/core/src/main/java/com/chwl/core/bean/response/result/BooleanResult.java
new file mode 100644
index 000000000..760c91e0a
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bean/response/result/BooleanResult.java
@@ -0,0 +1,10 @@
+package com.chwl.core.bean.response.result;
+
+import com.chwl.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/chwl/core/bean/response/result/ChargeListResult.java
similarity index 64%
rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/ChargeListResult.java
rename to core/src/main/java/com/chwl/core/bean/response/result/ChargeListResult.java
index d387ccc34..e6e871011 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/ChargeListResult.java
+++ b/core/src/main/java/com/chwl/core/bean/response/result/ChargeListResult.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.bean.response.result;
+package com.chwl.core.bean.response.result;
 
-import com.yizhuan.xchat_android_core.pay.bean.ChargeBean;
+import com.chwl.core.pay.bean.ChargeBean;
 
 import java.util.List;
 
diff --git a/core/src/main/java/com/chwl/core/bean/response/result/CheckLostUserResult.java b/core/src/main/java/com/chwl/core/bean/response/result/CheckLostUserResult.java
new file mode 100644
index 000000000..a754ee94c
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bean/response/result/CheckLostUserResult.java
@@ -0,0 +1,7 @@
+package com.chwl.core.bean.response.result;
+
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.recall.bean.CheckLostUserInfo;
+
+public class CheckLostUserResult extends ServiceResult {
+}
diff --git a/core/src/main/java/com/chwl/core/bean/response/result/ExchangeInfoResult.java b/core/src/main/java/com/chwl/core/bean/response/result/ExchangeInfoResult.java
new file mode 100644
index 000000000..cc431fd5f
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bean/response/result/ExchangeInfoResult.java
@@ -0,0 +1,11 @@
+package com.chwl.core.bean.response.result;
+
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.withdraw.bean.ExchangerInfo;
+
+/**
+ * Created by Administrator on 2017/7/5 0005.
+ */
+
+public class ExchangeInfoResult extends ServiceResult {
+}
diff --git a/core/src/main/java/com/chwl/core/bean/response/result/FaceResult.java b/core/src/main/java/com/chwl/core/bean/response/result/FaceResult.java
new file mode 100644
index 000000000..87d5e047a
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bean/response/result/FaceResult.java
@@ -0,0 +1,11 @@
+package com.chwl.core.bean.response.result;
+
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.room.face.FaceListInfo;
+
+/**
+ * Created by chenran on 2017/7/27.
+ */
+
+public class FaceResult extends ServiceResult{
+}
diff --git a/core/src/main/java/com/chwl/core/bean/response/result/FansListResult.java b/core/src/main/java/com/chwl/core/bean/response/result/FansListResult.java
new file mode 100644
index 000000000..572fb3e1b
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bean/response/result/FansListResult.java
@@ -0,0 +1,11 @@
+package com.chwl.core.bean.response.result;
+
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.user.bean.FansListInfo;
+
+/**
+ * Created by Administrator on 2017/7/5 0005.
+ */
+
+public class FansListResult extends ServiceResult {
+}
diff --git a/core/src/main/java/com/chwl/core/bean/response/result/GiftInfosResult.java b/core/src/main/java/com/chwl/core/bean/response/result/GiftInfosResult.java
new file mode 100644
index 000000000..d93642c26
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bean/response/result/GiftInfosResult.java
@@ -0,0 +1,11 @@
+package com.chwl.core.bean.response.result;
+
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.bills.bean.TextInfos;
+
+/**
+ * Created by Seven on 2017/9/9.
+ */
+
+public class GiftInfosResult extends ServiceResult {
+}
diff --git a/core/src/main/java/com/chwl/core/bean/response/result/GiftRecieveInfoResult.java b/core/src/main/java/com/chwl/core/bean/response/result/GiftRecieveInfoResult.java
new file mode 100644
index 000000000..fadafb0d8
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bean/response/result/GiftRecieveInfoResult.java
@@ -0,0 +1,11 @@
+package com.chwl.core.bean.response.result;
+
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.gift.bean.GiftReceiveInfo;
+
+/**
+ * Created by chenran on 2017/11/25.
+ */
+
+public class GiftRecieveInfoResult extends ServiceResult {
+}
diff --git a/core/src/main/java/com/chwl/core/bean/response/result/GiftResult.java b/core/src/main/java/com/chwl/core/bean/response/result/GiftResult.java
new file mode 100644
index 000000000..3cf9a1f97
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bean/response/result/GiftResult.java
@@ -0,0 +1,11 @@
+package com.chwl.core.bean.response.result;
+
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.gift.bean.GiftListInfo;
+
+/**
+ * Created by chenran on 2017/7/27.
+ */
+
+public class GiftResult extends ServiceResult{
+}
diff --git a/core/src/main/java/com/chwl/core/bean/response/result/GiftWallListResult.java b/core/src/main/java/com/chwl/core/bean/response/result/GiftWallListResult.java
new file mode 100644
index 000000000..214de9a4a
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bean/response/result/GiftWallListResult.java
@@ -0,0 +1,13 @@
+package com.chwl.core.bean.response.result;
+
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.user.bean.GiftWallInfo;
+
+import java.util.List;
+
+/**
+ * Created by chenran on 2017/10/17.
+ */
+
+public class GiftWallListResult extends ServiceResult> {
+}
diff --git a/core/src/main/java/com/chwl/core/bean/response/result/GoBackResult.java b/core/src/main/java/com/chwl/core/bean/response/result/GoBackResult.java
new file mode 100644
index 000000000..a1a689201
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bean/response/result/GoBackResult.java
@@ -0,0 +1,7 @@
+package com.chwl.core.bean.response.result;
+
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.recall.bean.GoBackInfo;
+
+public class GoBackResult extends ServiceResult {
+}
diff --git a/core/src/main/java/com/chwl/core/bean/response/result/IdQueryUserInfoResult.java b/core/src/main/java/com/chwl/core/bean/response/result/IdQueryUserInfoResult.java
new file mode 100644
index 000000000..5d88862cd
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bean/response/result/IdQueryUserInfoResult.java
@@ -0,0 +1,12 @@
+package com.chwl.core.bean.response.result;
+
+import com.chwl.core.auth.entity.AccountInfo;
+import com.chwl.core.bean.response.ServiceResult;
+
+/**
+ * Created by chenran on 2017/2/16.
+ */
+
+public class IdQueryUserInfoResult extends ServiceResult{
+
+}
diff --git a/core/src/main/java/com/chwl/core/bean/response/result/InitResult.java b/core/src/main/java/com/chwl/core/bean/response/result/InitResult.java
new file mode 100644
index 000000000..b7c776c32
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bean/response/result/InitResult.java
@@ -0,0 +1,12 @@
+package com.chwl.core.bean.response.result;
+
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.initial.bean.InitInfo;
+
+/**
+ * @author xiaoyu
+ * @date 2017/12/8
+ */
+
+public class InitResult extends ServiceResult {
+}
diff --git a/core/src/main/java/com/chwl/core/bean/response/result/IntegerResult.java b/core/src/main/java/com/chwl/core/bean/response/result/IntegerResult.java
new file mode 100644
index 000000000..75a75ba68
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bean/response/result/IntegerResult.java
@@ -0,0 +1,10 @@
+package com.chwl.core.bean.response.result;
+
+import com.chwl.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/chwl/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/chwl/core/bean/response/result/LoginResult.java
index 62c5ca3d2..98c1452c2 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/LoginResult.java
+++ b/core/src/main/java/com/chwl/core/bean/response/result/LoginResult.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.bean.response.result;
+package com.chwl.core.bean.response.result;
 
-import com.yizhuan.xchat_android_core.auth.entity.AccountInfo;
-import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
+import com.chwl.core.auth.entity.AccountInfo;
+import com.chwl.core.bean.response.ServiceResult;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/core/src/main/java/com/chwl/core/bean/response/result/MultiGiftRecieveInfoResult.java b/core/src/main/java/com/chwl/core/bean/response/result/MultiGiftRecieveInfoResult.java
new file mode 100644
index 000000000..1733ef787
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bean/response/result/MultiGiftRecieveInfoResult.java
@@ -0,0 +1,11 @@
+package com.chwl.core.bean.response.result;
+
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.gift.bean.MultiGiftReceiveInfo;
+
+/**
+ * Created by chenran on 2017/11/25.
+ */
+
+public class MultiGiftRecieveInfoResult extends ServiceResult{
+}
diff --git a/core/src/main/java/com/chwl/core/bean/response/result/RedDrawListInfoResult.java b/core/src/main/java/com/chwl/core/bean/response/result/RedDrawListInfoResult.java
new file mode 100644
index 000000000..c89721d11
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bean/response/result/RedDrawListInfoResult.java
@@ -0,0 +1,13 @@
+package com.chwl.core.bean.response.result;
+
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.redPacket.bean.RedDrawListInfo;
+
+import java.util.List;
+
+/**
+ * Created by chenran on 2017/12/4.
+ */
+
+public class RedDrawListInfoResult extends ServiceResult> {
+}
diff --git a/core/src/main/java/com/chwl/core/bean/response/result/RedPacketResult.java b/core/src/main/java/com/chwl/core/bean/response/result/RedPacketResult.java
new file mode 100644
index 000000000..c78781639
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bean/response/result/RedPacketResult.java
@@ -0,0 +1,12 @@
+package com.chwl.core.bean.response.result;
+
+
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.redPacket.bean.RedPacketInfo;
+
+/**
+ * Created by zhouxiangfeng on 2017/5/28.
+ */
+
+public class RedPacketResult extends ServiceResult {
+}
diff --git a/core/src/main/java/com/chwl/core/bean/response/result/RegisterResult.java b/core/src/main/java/com/chwl/core/bean/response/result/RegisterResult.java
new file mode 100644
index 000000000..29d642baf
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bean/response/result/RegisterResult.java
@@ -0,0 +1,12 @@
+package com.chwl.core.bean.response.result;
+
+import com.chwl.core.auth.entity.TicketInfo;
+import com.chwl.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/chwl/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/chwl/core/bean/response/result/RequestChargeResult.java
index b419c657b..78b8c210a 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/RequestChargeResult.java
+++ b/core/src/main/java/com/chwl/core/bean/response/result/RequestChargeResult.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.bean.response.result;
+package com.chwl.core.bean.response.result;
 
 import com.google.gson.JsonObject;
-import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
+import com.chwl.core.bean.response.ServiceResult;
 
 /**
  * Created by zhouxiangfeng on 2017/5/4.
diff --git a/core/src/main/java/com/chwl/core/bean/response/result/RoomConsumeInfoListResult.java b/core/src/main/java/com/chwl/core/bean/response/result/RoomConsumeInfoListResult.java
new file mode 100644
index 000000000..f439859f3
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bean/response/result/RoomConsumeInfoListResult.java
@@ -0,0 +1,13 @@
+package com.chwl.core.bean.response.result;
+
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.room.queue.bean.RoomConsumeInfo;
+
+import java.util.List;
+
+/**
+ * Created by chenran on 2017/10/2.
+ */
+
+public class RoomConsumeInfoListResult extends ServiceResult> {
+}
diff --git a/core/src/main/java/com/chwl/core/bean/response/result/RoomRewardResult.java b/core/src/main/java/com/chwl/core/bean/response/result/RoomRewardResult.java
new file mode 100644
index 000000000..3d4a68715
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bean/response/result/RoomRewardResult.java
@@ -0,0 +1,12 @@
+package com.chwl.core.bean.response.result;
+
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.im.custom.bean.RewardBean;
+
+/**
+ * Created by zhouxiangfeng on 2017/5/4.
+ */
+
+public class RoomRewardResult extends ServiceResult {
+
+}
diff --git a/core/src/main/java/com/chwl/core/bean/response/result/ShareRedPacketResult.java b/core/src/main/java/com/chwl/core/bean/response/result/ShareRedPacketResult.java
new file mode 100644
index 000000000..83bd01f8c
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bean/response/result/ShareRedPacketResult.java
@@ -0,0 +1,12 @@
+package com.chwl.core.bean.response.result;
+
+
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.redPacket.bean.ShareRedBagInfo;
+
+/**
+ * Created by zhouxiangfeng on 2017/5/28.
+ */
+
+public class ShareRedPacketResult extends ServiceResult {
+}
diff --git a/core/src/main/java/com/chwl/core/bean/response/result/TabResult.java b/core/src/main/java/com/chwl/core/bean/response/result/TabResult.java
new file mode 100644
index 000000000..26cd0d4a9
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bean/response/result/TabResult.java
@@ -0,0 +1,16 @@
+package com.chwl.core.bean.response.result;
+
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.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/chwl/core/bean/response/result/TicketResult.java b/core/src/main/java/com/chwl/core/bean/response/result/TicketResult.java
new file mode 100644
index 000000000..80e944d6a
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bean/response/result/TicketResult.java
@@ -0,0 +1,12 @@
+package com.chwl.core.bean.response.result;
+
+import com.chwl.core.auth.entity.TicketInfo;
+import com.chwl.core.bean.response.ServiceResult;
+
+/**
+ * Created by zhouxiangfeng on 2017/5/4.
+ */
+
+public class TicketResult extends ServiceResult {
+
+}
diff --git a/core/src/main/java/com/chwl/core/bean/response/result/UserListResult.java b/core/src/main/java/com/chwl/core/bean/response/result/UserListResult.java
new file mode 100644
index 000000000..9c2c82686
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bean/response/result/UserListResult.java
@@ -0,0 +1,14 @@
+package com.chwl.core.bean.response.result;
+
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.user.bean.UserInfo;
+
+import java.util.List;
+
+/**
+ * Created by zhouxiangfeng on 2017/5/4.
+ */
+
+public class UserListResult extends ServiceResult> {
+
+}
diff --git a/core/src/main/java/com/chwl/core/bean/response/result/UserResult.java b/core/src/main/java/com/chwl/core/bean/response/result/UserResult.java
new file mode 100644
index 000000000..1f2cfabbd
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bean/response/result/UserResult.java
@@ -0,0 +1,12 @@
+package com.chwl.core.bean.response.result;
+
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.user.bean.UserInfo;
+
+/**
+ * Created by zhouxiangfeng on 2017/5/4.
+ */
+
+public class UserResult extends ServiceResult {
+
+}
diff --git a/core/src/main/java/com/chwl/core/bean/response/result/VersionsResult.java b/core/src/main/java/com/chwl/core/bean/response/result/VersionsResult.java
new file mode 100644
index 000000000..4400efeab
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bean/response/result/VersionsResult.java
@@ -0,0 +1,10 @@
+package com.chwl.core.bean.response.result;
+
+import com.chwl.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/chwl/core/bean/response/result/WalletInfoResult.java b/core/src/main/java/com/chwl/core/bean/response/result/WalletInfoResult.java
new file mode 100644
index 000000000..247c5ca3d
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bean/response/result/WalletInfoResult.java
@@ -0,0 +1,12 @@
+package com.chwl.core.bean.response.result;
+
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.pay.bean.WalletInfo;
+
+/**
+ * Created by zhouxiangfeng on 2017/5/4.
+ */
+
+public class WalletInfoResult extends ServiceResult {
+
+}
diff --git a/core/src/main/java/com/chwl/core/bean/response/result/WithdrawListResult.java b/core/src/main/java/com/chwl/core/bean/response/result/WithdrawListResult.java
new file mode 100644
index 000000000..d5c357926
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bean/response/result/WithdrawListResult.java
@@ -0,0 +1,13 @@
+package com.chwl.core.bean.response.result;
+
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.withdraw.bean.WithdrwaListInfo;
+
+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/chwl/core/bean/response/result/WithdrawRedListResult.java b/core/src/main/java/com/chwl/core/bean/response/result/WithdrawRedListResult.java
new file mode 100644
index 000000000..1fa251b5c
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bean/response/result/WithdrawRedListResult.java
@@ -0,0 +1,14 @@
+package com.chwl.core.bean.response.result;
+
+
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.redPacket.bean.WithdrawRedListInfo;
+
+import java.util.List;
+
+/**
+ * Created by zhouxiangfeng on 2017/5/28.
+ */
+
+public class WithdrawRedListResult extends ServiceResult> {
+}
diff --git a/core/src/main/java/com/chwl/core/bean/response/result/WithdrawRedSucceedResult.java b/core/src/main/java/com/chwl/core/bean/response/result/WithdrawRedSucceedResult.java
new file mode 100644
index 000000000..548eed627
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bean/response/result/WithdrawRedSucceedResult.java
@@ -0,0 +1,12 @@
+package com.chwl.core.bean.response.result;
+
+
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.redPacket.bean.WithdrawRedSucceedInfo;
+
+/**
+ * Created by zhouxiangfeng on 2017/5/28.
+ */
+
+public class WithdrawRedSucceedResult extends ServiceResult {
+}
diff --git a/core/src/main/java/com/chwl/core/bean/response/result/WithdrawUserInfoResult.java b/core/src/main/java/com/chwl/core/bean/response/result/WithdrawUserInfoResult.java
new file mode 100644
index 000000000..5184f55c9
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bean/response/result/WithdrawUserInfoResult.java
@@ -0,0 +1,12 @@
+package com.chwl.core.bean.response.result;
+
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.withdraw.bean.WithdrawInfo;
+
+/**
+ * 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/chwl/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/chwl/core/bills/BillModel.java
index 20df54e59..1145daef5 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/BillModel.java
+++ b/core/src/main/java/com/chwl/core/bills/BillModel.java
@@ -1,18 +1,18 @@
-package com.yizhuan.xchat_android_core.bills;
+package com.chwl.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.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.bills.bean.BillType;
+import com.chwl.core.bills.bean.NobleBillListInfo;
+import com.chwl.core.bills.result.ChargeResult;
+import com.chwl.core.bills.result.ExpendResult;
+import com.chwl.core.bills.result.IncomedResult;
+import com.chwl.core.bills.result.RedBagResult;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.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/chwl/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/chwl/core/bills/IBillModel.java
index 7fd08805a..2d9bd1290 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/IBillModel.java
+++ b/core/src/main/java/com/chwl/core/bills/IBillModel.java
@@ -1,11 +1,11 @@
-package com.yizhuan.xchat_android_core.bills;
+package com.chwl.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.chwl.core.base.IModel;
+import com.chwl.core.bills.bean.NobleBillListInfo;
+import com.chwl.core.bills.result.ChargeResult;
+import com.chwl.core.bills.result.ExpendResult;
+import com.chwl.core.bills.result.IncomedResult;
+import com.chwl.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/chwl/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/chwl/core/bills/IRadishGiftModel.java
index d66dc2cee..3c6a9c08c 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/IRadishGiftModel.java
+++ b/core/src/main/java/com/chwl/core/bills/IRadishGiftModel.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.bills;
+package com.chwl.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.chwl.core.base.IModel;
+import com.chwl.core.bills.result.RadishGiftResult;
+import com.chwl.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/chwl/core/bills/RadishGiftModel.java
similarity index 86%
rename from core/src/main/java/com/yizhuan/xchat_android_core/bills/RadishGiftModel.java
rename to core/src/main/java/com/chwl/core/bills/RadishGiftModel.java
index 86095c159..c5c978ddc 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/RadishGiftModel.java
+++ b/core/src/main/java/com/chwl/core/bills/RadishGiftModel.java
@@ -1,14 +1,14 @@
-package com.yizhuan.xchat_android_core.bills;
+package com.chwl.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.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.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.bills.result.RadishGiftResult;
+import com.chwl.core.user.bean.RadishWallInfo;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.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/chwl/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/chwl/core/bills/bean/BillItemEntity.java
index ef70d2b1b..23fb4aa3c 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/BillItemEntity.java
+++ b/core/src/main/java/com/chwl/core/bills/bean/BillItemEntity.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.bills.bean;
+package com.chwl.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/chwl/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/chwl/core/bills/bean/BillType.java
index 9879c0c9d..50166b4ff 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/BillType.java
+++ b/core/src/main/java/com/chwl/core/bills/bean/BillType.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.bills.bean;
+package com.chwl.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/chwl/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/chwl/core/bills/bean/ExpendInfo.java
index ea7b912c8..40f82a7d1 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/ExpendInfo.java
+++ b/core/src/main/java/com/chwl/core/bills/bean/ExpendInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.bills.bean;
+package com.chwl.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/chwl/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/chwl/core/bills/bean/ExpendListInfo.java
index abc6d1a2e..a7af287db 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/ExpendListInfo.java
+++ b/core/src/main/java/com/chwl/core/bills/bean/ExpendListInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.bills.bean;
+package com.chwl.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/chwl/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/chwl/core/bills/bean/IncomeInfo.java
index ddecdd80d..960443bda 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/IncomeInfo.java
+++ b/core/src/main/java/com/chwl/core/bills/bean/IncomeInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.bills.bean;
+package com.chwl.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/chwl/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/chwl/core/bills/bean/IncomeListInfo.java
index e68c3f1dd..5c7761bf6 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/IncomeListInfo.java
+++ b/core/src/main/java/com/chwl/core/bills/bean/IncomeListInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.bills.bean;
+package com.chwl.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/chwl/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/chwl/core/bills/bean/NobleBillListInfo.java
index 570674ee5..50ec59384 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/NobleBillListInfo.java
+++ b/core/src/main/java/com/chwl/core/bills/bean/NobleBillListInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.bills.bean;
+package com.chwl.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/chwl/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/chwl/core/bills/bean/RadishGiftInfo.java
index 26aa6ca16..3e9c5260b 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RadishGiftInfo.java
+++ b/core/src/main/java/com/chwl/core/bills/bean/RadishGiftInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.bills.bean;
+package com.chwl.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/chwl/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/chwl/core/bills/bean/RadishGiftListInfo.java
index d6272c8da..6ba96ef3a 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RadishGiftListInfo.java
+++ b/core/src/main/java/com/chwl/core/bills/bean/RadishGiftListInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.bills.bean;
+package com.chwl.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/chwl/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/chwl/core/bills/bean/RadishRecordInfo.java
index 079cc8904..72ecf2d4b 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RadishRecordInfo.java
+++ b/core/src/main/java/com/chwl/core/bills/bean/RadishRecordInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.bills.bean;
+package com.chwl.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/chwl/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/chwl/core/bills/bean/RadishRecordListInfo.java
index 16fd65da4..e0878d38f 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RadishRecordListInfo.java
+++ b/core/src/main/java/com/chwl/core/bills/bean/RadishRecordListInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.bills.bean;
+package com.chwl.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/chwl/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/chwl/core/bills/bean/RedBagInfo.java
index d50a3756f..d4996e857 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RedBagInfo.java
+++ b/core/src/main/java/com/chwl/core/bills/bean/RedBagInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.bills.bean;
+package com.chwl.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/chwl/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/chwl/core/bills/bean/RedBagListInfo.java
index 5b313ffaf..94f980c4f 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RedBagListInfo.java
+++ b/core/src/main/java/com/chwl/core/bills/bean/RedBagListInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.bills.bean;
+package com.chwl.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/chwl/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/chwl/core/bills/bean/TextInfos.java
index 48d50a8e7..924115fd7 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/TextInfos.java
+++ b/core/src/main/java/com/chwl/core/bills/bean/TextInfos.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.bills.bean;
+package com.chwl.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/chwl/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/chwl/core/bills/bean/TimeInfo.java
index 86d25cda4..f13fb01f9 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/TimeInfo.java
+++ b/core/src/main/java/com/chwl/core/bills/bean/TimeInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.bills.bean;
+package com.chwl.core.bills.bean;
 
 import java.io.Serializable;
 
diff --git a/core/src/main/java/com/chwl/core/bills/result/ChargeResult.java b/core/src/main/java/com/chwl/core/bills/result/ChargeResult.java
new file mode 100644
index 000000000..3025e8563
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bills/result/ChargeResult.java
@@ -0,0 +1,11 @@
+package com.chwl.core.bills.result;
+
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.bills.bean.ExpendListInfo;
+
+/**
+ * Created by Seven on 2017/9/9.
+ */
+
+public class ChargeResult extends ServiceResult {
+}
diff --git a/core/src/main/java/com/chwl/core/bills/result/ExpendResult.java b/core/src/main/java/com/chwl/core/bills/result/ExpendResult.java
new file mode 100644
index 000000000..550e6ca0e
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bills/result/ExpendResult.java
@@ -0,0 +1,11 @@
+package com.chwl.core.bills.result;
+
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.bills.bean.ExpendListInfo;
+
+/**
+ * Created by Seven on 2017/9/9.
+ */
+
+public class ExpendResult extends ServiceResult {
+}
diff --git a/core/src/main/java/com/chwl/core/bills/result/IncomedResult.java b/core/src/main/java/com/chwl/core/bills/result/IncomedResult.java
new file mode 100644
index 000000000..bebf91120
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bills/result/IncomedResult.java
@@ -0,0 +1,11 @@
+package com.chwl.core.bills.result;
+
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.bills.bean.IncomeListInfo;
+
+/**
+ * Created by Seven on 2017/9/9.
+ */
+
+public class IncomedResult extends ServiceResult {
+}
diff --git a/core/src/main/java/com/chwl/core/bills/result/RadishGiftResult.java b/core/src/main/java/com/chwl/core/bills/result/RadishGiftResult.java
new file mode 100644
index 000000000..36afc6cf0
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bills/result/RadishGiftResult.java
@@ -0,0 +1,7 @@
+package com.chwl.core.bills.result;
+
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.bills.bean.RadishGiftListInfo;
+
+public class RadishGiftResult extends ServiceResult {
+}
diff --git a/core/src/main/java/com/chwl/core/bills/result/RedBagResult.java b/core/src/main/java/com/chwl/core/bills/result/RedBagResult.java
new file mode 100644
index 000000000..1848240a5
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/bills/result/RedBagResult.java
@@ -0,0 +1,11 @@
+package com.chwl.core.bills.result;
+
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.bills.bean.RedBagListInfo;
+
+/**
+ * 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/chwl/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/chwl/core/certification/CertificationModel.java
index 23eaeb4dc..6a2d3e37f 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/certification/CertificationModel.java
+++ b/core/src/main/java/com/chwl/core/certification/CertificationModel.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.certification;
+package com.chwl.core.certification;
 
-import com.yizhuan.xchat_android_core.base.BaseModel;
+import com.chwl.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/chwl/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/chwl/core/certification/ICertificationModel.java
index bb017a76a..9e462eb6a 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/certification/ICertificationModel.java
+++ b/core/src/main/java/com/chwl/core/certification/ICertificationModel.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.certification;
+package com.chwl.core.certification;
 
-import com.yizhuan.xchat_android_core.base.IModel;
+import com.chwl.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/chwl/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/chwl/core/certification/event/CertificationResultEvent.java
index 2020569f6..c54fe4178 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/certification/event/CertificationResultEvent.java
+++ b/core/src/main/java/com/chwl/core/certification/event/CertificationResultEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.certification.event;
+package com.chwl.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/chwl/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/chwl/core/community/UserVo.kt
index 678b53f49..3a5c4a690 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/community/UserVo.kt
+++ b/core/src/main/java/com/chwl/core/community/UserVo.kt
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.community
+package com.chwl.core.community
 
-import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo
-import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils
+import com.chwl.core.decoration.headwear.bean.HeadWearInfo
+import com.chwl.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/chwl/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/chwl/core/contacts/ContactModel.java
index d045f46f3..d9961d325 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/contacts/ContactModel.java
+++ b/core/src/main/java/com/chwl/core/contacts/ContactModel.java
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_core.contacts;
+package com.chwl.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.chwl.core.auth.AuthModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.room.bean.SearchRoomInfo;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
 
 import java.util.List;
 
diff --git a/core/src/main/java/com/chwl/core/contacts/IContactModel.java b/core/src/main/java/com/chwl/core/contacts/IContactModel.java
new file mode 100644
index 000000000..12bc7b11d
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/contacts/IContactModel.java
@@ -0,0 +1,14 @@
+package com.chwl.core.contacts;
+
+import com.chwl.core.base.IModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.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/chwl/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/chwl/core/decoration/DecorationInfo.kt
index 15edc3555..f886c9f0b 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/DecorationInfo.kt
+++ b/core/src/main/java/com/chwl/core/decoration/DecorationInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.decoration
+package com.chwl.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/chwl/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/chwl/core/decoration/DecorationInfoEvent.java
index 6e639c3ac..1a4024ee3 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/DecorationInfoEvent.java
+++ b/core/src/main/java/com/chwl/core/decoration/DecorationInfoEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.decoration;
+package com.chwl.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/chwl/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/chwl/core/decoration/DecorationModel.kt
index a4cdd647b..fd2880ffa 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/DecorationModel.kt
+++ b/core/src/main/java/com/chwl/core/decoration/DecorationModel.kt
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_core.decoration
+package com.chwl.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.chwl.core.base.BaseModel
+import com.chwl.core.bean.response.ServiceResult
+import com.chwl.core.utils.net.RxHelper
+import com.chwl.core.utils.net.launchRequest
+import com.chwl.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/chwl/core/decoration/backgroud/BackgroundModel.java
similarity index 92%
rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/backgroud/BackgroundModel.java
rename to core/src/main/java/com/chwl/core/decoration/backgroud/BackgroundModel.java
index 6186d3535..b941cb910 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/backgroud/BackgroundModel.java
+++ b/core/src/main/java/com/chwl/core/decoration/backgroud/BackgroundModel.java
@@ -1,15 +1,15 @@
-package com.yizhuan.xchat_android_core.decoration.backgroud;
+package com.chwl.core.decoration.backgroud;
 
-import com.yizhuan.xchat_android_core.R;
-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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.decoration.backgroud.bean.BgInfo;
+import com.chwl.core.decoration.headwear.throwable.HeadwearPulledOffShelvesException;
+import com.chwl.core.utils.net.BalanceNotEnoughExeption;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.utils.ResUtil;
 
 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/chwl/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/chwl/core/decoration/backgroud/IBackgroundModel.java
index 24ebeef9c..b88a1c6e7 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/backgroud/IBackgroundModel.java
+++ b/core/src/main/java/com/chwl/core/decoration/backgroud/IBackgroundModel.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.decoration.backgroud;
+package com.chwl.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.chwl.core.base.IModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.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/chwl/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/chwl/core/decoration/backgroud/bean/BgInfo.java
index a34736b5b..ca2f8a11d 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/backgroud/bean/BgInfo.java
+++ b/core/src/main/java/com/chwl/core/decoration/backgroud/bean/BgInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.decoration.backgroud.bean;
+package com.chwl.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/chwl/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/chwl/core/decoration/bean/BaseDecoration.java
index 711ff8140..92275bd4f 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/bean/BaseDecoration.java
+++ b/core/src/main/java/com/chwl/core/decoration/bean/BaseDecoration.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.decoration.bean;
+package com.chwl.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/chwl/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/chwl/core/decoration/bean/CurrencyType.java
index e67905af6..ba58839af 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/bean/CurrencyType.java
+++ b/core/src/main/java/com/chwl/core/decoration/bean/CurrencyType.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.decoration.bean;
+package com.chwl.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/chwl/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/chwl/core/decoration/bean/DecorationStoreRouterType.java
index a1e70de6a..57f5bc6d8 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/bean/DecorationStoreRouterType.java
+++ b/core/src/main/java/com/chwl/core/decoration/bean/DecorationStoreRouterType.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.decoration.bean;
+package com.chwl.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/chwl/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/chwl/core/decoration/car/CarModel.java
index 468a38aa7..34ef7ad4a 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/car/CarModel.java
+++ b/core/src/main/java/com/chwl/core/decoration/car/CarModel.java
@@ -1,14 +1,14 @@
-package com.yizhuan.xchat_android_core.decoration.car;
+package com.chwl.core.decoration.car;
 
-import com.yizhuan.xchat_android_core.R;
-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.RxHelper;
-import com.yizhuan.xchat_android_library.net.rxnet.RxNet;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.decoration.car.bean.CarInfo;
+import com.chwl.core.utils.net.BalanceNotEnoughExeption;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.utils.ResUtil;
 
 import java.util.List;
 
@@ -190,7 +190,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.chwl.core.decoration.bean.CurrencyType}
      *                     支付货币类型：0钻石，1萝卜
      * @return
      */
@@ -324,7 +324,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.chwl.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/chwl/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/chwl/core/decoration/car/ICarModel.java
index d4174654b..0dcd8d190 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/car/ICarModel.java
+++ b/core/src/main/java/com/chwl/core/decoration/car/ICarModel.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.decoration.car;
+package com.chwl.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.chwl.core.base.IModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.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.chwl.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/chwl/core/decoration/car/bean/CarInfo.java
similarity index 96%
rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/car/bean/CarInfo.java
rename to core/src/main/java/com/chwl/core/decoration/car/bean/CarInfo.java
index 67bab0815..dcb135c3d 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/car/bean/CarInfo.java
+++ b/core/src/main/java/com/chwl/core/decoration/car/bean/CarInfo.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.decoration.car.bean;
+package com.chwl.core.decoration.car.bean;
 
 import com.google.gson.annotations.SerializedName;
-import com.yizhuan.xchat_android_core.decoration.bean.BaseDecoration;
+import com.chwl.core.decoration.bean.BaseDecoration;
 
 import java.io.Serializable;
 import java.util.HashMap;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/HeadwearModel.java b/core/src/main/java/com/chwl/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/chwl/core/decoration/headwear/HeadwearModel.java
index 3898c8ab7..567f1c728 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/HeadwearModel.java
+++ b/core/src/main/java/com/chwl/core/decoration/headwear/HeadwearModel.java
@@ -1,19 +1,19 @@
-package com.yizhuan.xchat_android_core.decoration.headwear;
+package com.chwl.core.decoration.headwear;
 
-import com.yizhuan.xchat_android_core.R;
-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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.decoration.headwear.bean.ChatBubbleInfo;
+import com.chwl.core.decoration.headwear.bean.HeadWearInfo;
+import com.chwl.core.decoration.headwear.bean.UserCardWearInfo;
+import com.chwl.core.decoration.headwear.throwable.HeadwearPulledOffShelvesException;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.utils.net.BalanceNotEnoughExeption;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.utils.ResUtil;
 
 import java.util.List;
 
@@ -187,7 +187,7 @@ public class HeadwearModel extends BaseModel implements IHeadwearModel {
     /**
      * 购买/续费头饰
      *
-     * @param currencyType {@link com.yizhuan.xchat_android_core.decoration.bean.CurrencyType}
+     * @param currencyType {@link com.chwl.core.decoration.bean.CurrencyType}
      * @return
      */
     @Override
@@ -246,7 +246,7 @@ public class HeadwearModel extends BaseModel implements IHeadwearModel {
     /**
      * 赠送头饰
      *
-     * @param currencyType {@link com.yizhuan.xchat_android_core.decoration.bean.CurrencyType}
+     * @param currencyType {@link com.chwl.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/chwl/core/decoration/headwear/IHeadwearModel.java
similarity index 82%
rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/IHeadwearModel.java
rename to core/src/main/java/com/chwl/core/decoration/headwear/IHeadwearModel.java
index 3372d2c56..c24bdf91a 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/IHeadwearModel.java
+++ b/core/src/main/java/com/chwl/core/decoration/headwear/IHeadwearModel.java
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_core.decoration.headwear;
+package com.chwl.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.chwl.core.base.IModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.decoration.headwear.bean.ChatBubbleInfo;
+import com.chwl.core.decoration.headwear.bean.HeadWearInfo;
+import com.chwl.core.decoration.headwear.bean.UserCardWearInfo;
 
 import java.util.List;
 
@@ -90,7 +90,7 @@ public interface IHeadwearModel extends IModel {
     /**
      * 赠送头饰
      *
-     * @param currencyType {@link com.yizhuan.xchat_android_core.decoration.bean.CurrencyType}
+     * @param currencyType {@link com.chwl.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/chwl/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/chwl/core/decoration/headwear/bean/ChatBubbleInfo.java
index 279a717f1..4d53d9975 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/bean/ChatBubbleInfo.java
+++ b/core/src/main/java/com/chwl/core/decoration/headwear/bean/ChatBubbleInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.decoration.headwear.bean;
+package com.chwl.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/chwl/core/decoration/headwear/bean/HeadWearInfo.java
similarity index 95%
rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/bean/HeadWearInfo.java
rename to core/src/main/java/com/chwl/core/decoration/headwear/bean/HeadWearInfo.java
index c98443702..8dfb4e1f1 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/bean/HeadWearInfo.java
+++ b/core/src/main/java/com/chwl/core/decoration/headwear/bean/HeadWearInfo.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.decoration.headwear.bean;
+package com.chwl.core.decoration.headwear.bean;
 
-import com.yizhuan.xchat_android_core.decoration.bean.BaseDecoration;
+import com.chwl.core.decoration.bean.BaseDecoration;
 
 import java.io.Serializable;
 import java.util.HashMap;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/bean/UserCardWearInfo.java b/core/src/main/java/com/chwl/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/chwl/core/decoration/headwear/bean/UserCardWearInfo.java
index 2501eca51..6d14f2cfa 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/bean/UserCardWearInfo.java
+++ b/core/src/main/java/com/chwl/core/decoration/headwear/bean/UserCardWearInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.decoration.headwear.bean;
+package com.chwl.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/chwl/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/chwl/core/decoration/headwear/throwable/HeadwearPulledOffShelvesException.java
index 1fbb623fe..2a33d9511 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/throwable/HeadwearPulledOffShelvesException.java
+++ b/core/src/main/java/com/chwl/core/decoration/headwear/throwable/HeadwearPulledOffShelvesException.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.decoration.headwear.throwable;
+package com.chwl.core.decoration.headwear.throwable;
 
 public class HeadwearPulledOffShelvesException extends Exception{
     public final static int code = 6202;//头饰下架异常码
diff --git a/core/src/main/java/com/chwl/core/decoration/nameplate/INamePlateModel.java b/core/src/main/java/com/chwl/core/decoration/nameplate/INamePlateModel.java
new file mode 100644
index 000000000..2a1c6c38b
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/decoration/nameplate/INamePlateModel.java
@@ -0,0 +1,18 @@
+package com.chwl.core.decoration.nameplate;
+
+import com.chwl.core.base.IModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.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/chwl/core/decoration/nameplate/NamePlateModel.java
similarity index 82%
rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/nameplate/NamePlateModel.java
rename to core/src/main/java/com/chwl/core/decoration/nameplate/NamePlateModel.java
index a7e7da061..78c31fc90 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/nameplate/NamePlateModel.java
+++ b/core/src/main/java/com/chwl/core/decoration/nameplate/NamePlateModel.java
@@ -1,15 +1,15 @@
-package com.yizhuan.xchat_android_core.decoration.nameplate;
+package com.chwl.core.decoration.nameplate;
 
-import com.yizhuan.xchat_android_core.R;
-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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.decoration.nameplate.bean.NamePlateInfo;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.utils.ResUtil;
 
 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/chwl/core/decoration/nameplate/bean/NamePlateInfo.java
similarity index 98%
rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/nameplate/bean/NamePlateInfo.java
rename to core/src/main/java/com/chwl/core/decoration/nameplate/bean/NamePlateInfo.java
index 7188200d5..c1498dc2d 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/nameplate/bean/NamePlateInfo.java
+++ b/core/src/main/java/com/chwl/core/decoration/nameplate/bean/NamePlateInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.decoration.nameplate.bean;
+package com.chwl.core.decoration.nameplate.bean;
 
 import java.util.List;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/exception/ErrorThrowable.java b/core/src/main/java/com/chwl/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/chwl/core/exception/ErrorThrowable.java
index 42ab60ee9..9236acb46 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/exception/ErrorThrowable.java
+++ b/core/src/main/java/com/chwl/core/exception/ErrorThrowable.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.exception;
+package com.chwl.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/chwl/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/chwl/core/exception/FailReasonException.java
index ba54cc5c1..07c5df59e 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/exception/FailReasonException.java
+++ b/core/src/main/java/com/chwl/core/exception/FailReasonException.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.exception;
+package com.chwl.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/chwl/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/chwl/core/exception/NullDataException.java
index db8501b13..b54a81c89 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/exception/NullDataException.java
+++ b/core/src/main/java/com/chwl/core/exception/NullDataException.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.exception;
+package com.chwl.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/chwl/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/chwl/core/exception/UnKnowException.java
index 8329269b3..673f1789e 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/exception/UnKnowException.java
+++ b/core/src/main/java/com/chwl/core/exception/UnKnowException.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.exception;
+package com.chwl.core.exception;
 
 /**
  * 未知错误
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/BillDateDivInfo.java b/core/src/main/java/com/chwl/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/chwl/core/family/bean/BillDateDivInfo.java
index bd6e49253..b5370b99e 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/BillDateDivInfo.java
+++ b/core/src/main/java/com/chwl/core/family/bean/BillDateDivInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.family.bean;
+package com.chwl.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/chwl/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/chwl/core/family/bean/CustomServiceInfo.java
index ded182486..fc6a80ee8 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/CustomServiceInfo.java
+++ b/core/src/main/java/com/chwl/core/family/bean/CustomServiceInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.family.bean;
+package com.chwl.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/chwl/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/chwl/core/family/bean/FamilyCustomServiceInfo.java
index 933a1c56a..c8f811231 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyCustomServiceInfo.java
+++ b/core/src/main/java/com/chwl/core/family/bean/FamilyCustomServiceInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.family.bean;
+package com.chwl.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/chwl/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/chwl/core/family/bean/FamilyGameInfo.java
index 9cbed04f2..b5206852b 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyGameInfo.java
+++ b/core/src/main/java/com/chwl/core/family/bean/FamilyGameInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.family.bean;
+package com.chwl.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/chwl/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/chwl/core/family/bean/FamilyGroupInfo.java
index 62b687448..88b2be51d 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyGroupInfo.java
+++ b/core/src/main/java/com/chwl/core/family/bean/FamilyGroupInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.family.bean;
+package com.chwl.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/chwl/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/chwl/core/family/bean/FamilyInfo.java
index bdf5343f0..0f3350c1f 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyInfo.java
+++ b/core/src/main/java/com/chwl/core/family/bean/FamilyInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.family.bean;
+package com.chwl.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/FamilyManageItemInfo.java b/core/src/main/java/com/chwl/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/chwl/core/family/bean/FamilyManageItemInfo.java
index 4f8387e22..08e55c106 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyManageItemInfo.java
+++ b/core/src/main/java/com/chwl/core/family/bean/FamilyManageItemInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.family.bean;
+package com.chwl.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/chwl/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/chwl/core/family/bean/FamilyMemberInfo.java
index 3db6573dc..693826750 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyMemberInfo.java
+++ b/core/src/main/java/com/chwl/core/family/bean/FamilyMemberInfo.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.family.bean;
+package com.chwl.core.family.bean;
 
-import com.yizhuan.xchat_android_core.level.UserLevelVo;
-import com.yizhuan.xchat_android_core.noble.NobleInfo;
+import com.chwl.core.level.UserLevelVo;
+import com.chwl.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/chwl/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/chwl/core/family/bean/FamilyPlazaInfo.java
index 813dd06e0..f3e06db2c 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyPlazaInfo.java
+++ b/core/src/main/java/com/chwl/core/family/bean/FamilyPlazaInfo.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.family.bean;
+package com.chwl.core.family.bean;
 
-import com.yizhuan.xchat_android_core.family.bean.response.familyPlaza.RespFamily;
+import com.chwl.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/chwl/core/family/bean/FindBannerInfo.java
similarity index 97%
rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FindBannerInfo.java
rename to core/src/main/java/com/chwl/core/family/bean/FindBannerInfo.java
index 62316a381..f4e61ac93 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FindBannerInfo.java
+++ b/core/src/main/java/com/chwl/core/family/bean/FindBannerInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.family.bean;
+package com.chwl.core.family.bean;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/HomeBannerInfo.java b/core/src/main/java/com/chwl/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/chwl/core/family/bean/HomeBannerInfo.java
index 7e9ccd352..62f4de618 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/HomeBannerInfo.java
+++ b/core/src/main/java/com/chwl/core/family/bean/HomeBannerInfo.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.family.bean;
+package com.chwl.core.family.bean;
 
-import com.yizhuan.xchat_android_core.home.bean.BannerInfo;
-import com.yizhuan.xchat_android_library.utils.ListUtils;
+import com.chwl.core.home.bean.BannerInfo;
+import com.chwl.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/chwl/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/chwl/core/family/bean/HomeTitleInfo.java
index 43d02c09a..071430db7 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/HomeTitleInfo.java
+++ b/core/src/main/java/com/chwl/core/family/bean/HomeTitleInfo.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.family.bean;
+package com.chwl.core.family.bean;
 
-import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils;
+import com.chwl.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/chwl/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/chwl/core/family/bean/TransactionRecordInfo.java
index 90e88e302..0c93d47f9 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/TransactionRecordInfo.java
+++ b/core/src/main/java/com/chwl/core/family/bean/TransactionRecordInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.family.bean;
+package com.chwl.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/chwl/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/chwl/core/family/bean/VMBillItemInfo.java
index d1911f443..54dfa8a91 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/VMBillItemInfo.java
+++ b/core/src/main/java/com/chwl/core/family/bean/VMBillItemInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.family.bean;
+package com.chwl.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/chwl/core/family/bean/response/RankingFamilyInfo.java
similarity index 94%
rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/RankingFamilyInfo.java
rename to core/src/main/java/com/chwl/core/family/bean/response/RankingFamilyInfo.java
index f1883723f..2b125a9ea 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/RankingFamilyInfo.java
+++ b/core/src/main/java/com/chwl/core/family/bean/response/RankingFamilyInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.family.bean.response;
+package com.chwl.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/chwl/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/chwl/core/family/bean/response/RespFamilyGameList.java
index 065ba7a96..c34cac48f 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/RespFamilyGameList.java
+++ b/core/src/main/java/com/chwl/core/family/bean/response/RespFamilyGameList.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.family.bean.response;
+package com.chwl.core.family.bean.response;
 
-import com.yizhuan.xchat_android_core.family.bean.FamilyGameInfo;
+import com.chwl.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/chwl/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/chwl/core/family/bean/response/RespFamilyRankList.java
index de4b74a29..eb7e4e01b 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/RespFamilyRankList.java
+++ b/core/src/main/java/com/chwl/core/family/bean/response/RespFamilyRankList.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.family.bean.response;
+package com.chwl.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/chwl/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/chwl/core/family/bean/response/familyPlaza/RespFamily.java
index 026a159d0..e5249ae25 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/familyPlaza/RespFamily.java
+++ b/core/src/main/java/com/chwl/core/family/bean/response/familyPlaza/RespFamily.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.family.bean.response.familyPlaza;
+package com.chwl.core.family.bean.response.familyPlaza;
 
-import com.yizhuan.xchat_android_core.family.bean.FamilyInfo;
+import com.chwl.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/chwl/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/chwl/core/family/bean/response/memberList/RespFamilymember.java
index 64e86351c..45e1e86e3 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/memberList/RespFamilymember.java
+++ b/core/src/main/java/com/chwl/core/family/bean/response/memberList/RespFamilymember.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.family.bean.response.memberList;
+package com.chwl.core.family.bean.response.memberList;
 
-import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo;
+import com.chwl.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/chwl/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/chwl/core/family/bean/response/moneyManagement/FamilyMoneyManagementInfo.java
index b9a6efa75..4795ec336 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/moneyManagement/FamilyMoneyManagementInfo.java
+++ b/core/src/main/java/com/chwl/core/family/bean/response/moneyManagement/FamilyMoneyManagementInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.family.bean.response.moneyManagement;
+package com.chwl.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/chwl/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/chwl/core/family/bean/response/moneyManagement/MonthlyRecord.java
index e7fe0ef7b..b52c5f8f2 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/moneyManagement/MonthlyRecord.java
+++ b/core/src/main/java/com/chwl/core/family/bean/response/moneyManagement/MonthlyRecord.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.family.bean.response.moneyManagement;
+package com.chwl.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/chwl/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/chwl/core/family/bean/response/moneyManagement/TradeMoneyRecord.java
index d264d5fb3..627d5ff91 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/moneyManagement/TradeMoneyRecord.java
+++ b/core/src/main/java/com/chwl/core/family/bean/response/moneyManagement/TradeMoneyRecord.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.family.bean.response.moneyManagement;
+package com.chwl.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/chwl/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/chwl/core/family/event/FamilyCurrencyUpdateEvent.java
index c8e9ff96d..936d5e2b1 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/family/event/FamilyCurrencyUpdateEvent.java
+++ b/core/src/main/java/com/chwl/core/family/event/FamilyCurrencyUpdateEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.family.event;
+package com.chwl.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/chwl/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/chwl/core/family/event/FamilyMemberUpdateEvent.java
index 32632673c..f6e4d77e0 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/family/event/FamilyMemberUpdateEvent.java
+++ b/core/src/main/java/com/chwl/core/family/event/FamilyMemberUpdateEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.family.event;
+package com.chwl.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/chwl/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/chwl/core/family/event/FamilyMineEvent.java
index 82d09bafb..be87faa1d 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/family/event/FamilyMineEvent.java
+++ b/core/src/main/java/com/chwl/core/family/event/FamilyMineEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.family.event;
+package com.chwl.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/chwl/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/chwl/core/family/event/FamilyUpdateEvent.java
index 00a706f53..9e5afafe2 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/family/event/FamilyUpdateEvent.java
+++ b/core/src/main/java/com/chwl/core/family/event/FamilyUpdateEvent.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.family.event;
+package com.chwl.core.family.event;
 
-import com.yizhuan.xchat_android_core.family.bean.FamilyInfo;
+import com.chwl.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/chwl/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/chwl/core/family/model/FamilyModel.java
index f615e9dea..b8eb81e5c 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/family/model/FamilyModel.java
+++ b/core/src/main/java/com/chwl/core/family/model/FamilyModel.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.family.model;
+package com.chwl.core.family.model;
 
 import android.annotation.SuppressLint;
 import android.text.TextUtils;
@@ -6,33 +6,33 @@ import android.text.TextUtils;
 import androidx.annotation.Nullable;
 
 import com.orhanobut.logger.Logger;
-import com.yizhuan.xchat_android_core.R;
-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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.core.Constants;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.auth.event.LoginEvent;
+import com.chwl.core.auth.event.LogoutEvent;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.family.bean.FamilyCustomServiceInfo;
+import com.chwl.core.family.bean.FamilyGameInfo;
+import com.chwl.core.family.bean.FamilyInfo;
+import com.chwl.core.family.bean.FamilyPlazaInfo;
+import com.chwl.core.family.bean.FindBannerInfo;
+import com.chwl.core.family.bean.response.RespFamilyGameList;
+import com.chwl.core.family.bean.response.RespFamilyRankList;
+import com.chwl.core.family.bean.response.familyPlaza.RespFamily;
+import com.chwl.core.family.bean.response.memberList.RespFamilymember;
+import com.chwl.core.family.bean.response.moneyManagement.FamilyMoneyManagementInfo;
+import com.chwl.core.family.bean.response.moneyManagement.TradeMoneyRecord;
+import com.chwl.core.family.event.FamilyCurrencyUpdateEvent;
+import com.chwl.core.family.event.FamilyMineEvent;
+import com.chwl.core.family.event.FamilyUpdateEvent;
+import com.chwl.core.user.UserModel;
+import com.chwl.core.user.bean.UserInfo;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.rxbus.RxBusHelper;
+import com.chwl.library.utils.ResUtil;
 
 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/chwl/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/chwl/core/family/model/IFamilyModel.java
index 71bd315f0..ccfb6e1fe 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/family/model/IFamilyModel.java
+++ b/core/src/main/java/com/chwl/core/family/model/IFamilyModel.java
@@ -1,18 +1,18 @@
-package com.yizhuan.xchat_android_core.family.model;
+package com.chwl.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.chwl.core.base.IModel;
+import com.chwl.core.family.bean.FamilyCustomServiceInfo;
+import com.chwl.core.family.bean.FamilyGameInfo;
+import com.chwl.core.family.bean.FamilyInfo;
+import com.chwl.core.family.bean.FamilyPlazaInfo;
+import com.chwl.core.family.bean.FindBannerInfo;
+import com.chwl.core.family.bean.response.RespFamilyRankList;
+import com.chwl.core.family.bean.response.familyPlaza.RespFamily;
+import com.chwl.core.family.bean.response.memberList.RespFamilymember;
+import com.chwl.core.family.bean.response.moneyManagement.FamilyMoneyManagementInfo;
+import com.chwl.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/chwl/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/chwl/core/fansteam/FansTeamInfo.kt
index 34ab320d3..4e4f953cd 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamInfo.kt
+++ b/core/src/main/java/com/chwl/core/fansteam/FansTeamInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.fansteam
+package com.chwl.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/chwl/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/chwl/core/fansteam/FansTeamInitInfo.kt
index 3aed3f47c..b272b7ea5 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamInitInfo.kt
+++ b/core/src/main/java/com/chwl/core/fansteam/FansTeamInitInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.fansteam
+package com.chwl.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/chwl/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/chwl/core/fansteam/FansTeamJoinInfo.kt
index 49010556e..e9939073f 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamJoinInfo.kt
+++ b/core/src/main/java/com/chwl/core/fansteam/FansTeamJoinInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.fansteam
+package com.chwl.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/chwl/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/chwl/core/fansteam/FansTeamJoinedInfo.kt
index 20f091f88..6c6593ad9 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamJoinedInfo.kt
+++ b/core/src/main/java/com/chwl/core/fansteam/FansTeamJoinedInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.fansteam
+package com.chwl.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/chwl/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/chwl/core/fansteam/FansTeamModel.kt
index a9b128e0b..ca4207d27 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamModel.kt
+++ b/core/src/main/java/com/chwl/core/fansteam/FansTeamModel.kt
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_core.fansteam
+package com.chwl.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.chwl.core.base.BaseModel
+import com.chwl.core.bean.response.ServiceResult
+import com.chwl.core.manager.AvRoomDataManager
+import com.chwl.core.utils.net.launchRequest
+import com.chwl.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/chwl/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/chwl/core/fansteam/FansTeamMsgInfo.kt
index 66e733ebb..5be425733 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamMsgInfo.kt
+++ b/core/src/main/java/com/chwl/core/fansteam/FansTeamMsgInfo.kt
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.fansteam
+package com.chwl.core.fansteam
 
-import com.yizhuan.xchat_android_core.gift.bean.GiftInfo
+import com.chwl.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/chwl/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/chwl/core/fansteam/FansTeamTaskInfo.kt
index 47f48f40c..1971aec72 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamTaskInfo.kt
+++ b/core/src/main/java/com/chwl/core/fansteam/FansTeamTaskInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.fansteam
+package com.chwl.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/chwl/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/chwl/core/fansteam/PrivilegeConfigVo.kt
index 9e341cdad..56c5232e5 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/PrivilegeConfigVo.kt
+++ b/core/src/main/java/com/chwl/core/fansteam/PrivilegeConfigVo.kt
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.fansteam
+package com.chwl.core.fansteam
 
-import com.yizhuan.xchat_android_core.gift.bean.GiftInfo
+import com.chwl.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/chwl/core/file/FileModel.java
similarity index 91%
rename from core/src/main/java/com/yizhuan/xchat_android_core/file/FileModel.java
rename to core/src/main/java/com/chwl/core/file/FileModel.java
index 0554f2b67..d0e32c412 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/file/FileModel.java
+++ b/core/src/main/java/com/chwl/core/file/FileModel.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.file;
+package com.chwl.core.file;
 
 import android.text.TextUtils;
 
@@ -6,14 +6,14 @@ 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.R;
-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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.community.bean.DynamicMedia;
+import com.chwl.core.exception.ErrorThrowable;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.utils.ResUtil;
 
 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/chwl/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/chwl/core/file/IFileModel.java
index dcc82dafd..f10619c9a 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/file/IFileModel.java
+++ b/core/src/main/java/com/chwl/core/file/IFileModel.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.file;
+package com.chwl.core.file;
 
-import com.yizhuan.xchat_android_core.base.IModel;
-import com.yizhuan.xchat_android_core.community.bean.DynamicMedia;
+import com.chwl.core.base.IModel;
+import com.chwl.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/chwl/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/chwl/core/file/UploadToken.java
index 55a7d8ebc..8a94c158a 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/file/UploadToken.java
+++ b/core/src/main/java/com/chwl/core/file/UploadToken.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.file;
+package com.chwl.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/chwl/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/chwl/core/gift/ChargeListener.java
index 40d716b0d..791b1c279 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/ChargeListener.java
+++ b/core/src/main/java/com/chwl/core/gift/ChargeListener.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.gift;
+package com.chwl.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/chwl/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/chwl/core/gift/GiftModel.java
index b2e9b84e0..a31f78c3f 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/GiftModel.java
+++ b/core/src/main/java/com/chwl/core/gift/GiftModel.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.gift;
+package com.chwl.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.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_ALL_MIC_LUCKY_GIFT;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_LUCKY_GIFT;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_MULTI_LUCK_GIFT;
 
 import android.os.CountDownTimer;
 import android.os.Handler;
@@ -14,52 +14,52 @@ 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.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.gift.bean.GiftFreeInfo;
-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.LuckyBagNoticeInfo;
-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.RoomFreeGiftEvent;
-import com.yizhuan.xchat_android_core.gift.event.UpdateKnapEvent;
-import com.yizhuan.xchat_android_core.gift.event.UpdateKnapFreeGiftEvent;
-import com.yizhuan.xchat_android_core.gift.event.UpdateKnapFreeGiftNumEvent;
-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.Logger;
-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.common.util.SPUtils;
-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.chwl.core.Constants;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.gift.bean.GiftFreeInfo;
+import com.chwl.core.gift.bean.GiftInfo;
+import com.chwl.core.gift.bean.GiftListInfo;
+import com.chwl.core.gift.bean.GiftMultiReceiverInfo;
+import com.chwl.core.gift.bean.GiftSendType;
+import com.chwl.core.gift.bean.GiftSource;
+import com.chwl.core.gift.bean.GiftType;
+import com.chwl.core.gift.bean.LuckyBagGifts;
+import com.chwl.core.gift.bean.LuckyBagNoticeInfo;
+import com.chwl.core.gift.bean.MultiGiftReceiveInfo;
+import com.chwl.core.gift.bean.SimpleVipInfo;
+import com.chwl.core.gift.event.RoomFreeGiftEvent;
+import com.chwl.core.gift.event.UpdateKnapEvent;
+import com.chwl.core.gift.event.UpdateKnapFreeGiftEvent;
+import com.chwl.core.gift.event.UpdateKnapFreeGiftNumEvent;
+import com.chwl.core.gift.exception.GiftOutOfDateException;
+import com.chwl.core.gift.toolbox.GiftToolbox;
+import com.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.core.im.custom.bean.GiftAttachment;
+import com.chwl.core.im.custom.bean.GiftBatchAttachment;
+import com.chwl.core.im.custom.bean.MultiGiftAttachment;
+import com.chwl.core.im.custom.bean.MultiLuckyGiftAttachment;
+import com.chwl.core.initial.InitialModel;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.manager.RoomEvent;
+import com.chwl.core.pay.PayModel;
+import com.chwl.core.room.bean.RoomInfo;
+import com.chwl.core.room.giftvalue.bean.GiftValueCommonUpdate;
+import com.chwl.core.room.giftvalue.helper.GiftValueMrg;
+import com.chwl.core.user.UserModel;
+import com.chwl.core.user.bean.UserInfo;
+import com.chwl.core.utils.Logger;
+import com.chwl.core.utils.net.BalanceNotEnoughExeption;
+import com.chwl.core.utils.net.RadishNotEnoughException;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.core.utils.net.VipLevelNotEnoughException;
+import com.chwl.core.vip.UserVipInfo;
+import com.chwl.library.common.util.SPUtils;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.utils.ListUtils;
+import com.chwl.library.utils.SingleToastUtil;
 
 import org.greenrobot.eventbus.EventBus;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/IGiftCore.java b/core/src/main/java/com/chwl/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/chwl/core/gift/IGiftCore.java
index a10747373..0f072a503 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/IGiftCore.java
+++ b/core/src/main/java/com/chwl/core/gift/IGiftCore.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.gift;
+package com.chwl.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.chwl.core.gift.bean.GiftInfo;
+import com.chwl.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/chwl/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/chwl/core/gift/IGiftCoreClient.java
index b515c1eb0..22e66de19 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/IGiftCoreClient.java
+++ b/core/src/main/java/com/chwl/core/gift/IGiftCoreClient.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.gift;
+package com.chwl.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.chwl.core.gift.bean.GiftInfo;
+import com.chwl.core.gift.bean.GiftReceiveInfo;
+import com.chwl.core.gift.bean.MultiGiftReceiveInfo;
+import com.chwl.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/chwl/core/gift/IGiftModel.java
similarity index 92%
rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/IGiftModel.java
rename to core/src/main/java/com/chwl/core/gift/IGiftModel.java
index b73c5cfd4..a0d04f2be 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/IGiftModel.java
+++ b/core/src/main/java/com/chwl/core/gift/IGiftModel.java
@@ -1,14 +1,14 @@
-package com.yizhuan.xchat_android_core.gift;
+package com.chwl.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.GiftFreeInfo;
-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.LuckyBagNoticeInfo;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.gift.bean.GiftFreeInfo;
+import com.chwl.core.gift.bean.GiftInfo;
+import com.chwl.core.gift.bean.GiftListInfo;
+import com.chwl.core.gift.bean.GiftMultiReceiverInfo;
+import com.chwl.core.gift.bean.LuckyBagNoticeInfo;
 
 import java.util.List;
 
@@ -51,7 +51,7 @@ public interface IGiftModel {
      *
      * @param giftType 礼物类型
      * @return
-     * @see com.yizhuan.xchat_android_core.gift.bean.GiftType
+     * @see com.chwl.core.gift.bean.GiftType
      */
     List getGiftInfoList(int giftType);
 
@@ -61,7 +61,7 @@ public interface IGiftModel {
      * @param roomUid
      * @param giftType
      * @return
-     * @see com.yizhuan.xchat_android_core.gift.bean.GiftType
+     * @see com.chwl.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/chwl/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/chwl/core/gift/bean/GiftEffectInfo.java
index ec6da2401..c6d2ffd74 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftEffectInfo.java
+++ b/core/src/main/java/com/chwl/core/gift/bean/GiftEffectInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.gift.bean;
+package com.chwl.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/chwl/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/chwl/core/gift/bean/GiftFileInfo.java
index ca502de81..900a9f178 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftFileInfo.java
+++ b/core/src/main/java/com/chwl/core/gift/bean/GiftFileInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.gift.bean;
+package com.chwl.core.gift.bean;
 
 import java.io.Serializable;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftFreeInfo.java b/core/src/main/java/com/chwl/core/gift/bean/GiftFreeInfo.java
similarity index 91%
rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftFreeInfo.java
rename to core/src/main/java/com/chwl/core/gift/bean/GiftFreeInfo.java
index 074d4e60b..1c5d66cf1 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftFreeInfo.java
+++ b/core/src/main/java/com/chwl/core/gift/bean/GiftFreeInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.gift.bean;
+package com.chwl.core.gift.bean;
 
 import lombok.Data;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftInfo.java b/core/src/main/java/com/chwl/core/gift/bean/GiftInfo.java
similarity index 97%
rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftInfo.java
rename to core/src/main/java/com/chwl/core/gift/bean/GiftInfo.java
index 81f938daf..3ee332d5d 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftInfo.java
+++ b/core/src/main/java/com/chwl/core/gift/bean/GiftInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.gift.bean;
+package com.chwl.core.gift.bean;
 
 import com.google.gson.annotations.SerializedName;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftKnapInfo.java b/core/src/main/java/com/chwl/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/chwl/core/gift/bean/GiftKnapInfo.java
index fef82bd24..d74ada80d 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftKnapInfo.java
+++ b/core/src/main/java/com/chwl/core/gift/bean/GiftKnapInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.gift.bean;
+package com.chwl.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/chwl/core/gift/bean/GiftList.java
similarity index 83%
rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftList.java
rename to core/src/main/java/com/chwl/core/gift/bean/GiftList.java
index 435c9e36a..6a10d64ee 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftList.java
+++ b/core/src/main/java/com/chwl/core/gift/bean/GiftList.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.gift.bean;
+package com.chwl.core.gift.bean;
 
 import java.io.Serializable;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftListInfo.java b/core/src/main/java/com/chwl/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/chwl/core/gift/bean/GiftListInfo.java
index 26221fcfc..c2488b39b 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftListInfo.java
+++ b/core/src/main/java/com/chwl/core/gift/bean/GiftListInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.gift.bean;
+package com.chwl.core.gift.bean;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/core/src/main/java/com/chwl/core/gift/bean/GiftLuckyBag.java b/core/src/main/java/com/chwl/core/gift/bean/GiftLuckyBag.java
new file mode 100644
index 000000000..256382ddb
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/gift/bean/GiftLuckyBag.java
@@ -0,0 +1,5 @@
+package com.chwl.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/chwl/core/gift/bean/GiftMultiReceiverInfo.java
similarity index 83%
rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftMultiReceiverInfo.java
rename to core/src/main/java/com/chwl/core/gift/bean/GiftMultiReceiverInfo.java
index 702e8911b..5cb7d3d9d 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftMultiReceiverInfo.java
+++ b/core/src/main/java/com/chwl/core/gift/bean/GiftMultiReceiverInfo.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.gift.bean;
+package com.chwl.core.gift.bean;
 
-import com.yizhuan.xchat_android_core.room.giftvalue.bean.IndexGiftValue;
+import com.chwl.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/GiftReceiveInfo.java b/core/src/main/java/com/chwl/core/gift/bean/GiftReceiveInfo.java
similarity index 83%
rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftReceiveInfo.java
rename to core/src/main/java/com/chwl/core/gift/bean/GiftReceiveInfo.java
index 0a2f5d61f..83a817a7f 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftReceiveInfo.java
+++ b/core/src/main/java/com/chwl/core/gift/bean/GiftReceiveInfo.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.gift.bean;
+package com.chwl.core.gift.bean;
 
-import com.yizhuan.xchat_android_core.room.giftvalue.bean.IndexGiftValue;
+import com.chwl.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/GiftReceiver.java b/core/src/main/java/com/chwl/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/chwl/core/gift/bean/GiftReceiver.java
index f4bdab61e..3aeee137b 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftReceiver.java
+++ b/core/src/main/java/com/chwl/core/gift/bean/GiftReceiver.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.gift.bean;
+package com.chwl.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/chwl/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/chwl/core/gift/bean/GiftSendType.java
index 753f424ef..5152539d4 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftSendType.java
+++ b/core/src/main/java/com/chwl/core/gift/bean/GiftSendType.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.gift.bean;
+package com.chwl.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/chwl/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/chwl/core/gift/bean/GiftSource.java
index 04010fa34..23129505a 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftSource.java
+++ b/core/src/main/java/com/chwl/core/gift/bean/GiftSource.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.gift.bean;
+package com.chwl.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/chwl/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/chwl/core/gift/bean/GiftTab.java
index f2001e284..e0761db34 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftTab.java
+++ b/core/src/main/java/com/chwl/core/gift/bean/GiftTab.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.gift.bean;
+package com.chwl.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/chwl/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/chwl/core/gift/bean/GiftType.java
index c0ede7c07..7097b467c 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftType.java
+++ b/core/src/main/java/com/chwl/core/gift/bean/GiftType.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.gift.bean;
+package com.chwl.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/chwl/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/chwl/core/gift/bean/LuckyBagGifts.java
index 2dd271b4d..d82f45094 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/LuckyBagGifts.java
+++ b/core/src/main/java/com/chwl/core/gift/bean/LuckyBagGifts.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.gift.bean;
+package com.chwl.core.gift.bean;
 
-import com.yizhuan.xchat_android_core.room.giftvalue.bean.IndexGiftValue;
+import com.chwl.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/chwl/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/chwl/core/gift/bean/LuckyBagNoticeInfo.java
index 37fd5f7bf..4f1487fec 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/LuckyBagNoticeInfo.java
+++ b/core/src/main/java/com/chwl/core/gift/bean/LuckyBagNoticeInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.gift.bean;
+package com.chwl.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/chwl/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/chwl/core/gift/bean/LuckyGiftList.java
index e13d07ea6..d830f42c4 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/LuckyGiftList.java
+++ b/core/src/main/java/com/chwl/core/gift/bean/LuckyGiftList.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.gift.bean;
+package com.chwl.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/chwl/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/chwl/core/gift/bean/MultiGiftReceiveInfo.java
index c26a47620..df4434941 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/MultiGiftReceiveInfo.java
+++ b/core/src/main/java/com/chwl/core/gift/bean/MultiGiftReceiveInfo.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.gift.bean;
+package com.chwl.core.gift.bean;
 
-import com.yizhuan.xchat_android_core.room.giftvalue.bean.IndexGiftValue;
+import com.chwl.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/chwl/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/chwl/core/gift/bean/SendGiftScenes.java
index 50af93e10..508e511c5 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/SendGiftScenes.java
+++ b/core/src/main/java/com/chwl/core/gift/bean/SendGiftScenes.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.gift.bean;
+package com.chwl.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/chwl/core/gift/bean/SimpleUserInfo.kt
similarity index 81%
rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/SimpleUserInfo.kt
rename to core/src/main/java/com/chwl/core/gift/bean/SimpleUserInfo.kt
index 61b7ed315..abea57656 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/SimpleUserInfo.kt
+++ b/core/src/main/java/com/chwl/core/gift/bean/SimpleUserInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.gift.bean
+package com.chwl.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/chwl/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/chwl/core/gift/bean/SimpleVipInfo.java
index 0478eb9ca..30ce54766 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/SimpleVipInfo.java
+++ b/core/src/main/java/com/chwl/core/gift/bean/SimpleVipInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.gift.bean;
+package com.chwl.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/chwl/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/chwl/core/gift/event/HideCarEffectEvent.java
index a8fa012b5..d69eedb5c 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/event/HideCarEffectEvent.java
+++ b/core/src/main/java/com/chwl/core/gift/event/HideCarEffectEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.gift.event;
+package com.chwl.core.gift.event;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/event/RoomFreeGiftEvent.java b/core/src/main/java/com/chwl/core/gift/event/RoomFreeGiftEvent.java
similarity index 67%
rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/event/RoomFreeGiftEvent.java
rename to core/src/main/java/com/chwl/core/gift/event/RoomFreeGiftEvent.java
index e7d96185b..361d983af 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/event/RoomFreeGiftEvent.java
+++ b/core/src/main/java/com/chwl/core/gift/event/RoomFreeGiftEvent.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.gift.event;
+package com.chwl.core.gift.event;
 
-import com.yizhuan.xchat_android_core.gift.bean.GiftFreeInfo;
+import com.chwl.core.gift.bean.GiftFreeInfo;
 
 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/chwl/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/chwl/core/gift/event/UpdateKnapEvent.java
index d7dbfbe97..60d6daa9e 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/event/UpdateKnapEvent.java
+++ b/core/src/main/java/com/chwl/core/gift/event/UpdateKnapEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.gift.event;
+package com.chwl.core.gift.event;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/event/UpdateKnapFreeGiftDataEvent.java b/core/src/main/java/com/chwl/core/gift/event/UpdateKnapFreeGiftDataEvent.java
similarity index 68%
rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/event/UpdateKnapFreeGiftDataEvent.java
rename to core/src/main/java/com/chwl/core/gift/event/UpdateKnapFreeGiftDataEvent.java
index f6796981d..5e99f2d3f 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/event/UpdateKnapFreeGiftDataEvent.java
+++ b/core/src/main/java/com/chwl/core/gift/event/UpdateKnapFreeGiftDataEvent.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.gift.event;
+package com.chwl.core.gift.event;
 
-import com.yizhuan.xchat_android_core.im.custom.bean.RoomFreeGiftMsgBean;
+import com.chwl.core.im.custom.bean.RoomFreeGiftMsgBean;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/event/UpdateKnapFreeGiftEvent.java b/core/src/main/java/com/chwl/core/gift/event/UpdateKnapFreeGiftEvent.java
similarity index 83%
rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/event/UpdateKnapFreeGiftEvent.java
rename to core/src/main/java/com/chwl/core/gift/event/UpdateKnapFreeGiftEvent.java
index d2e26de86..df404fe50 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/event/UpdateKnapFreeGiftEvent.java
+++ b/core/src/main/java/com/chwl/core/gift/event/UpdateKnapFreeGiftEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.gift.event;
+package com.chwl.core.gift.event;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/event/UpdateKnapFreeGiftNumEvent.java b/core/src/main/java/com/chwl/core/gift/event/UpdateKnapFreeGiftNumEvent.java
similarity index 83%
rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/event/UpdateKnapFreeGiftNumEvent.java
rename to core/src/main/java/com/chwl/core/gift/event/UpdateKnapFreeGiftNumEvent.java
index 580031d1a..3c8d93a00 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/event/UpdateKnapFreeGiftNumEvent.java
+++ b/core/src/main/java/com/chwl/core/gift/event/UpdateKnapFreeGiftNumEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.gift.event;
+package com.chwl.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/chwl/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/chwl/core/gift/exception/GiftOutOfDateException.java
index 8f53e5f82..857fb4960 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/exception/GiftOutOfDateException.java
+++ b/core/src/main/java/com/chwl/core/gift/exception/GiftOutOfDateException.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.gift.exception;
+package com.chwl.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/chwl/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/chwl/core/gift/toolbox/GiftToolbox.java
index 8301cb7a2..be2600b1f 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/toolbox/GiftToolbox.java
+++ b/core/src/main/java/com/chwl/core/gift/toolbox/GiftToolbox.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.gift.toolbox;
+package com.chwl.core.gift.toolbox;
 
 import android.text.TextUtils;
 
@@ -10,31 +10,31 @@ 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.chwl.core.auth.AuthModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.gift.GiftModel;
+import com.chwl.core.gift.bean.GiftInfo;
+import com.chwl.core.gift.bean.GiftMultiReceiverInfo;
+import com.chwl.core.gift.bean.GiftReceiveInfo;
+import com.chwl.core.gift.bean.GiftReceiver;
+import com.chwl.core.gift.bean.LuckyBagGifts;
+import com.chwl.core.gift.bean.MultiGiftReceiveInfo;
+import com.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.core.im.custom.bean.DrawGiftAttachment;
+import com.chwl.core.im.custom.bean.GiftAttachment;
+import com.chwl.core.im.custom.bean.GiftBatchAttachment;
+import com.chwl.core.im.custom.bean.MultiGiftAttachment;
+import com.chwl.core.im.custom.bean.MultiLuckyGiftAttachment;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.manager.RoomEvent;
+import com.chwl.core.public_chat_hall.manager.PublicChatHallDataManager;
+import com.chwl.core.public_chat_hall.model.PublicChatHallModel;
+import com.chwl.core.retry.ImRetryManager;
+import com.chwl.core.room.bean.RoomInfo;
+import com.chwl.core.user.UserModel;
+import com.chwl.core.user.bean.UserInfo;
+import com.chwl.library.utils.ListUtils;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/CustomNotifyType.java b/core/src/main/java/com/chwl/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/chwl/core/im/CustomNotifyType.java
index 870390892..64750cefd 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/CustomNotifyType.java
+++ b/core/src/main/java/com/chwl/core/im/CustomNotifyType.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im;
+package com.chwl.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/chwl/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/chwl/core/im/GreetModel.java
index 98656eae5..2ea2f63bd 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/GreetModel.java
+++ b/core/src/main/java/com/chwl/core/im/GreetModel.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.im;
+package com.chwl.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.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.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/chwl/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/chwl/core/im/RefreshInRoomListEvent.java
index 26bff9199..e5a95131d 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/RefreshInRoomListEvent.java
+++ b/core/src/main/java/com/chwl/core/im/RefreshInRoomListEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im;
+package com.chwl.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/chwl/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/chwl/core/im/avroom/IAVRoomCoreClient.java
index b4da320c3..e2a91cdf1 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/avroom/IAVRoomCoreClient.java
+++ b/core/src/main/java/com/chwl/core/im/avroom/IAVRoomCoreClient.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.im.avroom;
+package com.chwl.core.im.avroom;
 
-import com.yizhuan.xchat_android_library.coremanager.ICoreClient;
+import com.chwl.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/chwl/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/chwl/core/im/chatterbox/CanSendInfo.java
index ec566d8f2..5e8c68161 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/CanSendInfo.java
+++ b/core/src/main/java/com/chwl/core/im/chatterbox/CanSendInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.chatterbox;
+package com.chwl.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/chwl/core/im/chatterbox/ChatterBoxHelper.java
similarity index 88%
rename from core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/ChatterBoxHelper.java
rename to core/src/main/java/com/chwl/core/im/chatterbox/ChatterBoxHelper.java
index 003e85261..00d643061 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/ChatterBoxHelper.java
+++ b/core/src/main/java/com/chwl/core/im/chatterbox/ChatterBoxHelper.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.chatterbox;
+package com.chwl.core.im.chatterbox;
 
 import android.text.TextUtils;
 
@@ -8,17 +8,17 @@ 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.R;
-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.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
+import com.chwl.core.R;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.im.custom.bean.ChatterBoxAttachment;
+import com.chwl.core.im.custom.bean.ChatterBoxInitAttachment;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.user.UserModel;
+import com.chwl.core.user.bean.UserInfo;
+import com.chwl.core.utils.SharedPreferenceUtils;
+import com.chwl.core.utils.net.BeanObserver;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.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/chwl/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/chwl/core/im/chatterbox/ChatterBoxModel.java
index 2c376835d..1a6281940 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/ChatterBoxModel.java
+++ b/core/src/main/java/com/chwl/core/im/chatterbox/ChatterBoxModel.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.im.chatterbox;
+package com.chwl.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.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
 
 import java.util.List;
 
diff --git a/core/src/main/java/com/chwl/core/im/chatterbox/HideInputEvent.java b/core/src/main/java/com/chwl/core/im/chatterbox/HideInputEvent.java
new file mode 100644
index 000000000..ff3cb4981
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/im/chatterbox/HideInputEvent.java
@@ -0,0 +1,4 @@
+package com.chwl.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/chwl/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/chwl/core/im/chatterbox/IChatterBoxModel.java
index df895972b..63126d249 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/IChatterBoxModel.java
+++ b/core/src/main/java/com/chwl/core/im/chatterbox/IChatterBoxModel.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.im.chatterbox;
+package com.chwl.core.im.chatterbox;
 
-import com.yizhuan.xchat_android_core.base.IModel;
+import com.chwl.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/chwl/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/chwl/core/im/chatterbox/TopicBoxItemInfo.java
index 8d8d31bb4..8f0160652 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/TopicBoxItemInfo.java
+++ b/core/src/main/java/com/chwl/core/im/chatterbox/TopicBoxItemInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.chatterbox;
+package com.chwl.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/chwl/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/chwl/core/im/custom/AttachManager.java
index d6f345f41..50fe6963f 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/AttachManager.java
+++ b/core/src/main/java/com/chwl/core/im/custom/AttachManager.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.im.custom;
+package com.chwl.core.im.custom;
 
 import android.util.SparseArray;
 
-import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment;
+import com.chwl.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/chwl/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/chwl/core/im/custom/bean/ActivityTimerAttachment.java
index ed460393b..84af920e9 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/ActivityTimerAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/ActivityTimerAttachment.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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.chwl.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/chwl/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/chwl/core/im/custom/bean/AssistantAttachment.java
index 1d9bf0e8a..585e51030 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/AssistantAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/AssistantAttachment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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/chwl/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/chwl/core/im/custom/bean/AuctionAttachment.java
index af3a3c046..f6644dc9d 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/AuctionAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/AuctionAttachment.java
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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.chwl.core.room.auction.bean.AuctionInfo;
+import com.chwl.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/chwl/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/chwl/core/im/custom/bean/CarAttachment.java
index 7dba5c169..ca26a2b28 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CarAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/CarAttachment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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/chwl/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/chwl/core/im/custom/bean/CarveUpGoldAttachment.java
index d2bb8ed35..9e69e1c16 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CarveUpGoldAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/CarveUpGoldAttachment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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/chwl/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/chwl/core/im/custom/bean/CarveUpGoldSecondLevelAttachment.java
index 7e2f4bcdc..6ded20407 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CarveUpGoldSecondLevelAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/CarveUpGoldSecondLevelAttachment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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/chwl/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/chwl/core/im/custom/bean/CarveUpGoldThirdLevelAttachment.java
index 842afaad9..e38f55009 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CarveUpGoldThirdLevelAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/CarveUpGoldThirdLevelAttachment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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/chwl/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/chwl/core/im/custom/bean/ChatHintAttachment.java
index d38d2cc47..52e9cfc54 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/ChatHintAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/ChatHintAttachment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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/chwl/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/chwl/core/im/custom/bean/ChatterBoxAttachment.java
index de6cbc867..01e589693 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/ChatterBoxAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/ChatterBoxAttachment.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.core.im.custom.bean;
 
 import com.alibaba.fastjson.JSONObject;
-import com.yizhuan.xchat_android_core.im.chatterbox.TopicBoxItemInfo;
+import com.chwl.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/chwl/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/chwl/core/im/custom/bean/ChatterBoxInitAttachment.java
index 43ce1f83b..39ae34104 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/ChatterBoxInitAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/ChatterBoxInitAttachment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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/chwl/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/chwl/core/im/custom/bean/CleanScreenAttachment.java
index 00f3a4c47..1403104e7 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CleanScreenAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/CleanScreenAttachment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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/chwl/core/im/custom/bean/CpInviteAttachment.java
similarity index 88%
rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CpInviteAttachment.java
rename to core/src/main/java/com/chwl/core/im/custom/bean/CpInviteAttachment.java
index 9fe8965ea..a80932081 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CpInviteAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/CpInviteAttachment.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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 com.chwl.core.relation.cp.CpInviteInfo;
+import com.chwl.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/chwl/core/im/custom/bean/CustomAttachParser.java
similarity index 68%
rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CustomAttachParser.java
rename to core/src/main/java/com/chwl/core/im/custom/bean/CustomAttachParser.java
index 42780e771..130333d42 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CustomAttachParser.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/CustomAttachParser.java
@@ -1,131 +1,131 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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_CLAN;
-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_FAIRY;
-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_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_LUCKY_SEA;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_ROOM_NOTIFY;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_SERVER_NOTIFY;
-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_CLANAPPLY;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_CLANNORMAL;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_FAIRY_ASK_FOR;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_FAIRY_SEND;
-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_DIAMOND2;
-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.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.ROOM_FREE_GIFT;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.ROOM_FREE_GIFT_CHANGE;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.ROOM_FREE_GIFT_REST;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_DYNAMTC_BAN_DELETE;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_DYNAMTC_PASS;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_DYNAMTC_UNREADCOUNT;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_CAR;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_ROOM_PK;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ASSISTANT_COMMON_MSG;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ASSISTANT_MSG;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_BOX;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CHARM_LEVEL_UP;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CHATTER_BOX;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CHATTER_BOX_ASK;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CHATTER_BOX_DROP;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CHATTER_BOX_INIT;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CLAN;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAGON_BAR;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAW_GIFT_EFFECT;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_EXPER_LEVEL_UP;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_EXPER_LEVEL_UP_NOTICE;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_FAIRY;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_MEMBER_COUNT;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_ROOM_NOTIFY;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_TOPIC;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_ROOM_JOIN_NOTICE;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_COMMON_SYSTEM_MSG;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_KICK_MIC;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_LUCKY_MONEY;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_SEND_MAGIC;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_SHARE_IN_APP;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEAD_SHIFT_OUT;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_IM_TIP;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LEAVE_MODE;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LEAVE_MODE_NOTICE;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LEVEL_UP;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_ROOM_NOTIFY;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_SERVER_NOTIFY;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MENTORING_RELATIONSHIP;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MINI_WORLD;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MODULE_HALL;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_PUBLIC_CHAT_HALL;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_QUEUING_MIC;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RADISH;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RED_PACKAGE;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ROOM_GIFT_VALUE;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_FAMILY;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_MINI_WORLD;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_ROOM;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_TEAM;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SIGN_IN;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_CLANAPPLY;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_CLANNORMAL;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_FAIRY_ASK_FOR;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_FAIRY_SEND;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_APPLY_EXIT;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_APPLY_JOIN;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_MANAGER_INVITE;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_NOTICE;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_TO_BE_OWNER;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_PUBLIC_CHAT_HALL_AIT;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_PUBLIC_CHAT_HALL_AIT_ME;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_PUBLIC_CHAT_HALL_FULL_SCREEN;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_PUBLIC_CHAT_HALL_GIFT;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_RED_PACKAGE_RECEIVE_ALL_DIAMOND;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_RED_PACKAGE_RECEIVE_ROOM_DIAMOND;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_RED_PACKAGE_RECEIVE_ROOM_DIAMOND2;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_RED_PACKAGE_RECEIVE_ROOM_MSG;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_DRAW_GIFT_EFFECT;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_RECEIVE_LUCKY_MONEY;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_ADD_BLACK;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_KICK_ROOM;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_LUCKY_MONEY;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_MULTI_MAGIC;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_SINGLE_MAGIC;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_AUDIO;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_CLEAN_SCREEN;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_CLOSE_REDPACKAGE;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_CLOSE_SCREEN;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_GIFT;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_NOTICE;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VOICE_BOTTLE_HEAD;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VOICE_BOTTLE_SUB_HEART;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VOICE_BOTTLE_SUB_HELLO;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VOICE_BOTTLE_SUB_TO_RECORDING;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VOICE_BOTTLE_SUB_tO_MATCHING;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_NOTI_SUB_GAME_ATTACK;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_NOTI_SUB_GAME_RESULT;
+import static com.chwl.core.im.custom.bean.CustomAttachment.ROOM_FREE_GIFT;
+import static com.chwl.core.im.custom.bean.CustomAttachment.ROOM_FREE_GIFT_CHANGE;
+import static com.chwl.core.im.custom.bean.CustomAttachment.ROOM_FREE_GIFT_REST;
 
 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.R;
-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.gift.GiftModel;
-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.module_hall.im.ClanAttachment;
-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.ResUtil;
-import com.yizhuan.xchat_android_library.utils.log.MLog;
+import com.chwl.core.R;
+import com.chwl.core.bean.attachmsg.RoomQueueMsgAttachment;
+import com.chwl.core.community.attachment.DynamicSysAttachment;
+import com.chwl.core.community.attachment.UnReadCountAttachment;
+import com.chwl.core.community.im.WorldDynamicAttachment;
+import com.chwl.core.gift.GiftModel;
+import com.chwl.core.im.custom.AttachManager;
+import com.chwl.core.mentoring_relationship.attachment.MentoringApprenticeMissionFourAttachment;
+import com.chwl.core.mentoring_relationship.attachment.MentoringApprenticeMissionOneAttachment;
+import com.chwl.core.mentoring_relationship.attachment.MentoringApprenticeMissionThreeAttachment;
+import com.chwl.core.mentoring_relationship.attachment.MentoringApprenticeMissionTwoAttachment;
+import com.chwl.core.mentoring_relationship.attachment.MentoringMasterMissionFourAttachment;
+import com.chwl.core.mentoring_relationship.attachment.MentoringMasterMissionOneAttachment;
+import com.chwl.core.mentoring_relationship.attachment.MentoringMasterMissionThreeAttachment;
+import com.chwl.core.mentoring_relationship.attachment.MentoringMasterMissionTwoAttachment;
+import com.chwl.core.mentoring_relationship.attachment.MentoringMissionTipsAttachment;
+import com.chwl.core.mentoring_relationship.attachment.MentoringSharingRoomAttachment;
+import com.chwl.core.miniworld.bean.MWChatMemberCountAttachment;
+import com.chwl.core.miniworld.bean.MWChatTopicAttachment;
+import com.chwl.core.miniworld.bean.OpenAudioPartyAttachment;
+import com.chwl.core.module_hall.im.ClanAttachment;
+import com.chwl.core.public_chat_hall.attachment.AitFriendsAttachment;
+import com.chwl.core.public_chat_hall.attachment.AitMeAttachment;
+import com.chwl.core.room.bean.LeaveModeAttachment;
+import com.chwl.core.room.pk.attachment.RoomPkAttachment;
+import com.chwl.core.room.queuing_mic.attachment.QueuingMicAttachment;
+import com.chwl.core.super_admin.attachment.SuperAdminOpAttachment;
+import com.chwl.core.super_admin.util.SaMsgUtil;
+import com.chwl.core.utils.LogUtils;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.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/chwl/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/chwl/core/im/custom/bean/CustomAttachment.java
index eb0253bf7..532dc9868 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CustomAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/CustomAttachment.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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.chwl.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/chwl/core/im/custom/bean/DatingAllNotifyAttachment.java
similarity index 88%
rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/DatingAllNotifyAttachment.java
rename to core/src/main/java/com/chwl/core/im/custom/bean/DatingAllNotifyAttachment.java
index 123268fc1..e6ea9eed6 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/DatingAllNotifyAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/DatingAllNotifyAttachment.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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.chwl.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/chwl/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/chwl/core/im/custom/bean/DatingAttachment.java
index e95b4fcf7..10298fa42 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/DatingAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/DatingAttachment.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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.chwl.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/chwl/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/chwl/core/im/custom/bean/DatingPublishAttachment.java
index 411109164..35209489c 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/DatingPublishAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/DatingPublishAttachment.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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.chwl.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/chwl/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/chwl/core/im/custom/bean/DiceThrowAttachment.java
index 2711d911f..798d7d562 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/DiceThrowAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/DiceThrowAttachment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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/chwl/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/chwl/core/im/custom/bean/DrawGiftAttachment.java
index 69a720f96..4af973f69 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/DrawGiftAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/DrawGiftAttachment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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/chwl/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/chwl/core/im/custom/bean/FaceAttachment.java
index 8dc9b23cb..f0b68c0d4 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/FaceAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/FaceAttachment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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.chwl.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/FairyMsgAttachment.java b/core/src/main/java/com/chwl/core/im/custom/bean/FairyMsgAttachment.java
similarity index 85%
rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/FairyMsgAttachment.java
rename to core/src/main/java/com/chwl/core/im/custom/bean/FairyMsgAttachment.java
index b10064ef6..52ce31e73 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/FairyMsgAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/FairyMsgAttachment.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.core.im.custom.bean;
 
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
-import com.yizhuan.xchat_android_core.treasurefairy.FairyMsgInfoBean;
+import com.chwl.core.treasurefairy.FairyMsgInfoBean;
 
 /**
  * Created by chenran on 2017/10/4.
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/FairySendAttachment.java b/core/src/main/java/com/chwl/core/im/custom/bean/FairySendAttachment.java
similarity index 97%
rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/FairySendAttachment.java
rename to core/src/main/java/com/chwl/core/im/custom/bean/FairySendAttachment.java
index 380cc1eb5..72b61b00d 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/FairySendAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/FairySendAttachment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.core.im.custom.bean;
 
 import com.alibaba.fastjson.JSONObject;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/FansTeamMsgAttachment.java b/core/src/main/java/com/chwl/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/chwl/core/im/custom/bean/FansTeamMsgAttachment.java
index a8beb34b5..14c9d187e 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/FansTeamMsgAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/FansTeamMsgAttachment.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.core.im.custom.bean;
 
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
-import com.yizhuan.xchat_android_core.fansteam.FansTeamMsgInfo;
+import com.chwl.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/chwl/core/im/custom/bean/GiftAttachment.java
similarity index 93%
rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/GiftAttachment.java
rename to core/src/main/java/com/chwl/core/im/custom/bean/GiftAttachment.java
index 7bfddc67c..c53779305 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/GiftAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/GiftAttachment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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.GiftReceiveInfo;
-import com.yizhuan.xchat_android_core.room.giftvalue.bean.IndexGiftValue;
+import com.chwl.core.gift.bean.GiftInfo;
+import com.chwl.core.gift.bean.GiftReceiveInfo;
+import com.chwl.core.room.giftvalue.bean.IndexGiftValue;
 
 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/chwl/core/im/custom/bean/GiftBatchAttachment.java
similarity index 91%
rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/GiftBatchAttachment.java
rename to core/src/main/java/com/chwl/core/im/custom/bean/GiftBatchAttachment.java
index eeeaea117..dc3f71555 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/GiftBatchAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/GiftBatchAttachment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.core.im.custom.bean;
 
 import android.text.TextUtils;
 
@@ -8,10 +8,10 @@ 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.chwl.core.gift.bean.GiftInfo;
+import com.chwl.core.gift.bean.GiftMultiReceiverInfo;
+import com.chwl.core.gift.bean.GiftReceiver;
+import com.chwl.core.room.giftvalue.bean.IndexGiftValue;
 
 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/chwl/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/chwl/core/im/custom/bean/GiftCompoundAttachment.java
index ec03bc2bb..108de7d4f 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/GiftCompoundAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/GiftCompoundAttachment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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/chwl/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/chwl/core/im/custom/bean/GiftCompoundMsgBean.java
index 2e688c024..74e1ab7c5 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/GiftCompoundMsgBean.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/GiftCompoundMsgBean.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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/chwl/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/chwl/core/im/custom/bean/ImTipAttachment.java
index ff9ac9d59..5be93c0dd 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/ImTipAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/ImTipAttachment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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/chwl/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/chwl/core/im/custom/bean/InAppSharingFamilyAttachment.java
index 837127d25..34f0d67ba 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/InAppSharingFamilyAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/InAppSharingFamilyAttachment.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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.chwl.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/chwl/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/chwl/core/im/custom/bean/InAppSharingMiniWorldAttachment.java
index c8f84e4e5..8973604b8 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/InAppSharingMiniWorldAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/InAppSharingMiniWorldAttachment.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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.chwl.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/chwl/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/chwl/core/im/custom/bean/InAppSharingRoomAttachment.java
index 2e2eff08a..2bb0cec43 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/InAppSharingRoomAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/InAppSharingRoomAttachment.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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.chwl.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/chwl/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/chwl/core/im/custom/bean/InAppSharingTeamAttachment.java
index fa1aa528f..3535fd487 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/InAppSharingTeamAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/InAppSharingTeamAttachment.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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.chwl.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/chwl/core/im/custom/bean/JoinMiniWorldAttachment.java
similarity index 82%
rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/JoinMiniWorldAttachment.java
rename to core/src/main/java/com/chwl/core/im/custom/bean/JoinMiniWorldAttachment.java
index b2446a849..56c60fc59 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/JoinMiniWorldAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/JoinMiniWorldAttachment.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.core.im.custom.bean;
 
-import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInWorldInfo;
-import com.yizhuan.xchat_android_core.user.bean.UserInfo;
+import com.chwl.core.miniworld.bean.MiniWorldInWorldInfo;
+import com.chwl.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/chwl/core/im/custom/bean/JoinMiniWorldNoticeAttachment.java
similarity index 97%
rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/JoinMiniWorldNoticeAttachment.java
rename to core/src/main/java/com/chwl/core/im/custom/bean/JoinMiniWorldNoticeAttachment.java
index 3d9b62875..614ca7c6b 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/JoinMiniWorldNoticeAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/JoinMiniWorldNoticeAttachment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.core.im.custom.bean;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/LevelUpAttachment.java b/core/src/main/java/com/chwl/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/chwl/core/im/custom/bean/LevelUpAttachment.java
index 8a6b23f31..2eb0c4c61 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/LevelUpAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/LevelUpAttachment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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/chwl/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/chwl/core/im/custom/bean/LevelUpNoticeAttachment.java
index efa2029e2..e5111433a 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/LevelUpNoticeAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/LevelUpNoticeAttachment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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/chwl/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/chwl/core/im/custom/bean/LotteryAttachment.java
index 39c913aba..ebac3f367 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/LotteryAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/LotteryAttachment.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.core.im.custom.bean;
 
 import com.alibaba.fastjson.JSONObject;
-import com.yizhuan.xchat_android_core.activity.bean.LotteryInfo;
+import com.chwl.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/chwl/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/chwl/core/im/custom/bean/LuckyMoneyAttachment.java
index 8d74d64de..4afec05fc 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/LuckyMoneyAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/LuckyMoneyAttachment.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.core.im.custom.bean;
 
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
-import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyInfo;
+import com.chwl.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/chwl/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/chwl/core/im/custom/bean/LuckyMoneyTipsAttachment.java
index 2f137bbc2..4910968b7 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/LuckyMoneyTipsAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/LuckyMoneyTipsAttachment.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.core.im.custom.bean;
 
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
-import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyInfo;
+import com.chwl.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/chwl/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/chwl/core/im/custom/bean/MagicAllMicAttachment.java
index dabe8bd0a..48fdaf713 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MagicAllMicAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/MagicAllMicAttachment.java
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.core.im.custom.bean;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-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.MultiMagicReceivedInfo;
+import com.chwl.core.magic.MagicModel;
+import com.chwl.core.magic.bean.MagicInfo;
+import com.chwl.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/chwl/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/chwl/core/im/custom/bean/MagicAttachment.java
index 3ad220e36..7f126e751 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MagicAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/MagicAttachment.java
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.core.im.custom.bean;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-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.chwl.core.magic.MagicModel;
+import com.chwl.core.magic.bean.MagicInfo;
+import com.chwl.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/chwl/core/im/custom/bean/MagicBatchAttachment.java
similarity index 89%
rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MagicBatchAttachment.java
rename to core/src/main/java/com/chwl/core/im/custom/bean/MagicBatchAttachment.java
index 60c8e3900..b95c5a502 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MagicBatchAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/MagicBatchAttachment.java
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.core.im.custom.bean;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-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.chwl.core.magic.MagicModel;
+import com.chwl.core.magic.bean.MagicInfo;
+import com.chwl.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/chwl/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/chwl/core/im/custom/bean/MatchAttachment.java
index a6655f820..5a06324f8 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MatchAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/MatchAttachment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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/chwl/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/chwl/core/im/custom/bean/MatchTicketAttachment.java
index 0f68c9328..64ca9e2e8 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MatchTicketAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/MatchTicketAttachment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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/chwl/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/chwl/core/im/custom/bean/MonsterAttackAttachment.java
index 510127f03..3f42632e2 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MonsterAttackAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/MonsterAttackAttachment.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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.chwl.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/chwl/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/chwl/core/im/custom/bean/MonsterHuntingResultAttachment.java
index af0e37721..b15fec316 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MonsterHuntingResultAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/MonsterHuntingResultAttachment.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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.chwl.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/chwl/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/chwl/core/im/custom/bean/MonsterStatusAttachment.java
index ccdc06d40..7ccf6d377 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MonsterStatusAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/MonsterStatusAttachment.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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.chwl.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/chwl/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/chwl/core/im/custom/bean/MultiGiftAttachment.java
index 8ee2d0cde..db18d3e89 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MultiGiftAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/MultiGiftAttachment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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.chwl.core.gift.bean.GiftInfo;
+import com.chwl.core.gift.bean.MultiGiftReceiveInfo;
+import com.chwl.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/chwl/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/chwl/core/im/custom/bean/MultiLuckyGiftAttachment.java
index cf0946567..8797adbda 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MultiLuckyGiftAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/MultiLuckyGiftAttachment.java
@@ -1,12 +1,12 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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.chwl.core.gift.bean.LuckyBagGifts;
+import com.chwl.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/NewbieHelloAttachment.java b/core/src/main/java/com/chwl/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/chwl/core/im/custom/bean/NewbieHelloAttachment.java
index 1454cf97b..e283f9205 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/NewbieHelloAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/NewbieHelloAttachment.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.core.im.custom.bean;
 
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
-import com.yizhuan.xchat_android_core.newbie.NewbieHelloInfo;
+import com.chwl.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/chwl/core/im/custom/bean/NobleAttachment.java
similarity index 92%
rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/NobleAttachment.java
rename to core/src/main/java/com/chwl/core/im/custom/bean/NobleAttachment.java
index 37f7527e2..1fb7e9766 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/NobleAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/NobleAttachment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.core.im.custom.bean;
 
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
@@ -8,11 +8,11 @@ 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_core.R;
-import com.yizhuan.xchat_android_core.noble.NobleInfo;
-import com.yizhuan.xchat_android_core.noble.NobleProtocol;
-import com.yizhuan.xchat_android_library.rxbus.RxBusHelper;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.core.noble.NobleInfo;
+import com.chwl.core.noble.NobleProtocol;
+import com.chwl.library.rxbus.RxBusHelper;
+import com.chwl.library.utils.ResUtil;
 
 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/chwl/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/chwl/core/im/custom/bean/NoticeAttachment.java
index f5c3889b0..6ce72457d 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/NoticeAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/NoticeAttachment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.core.im.custom.bean;
 
 import com.alibaba.fastjson.JSONObject;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/NotifyH5Attachment.kt b/core/src/main/java/com/chwl/core/im/custom/bean/NotifyH5Attachment.kt
similarity index 85%
rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/NotifyH5Attachment.kt
rename to core/src/main/java/com/chwl/core/im/custom/bean/NotifyH5Attachment.kt
index e6e457c18..ebe72cf55 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/NotifyH5Attachment.kt
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/NotifyH5Attachment.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean
+package com.chwl.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/NotifyH5Info.java b/core/src/main/java/com/chwl/core/im/custom/bean/NotifyH5Info.java
similarity index 80%
rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/NotifyH5Info.java
rename to core/src/main/java/com/chwl/core/im/custom/bean/NotifyH5Info.java
index 51d934682..cac33935f 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/NotifyH5Info.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/NotifyH5Info.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.core.im.custom.bean;
 
 import lombok.Data;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/OpenRoomNotiAttachment.java b/core/src/main/java/com/chwl/core/im/custom/bean/OpenRoomNotiAttachment.java
similarity index 95%
rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/OpenRoomNotiAttachment.java
rename to core/src/main/java/com/chwl/core/im/custom/bean/OpenRoomNotiAttachment.java
index fd7e35cbc..274d1f24a 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/OpenRoomNotiAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/OpenRoomNotiAttachment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.core.im.custom.bean;
 
 import com.alibaba.fastjson.JSONObject;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/OpenSignInAttachment.java b/core/src/main/java/com/chwl/core/im/custom/bean/OpenSignInAttachment.java
similarity index 86%
rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/OpenSignInAttachment.java
rename to core/src/main/java/com/chwl/core/im/custom/bean/OpenSignInAttachment.java
index ee5d55b2b..6e1bdb9c6 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/OpenSignInAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/OpenSignInAttachment.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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.chwl.core.radish.signin.bean.ImNotice;
 
 import lombok.Getter;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/P2PContactRechargeAttachment.java b/core/src/main/java/com/chwl/core/im/custom/bean/P2PContactRechargeAttachment.java
similarity index 91%
rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/P2PContactRechargeAttachment.java
rename to core/src/main/java/com/chwl/core/im/custom/bean/P2PContactRechargeAttachment.java
index 16eb59e64..ef1f7ab22 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/P2PContactRechargeAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/P2PContactRechargeAttachment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.core.im.custom.bean;
 
 import com.alibaba.fastjson.JSONObject;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/PlayEffectInfo.java b/core/src/main/java/com/chwl/core/im/custom/bean/PlayEffectInfo.java
similarity index 65%
rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/PlayEffectInfo.java
rename to core/src/main/java/com/chwl/core/im/custom/bean/PlayEffectInfo.java
index 558dcd44c..c650c5f5e 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/PlayEffectInfo.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/PlayEffectInfo.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.core.im.custom.bean;
 
-import com.yizhuan.xchat_android_core.gift.bean.LuckyBagNoticeInfo;
-import com.yizhuan.xchat_android_core.treasurefairy.FairyMsgInfoBean;
+import com.chwl.core.gift.bean.LuckyBagNoticeInfo;
+import com.chwl.core.treasurefairy.FairyMsgInfoBean;
 
 import lombok.Data;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RedPackageAttachment.java b/core/src/main/java/com/chwl/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/chwl/core/im/custom/bean/RedPackageAttachment.java
index e48be6a34..7d4687ad9 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RedPackageAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/RedPackageAttachment.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.core.im.custom.bean;
 
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
-import com.yizhuan.xchat_android_core.redpackage.RedPackageNotifyInfo;
+import com.chwl.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/chwl/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/chwl/core/im/custom/bean/RedPackageRoomMsgAttachment.java
index 84a407cee..7a0aa9012 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RedPackageRoomMsgAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/RedPackageRoomMsgAttachment.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.core.im.custom.bean;
 
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
-import com.yizhuan.xchat_android_core.redpackage.RedEnvelopeRoomMsg;
+import com.chwl.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/chwl/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/chwl/core/im/custom/bean/RedPacketAttachment.java
index 0d109fba3..eeddc0733 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RedPacketAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/RedPacketAttachment.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.core.im.custom.bean;
 
 import com.alibaba.fastjson.JSONObject;
-import com.yizhuan.xchat_android_core.redPacket.bean.RedPacketInfoV2;
+import com.chwl.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/chwl/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/chwl/core/im/custom/bean/RequestUpmicAttachment.java
index 06455d8d4..302df7197 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RequestUpmicAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/RequestUpmicAttachment.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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.chwl.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/chwl/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/chwl/core/im/custom/bean/RewardBean.java
index 976239f88..487e9b896 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RewardBean.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/RewardBean.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.core.im.custom.bean;
 
 import java.io.Serializable;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomAlbumAttachment.java b/core/src/main/java/com/chwl/core/im/custom/bean/RoomAlbumAttachment.java
similarity index 89%
rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomAlbumAttachment.java
rename to core/src/main/java/com/chwl/core/im/custom/bean/RoomAlbumAttachment.java
index 299dcec4c..e5d421819 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomAlbumAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/RoomAlbumAttachment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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/RoomAlbumMsgInfo.kt b/core/src/main/java/com/chwl/core/im/custom/bean/RoomAlbumMsgInfo.kt
similarity index 50%
rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomAlbumMsgInfo.kt
rename to core/src/main/java/com/chwl/core/im/custom/bean/RoomAlbumMsgInfo.kt
index 9656cf7b1..5f8a546dc 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomAlbumMsgInfo.kt
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/RoomAlbumMsgInfo.kt
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.im.custom.bean
+package com.chwl.core.im.custom.bean
 
-import com.yizhuan.xchat_android_core.level.UserLevelVo
+import com.chwl.core.level.UserLevelVo
 
 data class RoomAlbumMsgInfo(
     val roomPhoto: RoomPhoto,
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomBoxPrizeAttachment.java b/core/src/main/java/com/chwl/core/im/custom/bean/RoomBoxPrizeAttachment.java
similarity index 94%
rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomBoxPrizeAttachment.java
rename to core/src/main/java/com/chwl/core/im/custom/bean/RoomBoxPrizeAttachment.java
index bb83326ef..c9caba238 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomBoxPrizeAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/RoomBoxPrizeAttachment.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.core.im.custom.bean;
 
 import com.alibaba.fastjson.JSONObject;
 import com.netease.nim.uikit.common.util.string.StringUtil;
-import com.yizhuan.xchat_android_core.R;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.library.utils.ResUtil;
 
 /**
  * Created by chenran on 2017/10/4.
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomBoxPrizeInfo.java b/core/src/main/java/com/chwl/core/im/custom/bean/RoomBoxPrizeInfo.java
similarity index 82%
rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomBoxPrizeInfo.java
rename to core/src/main/java/com/chwl/core/im/custom/bean/RoomBoxPrizeInfo.java
index 1ccd83ceb..73c93f093 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomBoxPrizeInfo.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/RoomBoxPrizeInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.core.im.custom.bean;
 
 import lombok.Data;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomFollowOwnerAttachment.java b/core/src/main/java/com/chwl/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/chwl/core/im/custom/bean/RoomFollowOwnerAttachment.java
index 53d8ed490..5e3afead2 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomFollowOwnerAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/RoomFollowOwnerAttachment.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.core.im.custom.bean;
 
-import com.yizhuan.xchat_android_core.user.bean.UserInfo;
+import com.chwl.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/chwl/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/chwl/core/im/custom/bean/RoomFollowOwnerAttachment2.java
index b9624c6ef..5e99519c4 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomFollowOwnerAttachment2.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/RoomFollowOwnerAttachment2.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.core.im.custom.bean;
 
-import com.yizhuan.xchat_android_core.user.bean.UserInfo;
+import com.chwl.core.user.bean.UserInfo;
 
 /**
  * 聊天室弹出关注房主的提示
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomFreeGiftAttachment.java b/core/src/main/java/com/chwl/core/im/custom/bean/RoomFreeGiftAttachment.java
similarity index 93%
rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomFreeGiftAttachment.java
rename to core/src/main/java/com/chwl/core/im/custom/bean/RoomFreeGiftAttachment.java
index 59eb59d9b..5ed2201c4 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomFreeGiftAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/RoomFreeGiftAttachment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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/RoomFreeGiftMsgBean.java b/core/src/main/java/com/chwl/core/im/custom/bean/RoomFreeGiftMsgBean.java
similarity index 80%
rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomFreeGiftMsgBean.java
rename to core/src/main/java/com/chwl/core/im/custom/bean/RoomFreeGiftMsgBean.java
index 656306102..1efa2b7b3 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomFreeGiftMsgBean.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/RoomFreeGiftMsgBean.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.core.im.custom.bean;
 
 import lombok.Data;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomGiftValueAttachment.java b/core/src/main/java/com/chwl/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/chwl/core/im/custom/bean/RoomGiftValueAttachment.java
index 45c65015c..524c947aa 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomGiftValueAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/RoomGiftValueAttachment.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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.chwl.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/chwl/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/chwl/core/im/custom/bean/RoomInfoAttachment.java
index 5ade16f95..1d747374b 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomInfoAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/RoomInfoAttachment.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.core.im.custom.bean;
 
 import com.alibaba.fastjson.JSONObject;
-import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
+import com.chwl.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/chwl/core/im/custom/bean/RoomInviteFansAttachment.java
similarity index 93%
rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomInviteFansAttachment.java
rename to core/src/main/java/com/chwl/core/im/custom/bean/RoomInviteFansAttachment.java
index 7b2f1cc67..144bed58f 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomInviteFansAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/RoomInviteFansAttachment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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/RoomInviteFansInfo.java b/core/src/main/java/com/chwl/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/chwl/core/im/custom/bean/RoomInviteFansInfo.java
index 40f7f579d..cdd3ce9ce 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomInviteFansInfo.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/RoomInviteFansInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.core.im.custom.bean;
 
 import java.io.Serializable;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomLuckySeaAttachment.java b/core/src/main/java/com/chwl/core/im/custom/bean/RoomLuckySeaAttachment.java
similarity index 94%
rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomLuckySeaAttachment.java
rename to core/src/main/java/com/chwl/core/im/custom/bean/RoomLuckySeaAttachment.java
index 4382ecc81..40eb967bc 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomLuckySeaAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/RoomLuckySeaAttachment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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/RoomLuckySeaMsgBean.java b/core/src/main/java/com/chwl/core/im/custom/bean/RoomLuckySeaMsgBean.java
similarity index 85%
rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomLuckySeaMsgBean.java
rename to core/src/main/java/com/chwl/core/im/custom/bean/RoomLuckySeaMsgBean.java
index f108e4d1f..66b82e045 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomLuckySeaMsgBean.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/RoomLuckySeaMsgBean.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.core.im.custom.bean;
 
 import lombok.Data;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomNoticeAttachment.java b/core/src/main/java/com/chwl/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/chwl/core/im/custom/bean/RoomNoticeAttachment.java
index e8e972f0c..3063e3fb5 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomNoticeAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/RoomNoticeAttachment.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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.chwl.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/chwl/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/chwl/core/im/custom/bean/RoomPKAttachment.java
index 5f22df23b..57140ac46 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomPKAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/RoomPKAttachment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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/RoomPhoto.kt b/core/src/main/java/com/chwl/core/im/custom/bean/RoomPhoto.kt
similarity index 84%
rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomPhoto.kt
rename to core/src/main/java/com/chwl/core/im/custom/bean/RoomPhoto.kt
index f93d7a863..6ff5af9d5 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomPhoto.kt
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/RoomPhoto.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean
+package com.chwl.core.im.custom.bean
 
 data class RoomPhoto(
     val createTime: String,
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomPkBean.java b/core/src/main/java/com/chwl/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/chwl/core/im/custom/bean/RoomPkBean.java
index f0fbcd405..870d0bd30 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomPkBean.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/RoomPkBean.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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/chwl/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/chwl/core/im/custom/bean/RoomRankAttachment.java
index 550424ba7..9bec06c2c 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomRankAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/RoomRankAttachment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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/chwl/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/chwl/core/im/custom/bean/RoomRankMsgBean.java
index 5b538dd76..702b0f3d7 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomRankMsgBean.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/RoomRankMsgBean.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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/chwl/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/chwl/core/im/custom/bean/RoomReceivedLuckyGiftAttachment.java
index edde37f6c..3b0a22727 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomReceivedLuckyGiftAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/RoomReceivedLuckyGiftAttachment.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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.chwl.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/chwl/core/im/custom/bean/RoomTipAttachment.java
similarity index 92%
rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomTipAttachment.java
rename to core/src/main/java/com/chwl/core/im/custom/bean/RoomTipAttachment.java
index 403954c9d..cc5a892d6 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomTipAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/RoomTipAttachment.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.core.im.custom.bean;
 
 import com.alibaba.fastjson.JSONObject;
 import com.netease.nim.uikit.common.util.string.StringUtil;
-import com.yizhuan.xchat_android_core.R;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.library.utils.ResUtil;
 
 /**
  * Created by chenran on 2017/10/4.
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RouterType.java b/core/src/main/java/com/chwl/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/chwl/core/im/custom/bean/RouterType.java
index 461dfed0d..77210b556 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RouterType.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/RouterType.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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/chwl/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/chwl/core/im/custom/bean/SingleRoomRankAttachment.java
index 67e073b76..27275a97d 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SingleRoomRankAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/SingleRoomRankAttachment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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/chwl/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/chwl/core/im/custom/bean/SingleRoomRankMsgBean.java
index b2f54dbbe..0351beb0b 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SingleRoomRankMsgBean.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/SingleRoomRankMsgBean.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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/chwl/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/chwl/core/im/custom/bean/SkillMsgAttachment.java
index 076546775..87601a91b 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SkillMsgAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/SkillMsgAttachment.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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.chwl.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/chwl/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/chwl/core/im/custom/bean/SysMsgAttachment.java
index d2fc5cbb9..d0f16c6a3 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SysMsgAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/SysMsgAttachment.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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.chwl.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/chwl/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/chwl/core/im/custom/bean/SysMsgV2Attachment.java
index 95f26b666..6fa2fba42 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SysMsgV2Attachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/SysMsgV2Attachment.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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.chwl.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/chwl/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/chwl/core/im/custom/bean/SysMsgVoiceAttachment.java
index fcc45ef28..4e0afa337 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SysMsgVoiceAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/SysMsgVoiceAttachment.java
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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.chwl.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/chwl/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/chwl/core/im/custom/bean/TarotAttachment.java
index 4c3f6d87e..3388cc3c6 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/TarotAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/TarotAttachment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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/chwl/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/chwl/core/im/custom/bean/TarotMsgBean.java
index df9136a7a..25f0d21c6 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/TarotMsgBean.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/TarotMsgBean.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.core.im.custom.bean;
 
 import lombok.Data;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/User.kt b/core/src/main/java/com/chwl/core/im/custom/bean/User.kt
similarity index 93%
rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/User.kt
rename to core/src/main/java/com/chwl/core/im/custom/bean/User.kt
index efa29bd9a..a4ea547ea 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/User.kt
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/User.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.custom.bean
+package com.chwl.core.im.custom.bean
 
 data class User(
     val avatar: String,
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/VipMessageAttachment.java b/core/src/main/java/com/chwl/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/chwl/core/im/custom/bean/VipMessageAttachment.java
index 15f44a9ee..8940e5d21 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/VipMessageAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/VipMessageAttachment.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.core.im.custom.bean;
 
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
-import com.yizhuan.xchat_android_core.vip.VipMessageInfo;
+import com.chwl.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/chwl/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/chwl/core/im/custom/bean/VoiceBottleSayHiAttachment.java
index c31957d0f..a4334185b 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/VoiceBottleSayHiAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/VoiceBottleSayHiAttachment.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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.chwl.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/chwl/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/chwl/core/im/custom/bean/VoiceBottleShakeHeartAttachment.java
index c6d00ddf6..6f3e86df1 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/VoiceBottleShakeHeartAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/VoiceBottleShakeHeartAttachment.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.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.chwl.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/chwl/core/im/custom/bean/WelcomeAttachment.java
similarity index 88%
rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/WelcomeAttachment.java
rename to core/src/main/java/com/chwl/core/im/custom/bean/WelcomeAttachment.java
index 7a17a0e1e..04b0561f3 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/WelcomeAttachment.java
+++ b/core/src/main/java/com/chwl/core/im/custom/bean/WelcomeAttachment.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.im.custom.bean;
+package com.chwl.core.im.custom.bean;
 
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
-import com.yizhuan.xchat_android_core.auth.AuthModel;
-import com.yizhuan.xchat_android_core.room.bean.WelcomeInfo;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.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/chwl/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/chwl/core/im/friend/IIMFriendCore.java
index 41766d32e..ce135a42f 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/friend/IIMFriendCore.java
+++ b/core/src/main/java/com/chwl/core/im/friend/IIMFriendCore.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.im.friend;
+package com.chwl.core.im.friend;
 
 import com.netease.nimlib.sdk.friend.constant.FriendFieldEnum;
-import com.yizhuan.xchat_android_library.coremanager.IBaseCore;
+import com.chwl.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/chwl/core/im/friend/IMFriendModel.java
similarity index 91%
rename from core/src/main/java/com/yizhuan/xchat_android_core/im/friend/IMFriendModel.java
rename to core/src/main/java/com/chwl/core/im/friend/IMFriendModel.java
index cb99975d1..293646549 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/friend/IMFriendModel.java
+++ b/core/src/main/java/com/chwl/core/im/friend/IMFriendModel.java
@@ -1,19 +1,19 @@
-package com.yizhuan.xchat_android_core.im.friend;
+package com.chwl.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.R;
-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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.core.bean.response.result.UserListResult;
+import com.chwl.core.manager.BaseMvpModel;
+import com.chwl.core.manager.IMMessageManager;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.manager.RelationShipEvent;
+import com.chwl.core.user.bean.UserInfo;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.utils.ResUtil;
 
 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/chwl/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/chwl/core/im/login/IIMLoginClient.java
index a29effb51..6469ebeb2 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/login/IIMLoginClient.java
+++ b/core/src/main/java/com/chwl/core/im/login/IIMLoginClient.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.login;
+package com.chwl.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/chwl/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/chwl/core/im/login/IIMLoginCore.java
index 9c721ee49..717275bae 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/login/IIMLoginCore.java
+++ b/core/src/main/java/com/chwl/core/im/login/IIMLoginCore.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.im.login;
+package com.chwl.core.im.login;
 
 import com.netease.nimlib.sdk.auth.OnlineClient;
-import com.yizhuan.xchat_android_core.base.IModel;
+import com.chwl.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/chwl/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/chwl/core/im/notification/INotificationCore.java
index c48be6564..40e7ea489 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/notification/INotificationCore.java
+++ b/core/src/main/java/com/chwl/core/im/notification/INotificationCore.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.im.notification;
+package com.chwl.core.im.notification;
 
 import com.netease.nimlib.sdk.msg.model.CustomNotification;
-import com.yizhuan.xchat_android_library.coremanager.IBaseCore;
+import com.chwl.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/chwl/core/im/notification/INotificationCoreClient.java
similarity index 72%
rename from core/src/main/java/com/yizhuan/xchat_android_core/im/notification/INotificationCoreClient.java
rename to core/src/main/java/com/chwl/core/im/notification/INotificationCoreClient.java
index 7b3add40a..251ae0036 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/notification/INotificationCoreClient.java
+++ b/core/src/main/java/com/chwl/core/im/notification/INotificationCoreClient.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.im.notification;
+package com.chwl.core.im.notification;
 
 import com.alibaba.fastjson.JSONObject;
-import com.yizhuan.xchat_android_library.coremanager.ICoreClient;
+import com.chwl.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/chwl/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/chwl/core/im/room/IIMRoomCoreClient.java
index 45fcc9f87..e05b08f92 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/room/IIMRoomCoreClient.java
+++ b/core/src/main/java/com/chwl/core/im/room/IIMRoomCoreClient.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.im.room;
+package com.chwl.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.chwl.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/chwl/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/chwl/core/im/state/IPhoneCallStateModel.java
index 10d9fe5f3..0be25d264 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/state/IPhoneCallStateModel.java
+++ b/core/src/main/java/com/chwl/core/im/state/IPhoneCallStateModel.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.im.state;
+package com.chwl.core.im.state;
 
-import com.yizhuan.xchat_android_core.base.IModel;
+import com.chwl.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/chwl/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/chwl/core/im/state/PhoneCallStateModel.java
index d10db46b1..cebfbd430 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/state/PhoneCallStateModel.java
+++ b/core/src/main/java/com/chwl/core/im/state/PhoneCallStateModel.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.im.state;
+package com.chwl.core.im.state;
 
 import android.telephony.TelephonyManager;
 import android.util.Log;
 
-import com.yizhuan.xchat_android_core.base.BaseModel;
+import com.chwl.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/chwl/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/chwl/core/im/sysmsg/ISysMsgCore.java
index 8bffb9c3b..e15538577 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/sysmsg/ISysMsgCore.java
+++ b/core/src/main/java/com/chwl/core/im/sysmsg/ISysMsgCore.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.im.sysmsg;
+package com.chwl.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.chwl.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/chwl/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/chwl/core/im/sysmsg/ISysMsgCoreClient.java
index 2f970d444..d98291c3b 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/sysmsg/ISysMsgCoreClient.java
+++ b/core/src/main/java/com/chwl/core/im/sysmsg/ISysMsgCoreClient.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.im.sysmsg;
+package com.chwl.core.im.sysmsg;
 
 import com.netease.nimlib.sdk.msg.model.SystemMessage;
-import com.yizhuan.xchat_android_library.coremanager.ICoreClient;
+import com.chwl.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/chwl/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/chwl/core/initial/FaceComponent.java
index b5f58f1c6..0f403d962 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/initial/FaceComponent.java
+++ b/core/src/main/java/com/chwl/core/initial/FaceComponent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.initial;
+package com.chwl.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/chwl/core/initial/IInitialModel.java
similarity index 76%
rename from core/src/main/java/com/yizhuan/xchat_android_core/initial/IInitialModel.java
rename to core/src/main/java/com/chwl/core/initial/IInitialModel.java
index 4ff38bb61..685634345 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/initial/IInitialModel.java
+++ b/core/src/main/java/com/chwl/core/initial/IInitialModel.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.initial;
+package com.chwl.core.initial;
 
 import android.annotation.SuppressLint;
 
@@ -6,12 +6,12 @@ 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.FairyOpenInfo;
-import com.yizhuan.xchat_android_core.initial.bean.InitInfo;
+import com.chwl.core.base.IModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.home.bean.MainTabInfo;
+import com.chwl.core.initial.bean.BoxInfo;
+import com.chwl.core.initial.bean.FairyOpenInfo;
+import com.chwl.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/chwl/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/chwl/core/initial/InitialModel.java
index b14cce097..f974f0dcb 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/initial/InitialModel.java
+++ b/core/src/main/java/com/chwl/core/initial/InitialModel.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.initial;
+package com.chwl.core.initial;
 
 
 import android.annotation.SuppressLint;
@@ -18,32 +18,32 @@ import com.bumptech.glide.request.target.Target;
 import com.example.lib_utils.LanguageUtils;
 import com.example.lib_utils.TelephonyUtils;
 import com.netease.nim.uikit.support.glide.GlideApp;
-import com.yizhuan.xchat_android_core.R;
-import com.yizhuan.xchat_android_core.DemoCache;
-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.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.FairyOpenInfo;
-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.user.event.LoadLoginUserInfoEvent;
-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.ResUtil;
-import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
+import com.chwl.core.R;
+import com.chwl.core.DemoCache;
+import com.chwl.core.auth.event.LogoutEvent;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.certification.CertificationModel;
+import com.chwl.core.home.bean.MainTabInfo;
+import com.chwl.core.home.bean.MainTabType;
+import com.chwl.core.initial.bean.BoxInfo;
+import com.chwl.core.initial.bean.FairyOpenInfo;
+import com.chwl.core.initial.bean.InitInfo;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.noble.NobleDataManager;
+import com.chwl.core.public_chat_hall.manager.PublicChatHallDataManager;
+import com.chwl.core.room.face.DynamicFaceModel;
+import com.chwl.core.user.event.LoadLoginUserInfoEvent;
+import com.chwl.core.utils.CurrentTimeUtils;
+import com.chwl.core.utils.SharedPreferenceUtils;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.core.withdraw.WithdrawModel;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.utils.JavaUtil;
+import com.chwl.library.utils.ListUtils;
+import com.chwl.library.utils.NetworkUtils;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.config.BasicConfig;
 
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/initial/NobleResourceComponent.java b/core/src/main/java/com/chwl/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/chwl/core/initial/NobleResourceComponent.java
index b1acb67bd..69d925cec 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/initial/NobleResourceComponent.java
+++ b/core/src/main/java/com/chwl/core/initial/NobleResourceComponent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.initial;
+package com.chwl.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/chwl/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/chwl/core/initial/SplashComponent.java
index 62bc5f22a..b14e91089 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/initial/SplashComponent.java
+++ b/core/src/main/java/com/chwl/core/initial/SplashComponent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.initial;
+package com.chwl.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/chwl/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/chwl/core/initial/bean/BoxInfo.java
index 3ca273585..45ebf22b6 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/BoxInfo.java
+++ b/core/src/main/java/com/chwl/core/initial/bean/BoxInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.initial.bean;
+package com.chwl.core.initial.bean;
 
 import lombok.Data;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/FairyOpenInfo.java b/core/src/main/java/com/chwl/core/initial/bean/FairyOpenInfo.java
similarity index 87%
rename from core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/FairyOpenInfo.java
rename to core/src/main/java/com/chwl/core/initial/bean/FairyOpenInfo.java
index 033058bf7..4286ce907 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/FairyOpenInfo.java
+++ b/core/src/main/java/com/chwl/core/initial/bean/FairyOpenInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.initial.bean;
+package com.chwl.core.initial.bean;
 
 public class FairyOpenInfo {
     private int levelLimit;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/InitInfo.java b/core/src/main/java/com/chwl/core/initial/bean/InitInfo.java
similarity index 91%
rename from core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/InitInfo.java
rename to core/src/main/java/com/chwl/core/initial/bean/InitInfo.java
index 55e7e2378..168653de6 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/InitInfo.java
+++ b/core/src/main/java/com/chwl/core/initial/bean/InitInfo.java
@@ -1,12 +1,12 @@
-package com.yizhuan.xchat_android_core.initial.bean;
+package com.chwl.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.chwl.core.initial.FaceComponent;
+import com.chwl.core.initial.NobleResourceComponent;
+import com.chwl.core.initial.SplashComponent;
+import com.chwl.core.monsterhunting.bean.MonsterInitInfo;
+import com.chwl.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/chwl/core/initial/bean/RedEnvelopeConfig.java
similarity index 97%
rename from core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/RedEnvelopeConfig.java
rename to core/src/main/java/com/chwl/core/initial/bean/RedEnvelopeConfig.java
index 99b14e355..3edf0e4ee 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/RedEnvelopeConfig.java
+++ b/core/src/main/java/com/chwl/core/initial/bean/RedEnvelopeConfig.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.initial.bean;
+package com.chwl.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/chwl/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/chwl/core/initial/bean/TaxInfo.java
index bb14006f3..d970d8ccc 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/TaxInfo.java
+++ b/core/src/main/java/com/chwl/core/initial/bean/TaxInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.initial.bean;
+package com.chwl.core.initial.bean;
 
 import java.io.Serializable;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/interceptor/MyOkHttpRetryInterceptor.java b/core/src/main/java/com/chwl/core/interceptor/MyOkHttpRetryInterceptor.java
similarity index 94%
rename from core/src/main/java/com/yizhuan/xchat_android_core/interceptor/MyOkHttpRetryInterceptor.java
rename to core/src/main/java/com/chwl/core/interceptor/MyOkHttpRetryInterceptor.java
index 3cb1fcf50..ffcb793ad 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/interceptor/MyOkHttpRetryInterceptor.java
+++ b/core/src/main/java/com/chwl/core/interceptor/MyOkHttpRetryInterceptor.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.interceptor;
+package com.chwl.core.interceptor;
 
-import com.yizhuan.xchat_android_core.utils.Logger;
+import com.chwl.core.utils.Logger;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/interceptor/NoParamsInterceptor.java b/core/src/main/java/com/chwl/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/chwl/core/interceptor/NoParamsInterceptor.java
index 36e8939c7..dab1a3fe6 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/interceptor/NoParamsInterceptor.java
+++ b/core/src/main/java/com/chwl/core/interceptor/NoParamsInterceptor.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.interceptor;
+package com.chwl.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/chwl/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/chwl/core/interceptor/ParamsInterceptor.java
index 9a73ebb67..448a9e2f7 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/interceptor/ParamsInterceptor.java
+++ b/core/src/main/java/com/chwl/core/interceptor/ParamsInterceptor.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.interceptor;
+package com.chwl.core.interceptor;
 
 
 import android.text.TextUtils;
@@ -6,10 +6,10 @@ import android.text.TextUtils;
 import androidx.annotation.NonNull;
 
 import com.example.lib_utils.TelephonyUtils;
-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.chwl.core.auth.AuthModel;
+import com.chwl.core.utils.APIEncryptUtil;
+import com.chwl.core.utils.OaidUtil;
+import com.chwl.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/chwl/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/chwl/core/interceptor/PathFilter.java
index d4211fb49..bb608418b 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/interceptor/PathFilter.java
+++ b/core/src/main/java/com/chwl/core/interceptor/PathFilter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.interceptor;
+package com.chwl.core.interceptor;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/interceptor/TimeSyncInterceptor.kt b/core/src/main/java/com/chwl/core/interceptor/TimeSyncInterceptor.kt
similarity index 92%
rename from core/src/main/java/com/yizhuan/xchat_android_core/interceptor/TimeSyncInterceptor.kt
rename to core/src/main/java/com/chwl/core/interceptor/TimeSyncInterceptor.kt
index 164129b17..0d3a8f2ff 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/interceptor/TimeSyncInterceptor.kt
+++ b/core/src/main/java/com/chwl/core/interceptor/TimeSyncInterceptor.kt
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.interceptor
+package com.chwl.core.interceptor
 
 import com.example.lib_utils.AppUtils
 import com.example.lib_utils.ServiceTime
-import com.yizhuan.xchat_android_core.utils.LogUtils
-import com.yizhuan.xchat_android_library.utils.NetworkUtils
+import com.chwl.core.utils.LogUtils
+import com.chwl.library.utils.NetworkUtils
 import okhttp3.Headers
 import okhttp3.Interceptor
 import okhttp3.Response
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/kick/IKickModel.java b/core/src/main/java/com/chwl/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/chwl/core/kick/IKickModel.java
index 1a26a309a..31cf33fad 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/kick/IKickModel.java
+++ b/core/src/main/java/com/chwl/core/kick/IKickModel.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.kick;
+package com.chwl.core.kick;
 
 import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage;
-import com.yizhuan.xchat_android_core.base.IModel;
+import com.chwl.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/chwl/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/chwl/core/kick/KickModel.java
index 1bcc1679e..96632f8b1 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/kick/KickModel.java
+++ b/core/src/main/java/com/chwl/core/kick/KickModel.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.kick;
+package com.chwl.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.chwl.core.base.BaseModel;
+import com.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.manager.RoomEvent;
+import com.chwl.core.super_admin.util.SaMsgUtil;
+import com.chwl.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/chwl/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/chwl/core/level/UserLevelResourceType.java
index 734b404b2..4c3e3372b 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/level/UserLevelResourceType.java
+++ b/core/src/main/java/com/chwl/core/level/UserLevelResourceType.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.level;
+package com.chwl.core.level;
 
 /**
  * 
  

diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/level/UserLevelVo.java b/core/src/main/java/com/chwl/core/level/UserLevelVo.java
similarity index 98%
rename from core/src/main/java/com/yizhuan/xchat_android_core/level/UserLevelVo.java
rename to core/src/main/java/com/chwl/core/level/UserLevelVo.java
index ec61c0150..e4866ce35 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/level/UserLevelVo.java
+++ b/core/src/main/java/com/chwl/core/level/UserLevelVo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.level;
+package com.chwl.core.level;
 
 import java.io.Serializable;
 import java.util.HashMap;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/level/event/CharmLevelUpEvent.java b/core/src/main/java/com/chwl/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/chwl/core/level/event/CharmLevelUpEvent.java
index 5a6d2cc1a..be247c1ac 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/level/event/CharmLevelUpEvent.java
+++ b/core/src/main/java/com/chwl/core/level/event/CharmLevelUpEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.level.event;
+package com.chwl.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/chwl/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/chwl/core/level/event/LevelUpEvent.java
index 6d4eb6532..e839f2475 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/level/event/LevelUpEvent.java
+++ b/core/src/main/java/com/chwl/core/level/event/LevelUpEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.level.event;
+package com.chwl.core.level.event;
 
 public class LevelUpEvent {
 
diff --git a/core/src/main/java/com/chwl/core/linked/ILinkedModel.java b/core/src/main/java/com/chwl/core/linked/ILinkedModel.java
new file mode 100644
index 000000000..cddabdcc1
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/linked/ILinkedModel.java
@@ -0,0 +1,13 @@
+package com.chwl.core.linked;
+
+import com.chwl.core.base.IModel;
+import com.chwl.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/chwl/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/chwl/core/linked/LinkedModel.java
index c33b0ceeb..30b6dee48 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/linked/LinkedModel.java
+++ b/core/src/main/java/com/chwl/core/linked/LinkedModel.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.linked;
+package com.chwl.core.linked;
 
-import com.yizhuan.xchat_android_core.base.BaseModel;
-import com.yizhuan.xchat_android_core.linked.bean.LinkedInfo;
+import com.chwl.core.base.BaseModel;
+import com.chwl.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/chwl/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/chwl/core/linked/bean/LinkedInfo.java
index a00eb1173..07c75b862 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/linked/bean/LinkedInfo.java
+++ b/core/src/main/java/com/chwl/core/linked/bean/LinkedInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.linked.bean;
+package com.chwl.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/chwl/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/chwl/core/linked/event/LinkMeInfoUpdateEvent.java
index 9027b1813..af499eeb1 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/linked/event/LinkMeInfoUpdateEvent.java
+++ b/core/src/main/java/com/chwl/core/linked/event/LinkMeInfoUpdateEvent.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.linked.event;
+package com.chwl.core.linked.event;
 
-import com.yizhuan.xchat_android_core.linked.bean.LinkedInfo;
+import com.chwl.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/chwl/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/chwl/core/luckymoney/LuckyMoneyInfo.java
index 094f7755e..9557a1344 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/luckymoney/LuckyMoneyInfo.java
+++ b/core/src/main/java/com/chwl/core/luckymoney/LuckyMoneyInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.luckymoney;
+package com.chwl.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/chwl/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/chwl/core/luckymoney/LuckyMoneyRecordsInfo.java
index 647c8988b..21137a8b6 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/luckymoney/LuckyMoneyRecordsInfo.java
+++ b/core/src/main/java/com/chwl/core/luckymoney/LuckyMoneyRecordsInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.luckymoney;
+package com.chwl.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/chwl/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/chwl/core/luckymoney/LuckyMoneyUserInfo.java
index 1e2a1165c..9d1db8310 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/luckymoney/LuckyMoneyUserInfo.java
+++ b/core/src/main/java/com/chwl/core/luckymoney/LuckyMoneyUserInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.luckymoney;
+package com.chwl.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/chwl/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/chwl/core/magic/IMagicModel.java
index 286b48c95..60cd46f89 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/magic/IMagicModel.java
+++ b/core/src/main/java/com/chwl/core/magic/IMagicModel.java
@@ -1,13 +1,13 @@
-package com.yizhuan.xchat_android_core.magic;
+package com.chwl.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.chwl.core.base.IModel;
+import com.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.core.magic.bean.MagicInfo;
+import com.chwl.core.magic.bean.MagicMultiReceiverInfo;
+import com.chwl.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/chwl/core/magic/MagicModel.java
similarity index 91%
rename from core/src/main/java/com/yizhuan/xchat_android_core/magic/MagicModel.java
rename to core/src/main/java/com/chwl/core/magic/MagicModel.java
index 1ba0c4963..2e89d2d13 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/magic/MagicModel.java
+++ b/core/src/main/java/com/chwl/core/magic/MagicModel.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.magic;
+package com.chwl.core.magic;
 
 import android.annotation.SuppressLint;
 import android.os.Handler;
@@ -9,35 +9,35 @@ 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.R;
-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.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.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.exception.MagicOutOfDateException;
-import com.yizhuan.xchat_android_core.magic.toolbox.MagicToolbox;
-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.retry.ImRetryManager;
-import com.yizhuan.xchat_android_core.retry.RetryChatRoomMessage;
-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.utils.net.BalanceNotEnoughExeption;
-import com.yizhuan.xchat_android_core.utils.net.FreezeException;
-import com.yizhuan.xchat_android_library.net.rxnet.RxNet;
-import com.yizhuan.xchat_android_library.utils.ListUtils;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.exception.UnKnowException;
+import com.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.core.im.custom.bean.MagicAllMicAttachment;
+import com.chwl.core.im.custom.bean.MagicAttachment;
+import com.chwl.core.im.custom.bean.MagicBatchAttachment;
+import com.chwl.core.magic.bean.MagicInfo;
+import com.chwl.core.magic.bean.MagicMultiReceiverInfo;
+import com.chwl.core.magic.bean.MagicReceivedInfo;
+import com.chwl.core.magic.bean.MultiMagicReceivedInfo;
+import com.chwl.core.magic.exception.MagicOutOfDateException;
+import com.chwl.core.magic.toolbox.MagicToolbox;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.manager.RoomEvent;
+import com.chwl.core.pay.PayModel;
+import com.chwl.core.retry.ImRetryManager;
+import com.chwl.core.retry.RetryChatRoomMessage;
+import com.chwl.core.room.bean.RoomInfo;
+import com.chwl.core.room.giftvalue.bean.GiftValueCommonUpdate;
+import com.chwl.core.room.giftvalue.helper.GiftValueMrg;
+import com.chwl.core.utils.net.BalanceNotEnoughExeption;
+import com.chwl.core.utils.net.FreezeException;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.utils.ListUtils;
+import com.chwl.library.utils.ResUtil;
 
 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/chwl/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/chwl/core/magic/ObjectPool.java
index c56ba915c..3adde3226 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/magic/ObjectPool.java
+++ b/core/src/main/java/com/chwl/core/magic/ObjectPool.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.magic;
+package com.chwl.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/chwl/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/chwl/core/magic/bean/MagicInfo.java
index 86b3f5911..8719e4601 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MagicInfo.java
+++ b/core/src/main/java/com/chwl/core/magic/bean/MagicInfo.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.magic.bean;
+package com.chwl.core.magic.bean;
 
 import com.google.gson.annotations.SerializedName;
-import com.yizhuan.xchat_android_core.gift.bean.GiftInfo;
+import com.chwl.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/chwl/core/magic/bean/MagicMultiReceiverInfo.java
similarity index 90%
rename from core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MagicMultiReceiverInfo.java
rename to core/src/main/java/com/chwl/core/magic/bean/MagicMultiReceiverInfo.java
index 65059c8c4..c05a04e62 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MagicMultiReceiverInfo.java
+++ b/core/src/main/java/com/chwl/core/magic/bean/MagicMultiReceiverInfo.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.magic.bean;
+package com.chwl.core.magic.bean;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.google.gson.annotations.SerializedName;
-import com.yizhuan.xchat_android_core.room.giftvalue.bean.RoomGiftValue;
+import com.chwl.core.room.giftvalue.bean.RoomGiftValue;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MagicReceivedInfo.java b/core/src/main/java/com/chwl/core/magic/bean/MagicReceivedInfo.java
similarity index 90%
rename from core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MagicReceivedInfo.java
rename to core/src/main/java/com/chwl/core/magic/bean/MagicReceivedInfo.java
index d6f5a819f..f17228e9e 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MagicReceivedInfo.java
+++ b/core/src/main/java/com/chwl/core/magic/bean/MagicReceivedInfo.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.magic.bean;
+package com.chwl.core.magic.bean;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.google.gson.annotations.SerializedName;
-import com.yizhuan.xchat_android_core.room.giftvalue.bean.RoomGiftValue;
+import com.chwl.core.room.giftvalue.bean.RoomGiftValue;
 
 import java.io.Serializable;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MagicReceiver.java b/core/src/main/java/com/chwl/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/chwl/core/magic/bean/MagicReceiver.java
index a5d0111ce..7388aa760 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MagicReceiver.java
+++ b/core/src/main/java/com/chwl/core/magic/bean/MagicReceiver.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.magic.bean;
+package com.chwl.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/chwl/core/magic/bean/MultiMagicReceivedInfo.java
similarity index 89%
rename from core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MultiMagicReceivedInfo.java
rename to core/src/main/java/com/chwl/core/magic/bean/MultiMagicReceivedInfo.java
index 7896d3815..2d62791d6 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MultiMagicReceivedInfo.java
+++ b/core/src/main/java/com/chwl/core/magic/bean/MultiMagicReceivedInfo.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.magic.bean;
+package com.chwl.core.magic.bean;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.google.gson.annotations.SerializedName;
-import com.yizhuan.xchat_android_core.room.giftvalue.bean.RoomGiftValue;
+import com.chwl.core.room.giftvalue.bean.RoomGiftValue;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/magic/exception/MagicOutOfDateException.java b/core/src/main/java/com/chwl/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/chwl/core/magic/exception/MagicOutOfDateException.java
index d0b4e6d53..e0fe76485 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/magic/exception/MagicOutOfDateException.java
+++ b/core/src/main/java/com/chwl/core/magic/exception/MagicOutOfDateException.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.magic.exception;
+package com.chwl.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/chwl/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/chwl/core/magic/toolbox/MagicToolbox.java
index 2e46b641c..4d5c9b559 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/magic/toolbox/MagicToolbox.java
+++ b/core/src/main/java/com/chwl/core/magic/toolbox/MagicToolbox.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.magic.toolbox;
+package com.chwl.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.chwl.core.magic.bean.MagicMultiReceiverInfo;
+import com.chwl.core.magic.bean.MagicReceiver;
+import com.chwl.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/chwl/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/chwl/core/manager/AvRoomDataManager.java
index 433ab4e24..4e4db3ec7 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/manager/AvRoomDataManager.java
+++ b/core/src/main/java/com/chwl/core/manager/AvRoomDataManager.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.manager;
+package com.chwl.core.manager;
 
 import android.annotation.SuppressLint;
 import android.graphics.Point;
@@ -22,30 +22,30 @@ 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_core.R;
+import com.chwl.core.R;
 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.FindLoveSwitchVo;
-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.bean.SeizeTreasureSwitchVo;
-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.super_admin.SuperAdminDataMrg;
-import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil;
-import com.yizhuan.xchat_android_core.support.room.RoomContext;
-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.utils.ListUtils;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.DemoCache;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.bean.RoomQueueInfo;
+import com.chwl.core.im.custom.bean.RoomPkBean;
+import com.chwl.core.room.bean.BoxSwitchVo;
+import com.chwl.core.room.bean.FindLoveSwitchVo;
+import com.chwl.core.room.bean.RoomInfo;
+import com.chwl.core.room.bean.RoomModeType;
+import com.chwl.core.room.bean.SeizeTreasureSwitchVo;
+import com.chwl.core.room.bean.SimplePartyRoomInfo;
+import com.chwl.core.room.event.RoomClearScreenEvent;
+import com.chwl.core.room.game.GameStatus;
+import com.chwl.core.room.giftvalue.helper.GiftValueMrg;
+import com.chwl.core.super_admin.SuperAdminDataMrg;
+import com.chwl.core.super_admin.util.SuperAdminUtil;
+import com.chwl.core.support.room.RoomContext;
+import com.chwl.core.user.UserModel;
+import com.chwl.core.utils.CurrentTimeUtils;
+import com.chwl.core.utils.LogUtils;
+import com.chwl.core.utils.StringUtils;
+import com.chwl.library.utils.ListUtils;
+import com.chwl.library.utils.ResUtil;
 
 import org.greenrobot.eventbus.EventBus;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/manager/BaseMvpModel.java b/core/src/main/java/com/chwl/core/manager/BaseMvpModel.java
similarity index 95%
rename from core/src/main/java/com/yizhuan/xchat_android_core/manager/BaseMvpModel.java
rename to core/src/main/java/com/chwl/core/manager/BaseMvpModel.java
index e102e6868..47e531016 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/manager/BaseMvpModel.java
+++ b/core/src/main/java/com/chwl/core/manager/BaseMvpModel.java
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_core.manager;
+package com.chwl.core.manager;
 
 import com.netease.nimlib.sdk.util.api.RequestResult;
-import com.yizhuan.xchat_android_core.R;
-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.ResUtil;
+import com.chwl.core.R;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.library.net.rxnet.callback.CallBack;
+import com.chwl.library.utils.ResUtil;
 
 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/chwl/core/manager/IMBroadcastManager.java
similarity index 89%
rename from core/src/main/java/com/yizhuan/xchat_android_core/manager/IMBroadcastManager.java
rename to core/src/main/java/com/chwl/core/manager/IMBroadcastManager.java
index 49c25ff61..13426c0b4 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/manager/IMBroadcastManager.java
+++ b/core/src/main/java/com/chwl/core/manager/IMBroadcastManager.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.manager;
+package com.chwl.core.manager;
 
 import android.text.TextUtils;
 
@@ -7,10 +7,10 @@ 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.bean.NewestVersionInfo;
-import com.yizhuan.xchat_android_core.upgrade.event.ImPushUpdateAppEvent;
+import com.chwl.core.bean.BaseProtocol;
+import com.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.core.upgrade.bean.NewestVersionInfo;
+import com.chwl.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/chwl/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/chwl/core/manager/IMMessageManager.java
index 373fea99d..3cd1f7426 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/manager/IMMessageManager.java
+++ b/core/src/main/java/com/chwl/core/manager/IMMessageManager.java
@@ -1,14 +1,14 @@
-package com.yizhuan.xchat_android_core.manager;
+package com.chwl.core.manager;
 
-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.chwl.core.im.custom.bean.CustomAttachment.CP_INVITE_MESSAGE;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_LOTTERY;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_PACKET;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LEVEL_UP;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MODULE_HALL;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_NEWBIE;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RECEIV_NEWBIE_HELLO;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_NOTICE;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_TO_BE_OWNER;
 
 import android.util.Log;
 
@@ -26,23 +26,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.chwl.core.activity.event.ActivityEvent;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.im.custom.bean.CpInviteAttachment;
+import com.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.core.im.custom.bean.LevelUpAttachment;
+import com.chwl.core.im.custom.bean.LotteryAttachment;
+import com.chwl.core.im.custom.bean.LuckyMoneyTipsAttachment;
+import com.chwl.core.im.custom.bean.NewbieHelloAttachment;
+import com.chwl.core.im.custom.bean.RedPacketAttachment;
+import com.chwl.core.level.event.CharmLevelUpEvent;
+import com.chwl.core.level.event.LevelUpEvent;
+import com.chwl.core.luckymoney.LuckyMoneyInfo;
+import com.chwl.core.manager.event.HallInfoChangeEvent;
+import com.chwl.core.newbie.NewbieHelloInfo;
+import com.chwl.core.newbie.event.NewbieHelloDialogEvent;
+import com.chwl.core.relation.cp.CpInviteInfo;
+import com.chwl.core.web.event.WebViewRefreshEvent;
 
 import org.greenrobot.eventbus.EventBus;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/manager/IMSystemMsgManager.java b/core/src/main/java/com/chwl/core/manager/IMSystemMsgManager.java
similarity index 79%
rename from core/src/main/java/com/yizhuan/xchat_android_core/manager/IMSystemMsgManager.java
rename to core/src/main/java/com/chwl/core/manager/IMSystemMsgManager.java
index ff6abeb6a..781cf074d 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/manager/IMSystemMsgManager.java
+++ b/core/src/main/java/com/chwl/core/manager/IMSystemMsgManager.java
@@ -1,19 +1,19 @@
-package com.yizhuan.xchat_android_core.manager;
+package com.chwl.core.manager;
 
-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.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_DYNAMTC_UNREADCOUNT;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_MEMBER_COUNT;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_ROOM_NOTIFY;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_TOPIC;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_ACCOUNT;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_VISITOR;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_WORLD_DYNAMIC;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MINI_WORLD;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ROOM_TASK_TIPS;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_ROOM_TASK_TIPS;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_VISITOR_UNREAD;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP_SELF_OPEN;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP_SELF_UPGRADE;
 
 import android.text.TextUtils;
 import android.util.Log;
@@ -28,37 +28,37 @@ 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.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.chwl.core.auth.AuthModel;
+import com.chwl.core.community.attachment.UnReadCountAttachment;
+import com.chwl.core.community.event.UnReadCountEvent;
+import com.chwl.core.home.event.VisitorUnreadCountEvent;
+import com.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.core.im.custom.bean.VoiceBottleSayHiAttachment;
+import com.chwl.core.mentoring_relationship.attachment.MentoringApprenticeMissionFourAttachment;
+import com.chwl.core.mentoring_relationship.attachment.MentoringApprenticeMissionOneAttachment;
+import com.chwl.core.mentoring_relationship.attachment.MentoringApprenticeMissionThreeAttachment;
+import com.chwl.core.mentoring_relationship.attachment.MentoringApprenticeMissionTwoAttachment;
+import com.chwl.core.mentoring_relationship.attachment.MentoringGrabApprenticesAttachment;
+import com.chwl.core.mentoring_relationship.attachment.MentoringMasterMissionFourAttachment;
+import com.chwl.core.mentoring_relationship.attachment.MentoringMasterMissionOneAttachment;
+import com.chwl.core.mentoring_relationship.attachment.MentoringMasterMissionThreeAttachment;
+import com.chwl.core.mentoring_relationship.attachment.MentoringMasterMissionTwoAttachment;
+import com.chwl.core.mentoring_relationship.attachment.MentoringMissionTipsAttachment;
+import com.chwl.core.mentoring_relationship.event.MentoringRelationshipMissionEvent;
+import com.chwl.core.miniworld.event.MWChatTopicEvent;
+import com.chwl.core.miniworld.event.MWGroupChatMemberEvent;
+import com.chwl.core.patriarch.bean.LimitNotice;
+import com.chwl.core.patriarch.event.ImPushMsgPmLimitTimeEvent;
+import com.chwl.core.pay.bean.FirstChargeGoods;
+import com.chwl.core.pay.event.ChargeCustomNotificationEvent;
+import com.chwl.core.pay.event.FirstChargeEvent;
+import com.chwl.core.pay.event.FirstRechargeEvent;
+import com.chwl.core.pay.event.NewUserChargeEvent;
+import com.chwl.core.room.event.RoomTaskTipsEvent;
+import com.chwl.core.user.UserModel;
+import com.chwl.core.vip.VipInfo;
+import com.chwl.core.vip.VipOpenEvent;
+import com.chwl.core.vip.VipUpgradeEvent;
 
 import org.greenrobot.eventbus.EventBus;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/manager/RelationShipEvent.java b/core/src/main/java/com/chwl/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/chwl/core/manager/RelationShipEvent.java
index 42559d2b8..b9dafcdac 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/manager/RelationShipEvent.java
+++ b/core/src/main/java/com/chwl/core/manager/RelationShipEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.manager;
+package com.chwl.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/chwl/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/chwl/core/manager/RoomEvent.java
index 7aefa207a..2f114d5f3 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/manager/RoomEvent.java
+++ b/core/src/main/java/com/chwl/core/manager/RoomEvent.java
@@ -1,25 +1,25 @@
-package com.yizhuan.xchat_android_core.manager;
+package com.chwl.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.chwl.core.bean.RoomQueueInfo;
+import com.chwl.core.bean.attachmsg.RoomQueueMsgAttachment;
+import com.chwl.core.gift.bean.GiftMultiReceiverInfo;
+import com.chwl.core.gift.bean.GiftReceiveInfo;
+import com.chwl.core.gift.bean.LuckyBagGifts;
+import com.chwl.core.gift.bean.MultiGiftReceiveInfo;
+import com.chwl.core.im.custom.bean.AssistantAttachment;
+import com.chwl.core.im.custom.bean.CarAttachment;
+import com.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.core.im.custom.bean.MonsterHuntingResultAttachment;
+import com.chwl.core.im.custom.bean.MonsterStatusAttachment;
+import com.chwl.core.im.custom.bean.NobleAttachment;
+import com.chwl.core.magic.bean.MagicReceivedInfo;
+import com.chwl.core.magic.bean.MultiMagicReceivedInfo;
+import com.chwl.core.monsterhunting.bean.MonsterAttackInfo;
+import com.chwl.core.pay.bean.WalletInfo;
+import com.chwl.core.room.auction.bean.AuctionInfo;
+import com.chwl.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/chwl/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/chwl/core/manager/event/HallInfoChangeEvent.java
index 33c50e309..5655a3cdf 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/manager/event/HallInfoChangeEvent.java
+++ b/core/src/main/java/com/chwl/core/manager/event/HallInfoChangeEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.manager.event;
+package com.chwl.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/chwl/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/chwl/core/manager/event/HistoryMessageEvent.java
index dd9c22f44..00172235f 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/manager/event/HistoryMessageEvent.java
+++ b/core/src/main/java/com/chwl/core/manager/event/HistoryMessageEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.manager.event;
+package com.chwl.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/chwl/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/chwl/core/monsterhunting/SimpleAnimationListener.java
index 82cb438c6..4bebafff1 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/SimpleAnimationListener.java
+++ b/core/src/main/java/com/chwl/core/monsterhunting/SimpleAnimationListener.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.monsterhunting;
+package com.chwl.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/chwl/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/chwl/core/monsterhunting/bean/MonsterAttackInfo.java
index a1ecbf427..27d53c0c5 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterAttackInfo.java
+++ b/core/src/main/java/com/chwl/core/monsterhunting/bean/MonsterAttackInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.monsterhunting.bean;
+package com.chwl.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/chwl/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/chwl/core/monsterhunting/bean/MonsterAttackReceiveInfo.java
index e06be7e69..f7f03cc0b 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterAttackReceiveInfo.java
+++ b/core/src/main/java/com/chwl/core/monsterhunting/bean/MonsterAttackReceiveInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.monsterhunting.bean;
+package com.chwl.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/chwl/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/chwl/core/monsterhunting/bean/MonsterEvent.java
index ae4184eeb..f3e23ebc0 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterEvent.java
+++ b/core/src/main/java/com/chwl/core/monsterhunting/bean/MonsterEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.monsterhunting.bean;
+package com.chwl.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/chwl/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/chwl/core/monsterhunting/bean/MonsterHunter.java
index 6f3c3dadb..4ac601e59 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterHunter.java
+++ b/core/src/main/java/com/chwl/core/monsterhunting/bean/MonsterHunter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.monsterhunting.bean;
+package com.chwl.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/chwl/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/chwl/core/monsterhunting/bean/MonsterHuntingResult.java
index c9532b2c5..5e4083b0b 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterHuntingResult.java
+++ b/core/src/main/java/com/chwl/core/monsterhunting/bean/MonsterHuntingResult.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.monsterhunting.bean;
+package com.chwl.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/chwl/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/chwl/core/monsterhunting/bean/MonsterHuntingReward.java
index f38bb3262..0ed958ddb 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterHuntingReward.java
+++ b/core/src/main/java/com/chwl/core/monsterhunting/bean/MonsterHuntingReward.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.monsterhunting.bean;
+package com.chwl.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/chwl/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/chwl/core/monsterhunting/bean/MonsterInfo.java
index ecad75be7..939651b35 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterInfo.java
+++ b/core/src/main/java/com/chwl/core/monsterhunting/bean/MonsterInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.monsterhunting.bean;
+package com.chwl.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/chwl/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/chwl/core/monsterhunting/bean/MonsterInitInfo.java
index 80d86b97e..8329b9648 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterInitInfo.java
+++ b/core/src/main/java/com/chwl/core/monsterhunting/bean/MonsterInitInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.monsterhunting.bean;
+package com.chwl.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/chwl/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/chwl/core/monsterhunting/bean/MonsterListInfo.java
index b5b56e44d..ab73fa0f7 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterListInfo.java
+++ b/core/src/main/java/com/chwl/core/monsterhunting/bean/MonsterListInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.monsterhunting.bean;
+package com.chwl.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/chwl/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/chwl/core/monsterhunting/bean/MonsterProtocol.java
index fa2ae908f..96d5e1e2f 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterProtocol.java
+++ b/core/src/main/java/com/chwl/core/monsterhunting/bean/MonsterProtocol.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.monsterhunting.bean;
+package com.chwl.core.monsterhunting.bean;
 
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import com.yizhuan.xchat_android_core.bean.BaseProtocol;
+import com.chwl.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/chwl/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/chwl/core/monsterhunting/manager/MonsterDataManager.java
index 571087123..70dfcc9ad 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/manager/MonsterDataManager.java
+++ b/core/src/main/java/com/chwl/core/monsterhunting/manager/MonsterDataManager.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.monsterhunting.manager;
+package com.chwl.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.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.monsterhunting.bean.MonsterInfo;
+import com.chwl.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/chwl/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/chwl/core/monsterhunting/model/IMonsterHuntingModel.java
index 85d209c48..f825a9bff 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/model/IMonsterHuntingModel.java
+++ b/core/src/main/java/com/chwl/core/monsterhunting/model/IMonsterHuntingModel.java
@@ -1,11 +1,11 @@
-package com.yizhuan.xchat_android_core.monsterhunting.model;
+package com.chwl.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.chwl.core.base.IModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.monsterhunting.bean.MonsterAttackInfo;
+import com.chwl.core.monsterhunting.bean.MonsterHuntingResult;
+import com.chwl.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/chwl/core/monsterhunting/model/MonsterHuntingModel.java
similarity index 91%
rename from core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/model/MonsterHuntingModel.java
rename to core/src/main/java/com/chwl/core/monsterhunting/model/MonsterHuntingModel.java
index 9655e26c1..bf826a7e4 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/model/MonsterHuntingModel.java
+++ b/core/src/main/java/com/chwl/core/monsterhunting/model/MonsterHuntingModel.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.monsterhunting.model;
+package com.chwl.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.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_MONSTER_HUNTING;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_MONSTER_HUNTING;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_NOTI_SUB_GAME_END;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_NOTI_SUB_GAME_RESULT;
 
 import android.os.CountDownTimer;
 import android.os.Handler;
@@ -21,26 +21,26 @@ 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.R;
-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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.BaseProtocol;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.core.im.custom.bean.MonsterAttackAttachment;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.manager.RoomEvent;
+import com.chwl.core.monsterhunting.bean.MonsterAttackInfo;
+import com.chwl.core.monsterhunting.bean.MonsterHuntingResult;
+import com.chwl.core.monsterhunting.bean.MonsterInfo;
+import com.chwl.core.monsterhunting.bean.MonsterProtocol;
+import com.chwl.core.monsterhunting.rxevent.MonsterUpdateEvent;
+import com.chwl.core.room.bean.RoomInfo;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.rxbus.RxBusHelper;
+import com.chwl.library.utils.ListUtils;
+import com.chwl.library.utils.ResUtil;
 
 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/chwl/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/chwl/core/monsterhunting/rxevent/MonsterUpdateEvent.java
index a1f51faf6..4418e6b4b 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/rxevent/MonsterUpdateEvent.java
+++ b/core/src/main/java/com/chwl/core/monsterhunting/rxevent/MonsterUpdateEvent.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.monsterhunting.rxevent;
+package com.chwl.core.monsterhunting.rxevent;
 
-import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterProtocol;
+import com.chwl.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/chwl/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/chwl/core/msg/ImsgClient.java
index 777727a4c..52b41d61b 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/msg/ImsgClient.java
+++ b/core/src/main/java/com/chwl/core/msg/ImsgClient.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.msg;
+package com.chwl.core.msg;
 
-import com.yizhuan.xchat_android_library.coremanager.ICoreClient;
+import com.chwl.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/chwl/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/chwl/core/msg/sys/ApproveMsgInfo.java
index f24d1a817..8d0b02e33 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ApproveMsgInfo.java
+++ b/core/src/main/java/com/chwl/core/msg/sys/ApproveMsgInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.msg.sys;
+package com.chwl.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/chwl/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/chwl/core/msg/sys/ErbanSysMsgComponent.java
index 377bbfd58..a02ddca7b 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ErbanSysMsgComponent.java
+++ b/core/src/main/java/com/chwl/core/msg/sys/ErbanSysMsgComponent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.msg.sys;
+package com.chwl.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/chwl/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/chwl/core/msg/sys/ErbanSysMsgInfo.java
index 61ce9d777..00ec9c908 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ErbanSysMsgInfo.java
+++ b/core/src/main/java/com/chwl/core/msg/sys/ErbanSysMsgInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.msg.sys;
+package com.chwl.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/chwl/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/chwl/core/msg/sys/ErbanSysMsgLayout.java
index 17f305281..17810e9f4 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ErbanSysMsgLayout.java
+++ b/core/src/main/java/com/chwl/core/msg/sys/ErbanSysMsgLayout.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.msg.sys;
+package com.chwl.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/chwl/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/chwl/core/msg/sys/ErbanSysMsgModel.java
index 76235dbd9..eaa106e0a 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ErbanSysMsgModel.java
+++ b/core/src/main/java/com/chwl/core/msg/sys/ErbanSysMsgModel.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.msg.sys;
+package com.chwl.core.msg.sys;
 
-import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
+import com.chwl.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/chwl/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/chwl/core/msg/sys/ErbanSysMsgParamKey.java
index c8e6071d1..15b5923e1 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ErbanSysMsgParamKey.java
+++ b/core/src/main/java/com/chwl/core/msg/sys/ErbanSysMsgParamKey.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.msg.sys;
+package com.chwl.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/chwl/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/chwl/core/msg/sysv2/ErbanSysMsgV2Component.java
index dd33f3a39..f34e62ad8 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sysv2/ErbanSysMsgV2Component.java
+++ b/core/src/main/java/com/chwl/core/msg/sysv2/ErbanSysMsgV2Component.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.msg.sysv2;
+package com.chwl.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/chwl/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/chwl/core/msg/sysv2/ErbanSysMsgV2Info.java
index 4b8fbc5cb..573484349 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sysv2/ErbanSysMsgV2Info.java
+++ b/core/src/main/java/com/chwl/core/msg/sysv2/ErbanSysMsgV2Info.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.msg.sysv2;
+package com.chwl.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/chwl/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/chwl/core/msg/sysv2/ErbanSysMsgV2Layout.java
index 20a140fd2..ca460f154 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sysv2/ErbanSysMsgV2Layout.java
+++ b/core/src/main/java/com/chwl/core/msg/sysv2/ErbanSysMsgV2Layout.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.msg.sysv2;
+package com.chwl.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/chwl/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/chwl/core/newbie/NewbieHelloInfo.java
index a04b866e6..175dbca14 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/newbie/NewbieHelloInfo.java
+++ b/core/src/main/java/com/chwl/core/newbie/NewbieHelloInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.newbie;
+package com.chwl.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/chwl/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/chwl/core/newbie/event/NewbieHelloDialogEvent.java
index cc9bdae5c..5cb45d1c7 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/newbie/event/NewbieHelloDialogEvent.java
+++ b/core/src/main/java/com/chwl/core/newbie/event/NewbieHelloDialogEvent.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.newbie.event;
+package com.chwl.core.newbie.event;
 
-import com.yizhuan.xchat_android_core.newbie.NewbieHelloInfo;
+import com.chwl.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/chwl/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/chwl/core/noble/AllServiceGiftProtocol.java
index fa83228f1..d95847445 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/noble/AllServiceGiftProtocol.java
+++ b/core/src/main/java/com/chwl/core/noble/AllServiceGiftProtocol.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.noble;
+package com.chwl.core.noble;
 
-import com.yizhuan.xchat_android_core.bean.BaseProtocol;
+import com.chwl.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/chwl/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/chwl/core/noble/NobleConfig.java
index 57458b39e..66a17ec5a 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleConfig.java
+++ b/core/src/main/java/com/chwl/core/noble/NobleConfig.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.noble;
+package com.chwl.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/chwl/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/chwl/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/chwl/core/noble/NobleDataManager.java
similarity index 95%
rename from core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleDataManager.java
rename to core/src/main/java/com/chwl/core/noble/NobleDataManager.java
index 90b7cb1f3..dd68282e6 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleDataManager.java
+++ b/core/src/main/java/com/chwl/core/noble/NobleDataManager.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.noble;
+package com.chwl.core.noble;
 
 import android.text.TextUtils;
 import android.util.Log;
@@ -7,17 +7,17 @@ import androidx.collection.LongSparseArray;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
-import com.yizhuan.xchat_android_core.DemoCache;
-import com.yizhuan.xchat_android_core.R;
-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.ResUtil;
-import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
+import com.chwl.core.DemoCache;
+import com.chwl.core.R;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.initial.InitialModel;
+import com.chwl.core.initial.NobleResourceComponent;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.manager.RoomEvent;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.utils.ListUtils;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.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/chwl/core/noble/NobleInfo.java
similarity index 99%
rename from core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleInfo.java
rename to core/src/main/java/com/chwl/core/noble/NobleInfo.java
index 8e892b4ff..5469b3db6 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleInfo.java
+++ b/core/src/main/java/com/chwl/core/noble/NobleInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.noble;
+package com.chwl.core.noble;
 
 import android.text.TextUtils;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleProtocol.java b/core/src/main/java/com/chwl/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/chwl/core/noble/NobleProtocol.java
index 38f8014b0..3bc882d28 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleProtocol.java
+++ b/core/src/main/java/com/chwl/core/noble/NobleProtocol.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.noble;
+package com.chwl.core.noble;
 
-import com.yizhuan.xchat_android_core.bean.BaseProtocol;
+import com.chwl.core.bean.BaseProtocol;
 
 /**
  * 
 贵族协议 

diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleResourceType.java b/core/src/main/java/com/chwl/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/chwl/core/noble/NobleResourceType.java
index 56f1a3e42..64d881ca6 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleResourceType.java
+++ b/core/src/main/java/com/chwl/core/noble/NobleResourceType.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.noble;
+package com.chwl.core.noble;
 
 /**
  * 所有资源的类型
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleRight.java b/core/src/main/java/com/chwl/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/chwl/core/noble/NobleRight.java
index 91e1ca8a0..c7fddf1d0 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleRight.java
+++ b/core/src/main/java/com/chwl/core/noble/NobleRight.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.noble;
+package com.chwl.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/chwl/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/chwl/core/noble/NobleUtil.java
index 3228e7f64..da85e7786 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleUtil.java
+++ b/core/src/main/java/com/chwl/core/noble/NobleUtil.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.noble;
+package com.chwl.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.chwl.core.room.queue.bean.MicMemberInfo;
+import com.chwl.core.user.bean.UserInfo;
+import com.chwl.core.utils.ExtensionUtil;
+import com.chwl.core.utils.ImageSplitter;
+import com.chwl.library.utils.ListUtils;
+import com.chwl.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/chwl/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/chwl/core/patriarch/bean/LimitNotice.java
index 92432d62e..1fb0de1ce 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/patriarch/bean/LimitNotice.java
+++ b/core/src/main/java/com/chwl/core/patriarch/bean/LimitNotice.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.patriarch.bean;
+package com.chwl.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/chwl/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/chwl/core/patriarch/event/CloseMinRoomEvent.java
index 60be427cc..a17be640a 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/patriarch/event/CloseMinRoomEvent.java
+++ b/core/src/main/java/com/chwl/core/patriarch/event/CloseMinRoomEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.patriarch.event;
+package com.chwl.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/chwl/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/chwl/core/patriarch/event/ImPushMsgPmLimitTimeEvent.java
index fdfc8c811..85dc75738 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/patriarch/event/ImPushMsgPmLimitTimeEvent.java
+++ b/core/src/main/java/com/chwl/core/patriarch/event/ImPushMsgPmLimitTimeEvent.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.patriarch.event;
+package com.chwl.core.patriarch.event;
 
-import com.yizhuan.xchat_android_core.base.BaseBusEvent;
+import com.chwl.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/chwl/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/chwl/core/patriarch/event/PmDismissAllLimitDialogEvent.java
index 69be68ad7..a9a5e450e 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/patriarch/event/PmDismissAllLimitDialogEvent.java
+++ b/core/src/main/java/com/chwl/core/patriarch/event/PmDismissAllLimitDialogEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.patriarch.event;
+package com.chwl.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/chwl/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/chwl/core/patriarch/exception/PmRoomLimitException.java
index cc25c45e1..c6946d1ec 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/patriarch/exception/PmRoomLimitException.java
+++ b/core/src/main/java/com/chwl/core/patriarch/exception/PmRoomLimitException.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.patriarch.exception;
+package com.chwl.core.patriarch.exception;
 
 
-import com.yizhuan.xchat_android_core.base.BaseErrorException;
+import com.chwl.core.base.BaseErrorException;
 
 /**
  * 青少年模式 限制进房/开房
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/GoldGiveModel.java b/core/src/main/java/com/chwl/core/pay/GoldGiveModel.java
similarity index 78%
rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/GoldGiveModel.java
rename to core/src/main/java/com/chwl/core/pay/GoldGiveModel.java
index ae62f74a8..c147e85b6 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/GoldGiveModel.java
+++ b/core/src/main/java/com/chwl/core/pay/GoldGiveModel.java
@@ -1,12 +1,12 @@
-package com.yizhuan.xchat_android_core.pay;
+package com.chwl.core.pay;
 
-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.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.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.pay.bean.GiveInfo;
+import com.chwl.core.pay.event.SendGoldSuccessEvent;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
 
 import org.greenrobot.eventbus.EventBus;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/IGoldGiveModel.java b/core/src/main/java/com/chwl/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/chwl/core/pay/IGoldGiveModel.java
index 055a76c96..9b8a15698 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/IGoldGiveModel.java
+++ b/core/src/main/java/com/chwl/core/pay/IGoldGiveModel.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.pay;
+package com.chwl.core.pay;
 
-import com.yizhuan.xchat_android_core.pay.bean.GiveInfo;
+import com.chwl.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/chwl/core/pay/IPayModel.java
similarity index 83%
rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/IPayModel.java
rename to core/src/main/java/com/chwl/core/pay/IPayModel.java
index 1d524a6dd..78dc6966c 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/IPayModel.java
+++ b/core/src/main/java/com/chwl/core/pay/IPayModel.java
@@ -1,17 +1,17 @@
-package com.yizhuan.xchat_android_core.pay;
+package com.chwl.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.Banner;
-import com.yizhuan.xchat_android_core.pay.bean.ChargeChannelInfo;
-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.PayRecordId;
-import com.yizhuan.xchat_android_core.pay.bean.WalletInfo;
+import com.chwl.core.base.IModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.bean.response.result.ChargeListResult;
+import com.chwl.core.pay.bean.Banner;
+import com.chwl.core.pay.bean.ChargeChannelInfo;
+import com.chwl.core.pay.bean.FirstChargeGoods;
+import com.chwl.core.pay.bean.NewUserChargeInfo;
+import com.chwl.core.pay.bean.PayRecordId;
+import com.chwl.core.pay.bean.WalletInfo;
 import java.util.List;
 
 import io.reactivex.Single;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/PayModel.java b/core/src/main/java/com/chwl/core/pay/PayModel.java
similarity index 92%
rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/PayModel.java
rename to core/src/main/java/com/chwl/core/pay/PayModel.java
index e17f59941..baacd4480 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/PayModel.java
+++ b/core/src/main/java/com/chwl/core/pay/PayModel.java
@@ -1,38 +1,38 @@
-package com.yizhuan.xchat_android_core.pay;
+package com.chwl.core.pay;
 
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_ACCOUNT;
+import static com.chwl.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_constants.XChatConstants;
-import com.yizhuan.xchat_android_core.R;
-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.Banner;
-import com.yizhuan.xchat_android_core.pay.bean.ChargeBannerInfo;
-import com.yizhuan.xchat_android_core.pay.bean.ChargeChannelInfo;
-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.PayRecordId;
-import com.yizhuan.xchat_android_core.pay.bean.WalletInfo;
-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.IgnoreException;
-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.ResUtil;
-import com.yizhuan.xchat_android_library.utils.codec.DESUtils;
+import com.chwl.core.R;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.bean.response.result.ChargeListResult;
+import com.chwl.core.bean.response.result.WalletInfoResult;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.manager.RoomEvent;
+import com.chwl.core.pay.bean.Banner;
+import com.chwl.core.pay.bean.ChargeBannerInfo;
+import com.chwl.core.pay.bean.ChargeChannelInfo;
+import com.chwl.core.pay.bean.FirstChargeGoods;
+import com.chwl.core.pay.bean.NewUserChargeInfo;
+import com.chwl.core.pay.bean.PayRecordId;
+import com.chwl.core.pay.bean.WalletInfo;
+import com.chwl.core.pay.event.ChargeCustomNotificationEvent;
+import com.chwl.core.pay.event.FirstRechargeEvent;
+import com.chwl.core.pay.event.GetWalletInfoEvent;
+import com.chwl.core.pay.event.UpdateWalletInfoEvent;
+import com.chwl.core.user.event.LoginUserInfoUpdateEvent;
+import com.chwl.core.utils.net.IgnoreException;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.utils.NetworkUtils;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.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/Banner.kt b/core/src/main/java/com/chwl/core/pay/bean/Banner.kt
similarity index 60%
rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/Banner.kt
rename to core/src/main/java/com/chwl/core/pay/bean/Banner.kt
index 108ea6d05..a65ceb488 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/Banner.kt
+++ b/core/src/main/java/com/chwl/core/pay/bean/Banner.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.pay.bean
+package com.chwl.core.pay.bean
 
 data class Banner(
     val bannerUrl: String,
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/ChargeBannerInfo.kt b/core/src/main/java/com/chwl/core/pay/bean/ChargeBannerInfo.kt
similarity index 64%
rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/ChargeBannerInfo.kt
rename to core/src/main/java/com/chwl/core/pay/bean/ChargeBannerInfo.kt
index 86692e30f..cd629cbf3 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/ChargeBannerInfo.kt
+++ b/core/src/main/java/com/chwl/core/pay/bean/ChargeBannerInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.pay.bean
+package com.chwl.core.pay.bean
 
 data class ChargeBannerInfo(
     val banners: List,
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/ChargeBean.java b/core/src/main/java/com/chwl/core/pay/bean/ChargeBean.java
similarity index 98%
rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/ChargeBean.java
rename to core/src/main/java/com/chwl/core/pay/bean/ChargeBean.java
index ce120d1e3..0bcba7b57 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/ChargeBean.java
+++ b/core/src/main/java/com/chwl/core/pay/bean/ChargeBean.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.pay.bean;
+package com.chwl.core.pay.bean;
 
 import com.example.module_base.support.billing.IProductDetails;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/ChargeChannelInfo.kt b/core/src/main/java/com/chwl/core/pay/bean/ChargeChannelInfo.kt
similarity index 54%
rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/ChargeChannelInfo.kt
rename to core/src/main/java/com/chwl/core/pay/bean/ChargeChannelInfo.kt
index 5e4d9da10..fdc9d56d9 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/ChargeChannelInfo.kt
+++ b/core/src/main/java/com/chwl/core/pay/bean/ChargeChannelInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.pay.bean
+package com.chwl.core.pay.bean
 
 data class ChargeChannelInfo(
     val isNative: Boolean
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/FirstChargeGoods.java b/core/src/main/java/com/chwl/core/pay/bean/FirstChargeGoods.java
similarity index 91%
rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/FirstChargeGoods.java
rename to core/src/main/java/com/chwl/core/pay/bean/FirstChargeGoods.java
index fbcdca13d..787e6b872 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/FirstChargeGoods.java
+++ b/core/src/main/java/com/chwl/core/pay/bean/FirstChargeGoods.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.pay.bean;
+package com.chwl.core.pay.bean;
 
 
 import com.example.module_base.support.billing.IProductDetails;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/FirstChargeReward.java b/core/src/main/java/com/chwl/core/pay/bean/FirstChargeReward.java
similarity index 97%
rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/FirstChargeReward.java
rename to core/src/main/java/com/chwl/core/pay/bean/FirstChargeReward.java
index 8b3ad1167..6797b9356 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/FirstChargeReward.java
+++ b/core/src/main/java/com/chwl/core/pay/bean/FirstChargeReward.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.pay.bean;
+package com.chwl.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/chwl/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/chwl/core/pay/bean/GiveGoldResult.java
index 3921e548e..9521e0e5d 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/GiveGoldResult.java
+++ b/core/src/main/java/com/chwl/core/pay/bean/GiveGoldResult.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.pay.bean;
+package com.chwl.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/chwl/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/chwl/core/pay/bean/GiveInfo.java
index ae49f37d6..8f7da55eb 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/GiveInfo.java
+++ b/core/src/main/java/com/chwl/core/pay/bean/GiveInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.pay.bean;
+package com.chwl.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/chwl/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/chwl/core/pay/bean/NewUserChargeInfo.java
index 5dbd363a1..3fed27ebb 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/NewUserChargeInfo.java
+++ b/core/src/main/java/com/chwl/core/pay/bean/NewUserChargeInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.pay.bean;
+package com.chwl.core.pay.bean;
 
 import java.util.List;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/PayRecordId.java b/core/src/main/java/com/chwl/core/pay/bean/PayRecordId.java
similarity index 81%
rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/PayRecordId.java
rename to core/src/main/java/com/chwl/core/pay/bean/PayRecordId.java
index 55bb2e745..a6e1d37f0 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/PayRecordId.java
+++ b/core/src/main/java/com/chwl/core/pay/bean/PayRecordId.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.pay.bean;
+package com.chwl.core.pay.bean;
 
 public class PayRecordId {
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/WalletInfo.java b/core/src/main/java/com/chwl/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/chwl/core/pay/bean/WalletInfo.java
index 963ec9710..a9fee2f9c 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/WalletInfo.java
+++ b/core/src/main/java/com/chwl/core/pay/bean/WalletInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.pay.bean;
+package com.chwl.core.pay.bean;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/event/ChargeCustomNotificationEvent.java b/core/src/main/java/com/chwl/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/chwl/core/pay/event/ChargeCustomNotificationEvent.java
index ab0199263..d8a19d377 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/event/ChargeCustomNotificationEvent.java
+++ b/core/src/main/java/com/chwl/core/pay/event/ChargeCustomNotificationEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.pay.event;
+package com.chwl.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/chwl/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/chwl/core/pay/event/FirstChargeEvent.java
index b39cc6751..b329a9ef1 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/event/FirstChargeEvent.java
+++ b/core/src/main/java/com/chwl/core/pay/event/FirstChargeEvent.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.pay.event;
+package com.chwl.core.pay.event;
 
 
-import com.yizhuan.xchat_android_core.pay.bean.FirstChargeReward;
+import com.chwl.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/chwl/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/chwl/core/pay/event/FirstRechargeEvent.java
index 6a05461ab..3ac5a90c5 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/event/FirstRechargeEvent.java
+++ b/core/src/main/java/com/chwl/core/pay/event/FirstRechargeEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.pay.event;
+package com.chwl.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/chwl/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/chwl/core/pay/event/GetWalletInfoEvent.java
index acdfcf2d4..bc6614ed0 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/event/GetWalletInfoEvent.java
+++ b/core/src/main/java/com/chwl/core/pay/event/GetWalletInfoEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.pay.event;
+package com.chwl.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/chwl/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/chwl/core/pay/event/NewUserChargeEvent.java
index f994bb7e7..3804781bc 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/event/NewUserChargeEvent.java
+++ b/core/src/main/java/com/chwl/core/pay/event/NewUserChargeEvent.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.pay.event;
+package com.chwl.core.pay.event;
 
 
-import com.yizhuan.xchat_android_core.pay.bean.FirstChargeReward;
+import com.chwl.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/chwl/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/chwl/core/pay/event/SendGoldSuccessEvent.java
index 76ba38f49..8bce117e2 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/event/SendGoldSuccessEvent.java
+++ b/core/src/main/java/com/chwl/core/pay/event/SendGoldSuccessEvent.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.pay.event;
+package com.chwl.core.pay.event;
 
-import com.yizhuan.xchat_android_core.base.BaseBusEvent;
+import com.chwl.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/chwl/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/chwl/core/pay/event/UpdateWalletInfoEvent.java
index 29bd7017a..fa8ebdc03 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/event/UpdateWalletInfoEvent.java
+++ b/core/src/main/java/com/chwl/core/pay/event/UpdateWalletInfoEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.pay.event;
+package com.chwl.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/chwl/core/praise/IPraiseModel.java
similarity index 89%
rename from core/src/main/java/com/yizhuan/xchat_android_core/praise/IPraiseModel.java
rename to core/src/main/java/com/chwl/core/praise/IPraiseModel.java
index d90941dd5..d32735ee1 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/praise/IPraiseModel.java
+++ b/core/src/main/java/com/chwl/core/praise/IPraiseModel.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.praise;
+package com.chwl.core.praise;
 
-import com.yizhuan.xchat_android_core.base.IModel;
+import com.chwl.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/chwl/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/chwl/core/praise/PraiseModel.java
index fe5364fac..4cd2be971 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/praise/PraiseModel.java
+++ b/core/src/main/java/com/chwl/core/praise/PraiseModel.java
@@ -1,28 +1,28 @@
-package com.yizhuan.xchat_android_core.praise;
+package com.chwl.core.praise;
 
 import android.annotation.SuppressLint;
 import android.util.LongSparseArray;
 
 import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder;
 import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage;
-import com.yizhuan.xchat_android_core.R;
-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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.bean.response.result.BooleanResult;
+import com.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.core.im.custom.bean.RoomTipAttachment;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.praise.event.IsLikedEvent;
+import com.chwl.core.praise.event.PraiseEvent;
+import com.chwl.core.room.bean.RoomInfo;
+import com.chwl.core.super_admin.util.SuperAdminUtil;
+import com.chwl.core.user.UserModel;
+import com.chwl.core.user.bean.UserInfo;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.utils.ResUtil;
 
 import org.greenrobot.eventbus.EventBus;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/praise/event/IsLikedEvent.java b/core/src/main/java/com/chwl/core/praise/event/IsLikedEvent.java
similarity index 81%
rename from core/src/main/java/com/yizhuan/xchat_android_core/praise/event/IsLikedEvent.java
rename to core/src/main/java/com/chwl/core/praise/event/IsLikedEvent.java
index baa15e92a..11ee24155 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/praise/event/IsLikedEvent.java
+++ b/core/src/main/java/com/chwl/core/praise/event/IsLikedEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.praise.event;
+package com.chwl.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/chwl/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/chwl/core/praise/event/PraiseEvent.java
index 668373b8a..be879242a 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/praise/event/PraiseEvent.java
+++ b/core/src/main/java/com/chwl/core/praise/event/PraiseEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.praise.event;
+package com.chwl.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/chwl/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/chwl/core/radish/IRadishModel.java
index f9b037de1..872c080fe 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/IRadishModel.java
+++ b/core/src/main/java/com/chwl/core/radish/IRadishModel.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.radish;
+package com.chwl.core.radish;
 
-import com.yizhuan.xchat_android_core.base.IModel;
+import com.chwl.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/chwl/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/chwl/core/radish/RadishModel.java
index 8f3234674..19d953df7 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/RadishModel.java
+++ b/core/src/main/java/com/chwl/core/radish/RadishModel.java
@@ -1,14 +1,14 @@
-package com.yizhuan.xchat_android_core.radish;
+package com.chwl.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.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.radish.event.RadishWalletInfoUpdateEvent;
+import com.chwl.core.user.event.LoadLoginUserInfoEvent;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
diff --git a/core/src/main/java/com/chwl/core/radish/RadishRecordResult.java b/core/src/main/java/com/chwl/core/radish/RadishRecordResult.java
new file mode 100644
index 000000000..74ed6f6f3
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/radish/RadishRecordResult.java
@@ -0,0 +1,7 @@
+package com.chwl.core.radish;
+
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.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/chwl/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/chwl/core/radish/RadishWalletInfo.java
index 0127e71da..e7ae24238 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/RadishWalletInfo.java
+++ b/core/src/main/java/com/chwl/core/radish/RadishWalletInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.radish;
+package com.chwl.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/chwl/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/chwl/core/radish/event/RadishWalletInfoUpdateEvent.java
index 4305fafba..139b28433 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/event/RadishWalletInfoUpdateEvent.java
+++ b/core/src/main/java/com/chwl/core/radish/event/RadishWalletInfoUpdateEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.radish.event;
+package com.chwl.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/chwl/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/chwl/core/radish/event/ReceivePrizeEvent.java
index f8e6da40d..d1b1cee7f 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/event/ReceivePrizeEvent.java
+++ b/core/src/main/java/com/chwl/core/radish/event/ReceivePrizeEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.radish.event;
+package com.chwl.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/chwl/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/chwl/core/radish/event/SignInSuccessEvent.java
index 29120a4a5..00e1f7de6 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/event/SignInSuccessEvent.java
+++ b/core/src/main/java/com/chwl/core/radish/event/SignInSuccessEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.radish.event;
+package com.chwl.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/chwl/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/chwl/core/radish/signin/ISignInModel.java
index f6f7af134..4c247820c 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/ISignInModel.java
+++ b/core/src/main/java/com/chwl/core/radish/signin/ISignInModel.java
@@ -1,12 +1,12 @@
-package com.yizhuan.xchat_android_core.radish.signin;
+package com.chwl.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.chwl.core.radish.signin.bean.DrawNoticeInfo;
+import com.chwl.core.radish.signin.bean.ReceiveTotalRewardInfo;
+import com.chwl.core.radish.signin.bean.ReplenishSignInfo;
+import com.chwl.core.radish.signin.bean.RewardNoticeInfo;
+import com.chwl.core.radish.signin.bean.SignDetailInfo;
+import com.chwl.core.radish.signin.bean.SignDrawInfo;
+import com.chwl.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/chwl/core/radish/signin/SignInModel.java
similarity index 87%
rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/SignInModel.java
rename to core/src/main/java/com/chwl/core/radish/signin/SignInModel.java
index dd0af2b05..cdf5c59ec 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/SignInModel.java
+++ b/core/src/main/java/com/chwl/core/radish/signin/SignInModel.java
@@ -1,23 +1,23 @@
-package com.yizhuan.xchat_android_core.radish.signin;
+package com.chwl.core.radish.signin;
 
 import android.util.Log;
 
-import com.yizhuan.xchat_android_core.BuildConfig;
-import com.yizhuan.xchat_android_core.R;
-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.utils.net.RxHelper;
-import com.yizhuan.xchat_android_library.net.rxnet.RxNet;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.BuildConfig;
+import com.chwl.core.R;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.radish.event.SignInSuccessEvent;
+import com.chwl.core.radish.signin.bean.DrawNoticeInfo;
+import com.chwl.core.radish.signin.bean.ReceiveTotalRewardInfo;
+import com.chwl.core.radish.signin.bean.ReplenishSignInfo;
+import com.chwl.core.radish.signin.bean.RewardNoticeInfo;
+import com.chwl.core.radish.signin.bean.SignDetailInfo;
+import com.chwl.core.radish.signin.bean.SignDrawInfo;
+import com.chwl.core.radish.signin.bean.SignInfo;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.utils.ResUtil;
 
 import org.greenrobot.eventbus.EventBus;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/DrawNoticeInfo.java b/core/src/main/java/com/chwl/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/chwl/core/radish/signin/bean/DrawNoticeInfo.java
index 7564a835e..d188df598 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/DrawNoticeInfo.java
+++ b/core/src/main/java/com/chwl/core/radish/signin/bean/DrawNoticeInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.radish.signin.bean;
+package com.chwl.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/chwl/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/chwl/core/radish/signin/bean/ImNotice.java
index 918814f5c..e07ad5801 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/ImNotice.java
+++ b/core/src/main/java/com/chwl/core/radish/signin/bean/ImNotice.java
@@ -1,11 +1,11 @@
-package com.yizhuan.xchat_android_core.radish.signin.bean;
+package com.chwl.core.radish.signin.bean;
 
 import java.io.Serializable;
 
 import lombok.Data;
 
 /**
- * 提醒，{@link com.yizhuan.xchat_android_core.im.custom.bean.OpenSignInAttachment}
+ * 提醒，{@link com.chwl.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/chwl/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/chwl/core/radish/signin/bean/ReceiveTotalRewardInfo.java
index 119f63ddf..8e700776b 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/ReceiveTotalRewardInfo.java
+++ b/core/src/main/java/com/chwl/core/radish/signin/bean/ReceiveTotalRewardInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.radish.signin.bean;
+package com.chwl.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/chwl/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/chwl/core/radish/signin/bean/ReplenishSignInfo.java
index 49a6ba86a..d8764b2c6 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/ReplenishSignInfo.java
+++ b/core/src/main/java/com/chwl/core/radish/signin/bean/ReplenishSignInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.radish.signin.bean;
+package com.chwl.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/chwl/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/chwl/core/radish/signin/bean/Reward.java
index 0e5b4f73a..15d464714 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/Reward.java
+++ b/core/src/main/java/com/chwl/core/radish/signin/bean/Reward.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.radish.signin.bean;
+package com.chwl.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/chwl/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/chwl/core/radish/signin/bean/RewardNoticeInfo.java
index 9a8bf17de..565385a23 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/RewardNoticeInfo.java
+++ b/core/src/main/java/com/chwl/core/radish/signin/bean/RewardNoticeInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.radish.signin.bean;
+package com.chwl.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/chwl/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/chwl/core/radish/signin/bean/RsPlatformType.java
index e46d2263b..50a956955 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/RsPlatformType.java
+++ b/core/src/main/java/com/chwl/core/radish/signin/bean/RsPlatformType.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.radish.signin.bean;
+package com.chwl.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/chwl/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/chwl/core/radish/signin/bean/SignDetailInfo.java
index 91b2d9b5d..461747b71 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/SignDetailInfo.java
+++ b/core/src/main/java/com/chwl/core/radish/signin/bean/SignDetailInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.radish.signin.bean;
+package com.chwl.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/chwl/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/chwl/core/radish/signin/bean/SignDrawInfo.java
index ae4487e41..85a64ab3e 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/SignDrawInfo.java
+++ b/core/src/main/java/com/chwl/core/radish/signin/bean/SignDrawInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.radish.signin.bean;
+package com.chwl.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/chwl/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/chwl/core/radish/signin/bean/SignInfo.java
index 76ab9af5c..ac5f53749 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/SignInfo.java
+++ b/core/src/main/java/com/chwl/core/radish/signin/bean/SignInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.radish.signin.bean;
+package com.chwl.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/chwl/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/chwl/core/radish/task/ITaskModel.java
index 1d757869a..eef2f54fd 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/task/ITaskModel.java
+++ b/core/src/main/java/com/chwl/core/radish/task/ITaskModel.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.radish.task;
+package com.chwl.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.chwl.core.radish.task.bean.CheckNewUserTaskInfo;
+import com.chwl.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/chwl/core/radish/task/TaskModel.java
similarity index 79%
rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/task/TaskModel.java
rename to core/src/main/java/com/chwl/core/radish/task/TaskModel.java
index 756087095..343b2eedf 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/task/TaskModel.java
+++ b/core/src/main/java/com/chwl/core/radish/task/TaskModel.java
@@ -1,18 +1,18 @@
-package com.yizhuan.xchat_android_core.radish.task;
+package com.chwl.core.radish.task;
 
 import com.google.gson.JsonElement;
-import com.yizhuan.xchat_android_core.R;
-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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.radish.RadishModel;
+import com.chwl.core.radish.event.ReceivePrizeEvent;
+import com.chwl.core.radish.task.bean.CheckNewUserTaskInfo;
+import com.chwl.core.radish.task.bean.PrizeType;
+import com.chwl.core.radish.task.bean.TaskInfo;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.utils.ResUtil;
 
 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/chwl/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/chwl/core/radish/task/bean/CheckNewUserTaskInfo.java
index 032f72ed5..50e4ae9de 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/task/bean/CheckNewUserTaskInfo.java
+++ b/core/src/main/java/com/chwl/core/radish/task/bean/CheckNewUserTaskInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.radish.task.bean;
+package com.chwl.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/chwl/core/radish/task/bean/PrizeAnim.java
similarity index 83%
rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/task/bean/PrizeAnim.java
rename to core/src/main/java/com/chwl/core/radish/task/bean/PrizeAnim.java
index f8f42a162..681ecc024 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/task/bean/PrizeAnim.java
+++ b/core/src/main/java/com/chwl/core/radish/task/bean/PrizeAnim.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.radish.task.bean;
+package com.chwl.core.radish.task.bean;
 
-import com.yizhuan.xchat_android_core.R;
-import com.yizhuan.xchat_android_core.radish.signin.bean.ReceiveTotalRewardInfo;
-import com.yizhuan.xchat_android_core.radish.signin.bean.SignDrawInfo;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.core.radish.signin.bean.ReceiveTotalRewardInfo;
+import com.chwl.core.radish.signin.bean.SignDrawInfo;
+import com.chwl.library.utils.ResUtil;
 
 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/chwl/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/chwl/core/radish/task/bean/PrizeType.java
index 405483ce3..63bce9223 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/task/bean/PrizeType.java
+++ b/core/src/main/java/com/chwl/core/radish/task/bean/PrizeType.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.radish.task.bean;
+package com.chwl.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/chwl/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/chwl/core/radish/task/bean/TaskInfo.java
index 7de128ffa..8d8935540 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/task/bean/TaskInfo.java
+++ b/core/src/main/java/com/chwl/core/radish/task/bean/TaskInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.radish.task.bean;
+package com.chwl.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/chwl/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/chwl/core/realm/IRealmCore.java
index 4126b114f..a6c4ef4f9 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/realm/IRealmCore.java
+++ b/core/src/main/java/com/chwl/core/realm/IRealmCore.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.realm;
+package com.chwl.core.realm;
 
-import com.yizhuan.xchat_android_library.coremanager.IBaseCore;
+import com.chwl.library.coremanager.IBaseCore;
 
 import io.realm.Realm;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/recall/IRecallModel.java b/core/src/main/java/com/chwl/core/recall/IRecallModel.java
similarity index 59%
rename from core/src/main/java/com/yizhuan/xchat_android_core/recall/IRecallModel.java
rename to core/src/main/java/com/chwl/core/recall/IRecallModel.java
index cdc20ed55..517bde509 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/recall/IRecallModel.java
+++ b/core/src/main/java/com/chwl/core/recall/IRecallModel.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.recall;
+package com.chwl.core.recall;
 
-import com.yizhuan.xchat_android_core.base.IModel;
-import com.yizhuan.xchat_android_core.recall.bean.CheckLostUserInfo;
+import com.chwl.core.base.IModel;
+import com.chwl.core.recall.bean.CheckLostUserInfo;
 
 import io.reactivex.Single;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/recall/RecallModel.java b/core/src/main/java/com/chwl/core/recall/RecallModel.java
similarity index 80%
rename from core/src/main/java/com/yizhuan/xchat_android_core/recall/RecallModel.java
rename to core/src/main/java/com/chwl/core/recall/RecallModel.java
index 808e2a480..c54d116cc 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/recall/RecallModel.java
+++ b/core/src/main/java/com/chwl/core/recall/RecallModel.java
@@ -1,16 +1,16 @@
-package com.yizhuan.xchat_android_core.recall;
+package com.chwl.core.recall;
 
-import com.yizhuan.xchat_android_core.R;
-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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.bean.response.result.CheckLostUserResult;
+import com.chwl.core.recall.bean.CheckLostUserInfo;
+import com.chwl.core.recall.bean.GoBackInfo;
+import com.chwl.core.recall.event.CheckLostUserEvent;
+import com.chwl.core.recall.event.GoBackEvent;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.utils.ResUtil;
 
 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/chwl/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/chwl/core/recall/bean/CheckLostUserInfo.java
index e084ffbcf..f39ae80f7 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/recall/bean/CheckLostUserInfo.java
+++ b/core/src/main/java/com/chwl/core/recall/bean/CheckLostUserInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.recall.bean;
+package com.chwl.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/chwl/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/chwl/core/recall/bean/GoBackInfo.java
index fb290d36f..c8ea7bc58 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/recall/bean/GoBackInfo.java
+++ b/core/src/main/java/com/chwl/core/recall/bean/GoBackInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.recall.bean;
+package com.chwl.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/chwl/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/chwl/core/recall/event/CheckLostUserEvent.java
index fbd0a411b..0173cfebf 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/recall/event/CheckLostUserEvent.java
+++ b/core/src/main/java/com/chwl/core/recall/event/CheckLostUserEvent.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.recall.event;
+package com.chwl.core.recall.event;
 
-import com.yizhuan.xchat_android_core.base.BaseDataEvent;
-import com.yizhuan.xchat_android_core.recall.bean.CheckLostUserInfo;
+import com.chwl.core.base.BaseDataEvent;
+import com.chwl.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/chwl/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/chwl/core/recall/event/GoBackEvent.java
index c1658fc36..09950a499 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/recall/event/GoBackEvent.java
+++ b/core/src/main/java/com/chwl/core/recall/event/GoBackEvent.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.recall.event;
+package com.chwl.core.recall.event;
 
-import com.yizhuan.xchat_android_core.base.BaseDataEvent;
-import com.yizhuan.xchat_android_core.recall.bean.GoBackInfo;
+import com.chwl.core.base.BaseDataEvent;
+import com.chwl.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/chwl/core/redPacket/IRedPacketModel.java
similarity index 58%
rename from core/src/main/java/com/yizhuan/xchat_android_core/redPacket/IRedPacketModel.java
rename to core/src/main/java/com/chwl/core/redPacket/IRedPacketModel.java
index 91ec563a1..48f802eee 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/IRedPacketModel.java
+++ b/core/src/main/java/com/chwl/core/redPacket/IRedPacketModel.java
@@ -1,11 +1,11 @@
-package com.yizhuan.xchat_android_core.redPacket;
+package com.chwl.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.chwl.core.base.IModel;
+import com.chwl.core.redPacket.bean.ActionDialogInfo;
+import com.chwl.core.redPacket.bean.RedDrawListInfo;
+import com.chwl.core.redPacket.bean.RedPacketInfo;
+import com.chwl.core.redPacket.bean.WithdrawRedListInfo;
+import com.chwl.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/chwl/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/chwl/core/redPacket/RedPacketModel.java
index 28f2e662f..fa035974c 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/RedPacketModel.java
+++ b/core/src/main/java/com/chwl/core/redPacket/RedPacketModel.java
@@ -1,20 +1,20 @@
-package com.yizhuan.xchat_android_core.redPacket;
+package com.chwl.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.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.result.ActionDialogResult;
+import com.chwl.core.bean.response.result.RedDrawListInfoResult;
+import com.chwl.core.bean.response.result.RedPacketResult;
+import com.chwl.core.bean.response.result.WithdrawRedListResult;
+import com.chwl.core.bean.response.result.WithdrawRedSucceedResult;
+import com.chwl.core.redPacket.bean.ActionDialogInfo;
+import com.chwl.core.redPacket.bean.RedDrawListInfo;
+import com.chwl.core.redPacket.bean.RedPacketInfo;
+import com.chwl.core.redPacket.bean.WithdrawRedListInfo;
+import com.chwl.core.redPacket.bean.WithdrawRedSucceedInfo;
+import com.chwl.core.redPacket.event.GetRedInfoEvent;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.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/chwl/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/chwl/core/redPacket/bean/ActionDialogInfo.java
index 81f891c3f..850cda432 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/ActionDialogInfo.java
+++ b/core/src/main/java/com/chwl/core/redPacket/bean/ActionDialogInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.redPacket.bean;
+package com.chwl.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/chwl/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/chwl/core/redPacket/bean/RedDrawListInfo.java
index 31abd4168..f5ca32c5a 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/RedDrawListInfo.java
+++ b/core/src/main/java/com/chwl/core/redPacket/bean/RedDrawListInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.redPacket.bean;
+package com.chwl.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/chwl/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/chwl/core/redPacket/bean/RedPacketInfo.java
index 986cda537..d42d994b2 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/RedPacketInfo.java
+++ b/core/src/main/java/com/chwl/core/redPacket/bean/RedPacketInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.redPacket.bean;
+package com.chwl.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/chwl/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/chwl/core/redPacket/bean/RedPacketInfoV2.java
index cfdf80675..aaacebf12 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/RedPacketInfoV2.java
+++ b/core/src/main/java/com/chwl/core/redPacket/bean/RedPacketInfoV2.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.redPacket.bean;
+package com.chwl.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/chwl/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/chwl/core/redPacket/bean/ShareRedBagInfo.java
index 52238b9b7..c56d0d232 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/ShareRedBagInfo.java
+++ b/core/src/main/java/com/chwl/core/redPacket/bean/ShareRedBagInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.redPacket.bean;
+package com.chwl.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/chwl/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/chwl/core/redPacket/bean/WithdrawRedListInfo.java
index 5e0de9721..a959b1fce 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/WithdrawRedListInfo.java
+++ b/core/src/main/java/com/chwl/core/redPacket/bean/WithdrawRedListInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.redPacket.bean;
+package com.chwl.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/chwl/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/chwl/core/redPacket/bean/WithdrawRedSucceedInfo.java
index 563bfd2e1..e4f4b61fd 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/WithdrawRedSucceedInfo.java
+++ b/core/src/main/java/com/chwl/core/redPacket/bean/WithdrawRedSucceedInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.redPacket.bean;
+package com.chwl.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/chwl/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/chwl/core/redPacket/event/GetRedInfoEvent.java
index f96c8e644..df084c89f 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/event/GetRedInfoEvent.java
+++ b/core/src/main/java/com/chwl/core/redPacket/event/GetRedInfoEvent.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.redPacket.event;
+package com.chwl.core.redPacket.event;
 
-import com.yizhuan.xchat_android_core.base.BaseDataEvent;
-import com.yizhuan.xchat_android_core.redPacket.bean.RedPacketInfo;
+import com.chwl.core.base.BaseDataEvent;
+import com.chwl.core.redPacket.bean.RedPacketInfo;
 
 /**
  * create by lvzebiao on 2018/9/5
diff --git a/core/src/main/java/com/chwl/core/redpackage/RedEnvelopeGiftItemVO.kt b/core/src/main/java/com/chwl/core/redpackage/RedEnvelopeGiftItemVO.kt
new file mode 100644
index 000000000..464ae84db
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/redpackage/RedEnvelopeGiftItemVO.kt
@@ -0,0 +1,9 @@
+package com.chwl.core.redpackage
+
+import com.chwl.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/chwl/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/chwl/core/redpackage/RedEnvelopeItemVO.kt
index 9a2ff53fa..14ed95b5a 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedEnvelopeItemVO.kt
+++ b/core/src/main/java/com/chwl/core/redpackage/RedEnvelopeItemVO.kt
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.redpackage
+package com.chwl.core.redpackage
 
-import com.yizhuan.xchat_android_core.community.UserVo
+import com.chwl.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/chwl/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/chwl/core/redpackage/RedEnvelopeRoomMsg.kt
index 13ec30be7..436417d3c 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedEnvelopeRoomMsg.kt
+++ b/core/src/main/java/com/chwl/core/redpackage/RedEnvelopeRoomMsg.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.redpackage
+package com.chwl.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/chwl/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/chwl/core/redpackage/RedEnvelopeState.kt
index fa64a1fab..734ed2c75 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedEnvelopeState.kt
+++ b/core/src/main/java/com/chwl/core/redpackage/RedEnvelopeState.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.redpackage
+package com.chwl.core.redpackage
 
 /**
  * 红包状态
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedEnvelopeVO.kt b/core/src/main/java/com/chwl/core/redpackage/RedEnvelopeVO.kt
similarity index 89%
rename from core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedEnvelopeVO.kt
rename to core/src/main/java/com/chwl/core/redpackage/RedEnvelopeVO.kt
index c1ecbe5a0..99fd6a294 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedEnvelopeVO.kt
+++ b/core/src/main/java/com/chwl/core/redpackage/RedEnvelopeVO.kt
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.redpackage
+package com.chwl.core.redpackage
 
-import com.yizhuan.xchat_android_core.community.UserVo
+import com.chwl.core.community.UserVo
 
 
 data class RedEnvelopeVO(
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedPackageData.kt b/core/src/main/java/com/chwl/core/redpackage/RedPackageData.kt
similarity index 94%
rename from core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedPackageData.kt
rename to core/src/main/java/com/chwl/core/redpackage/RedPackageData.kt
index 7578ece37..7b31f1318 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedPackageData.kt
+++ b/core/src/main/java/com/chwl/core/redpackage/RedPackageData.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.redpackage
+package com.chwl.core.redpackage
 
 import java.io.Serializable
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedPackageInfo.kt b/core/src/main/java/com/chwl/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/chwl/core/redpackage/RedPackageInfo.kt
index 832d42bcd..9f6601de1 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedPackageInfo.kt
+++ b/core/src/main/java/com/chwl/core/redpackage/RedPackageInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.redpackage
+package com.chwl.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/chwl/core/redpackage/RedPackageModel.kt
similarity index 91%
rename from core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedPackageModel.kt
rename to core/src/main/java/com/chwl/core/redpackage/RedPackageModel.kt
index 4963c5826..d6b9fcaf4 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedPackageModel.kt
+++ b/core/src/main/java/com/chwl/core/redpackage/RedPackageModel.kt
@@ -1,11 +1,11 @@
-package com.yizhuan.xchat_android_core.redpackage
+package com.chwl.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.chwl.core.bean.response.ServiceResult
+import com.chwl.core.utils.net.handleBeanData
+import com.chwl.core.utils.net.handleStringData
+import com.chwl.core.utils.net.io2main
+import com.chwl.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/chwl/core/redpackage/RedPackageNotifyInfo.kt
similarity index 95%
rename from core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedPackageNotifyInfo.kt
rename to core/src/main/java/com/chwl/core/redpackage/RedPackageNotifyInfo.kt
index a2d4bb783..684afe1c7 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedPackageNotifyInfo.kt
+++ b/core/src/main/java/com/chwl/core/redpackage/RedPackageNotifyInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.redpackage
+package com.chwl.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/chwl/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/chwl/core/redpackage/RedPackageType.kt
index 3b6702e51..42abad9aa 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedPackageType.kt
+++ b/core/src/main/java/com/chwl/core/redpackage/RedPackageType.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.redpackage
+package com.chwl.core.redpackage
 
 const val ROOM_DIAMOND = 1
 const val ROOM_GIFT = 3
diff --git a/core/src/main/java/com/chwl/core/relation/cp/CpBindUnbindEvent.java b/core/src/main/java/com/chwl/core/relation/cp/CpBindUnbindEvent.java
new file mode 100644
index 000000000..cc4bd299b
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/relation/cp/CpBindUnbindEvent.java
@@ -0,0 +1,4 @@
+package com.chwl.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/chwl/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/chwl/core/relation/cp/CpInviteDetailEntity.kt
index 2f1cf8625..def415b9d 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpInviteDetailEntity.kt
+++ b/core/src/main/java/com/chwl/core/relation/cp/CpInviteDetailEntity.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.relation.cp
+package com.chwl.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/chwl/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/chwl/core/relation/cp/CpInviteInfo.kt
index 112799cb6..58f79212d 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpInviteInfo.kt
+++ b/core/src/main/java/com/chwl/core/relation/cp/CpInviteInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.relation.cp
+package com.chwl.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/chwl/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/chwl/core/relation/cp/CpInvitePageEntity.kt
index 8f8f85b9f..bd0be6e7f 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpInvitePageEntity.kt
+++ b/core/src/main/java/com/chwl/core/relation/cp/CpInvitePageEntity.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.relation.cp
+package com.chwl.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/chwl/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/chwl/core/relation/cp/CpMpApplyListEntity.kt
index c00cc895d..cd5127a53 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpMpApplyListEntity.kt
+++ b/core/src/main/java/com/chwl/core/relation/cp/CpMpApplyListEntity.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.relation.cp
+package com.chwl.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/chwl/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/chwl/core/relation/cp/CpRelation.kt
index ee1c9e606..3e6c16ed4 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpRelation.kt
+++ b/core/src/main/java/com/chwl/core/relation/cp/CpRelation.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.relation.cp
+package com.chwl.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/chwl/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/chwl/core/relation/cp/CpTaskEntity.kt
index 4e4a00e1d..665b8e1f3 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpTaskEntity.kt
+++ b/core/src/main/java/com/chwl/core/relation/cp/CpTaskEntity.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.relation.cp
+package com.chwl.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/chwl/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/chwl/core/relation/cp/UserCpLevelMpEntity.kt
index 6b363b5f8..782e03470 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/UserCpLevelMpEntity.kt
+++ b/core/src/main/java/com/chwl/core/relation/cp/UserCpLevelMpEntity.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.relation.cp
+package com.chwl.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/chwl/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/chwl/core/relation/cp/UserCpListEntity.kt
index 039411d7e..a78b4dca5 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/UserCpListEntity.kt
+++ b/core/src/main/java/com/chwl/core/relation/cp/UserCpListEntity.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.relation.cp
+package com.chwl.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/chwl/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/chwl/core/room/IRoomCoreClient.java
index c2776923d..5d10dc306 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/IRoomCoreClient.java
+++ b/core/src/main/java/com/chwl/core/room/IRoomCoreClient.java
@@ -1,11 +1,11 @@
-package com.yizhuan.xchat_android_core.room;
+package com.chwl.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.chwl.core.room.bean.RoomInfo;
+import com.chwl.core.room.bean.SearchRoomInfo;
+import com.chwl.core.room.queue.bean.RoomConsumeInfo;
+import com.chwl.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/chwl/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/chwl/core/room/activitytimer/ActivityTimerEvent.java
index 5a20d1e1c..903e20f07 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/activitytimer/ActivityTimerEvent.java
+++ b/core/src/main/java/com/chwl/core/room/activitytimer/ActivityTimerEvent.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.room.activitytimer;
+package com.chwl.core.room.activitytimer;
 
-import com.yizhuan.xchat_android_core.base.BaseBusEvent;
+import com.chwl.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/chwl/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/chwl/core/room/activitytimer/TimerBean.java
index 1b40b8c26..a35bf5e85 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/activitytimer/TimerBean.java
+++ b/core/src/main/java/com/chwl/core/room/activitytimer/TimerBean.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.activitytimer;
+package com.chwl.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/chwl/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/chwl/core/room/anotherroompk/RoomPKModel.kt
index 25abc0b42..7a26ca08d 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/RoomPKModel.kt
+++ b/core/src/main/java/com/chwl/core/room/anotherroompk/RoomPKModel.kt
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.room.anotherroompk
+package com.chwl.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.chwl.core.bean.response.ServiceResult
+import com.chwl.core.im.custom.bean.RoomPkBean
+import com.chwl.core.utils.net.RxHelper
+import com.chwl.library.net.rxnet.RxNet
 import io.reactivex.Single
 import retrofit2.http.*
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/ShowGiftDialogEvent.java b/core/src/main/java/com/chwl/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/chwl/core/room/anotherroompk/ShowGiftDialogEvent.java
index 6975d1848..576d0b31b 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/ShowGiftDialogEvent.java
+++ b/core/src/main/java/com/chwl/core/room/anotherroompk/ShowGiftDialogEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.anotherroompk;
+package com.chwl.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/chwl/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/chwl/core/room/anotherroompk/ShowUserInfoDialogEvent.java
index d4f40cabb..00b412f27 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/ShowUserInfoDialogEvent.java
+++ b/core/src/main/java/com/chwl/core/room/anotherroompk/ShowUserInfoDialogEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.anotherroompk;
+package com.chwl.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/chwl/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/chwl/core/room/anotherroompk/SimpleRoomInfo.kt
index 8c6a5463c..cbcba2586 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/SimpleRoomInfo.kt
+++ b/core/src/main/java/com/chwl/core/room/anotherroompk/SimpleRoomInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.anotherroompk
+package com.chwl.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/chwl/core/room/anotherroompk/SingleRoomPKModel.kt
similarity index 93%
rename from core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/SingleRoomPKModel.kt
rename to core/src/main/java/com/chwl/core/room/anotherroompk/SingleRoomPKModel.kt
index 49ca6aa20..13138d343 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/SingleRoomPKModel.kt
+++ b/core/src/main/java/com/chwl/core/room/anotherroompk/SingleRoomPKModel.kt
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.room.anotherroompk
+package com.chwl.core.room.anotherroompk
 
-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.chwl.core.bean.response.ServiceResult
+import com.chwl.core.manager.AvRoomDataManager
+import com.chwl.core.utils.net.RxHelper
+import com.chwl.library.net.rxnet.RxNet
 import io.reactivex.Single
 import retrofit2.http.*
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/auction/IAuctionCore.java b/core/src/main/java/com/chwl/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/chwl/core/room/auction/IAuctionCore.java
index 0250c7f38..7a4037585 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/auction/IAuctionCore.java
+++ b/core/src/main/java/com/chwl/core/room/auction/IAuctionCore.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.room.auction;
+package com.chwl.core.room.auction;
 
-import com.yizhuan.xchat_android_core.room.auction.bean.AuctionInfo;
-import com.yizhuan.xchat_android_library.coremanager.IBaseCore;
+import com.chwl.core.room.auction.bean.AuctionInfo;
+import com.chwl.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/chwl/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/chwl/core/room/auction/IAuctionCoreClient.java
index d7e1285ca..9658c2f06 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/auction/IAuctionCoreClient.java
+++ b/core/src/main/java/com/chwl/core/room/auction/IAuctionCoreClient.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.room.auction;
+package com.chwl.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.chwl.core.room.auction.bean.AuctionInfo;
+import com.chwl.core.room.auction.bean.AuctionListUserInfo;
+import com.chwl.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/chwl/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/chwl/core/room/auction/bean/AuctionInfo.java
index a82cc47cd..7e6997f5f 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/auction/bean/AuctionInfo.java
+++ b/core/src/main/java/com/chwl/core/room/auction/bean/AuctionInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.auction.bean;
+package com.chwl.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/chwl/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/chwl/core/room/auction/bean/AuctionListUserInfo.java
index 88d766e2a..d97a04d46 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/auction/bean/AuctionListUserInfo.java
+++ b/core/src/main/java/com/chwl/core/room/auction/bean/AuctionListUserInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.auction.bean;
+package com.chwl.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/chwl/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/chwl/core/room/auction/bean/AuctionUser.java
index 19e5e7b8c..14fea2d2e 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/auction/bean/AuctionUser.java
+++ b/core/src/main/java/com/chwl/core/room/auction/bean/AuctionUser.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.auction.bean;
+package com.chwl.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/chwl/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/chwl/core/room/bean/AnchorInfo.kt
index 299c6fc5e..adf96942e 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/AnchorInfo.kt
+++ b/core/src/main/java/com/chwl/core/room/bean/AnchorInfo.kt
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.room.bean
+package com.chwl.core.room.bean
 
-import com.yizhuan.xchat_android_core.user.bean.UserInfoSkillEntity
+import com.chwl.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/chwl/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/chwl/core/room/bean/BoxSwitchVo.java
index db78f9b4c..2bcb70006 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/BoxSwitchVo.java
+++ b/core/src/main/java/com/chwl/core/room/bean/BoxSwitchVo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.bean;
+package com.chwl.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/chwl/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/chwl/core/room/bean/BroadcastInfo.kt
index 5f1786d4a..33a6a4c79 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/BroadcastInfo.kt
+++ b/core/src/main/java/com/chwl/core/room/bean/BroadcastInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.bean
+package com.chwl.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/chwl/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/chwl/core/room/bean/DatingAllNotifyInfo.kt
index a37fa6cc9..9d24f1971 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/DatingAllNotifyInfo.kt
+++ b/core/src/main/java/com/chwl/core/room/bean/DatingAllNotifyInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.bean
+package com.chwl.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/chwl/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/chwl/core/room/bean/DatingNotifyInfo.kt
index 48a71dfc4..6b597a075 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/DatingNotifyInfo.kt
+++ b/core/src/main/java/com/chwl/core/room/bean/DatingNotifyInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.bean
+package com.chwl.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/chwl/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/chwl/core/room/bean/DragonBarInfo.java
index 3d68f4232..a2e2aa7b7 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/DragonBarInfo.java
+++ b/core/src/main/java/com/chwl/core/room/bean/DragonBarInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.bean;
+package com.chwl.core.room.bean;
 
 /**
  * Created by huangmeng1 on 2018/7/12.
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/FindLoveSwitchVo.java b/core/src/main/java/com/chwl/core/room/bean/FindLoveSwitchVo.java
similarity index 97%
rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/FindLoveSwitchVo.java
rename to core/src/main/java/com/chwl/core/room/bean/FindLoveSwitchVo.java
index d8e8914b8..b5e099678 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/FindLoveSwitchVo.java
+++ b/core/src/main/java/com/chwl/core/room/bean/FindLoveSwitchVo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.bean;
+package com.chwl.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/HomeLiveTopInfo.kt b/core/src/main/java/com/chwl/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/chwl/core/room/bean/HomeLiveTopInfo.kt
index 97cb5aedf..f07e83c1c 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/HomeLiveTopInfo.kt
+++ b/core/src/main/java/com/chwl/core/room/bean/HomeLiveTopInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.bean
+package com.chwl.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/chwl/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/chwl/core/room/bean/LeaveModeAttachment.java
index dfb5c7481..cf2e94ce6 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/LeaveModeAttachment.java
+++ b/core/src/main/java/com/chwl/core/room/bean/LeaveModeAttachment.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.room.bean;
+package com.chwl.core.room.bean;
 
 import com.alibaba.fastjson.JSONObject;
-import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment;
+import com.chwl.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/chwl/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/chwl/core/room/bean/MeCenterInfo.kt
index f2c68204a..00ad8e13b 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/MeCenterInfo.kt
+++ b/core/src/main/java/com/chwl/core/room/bean/MeCenterInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.bean
+package com.chwl.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/chwl/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/chwl/core/room/bean/OnlineChatMember.java
index 6df262b87..85b04c026 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/OnlineChatMember.java
+++ b/core/src/main/java/com/chwl/core/room/bean/OnlineChatMember.java
@@ -1,13 +1,13 @@
-package com.yizhuan.xchat_android_core.room.bean;
+package com.chwl.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.chwl.core.noble.NobleResourceType;
+import com.chwl.core.noble.NobleUtil;
+import com.chwl.core.user.bean.UserInfo;
+import com.chwl.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/chwl/core/room/bean/RoomAudioSdkType.java
similarity index 74%
rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomAudioSdkType.java
rename to core/src/main/java/com/chwl/core/room/bean/RoomAudioSdkType.java
index 7caf13d00..fede9e0ba 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomAudioSdkType.java
+++ b/core/src/main/java/com/chwl/core/room/bean/RoomAudioSdkType.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.bean;
+package com.chwl.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/chwl/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/chwl/core/room/bean/RoomContributeDataInfo.java
index 537fdd85a..702219bcd 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomContributeDataInfo.java
+++ b/core/src/main/java/com/chwl/core/room/bean/RoomContributeDataInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.bean;
+package com.chwl.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/chwl/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/chwl/core/room/bean/RoomContributeRoomInfo.java
index c406a7939..b2386a1ae 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomContributeRoomInfo.java
+++ b/core/src/main/java/com/chwl/core/room/bean/RoomContributeRoomInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.bean;
+package com.chwl.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/chwl/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/chwl/core/room/bean/RoomContributeUserInfo.java
index 0f76adf77..f449477c8 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomContributeUserInfo.java
+++ b/core/src/main/java/com/chwl/core/room/bean/RoomContributeUserInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.bean;
+package com.chwl.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/chwl/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/chwl/core/room/bean/RoomInfo.java
index bdbabb234..221ab55a1 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomInfo.java
+++ b/core/src/main/java/com/chwl/core/room/bean/RoomInfo.java
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_core.room.bean;
+package com.chwl.core.room.bean;
 
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import com.yizhuan.xchat_android_core.R;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.library.utils.ResUtil;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomInviteFansInfo.kt b/core/src/main/java/com/chwl/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/chwl/core/room/bean/RoomInviteFansInfo.kt
index 0199058ed..8619a2ea2 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomInviteFansInfo.kt
+++ b/core/src/main/java/com/chwl/core/room/bean/RoomInviteFansInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.bean
+package com.chwl.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/chwl/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/chwl/core/room/bean/RoomListResult.java
index 9a4d1f833..7192980ff 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomListResult.java
+++ b/core/src/main/java/com/chwl/core/room/bean/RoomListResult.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.room.bean;
+package com.chwl.core.room.bean;
 
-import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
+import com.chwl.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/chwl/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/chwl/core/room/bean/RoomMessageViewNoticeInfo.java
index 11c09e526..77a6c7f7f 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomMessageViewNoticeInfo.java
+++ b/core/src/main/java/com/chwl/core/room/bean/RoomMessageViewNoticeInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.bean;
+package com.chwl.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/chwl/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/chwl/core/room/bean/RoomModeType.java
index ae4b462b9..f3b7d184f 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomModeType.java
+++ b/core/src/main/java/com/chwl/core/room/bean/RoomModeType.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.bean;
+package com.chwl.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/chwl/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/chwl/core/room/bean/RoomRankHalfHourDataInfo.java
index 3ccabac36..f6cd9c40e 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomRankHalfHourDataInfo.java
+++ b/core/src/main/java/com/chwl/core/room/bean/RoomRankHalfHourDataInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.bean;
+package com.chwl.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/chwl/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/chwl/core/room/bean/RoomRankHalfHourMeInfo.java
index 4a5d76736..7c0a1c4e6 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomRankHalfHourMeInfo.java
+++ b/core/src/main/java/com/chwl/core/room/bean/RoomRankHalfHourMeInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.bean;
+package com.chwl.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/chwl/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/chwl/core/room/bean/RoomRankHalfHourRankInfo.java
index 471d0ce06..6c0e86cde 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomRankHalfHourRankInfo.java
+++ b/core/src/main/java/com/chwl/core/room/bean/RoomRankHalfHourRankInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.bean;
+package com.chwl.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/chwl/core/room/bean/RoomRankMultiItem.java
similarity index 92%
rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomRankMultiItem.java
rename to core/src/main/java/com/chwl/core/room/bean/RoomRankMultiItem.java
index 9980f8460..35e33c42e 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomRankMultiItem.java
+++ b/core/src/main/java/com/chwl/core/room/bean/RoomRankMultiItem.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.bean;
+package com.chwl.core.room.bean;
 
 import com.chad.library.adapter.base.entity.MultiItemEntity;
 
diff --git a/core/src/main/java/com/chwl/core/room/bean/RoomResult.java b/core/src/main/java/com/chwl/core/room/bean/RoomResult.java
new file mode 100644
index 000000000..503173822
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/room/bean/RoomResult.java
@@ -0,0 +1,11 @@
+package com.chwl.core.room.bean;
+
+import com.chwl.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/chwl/core/room/bean/RoomSettingTabInfo.java
similarity index 96%
rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomSettingTabInfo.java
rename to core/src/main/java/com/chwl/core/room/bean/RoomSettingTabInfo.java
index 36bbb13a5..e25c128a5 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomSettingTabInfo.java
+++ b/core/src/main/java/com/chwl/core/room/bean/RoomSettingTabInfo.java
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_core.room.bean;
+package com.chwl.core.room.bean;
 
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import com.yizhuan.xchat_android_core.R;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.library.utils.ResUtil;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomWelcomeConfig.java b/core/src/main/java/com/chwl/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/chwl/core/room/bean/RoomWelcomeConfig.java
index 416631358..78bd382d3 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomWelcomeConfig.java
+++ b/core/src/main/java/com/chwl/core/room/bean/RoomWelcomeConfig.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.bean;
+package com.chwl.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/chwl/core/room/bean/SearchRoomInfo.java
similarity index 92%
rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/SearchRoomInfo.java
rename to core/src/main/java/com/chwl/core/room/bean/SearchRoomInfo.java
index eba6e8bd2..677dc9834 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/SearchRoomInfo.java
+++ b/core/src/main/java/com/chwl/core/room/bean/SearchRoomInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.bean;
+package com.chwl.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.chwl.core.home.bean.BannerInfo;
+import com.chwl.core.level.UserLevelVo;
+import com.chwl.core.noble.NobleInfo;
+import com.chwl.core.user.bean.UserInfo;
+import com.chwl.library.utils.ListUtils;
 
 import java.util.ArrayList;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/SeizeTreasureSwitchVo.kt b/core/src/main/java/com/chwl/core/room/bean/SeizeTreasureSwitchVo.kt
similarity index 79%
rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/SeizeTreasureSwitchVo.kt
rename to core/src/main/java/com/chwl/core/room/bean/SeizeTreasureSwitchVo.kt
index f8774cf84..db005eab3 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/SeizeTreasureSwitchVo.kt
+++ b/core/src/main/java/com/chwl/core/room/bean/SeizeTreasureSwitchVo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.bean
+package com.chwl.core.room.bean
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/ShowUserInfoDialog.java b/core/src/main/java/com/chwl/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/chwl/core/room/bean/ShowUserInfoDialog.java
index 43b527265..e8216136e 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/ShowUserInfoDialog.java
+++ b/core/src/main/java/com/chwl/core/room/bean/ShowUserInfoDialog.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.bean;
+package com.chwl.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/chwl/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/chwl/core/room/bean/SimplePartyRoomInfo.java
index f93167465..9b60485ac 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/SimplePartyRoomInfo.java
+++ b/core/src/main/java/com/chwl/core/room/bean/SimplePartyRoomInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.bean;
+package com.chwl.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/chwl/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/chwl/core/room/bean/SingleRoomSortInfo.kt
index 159d76fee..cec60c98d 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/SingleRoomSortInfo.kt
+++ b/core/src/main/java/com/chwl/core/room/bean/SingleRoomSortInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.bean
+package com.chwl.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/chwl/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/chwl/core/room/bean/UpMic.java
index 97829a977..5031b7f9d 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/UpMic.java
+++ b/core/src/main/java/com/chwl/core/room/bean/UpMic.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.bean;
+package com.chwl.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/chwl/core/room/bean/WelcomeInfo.java
similarity index 92%
rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/WelcomeInfo.java
rename to core/src/main/java/com/chwl/core/room/bean/WelcomeInfo.java
index 8357e7131..094b2677c 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/WelcomeInfo.java
+++ b/core/src/main/java/com/chwl/core/room/bean/WelcomeInfo.java
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_core.room.bean;
+package com.chwl.core.room.bean;
 
 import android.text.TextUtils;
 
 import com.netease.nim.uikit.common.util.log.LogUtil;
-import com.yizhuan.xchat_android_core.R;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.library.utils.ResUtil;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/core/RoomDataService.kt b/core/src/main/java/com/chwl/core/room/core/RoomDataService.kt
similarity index 51%
rename from core/src/main/java/com/yizhuan/xchat_android_core/room/core/RoomDataService.kt
rename to core/src/main/java/com/chwl/core/room/core/RoomDataService.kt
index 63a323cf5..5664418e6 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/core/RoomDataService.kt
+++ b/core/src/main/java/com/chwl/core/room/core/RoomDataService.kt
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.room.core
+package com.chwl.core.room.core
 
-import com.yizhuan.xchat_android_core.support.room.RoomService
+import com.chwl.core.support.room.RoomService
 
 /**
  * Created by Max on 2023/10/26 12:36
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/dragonball/DragonBallModel.java b/core/src/main/java/com/chwl/core/room/dragonball/DragonBallModel.java
similarity index 81%
rename from core/src/main/java/com/yizhuan/xchat_android_core/room/dragonball/DragonBallModel.java
rename to core/src/main/java/com/chwl/core/room/dragonball/DragonBallModel.java
index 1dcfbdc47..6441bc11b 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/dragonball/DragonBallModel.java
+++ b/core/src/main/java/com/chwl/core/room/dragonball/DragonBallModel.java
@@ -1,14 +1,14 @@
-package com.yizhuan.xchat_android_core.room.dragonball;
+package com.chwl.core.room.dragonball;
 
-import com.yizhuan.xchat_android_core.R;
-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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.room.bean.DragonBarInfo;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.utils.ResUtil;
 
 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/chwl/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/chwl/core/room/dragonball/IDragonBallModel.java
index bd9602581..0c71c558c 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/dragonball/IDragonBallModel.java
+++ b/core/src/main/java/com/chwl/core/room/dragonball/IDragonBallModel.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.room.dragonball;
+package com.chwl.core.room.dragonball;
 
-import com.yizhuan.xchat_android_core.base.IModel;
-import com.yizhuan.xchat_android_core.room.bean.DragonBarInfo;
+import com.chwl.core.base.IModel;
+import com.chwl.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/chwl/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/chwl/core/room/event/DatingSelectUserEvent.java
index 7d2351b63..9b26a5940 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/DatingSelectUserEvent.java
+++ b/core/src/main/java/com/chwl/core/room/event/DatingSelectUserEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.event;
+package com.chwl.core.room.event;
 
 public class DatingSelectUserEvent {
 
diff --git a/core/src/main/java/com/chwl/core/room/event/EixtCountDownEvent.java b/core/src/main/java/com/chwl/core/room/event/EixtCountDownEvent.java
new file mode 100644
index 000000000..50499d831
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/room/event/EixtCountDownEvent.java
@@ -0,0 +1,4 @@
+package com.chwl.core.room.event;
+
+public class EixtCountDownEvent {
+}
diff --git a/core/src/main/java/com/chwl/core/room/event/FaceIsReadyEvent.java b/core/src/main/java/com/chwl/core/room/event/FaceIsReadyEvent.java
new file mode 100644
index 000000000..f29057be0
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/room/event/FaceIsReadyEvent.java
@@ -0,0 +1,4 @@
+package com.chwl.core.room.event;
+
+public class FaceIsReadyEvent {
+}
diff --git a/core/src/main/java/com/chwl/core/room/event/FinishAvRoomEvent.java b/core/src/main/java/com/chwl/core/room/event/FinishAvRoomEvent.java
new file mode 100644
index 000000000..fae597e7d
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/room/event/FinishAvRoomEvent.java
@@ -0,0 +1,4 @@
+package com.chwl.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/chwl/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/chwl/core/room/event/MessageSizeEvent.java
index 8268016cf..440186919 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/MessageSizeEvent.java
+++ b/core/src/main/java/com/chwl/core/room/event/MessageSizeEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.event;
+package com.chwl.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/chwl/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/chwl/core/room/event/ReceiveFaceEvent.java
index 32006543b..8e28bd49f 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/ReceiveFaceEvent.java
+++ b/core/src/main/java/com/chwl/core/room/event/ReceiveFaceEvent.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.room.event;
+package com.chwl.core.room.event;
 
-import com.yizhuan.xchat_android_core.room.face.FaceReceiveInfo;
+import com.chwl.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/chwl/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/chwl/core/room/event/RoomAtEvent.java
index 551d16d36..5d398ad20 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomAtEvent.java
+++ b/core/src/main/java/com/chwl/core/room/event/RoomAtEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.event;
+package com.chwl.core.room.event;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/core/src/main/java/com/chwl/core/room/event/RoomClearScreenEvent.java b/core/src/main/java/com/chwl/core/room/event/RoomClearScreenEvent.java
new file mode 100644
index 000000000..b0b63d33c
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/room/event/RoomClearScreenEvent.java
@@ -0,0 +1,4 @@
+package com.chwl.core.room.event;
+
+public class RoomClearScreenEvent {
+}
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomExitEvent.java b/core/src/main/java/com/chwl/core/room/event/RoomExitEvent.java
similarity index 54%
rename from core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomExitEvent.java
rename to core/src/main/java/com/chwl/core/room/event/RoomExitEvent.java
index 3cb3cdc7d..3bcbb5673 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomExitEvent.java
+++ b/core/src/main/java/com/chwl/core/room/event/RoomExitEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.event;
+package com.chwl.core.room.event;
 
 import lombok.Data;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomInfoEvent.java b/core/src/main/java/com/chwl/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/chwl/core/room/event/RoomInfoEvent.java
index 50560fecc..aae610be6 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomInfoEvent.java
+++ b/core/src/main/java/com/chwl/core/room/event/RoomInfoEvent.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.room.event;
+package com.chwl.core.room.event;
 
-import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
+import com.chwl.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.chwl.core.Constants#PAGE_TYPE_MAIN_FRAGMENT
      */
     private int pageType;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomShieldEvent.java b/core/src/main/java/com/chwl/core/room/event/RoomShieldEvent.java
similarity index 54%
rename from core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomShieldEvent.java
rename to core/src/main/java/com/chwl/core/room/event/RoomShieldEvent.java
index 467b667bd..001e606e8 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomShieldEvent.java
+++ b/core/src/main/java/com/chwl/core/room/event/RoomShieldEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.event;
+package com.chwl.core.room.event;
 
 import lombok.Data;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomTaskTipsEvent.java b/core/src/main/java/com/chwl/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/chwl/core/room/event/RoomTaskTipsEvent.java
index 113aa2b16..e9c401531 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomTaskTipsEvent.java
+++ b/core/src/main/java/com/chwl/core/room/event/RoomTaskTipsEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.event;
+package com.chwl.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/chwl/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/chwl/core/room/event/SwitchRoomEvent.java
index 91922b213..fe2fe80ce 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/SwitchRoomEvent.java
+++ b/core/src/main/java/com/chwl/core/room/event/SwitchRoomEvent.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.room.event;
+package com.chwl.core.room.event;
 
-import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
+import com.chwl.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/chwl/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/chwl/core/room/exception/AntiSpamHitException.java
index 5db532a7b..a27e97324 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/exception/AntiSpamHitException.java
+++ b/core/src/main/java/com/chwl/core/room/exception/AntiSpamHitException.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.exception;
+package com.chwl.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/chwl/core/room/face/DynamicFaceModel.java
similarity index 94%
rename from core/src/main/java/com/yizhuan/xchat_android_core/room/face/DynamicFaceModel.java
rename to core/src/main/java/com/chwl/core/room/face/DynamicFaceModel.java
index 1838303ed..570fc2877 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/face/DynamicFaceModel.java
+++ b/core/src/main/java/com/chwl/core/room/face/DynamicFaceModel.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.room.face;
+package com.chwl.core.room.face;
 
-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.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_FACE;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_FACE_SEND;
 
 import android.annotation.SuppressLint;
 import android.text.TextUtils;
@@ -19,31 +19,31 @@ 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.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.RoomQueueInfo;
-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.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.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.chwl.core.DemoCache;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.RoomQueueInfo;
+import com.chwl.core.gift.bean.SimpleVipInfo;
+import com.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.core.im.custom.bean.FaceAttachment;
+import com.chwl.core.initial.InitialModel;
+import com.chwl.core.initial.bean.InitInfo;
+import com.chwl.core.interceptor.NoParamsInterceptor;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.room.bean.RoomInfo;
+import com.chwl.core.room.event.FaceIsReadyEvent;
+import com.chwl.core.room.event.ReceiveFaceEvent;
+import com.chwl.core.room.queue.bean.MicMemberInfo;
+import com.chwl.core.user.UserModel;
+import com.chwl.core.user.bean.UserInfo;
+import com.chwl.core.utils.LogUtils;
+import com.chwl.core.vip.UserVipInfo;
+import com.chwl.library.utils.ListUtils;
+import com.chwl.library.utils.NetworkUtils;
+import com.chwl.library.utils.codec.DESUtils;
+import com.chwl.library.utils.codec.MD5Utils;
+import com.chwl.library.utils.config.BasicConfig;
 
 import org.greenrobot.eventbus.EventBus;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/face/FaceInfo.java b/core/src/main/java/com/chwl/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/chwl/core/room/face/FaceInfo.java
index cc6576b23..423f43693 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/face/FaceInfo.java
+++ b/core/src/main/java/com/chwl/core/room/face/FaceInfo.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.room.face;
+package com.chwl.core.room.face;
 
 import com.google.gson.annotations.SerializedName;
-import com.yizhuan.xchat_android_core.gift.bean.SimpleVipInfo;
+import com.chwl.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/chwl/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/chwl/core/room/face/FaceListInfo.java
index e510a6b22..ccb84bc5c 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/face/FaceListInfo.java
+++ b/core/src/main/java/com/chwl/core/room/face/FaceListInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.face;
+package com.chwl.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/chwl/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/chwl/core/room/face/FaceReceiveInfo.java
index 1294a649a..546471369 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/face/FaceReceiveInfo.java
+++ b/core/src/main/java/com/chwl/core/room/face/FaceReceiveInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.face;
+package com.chwl.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/chwl/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/chwl/core/room/face/IDynamicFaceModel.java
index 2147e330a..76f14f898 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/face/IDynamicFaceModel.java
+++ b/core/src/main/java/com/chwl/core/room/face/IDynamicFaceModel.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.room.face;
+package com.chwl.core.room.face;
 
 import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage;
-import com.yizhuan.xchat_android_core.base.IModel;
+import com.chwl.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/chwl/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/chwl/core/room/face/IFaceCore.java
index 23572811a..5ecce39bd 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/face/IFaceCore.java
+++ b/core/src/main/java/com/chwl/core/room/face/IFaceCore.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.room.face;
+package com.chwl.core.room.face;
 
 import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage;
-import com.yizhuan.xchat_android_library.coremanager.IBaseCore;
+import com.chwl.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/chwl/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/chwl/core/room/face/IFaceCoreClient.java
index b4baa6553..ae168fd4d 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/face/IFaceCoreClient.java
+++ b/core/src/main/java/com/chwl/core/room/face/IFaceCoreClient.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.room.face;
+package com.chwl.core.room.face;
 
 import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage;
-import com.yizhuan.xchat_android_library.coremanager.ICoreClient;
+import com.chwl.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/chwl/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/chwl/core/room/game/GameCfg.kt
index 65f47ad14..b7188d16f 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameCfg.kt
+++ b/core/src/main/java/com/chwl/core/room/game/GameCfg.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.game
+package com.chwl.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/chwl/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/chwl/core/room/game/GameCodeInfo.kt
index 8a155d344..7e547318e 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameCodeInfo.kt
+++ b/core/src/main/java/com/chwl/core/room/game/GameCodeInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.game
+package com.chwl.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/chwl/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/chwl/core/room/game/GameInfo.kt
index 1b279dc03..bcd8ea403 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameInfo.kt
+++ b/core/src/main/java/com/chwl/core/room/game/GameInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.game
+package com.chwl.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/chwl/core/room/game/GameModel.kt
similarity index 75%
rename from core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameModel.kt
rename to core/src/main/java/com/chwl/core/room/game/GameModel.kt
index d62d7042e..086d3e2a3 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameModel.kt
+++ b/core/src/main/java/com/chwl/core/room/game/GameModel.kt
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_core.room.game
+package com.chwl.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.utils.net.RxHelper
-import com.yizhuan.xchat_android_library.net.rxnet.RxNet
+import com.chwl.core.auth.AuthModel
+import com.chwl.core.base.BaseModel
+import com.chwl.core.bean.response.ServiceResult
+import com.chwl.core.utils.net.RxHelper
+import com.chwl.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/chwl/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/chwl/core/room/game/GameStatus.java
index 09520854b..feb65cfd9 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameStatus.java
+++ b/core/src/main/java/com/chwl/core/room/game/GameStatus.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.game;
+package com.chwl.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/chwl/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/chwl/core/room/giftvalue/GiftValueModel.java
index 86a87a8e7..26e9cf957 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/GiftValueModel.java
+++ b/core/src/main/java/com/chwl/core/room/giftvalue/GiftValueModel.java
@@ -1,13 +1,13 @@
-package com.yizhuan.xchat_android_core.room.giftvalue;
+package com.chwl.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.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.room.giftvalue.bean.RoomGiftValue;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.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/chwl/core/room/giftvalue/IGiftValueModel.java
similarity index 84%
rename from core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/IGiftValueModel.java
rename to core/src/main/java/com/chwl/core/room/giftvalue/IGiftValueModel.java
index 9c7cb3ebf..b155c21b0 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/IGiftValueModel.java
+++ b/core/src/main/java/com/chwl/core/room/giftvalue/IGiftValueModel.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.room.giftvalue;
+package com.chwl.core.room.giftvalue;
 
-import com.yizhuan.xchat_android_core.room.giftvalue.bean.RoomGiftValue;
+import com.chwl.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/chwl/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/chwl/core/room/giftvalue/bean/GiftValueCommonUpdate.java
index d3d4ace9e..f2b16ba06 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/GiftValueCommonUpdate.java
+++ b/core/src/main/java/com/chwl/core/room/giftvalue/bean/GiftValueCommonUpdate.java
@@ -1,11 +1,11 @@
-package com.yizhuan.xchat_android_core.room.giftvalue.bean;
+package com.chwl.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.chwl.core.gift.GiftModel;
+import com.chwl.core.gift.bean.GiftInfo;
+import com.chwl.core.gift.bean.GiftMultiReceiverInfo;
+import com.chwl.core.gift.bean.GiftReceiveInfo;
+import com.chwl.core.gift.bean.LuckyBagGifts;
+import com.chwl.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/chwl/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/chwl/core/room/giftvalue/bean/GiftValueData.java
index 7fea75685..47b639c2c 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/GiftValueData.java
+++ b/core/src/main/java/com/chwl/core/room/giftvalue/bean/GiftValueData.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.room.giftvalue.bean;
+package com.chwl.core.room.giftvalue.bean;
 
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.Observer;
 
-import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
+import com.chwl.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/chwl/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/chwl/core/room/giftvalue/bean/GiftValueNetData.java
index c35763015..d08a463a5 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/GiftValueNetData.java
+++ b/core/src/main/java/com/chwl/core/room/giftvalue/bean/GiftValueNetData.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.giftvalue.bean;
+package com.chwl.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/chwl/core/room/giftvalue/bean/IndexGiftValue.java
similarity index 78%
rename from core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/IndexGiftValue.java
rename to core/src/main/java/com/chwl/core/room/giftvalue/bean/IndexGiftValue.java
index 0a69a8f21..b973065ee 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/IndexGiftValue.java
+++ b/core/src/main/java/com/chwl/core/room/giftvalue/bean/IndexGiftValue.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.giftvalue.bean;
+package com.chwl.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/chwl/core/room/giftvalue/bean/RoomGiftValue.java
similarity index 86%
rename from core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/RoomGiftValue.java
rename to core/src/main/java/com/chwl/core/room/giftvalue/bean/RoomGiftValue.java
index 9f7a81b0d..8a6b367ff 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/RoomGiftValue.java
+++ b/core/src/main/java/com/chwl/core/room/giftvalue/bean/RoomGiftValue.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.giftvalue.bean;
+package com.chwl.core.room.giftvalue.bean;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/helper/GiftValueFormat.java b/core/src/main/java/com/chwl/core/room/giftvalue/helper/GiftValueFormat.java
similarity index 75%
rename from core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/helper/GiftValueFormat.java
rename to core/src/main/java/com/chwl/core/room/giftvalue/helper/GiftValueFormat.java
index 88f866b68..e256810ec 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/helper/GiftValueFormat.java
+++ b/core/src/main/java/com/chwl/core/room/giftvalue/helper/GiftValueFormat.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.room.giftvalue.helper;
-import com.yizhuan.xchat_android_core.R;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+package com.chwl.core.room.giftvalue.helper;
+import com.chwl.core.R;
+import com.chwl.library.utils.ResUtil;
 
 /**
  * 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/chwl/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/chwl/core/room/giftvalue/helper/GiftValueMrg.java
index ad5076aeb..0e0d28d01 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/helper/GiftValueMrg.java
+++ b/core/src/main/java/com/chwl/core/room/giftvalue/helper/GiftValueMrg.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.giftvalue.helper;
+package com.chwl.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.chwl.core.auth.AuthModel;
+import com.chwl.core.bean.RoomQueueInfo;
+import com.chwl.core.im.custom.bean.RoomGiftValueAttachment;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.room.giftvalue.GiftValueModel;
+import com.chwl.core.room.giftvalue.bean.GiftValueCommonUpdate;
+import com.chwl.core.room.giftvalue.bean.GiftValueData;
+import com.chwl.core.room.giftvalue.bean.IndexGiftValue;
+import com.chwl.core.room.giftvalue.bean.RoomGiftValue;
+import com.chwl.core.utils.net.DontWarnObserver;
+import com.chwl.library.net.rxnet.callback.CallBack;
+import com.chwl.library.utils.JavaUtil;
+import com.chwl.library.utils.ListUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/AvRoomModel.java b/core/src/main/java/com/chwl/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/chwl/core/room/model/AvRoomModel.java
index ab80bf96a..7b653fd25 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/AvRoomModel.java
+++ b/core/src/main/java/com/chwl/core/room/model/AvRoomModel.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.model;
+package com.chwl.core.room.model;
 
 import android.annotation.SuppressLint;
 import android.text.TextUtils;
@@ -22,44 +22,44 @@ import com.netease.nimlib.sdk.msg.attachment.MsgAttachment;
 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.R;
-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.im.custom.bean.CustomAttachment;
-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.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.FirstChargeInfo;
-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.ResUtil;
+import com.chwl.core.R;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.decoration.car.bean.CarInfo;
+import com.chwl.core.decoration.headwear.bean.HeadWearInfo;
+import com.chwl.core.gift.bean.GiftInfo;
+import com.chwl.core.home.bean.HomeRoomInfo;
+import com.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.core.initial.InitialModel;
+import com.chwl.core.initial.bean.InitInfo;
+import com.chwl.core.level.UserLevelVo;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.manager.RoomEvent;
+import com.chwl.core.noble.NobleInfo;
+import com.chwl.core.patriarch.exception.PmRoomLimitException;
+import com.chwl.core.room.activitytimer.ActivityTimerEvent;
+import com.chwl.core.room.activitytimer.TimerBean;
+import com.chwl.core.room.bean.BroadcastInfo;
+import com.chwl.core.room.bean.RoomInfo;
+import com.chwl.core.room.bean.RoomResult;
+import com.chwl.core.room.bean.RoomWelcomeConfig;
+import com.chwl.core.room.bean.SearchRoomInfo;
+import com.chwl.core.room.bean.SimplePartyRoomInfo;
+import com.chwl.core.room.event.RoomInfoEvent;
+import com.chwl.core.room.giftvalue.helper.GiftValueMrg;
+import com.chwl.core.room.model.inteface.IAvRoomModel;
+import com.chwl.core.room.pk.model.PkModel;
+import com.chwl.core.super_admin.bean.KickOutExtBean;
+import com.chwl.core.super_admin.util.SuperAdminUtil;
+import com.chwl.core.user.UserModel;
+import com.chwl.core.user.bean.FirstChargeInfo;
+import com.chwl.core.user.bean.UserInfo;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.callback.CallBack;
+import com.chwl.library.utils.JavaUtil;
+import com.chwl.library.utils.ListUtils;
+import com.chwl.library.utils.ResUtil;
 
 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/chwl/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/chwl/core/room/model/HomePartyModel.java
index 7bf355f09..55fe9e6f8 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/HomePartyModel.java
+++ b/core/src/main/java/com/chwl/core/room/model/HomePartyModel.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.model;
+package com.chwl.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.chwl.core.auth.AuthModel;
+import com.chwl.core.bean.RoomQueueInfo;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.kick.KickModel;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.noble.NobleResourceType;
+import com.chwl.core.noble.NobleUtil;
+import com.chwl.core.room.model.inteface.IHomePartyModel;
+import com.chwl.core.super_admin.util.SaAttachmentFactory;
+import com.chwl.core.super_admin.util.SuperAdminUtil;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.net.rxnet.callback.CallBack;
+import com.chwl.library.utils.ListUtils;
+import com.chwl.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/chwl/core/room/model/HomePartyUserListModel.java
similarity index 94%
rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/HomePartyUserListModel.java
rename to core/src/main/java/com/chwl/core/room/model/HomePartyUserListModel.java
index 962f451a9..c65caee7e 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/HomePartyUserListModel.java
+++ b/core/src/main/java/com/chwl/core/room/model/HomePartyUserListModel.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.model;
+package com.chwl.core.room.model;
 
 import android.text.TextUtils;
 
@@ -7,15 +7,15 @@ 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.R;
-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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.core.Constants;
+import com.chwl.core.bean.RoomQueueInfo;
+import com.chwl.core.exception.ErrorThrowable;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.room.bean.OnlineChatMember;
+import com.chwl.core.room.model.inteface.IHomePartyUserListModel;
+import com.chwl.library.utils.ListUtils;
+import com.chwl.library.utils.ResUtil;
 
 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/chwl/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/chwl/core/room/model/MicQueueModel.java
index d1ad629c1..5316efca5 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/MicQueueModel.java
+++ b/core/src/main/java/com/chwl/core/room/model/MicQueueModel.java
@@ -1,13 +1,13 @@
-package com.yizhuan.xchat_android_core.room.model;
+package com.chwl.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.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.room.model.inteface.IMicQueueModel;
+import com.chwl.core.room.queuing_mic.bean.RespQueuingMicListInfo;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.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/chwl/core/room/model/RoomBaseModel.java
similarity index 95%
rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomBaseModel.java
rename to core/src/main/java/com/chwl/core/room/model/RoomBaseModel.java
index b9ee98d46..c6500a08c 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomBaseModel.java
+++ b/core/src/main/java/com/chwl/core/room/model/RoomBaseModel.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.model;
+package com.chwl.core.room.model;
 
 import android.annotation.SuppressLint;
 import android.text.TextUtils;
@@ -21,45 +21,45 @@ 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.R;
-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.GiftFreeInfo;
-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.FirstChargeInfo;
-import com.yizhuan.xchat_android_core.user.bean.UserInfo;
-import com.yizhuan.xchat_android_core.utils.net.RxHelper;
-import com.yizhuan.xchat_android_core.vip.UserVipInfo;
-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.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
+import com.chwl.core.R;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.RoomMicInfo;
+import com.chwl.core.bean.RoomQueueInfo;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.decoration.headwear.bean.HeadWearInfo;
+import com.chwl.core.exception.ErrorThrowable;
+import com.chwl.core.gift.bean.GiftFreeInfo;
+import com.chwl.core.gift.bean.GiftInfo;
+import com.chwl.core.home.bean.BannerInfo;
+import com.chwl.core.home.bean.HomeRoomInfo;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.room.activitytimer.TimerBean;
+import com.chwl.core.room.bean.BroadcastInfo;
+import com.chwl.core.room.bean.RoomInfo;
+import com.chwl.core.room.bean.RoomResult;
+import com.chwl.core.room.bean.RoomSettingTabInfo;
+import com.chwl.core.room.bean.RoomWelcomeConfig;
+import com.chwl.core.room.bean.SearchRoomInfo;
+import com.chwl.core.room.bean.SimplePartyRoomInfo;
+import com.chwl.core.room.giftvalue.helper.GiftValueMrg;
+import com.chwl.core.room.model.inteface.IRoomBaseModel;
+import com.chwl.core.room.pk.bean.RoomPKInvitedUpMicMember;
+import com.chwl.core.room.pk.model.PkModel;
+import com.chwl.core.room.queue.bean.MicMemberInfo;
+import com.chwl.core.user.UserModel;
+import com.chwl.core.user.bean.BaseInfo;
+import com.chwl.core.user.bean.FirstChargeInfo;
+import com.chwl.core.user.bean.UserInfo;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.core.vip.UserVipInfo;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.net.rxnet.callback.CallBack;
+import com.chwl.library.utils.JavaUtil;
+import com.chwl.library.utils.ListUtils;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SingleToastUtil;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomCharmModel.java b/core/src/main/java/com/chwl/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/chwl/core/room/model/RoomCharmModel.java
index a3754aa4d..99fb3db70 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomCharmModel.java
+++ b/core/src/main/java/com/chwl/core/room/model/RoomCharmModel.java
@@ -1,11 +1,11 @@
-package com.yizhuan.xchat_android_core.room.model;
+package com.chwl.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.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.room.bean.RoomContributeDataInfo;
+import com.chwl.core.room.model.inteface.IRoomCharmModel;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.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/chwl/core/room/model/RoomContributeListModel.java
similarity index 81%
rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomContributeListModel.java
rename to core/src/main/java/com/chwl/core/room/model/RoomContributeListModel.java
index 3824602ae..bb2a408fd 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomContributeListModel.java
+++ b/core/src/main/java/com/chwl/core/room/model/RoomContributeListModel.java
@@ -1,15 +1,15 @@
-package com.yizhuan.xchat_android_core.room.model;
+package com.chwl.core.room.model;
 
-import com.yizhuan.xchat_android_core.R;
-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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.room.bean.RoomContributeDataInfo;
+import com.chwl.core.room.bean.RoomInfo;
+import com.chwl.core.room.model.inteface.IRoomContributeListModel;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.utils.ResUtil;
 
 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/chwl/core/room/model/RoomInviteFansModel.kt
similarity index 74%
rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomInviteFansModel.kt
rename to core/src/main/java/com/chwl/core/room/model/RoomInviteFansModel.kt
index 7b42b5ecd..70ee53bc6 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomInviteFansModel.kt
+++ b/core/src/main/java/com/chwl/core/room/model/RoomInviteFansModel.kt
@@ -1,12 +1,12 @@
-package com.yizhuan.xchat_android_core.room.model
+package com.chwl.core.room.model
 
 
 
-import com.yizhuan.xchat_android_core.bean.response.ServiceResult
-import com.yizhuan.xchat_android_core.room.bean.RoomInviteFansInfo
-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.chwl.core.bean.response.ServiceResult
+import com.chwl.core.room.bean.RoomInviteFansInfo
+import com.chwl.core.utils.net.handleBeanData
+import com.chwl.core.utils.net.io2main
+import com.chwl.library.net.rxnet.RxNet
 import io.reactivex.Single
 import retrofit2.http.GET
 import retrofit2.http.POST
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomInviteModel.java b/core/src/main/java/com/chwl/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/chwl/core/room/model/RoomInviteModel.java
index ce0b8eab9..c378106f8 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomInviteModel.java
+++ b/core/src/main/java/com/chwl/core/room/model/RoomInviteModel.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.room.model;
+package com.chwl.core.room.model;
 
 import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember;
-import com.yizhuan.xchat_android_core.Constants;
-import com.yizhuan.xchat_android_core.room.model.inteface.IRoomInviteModel;
-import com.yizhuan.xchat_android_library.utils.ListUtils;
+import com.chwl.core.Constants;
+import com.chwl.core.room.model.inteface.IRoomInviteModel;
+import com.chwl.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/RoomRankModel.java b/core/src/main/java/com/chwl/core/room/model/RoomRankModel.java
similarity index 78%
rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomRankModel.java
rename to core/src/main/java/com/chwl/core/room/model/RoomRankModel.java
index ba89fa355..eaad4bca0 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomRankModel.java
+++ b/core/src/main/java/com/chwl/core/room/model/RoomRankModel.java
@@ -1,11 +1,11 @@
-package com.yizhuan.xchat_android_core.room.model;
+package com.chwl.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.model.inteface.IRoomRankModel;
-import com.yizhuan.xchat_android_core.utils.net.RxHelper;
-import com.yizhuan.xchat_android_library.net.rxnet.RxNet;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.room.bean.RoomRankHalfHourDataInfo;
+import com.chwl.core.room.model.inteface.IRoomRankModel;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.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/chwl/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/chwl/core/room/model/RoomSettingModel.java
index bcf7b209a..8208d849d 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomSettingModel.java
+++ b/core/src/main/java/com/chwl/core/room/model/RoomSettingModel.java
@@ -1,19 +1,19 @@
-package com.yizhuan.xchat_android_core.room.model;
+package com.chwl.core.room.model;
 
 import android.text.TextUtils;
 
-import com.yizhuan.xchat_android_core.R;
-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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.manager.BaseMvpModel;
+import com.chwl.core.room.bean.RoomInfo;
+import com.chwl.core.room.bean.RoomSettingTabInfo;
+import com.chwl.core.room.bean.SingleRoomSortInfo;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.net.rxnet.callback.CallBack;
+import com.chwl.library.utils.ResUtil;
 
 import java.util.List;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IAvRoomModel.java b/core/src/main/java/com/chwl/core/room/model/inteface/IAvRoomModel.java
similarity index 81%
rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IAvRoomModel.java
rename to core/src/main/java/com/chwl/core/room/model/inteface/IAvRoomModel.java
index 77ab9ce5f..19516002b 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IAvRoomModel.java
+++ b/core/src/main/java/com/chwl/core/room/model/inteface/IAvRoomModel.java
@@ -1,21 +1,21 @@
-package com.yizhuan.xchat_android_core.room.model.inteface;
+package com.chwl.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.GiftFreeInfo;
-import com.yizhuan.xchat_android_core.gift.bean.GiftInfo;
-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_core.user.bean.FirstChargeInfo;
-import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack;
+import com.chwl.core.base.IModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.gift.bean.GiftFreeInfo;
+import com.chwl.core.gift.bean.GiftInfo;
+import com.chwl.core.home.bean.HomeRoomInfo;
+import com.chwl.core.room.activitytimer.TimerBean;
+import com.chwl.core.room.bean.BroadcastInfo;
+import com.chwl.core.room.bean.RoomInfo;
+import com.chwl.core.room.bean.RoomResult;
+import com.chwl.core.room.bean.RoomWelcomeConfig;
+import com.chwl.core.room.bean.SearchRoomInfo;
+import com.chwl.core.room.bean.SimplePartyRoomInfo;
+import com.chwl.core.user.bean.FirstChargeInfo;
+import com.chwl.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/chwl/core/room/model/inteface/IHomePartyModel.java
similarity index 90%
rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IHomePartyModel.java
rename to core/src/main/java/com/chwl/core/room/model/inteface/IHomePartyModel.java
index bbd301431..dc774f2f3 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IHomePartyModel.java
+++ b/core/src/main/java/com/chwl/core/room/model/inteface/IHomePartyModel.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.room.model.inteface;
+package com.chwl.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.chwl.core.base.IModel;
+import com.chwl.library.net.rxnet.callback.CallBack;
 
 import java.util.List;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IHomePartyUserListModel.java b/core/src/main/java/com/chwl/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/chwl/core/room/model/inteface/IHomePartyUserListModel.java
index d3872de0d..9fc18ef0e 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IHomePartyUserListModel.java
+++ b/core/src/main/java/com/chwl/core/room/model/inteface/IHomePartyUserListModel.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.room.model.inteface;
+package com.chwl.core.room.model.inteface;
 
-import com.yizhuan.xchat_android_core.base.IModel;
-import com.yizhuan.xchat_android_core.room.bean.OnlineChatMember;
+import com.chwl.core.base.IModel;
+import com.chwl.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/chwl/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/chwl/core/room/model/inteface/IMicQueueModel.java
index e954aaeca..07783ca99 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IMicQueueModel.java
+++ b/core/src/main/java/com/chwl/core/room/model/inteface/IMicQueueModel.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.room.model.inteface;
+package com.chwl.core.room.model.inteface;
 
-import com.yizhuan.xchat_android_core.room.queuing_mic.bean.RespQueuingMicListInfo;
+import com.chwl.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/chwl/core/room/model/inteface/IRoomBaseModel.java
similarity index 90%
rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomBaseModel.java
rename to core/src/main/java/com/chwl/core/room/model/inteface/IRoomBaseModel.java
index d0de1fe68..0060ad489 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomBaseModel.java
+++ b/core/src/main/java/com/chwl/core/room/model/inteface/IRoomBaseModel.java
@@ -1,16 +1,16 @@
-package com.yizhuan.xchat_android_core.room.model.inteface;
+package com.chwl.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.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.chwl.core.base.IModel;
+import com.chwl.core.room.bean.RoomInfo;
+import com.chwl.core.room.bean.RoomResult;
+import com.chwl.core.room.pk.bean.RoomPKInvitedUpMicMember;
+import com.chwl.core.user.bean.BaseInfo;
+import com.chwl.core.user.bean.UserInfo;
+import com.chwl.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/chwl/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/chwl/core/room/model/inteface/IRoomCharmModel.java
index 75a5c9ebc..90a35f78c 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomCharmModel.java
+++ b/core/src/main/java/com/chwl/core/room/model/inteface/IRoomCharmModel.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.room.model.inteface;
+package com.chwl.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.chwl.core.base.IModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.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/chwl/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/chwl/core/room/model/inteface/IRoomContributeListModel.java
index ee60a5f32..03c2ab871 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomContributeListModel.java
+++ b/core/src/main/java/com/chwl/core/room/model/inteface/IRoomContributeListModel.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.room.model.inteface;
+package com.chwl.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.chwl.core.base.IModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.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/chwl/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/chwl/core/room/model/inteface/IRoomInviteModel.java
index a2f7b5438..af1e2f359 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomInviteModel.java
+++ b/core/src/main/java/com/chwl/core/room/model/inteface/IRoomInviteModel.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.room.model.inteface;
+package com.chwl.core.room.model.inteface;
 
 import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember;
-import com.yizhuan.xchat_android_core.base.IModel;
+import com.chwl.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/chwl/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/chwl/core/room/model/inteface/IRoomRankModel.java
index 3fbc12ddd..971d01a30 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomRankModel.java
+++ b/core/src/main/java/com/chwl/core/room/model/inteface/IRoomRankModel.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.room.model.inteface;
+package com.chwl.core.room.model.inteface;
 
-import com.yizhuan.xchat_android_core.base.IModel;
-import com.yizhuan.xchat_android_core.room.bean.RoomRankHalfHourDataInfo;
+import com.chwl.core.base.IModel;
+import com.chwl.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/chwl/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/chwl/core/room/model/inteface/IRoomSettingModel.java
index eaddbf95e..dd4298ba5 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomSettingModel.java
+++ b/core/src/main/java/com/chwl/core/room/model/inteface/IRoomSettingModel.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.room.model.inteface;
+package com.chwl.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.chwl.core.base.IModel;
+import com.chwl.core.room.bean.RoomInfo;
+import com.chwl.core.room.bean.RoomSettingTabInfo;
+import com.chwl.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/chwl/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/chwl/core/room/pk/attachment/RoomPkAttachment.java
index 0022f0d7d..88baf49d2 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/attachment/RoomPkAttachment.java
+++ b/core/src/main/java/com/chwl/core/room/pk/attachment/RoomPkAttachment.java
@@ -1,12 +1,12 @@
-package com.yizhuan.xchat_android_core.room.pk.attachment;
+package com.chwl.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.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.core.room.pk.bean.RoomPKInvitedUpMicMember;
+import com.chwl.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/chwl/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/chwl/core/room/pk/bean/PKMemberInfo.java
index 279f7ec00..eae9d9d85 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKMemberInfo.java
+++ b/core/src/main/java/com/chwl/core/room/pk/bean/PKMemberInfo.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.room.pk.bean;
+package com.chwl.core.room.pk.bean;
 
-import com.yizhuan.xchat_android_core.user.bean.UserInfo;
+import com.chwl.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/chwl/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/chwl/core/room/pk/bean/PKQueuingMicMemberInfo.java
index de5d1cc4c..732907b05 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKQueuingMicMemberInfo.java
+++ b/core/src/main/java/com/chwl/core/room/pk/bean/PKQueuingMicMemberInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.pk.bean;
+package com.chwl.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/chwl/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/chwl/core/room/pk/bean/PKRecordInfo.java
index 0c701ffed..2cfb86897 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKRecordInfo.java
+++ b/core/src/main/java/com/chwl/core/room/pk/bean/PKRecordInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.pk.bean;
+package com.chwl.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/chwl/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/chwl/core/room/pk/bean/PKRecordListInfo.java
index 8b493d066..db476aa64 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKRecordListInfo.java
+++ b/core/src/main/java/com/chwl/core/room/pk/bean/PKRecordListInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.pk.bean;
+package com.chwl.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/chwl/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/chwl/core/room/pk/bean/PKRespQueuingMicListInfo.java
index 6317f178a..c04b961d1 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKRespQueuingMicListInfo.java
+++ b/core/src/main/java/com/chwl/core/room/pk/bean/PKRespQueuingMicListInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.pk.bean;
+package com.chwl.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/chwl/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/chwl/core/room/pk/bean/PKTeamInfo.java
index a640f0ac4..07ff249de 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKTeamInfo.java
+++ b/core/src/main/java/com/chwl/core/room/pk/bean/PKTeamInfo.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.room.pk.bean;
+package com.chwl.core.room.pk.bean;
 
-import com.yizhuan.xchat_android_core.user.bean.UserInfo;
+import com.chwl.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/chwl/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/chwl/core/room/pk/bean/PKTeamMember.java
index be76a517c..e97ad62cd 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKTeamMember.java
+++ b/core/src/main/java/com/chwl/core/room/pk/bean/PKTeamMember.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.pk.bean;
+package com.chwl.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/chwl/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/chwl/core/room/pk/bean/RoomPKInvitedUpMicMember.java
index 3e5c0b9ba..1818bf739 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/RoomPKInvitedUpMicMember.java
+++ b/core/src/main/java/com/chwl/core/room/pk/bean/RoomPKInvitedUpMicMember.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.pk.bean;
+package com.chwl.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/chwl/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/chwl/core/room/pk/bean/RoomPkData.java
index e4b268214..add6dbc50 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/RoomPkData.java
+++ b/core/src/main/java/com/chwl/core/room/pk/bean/RoomPkData.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.pk.bean;
+package com.chwl.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/chwl/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/chwl/core/room/pk/bean/request/CreatePKMember.java
index 896c53902..0cf7d0497 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/request/CreatePKMember.java
+++ b/core/src/main/java/com/chwl/core/room/pk/bean/request/CreatePKMember.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.pk.bean.request;
+package com.chwl.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/chwl/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/chwl/core/room/pk/bean/response/RespPKData.java
index b8af5bef7..1e8be7167 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/response/RespPKData.java
+++ b/core/src/main/java/com/chwl/core/room/pk/bean/response/RespPKData.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.room.pk.bean.response;
+package com.chwl.core.room.pk.bean.response;
 
-import com.yizhuan.xchat_android_core.room.pk.bean.RoomPkData;
+import com.chwl.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/chwl/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/chwl/core/room/pk/event/PKDataUpdateEvent.java
index f68be068b..1c46f5a72 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/event/PKDataUpdateEvent.java
+++ b/core/src/main/java/com/chwl/core/room/pk/event/PKDataUpdateEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.pk.event;
+package com.chwl.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/chwl/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/chwl/core/room/pk/event/PKStateEvent.java
index bb3eeb0b5..5da85c62b 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/event/PKStateEvent.java
+++ b/core/src/main/java/com/chwl/core/room/pk/event/PKStateEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.pk.event;
+package com.chwl.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/chwl/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/chwl/core/room/pk/event/PKTimeFinishEvent.java
index 2fe149a35..955d5dcfc 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/event/PKTimeFinishEvent.java
+++ b/core/src/main/java/com/chwl/core/room/pk/event/PKTimeFinishEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.pk.event;
+package com.chwl.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/chwl/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/chwl/core/room/pk/event/PKTimeTickEvent.java
index 075b20c01..c5bd8ff9f 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/event/PKTimeTickEvent.java
+++ b/core/src/main/java/com/chwl/core/room/pk/event/PKTimeTickEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.pk.event;
+package com.chwl.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/chwl/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/chwl/core/room/pk/model/IPkModel.java
index ec388f777..a91711bb3 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/IPkModel.java
+++ b/core/src/main/java/com/chwl/core/room/pk/model/IPkModel.java
@@ -1,15 +1,15 @@
-package com.yizhuan.xchat_android_core.room.pk.model;
+package com.chwl.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.chwl.core.base.IModel;
+import com.chwl.core.room.pk.bean.PKMemberInfo;
+import com.chwl.core.room.pk.bean.PKRecordListInfo;
+import com.chwl.core.room.pk.bean.PKRespQueuingMicListInfo;
+import com.chwl.core.room.pk.bean.PKTeamInfo;
+import com.chwl.core.room.pk.bean.RoomPKInvitedUpMicMember;
+import com.chwl.core.room.pk.bean.RoomPkData;
+import com.chwl.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/chwl/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/chwl/core/room/pk/model/PkModel.java
index 25770046b..a3b3b594f 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/PkModel.java
+++ b/core/src/main/java/com/chwl/core/room/pk/model/PkModel.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.pk.model;
+package com.chwl.core.room.pk.model;
 
 import android.annotation.SuppressLint;
 import android.os.CountDownTimer;
@@ -10,48 +10,48 @@ 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.R;
-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.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.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.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
+import com.chwl.core.R;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.RoomQueueInfo;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.gift.GiftModel;
+import com.chwl.core.gift.bean.GiftInfo;
+import com.chwl.core.gift.bean.GiftList;
+import com.chwl.core.gift.bean.GiftMultiReceiverInfo;
+import com.chwl.core.gift.bean.GiftReceiveInfo;
+import com.chwl.core.gift.bean.GiftReceiver;
+import com.chwl.core.gift.bean.LuckyBagGifts;
+import com.chwl.core.gift.bean.MultiGiftReceiveInfo;
+import com.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.core.magic.MagicModel;
+import com.chwl.core.magic.bean.MagicInfo;
+import com.chwl.core.magic.bean.MagicReceivedInfo;
+import com.chwl.core.magic.bean.MultiMagicReceivedInfo;
+import com.chwl.core.manager.AudioEngineManager;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.manager.RoomEvent;
+import com.chwl.core.room.model.AvRoomModel;
+import com.chwl.core.room.pk.attachment.RoomPkAttachment;
+import com.chwl.core.room.pk.bean.PKMemberInfo;
+import com.chwl.core.room.pk.bean.PKRecordListInfo;
+import com.chwl.core.room.pk.bean.PKRespQueuingMicListInfo;
+import com.chwl.core.room.pk.bean.PKTeamInfo;
+import com.chwl.core.room.pk.bean.PKTeamMember;
+import com.chwl.core.room.pk.bean.RoomPKInvitedUpMicMember;
+import com.chwl.core.room.pk.bean.RoomPkData;
+import com.chwl.core.room.pk.bean.request.CreatePKMember;
+import com.chwl.core.room.pk.bean.response.RespPKData;
+import com.chwl.core.room.pk.event.PKDataUpdateEvent;
+import com.chwl.core.room.pk.event.PKTimeFinishEvent;
+import com.chwl.core.room.pk.event.PKTimeTickEvent;
+import com.chwl.core.user.UserModel;
+import com.chwl.core.user.bean.UserInfo;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.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/chwl/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/chwl/core/room/queue/bean/ConsumeInfo.java
index 73133ecfd..5dd29fb20 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/queue/bean/ConsumeInfo.java
+++ b/core/src/main/java/com/chwl/core/room/queue/bean/ConsumeInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.queue.bean;
+package com.chwl.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/chwl/core/room/queue/bean/MicMemberInfo.java
similarity index 97%
rename from core/src/main/java/com/yizhuan/xchat_android_core/room/queue/bean/MicMemberInfo.java
rename to core/src/main/java/com/chwl/core/room/queue/bean/MicMemberInfo.java
index 7582443ad..87022ffee 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/queue/bean/MicMemberInfo.java
+++ b/core/src/main/java/com/chwl/core/room/queue/bean/MicMemberInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.queue.bean;
+package com.chwl.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/chwl/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/chwl/core/room/queue/bean/RoomConsumeInfo.java
index eeb1f5991..276cb55b5 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/queue/bean/RoomConsumeInfo.java
+++ b/core/src/main/java/com/chwl/core/room/queue/bean/RoomConsumeInfo.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.room.queue.bean;
+package com.chwl.core.room.queue.bean;
 
-import com.yizhuan.xchat_android_core.level.UserLevelVo;
-import com.yizhuan.xchat_android_core.noble.NobleInfo;
+import com.chwl.core.level.UserLevelVo;
+import com.chwl.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/chwl/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/chwl/core/room/queuing_mic/attachment/QueuingMicAttachment.java
index e47a7c7e2..23b116a78 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/attachment/QueuingMicAttachment.java
+++ b/core/src/main/java/com/chwl/core/room/queuing_mic/attachment/QueuingMicAttachment.java
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_core.room.queuing_mic.attachment;
+package com.chwl.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.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.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/chwl/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/chwl/core/room/queuing_mic/bean/GroupType.java
index bd24aba37..70760a702 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/bean/GroupType.java
+++ b/core/src/main/java/com/chwl/core/room/queuing_mic/bean/GroupType.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.queuing_mic.bean;
+package com.chwl.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/chwl/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/chwl/core/room/queuing_mic/bean/QueuingMicInfo.java
index 7ba80cb8c..73abb2afc 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/bean/QueuingMicInfo.java
+++ b/core/src/main/java/com/chwl/core/room/queuing_mic/bean/QueuingMicInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.queuing_mic.bean;
+package com.chwl.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/chwl/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/chwl/core/room/queuing_mic/bean/QueuingMicMemeberInfo.java
index 871b18305..b95cd872a 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/bean/QueuingMicMemeberInfo.java
+++ b/core/src/main/java/com/chwl/core/room/queuing_mic/bean/QueuingMicMemeberInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.queuing_mic.bean;
+package com.chwl.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/chwl/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/chwl/core/room/queuing_mic/bean/RespQueuingMicListInfo.java
index 195cc68a1..27c99bedf 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/bean/RespQueuingMicListInfo.java
+++ b/core/src/main/java/com/chwl/core/room/queuing_mic/bean/RespQueuingMicListInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.queuing_mic.bean;
+package com.chwl.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/chwl/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/chwl/core/room/queuing_mic/event/HasAnimationEffect.java
index 4adfa6a9d..2e8a4c18b 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/event/HasAnimationEffect.java
+++ b/core/src/main/java/com/chwl/core/room/queuing_mic/event/HasAnimationEffect.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.queuing_mic.event;
+package com.chwl.core.room.queuing_mic.event;
 
 /**
  * 房间内更新头部开关特效图标事件
diff --git a/core/src/main/java/com/chwl/core/room/queuing_mic/event/QueuingMicEmptyEvent.java b/core/src/main/java/com/chwl/core/room/queuing_mic/event/QueuingMicEmptyEvent.java
new file mode 100644
index 000000000..b24de0d4e
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/room/queuing_mic/event/QueuingMicEmptyEvent.java
@@ -0,0 +1,4 @@
+package com.chwl.core.room.queuing_mic.event;
+
+public class QueuingMicEmptyEvent {
+}
diff --git a/core/src/main/java/com/chwl/core/room/queuing_mic/event/QueuingMicNotEmptyEvent.java b/core/src/main/java/com/chwl/core/room/queuing_mic/event/QueuingMicNotEmptyEvent.java
new file mode 100644
index 000000000..9487a68bf
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/room/queuing_mic/event/QueuingMicNotEmptyEvent.java
@@ -0,0 +1,4 @@
+package com.chwl.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/chwl/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/chwl/core/room/recommendpos/IRecommendCardModel.java
index a69ee8d2d..40a46b329 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/recommendpos/IRecommendCardModel.java
+++ b/core/src/main/java/com/chwl/core/room/recommendpos/IRecommendCardModel.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.room.recommendpos;
+package com.chwl.core.room.recommendpos;
 
-import com.yizhuan.xchat_android_core.room.recommendpos.bean.RecommendCard;
+import com.chwl.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.chwl.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/chwl/core/room/recommendpos/RecommendCardModel.java
similarity index 68%
rename from core/src/main/java/com/yizhuan/xchat_android_core/room/recommendpos/RecommendCardModel.java
rename to core/src/main/java/com/chwl/core/room/recommendpos/RecommendCardModel.java
index bf740098d..d39b45bce 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/recommendpos/RecommendCardModel.java
+++ b/core/src/main/java/com/chwl/core/room/recommendpos/RecommendCardModel.java
@@ -1,11 +1,11 @@
-package com.yizhuan.xchat_android_core.room.recommendpos;
+package com.chwl.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.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.room.recommendpos.bean.RecommendCard;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -33,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.chwl.core.room.recommendpos.bean.RcmdCardType}
      * @return list
      */
     @Override
@@ -46,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.chwl.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/chwl/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/chwl/core/room/recommendpos/bean/RcmdCardType.java
index 3f7927c3f..90241f48b 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/recommendpos/bean/RcmdCardType.java
+++ b/core/src/main/java/com/chwl/core/room/recommendpos/bean/RcmdCardType.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.recommendpos.bean;
+package com.chwl.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/chwl/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/chwl/core/room/recommendpos/bean/RecommendCard.java
index f8b695832..46e1e45ad 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/recommendpos/bean/RecommendCard.java
+++ b/core/src/main/java/com/chwl/core/room/recommendpos/bean/RecommendCard.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.recommendpos.bean;
+package com.chwl.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/chwl/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/chwl/core/room/treasure_box/bean/BoxRankingInfo.java
index 61eb0917b..ac7e46194 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/treasure_box/bean/BoxRankingInfo.java
+++ b/core/src/main/java/com/chwl/core/room/treasure_box/bean/BoxRankingInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.treasure_box.bean;
+package com.chwl.core.room.treasure_box.bean;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/treasure_box/bean/TreasureRankingInfo.kt b/core/src/main/java/com/chwl/core/room/treasure_box/bean/TreasureRankingInfo.kt
similarity index 78%
rename from core/src/main/java/com/yizhuan/xchat_android_core/room/treasure_box/bean/TreasureRankingInfo.kt
rename to core/src/main/java/com/chwl/core/room/treasure_box/bean/TreasureRankingInfo.kt
index a3772fc8c..66574cad9 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/treasure_box/bean/TreasureRankingInfo.kt
+++ b/core/src/main/java/com/chwl/core/room/treasure_box/bean/TreasureRankingInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.room.treasure_box.bean
+package com.chwl.core.room.treasure_box.bean
 
 import java.io.Serializable
 
diff --git a/core/src/main/java/com/chwl/core/room/treasure_box/event/RefreshBoxRankingEvent.java b/core/src/main/java/com/chwl/core/room/treasure_box/event/RefreshBoxRankingEvent.java
new file mode 100644
index 000000000..da5a502aa
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/room/treasure_box/event/RefreshBoxRankingEvent.java
@@ -0,0 +1,4 @@
+package com.chwl.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/chwl/core/settings/ISettingsModel.java
similarity index 71%
rename from core/src/main/java/com/yizhuan/xchat_android_core/settings/ISettingsModel.java
rename to core/src/main/java/com/chwl/core/settings/ISettingsModel.java
index e7e7cf785..2fe3650a4 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/settings/ISettingsModel.java
+++ b/core/src/main/java/com/chwl/core/settings/ISettingsModel.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.settings;
+package com.chwl.core.settings;
 
-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.chwl.core.base.IModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.settings.bean.SysAccount;
+import com.chwl.core.user.bean.UserInfo;
 
 import io.reactivex.Single;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/settings/SettingsModel.java b/core/src/main/java/com/chwl/core/settings/SettingsModel.java
similarity index 92%
rename from core/src/main/java/com/yizhuan/xchat_android_core/settings/SettingsModel.java
rename to core/src/main/java/com/chwl/core/settings/SettingsModel.java
index 900f004b1..df65b85c9 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/settings/SettingsModel.java
+++ b/core/src/main/java/com/chwl/core/settings/SettingsModel.java
@@ -1,17 +1,17 @@
-package com.yizhuan.xchat_android_core.settings;
+package com.chwl.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.R;
-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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.settings.bean.SysAccount;
+import com.chwl.core.user.bean.UserInfo;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.utils.ResUtil;
 
 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/chwl/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/chwl/core/settings/bean/SysAccount.java
index 9533a623c..713b50e15 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/settings/bean/SysAccount.java
+++ b/core/src/main/java/com/chwl/core/settings/bean/SysAccount.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.settings.bean;
+package com.chwl.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/chwl/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/chwl/core/share/IShareCoreClient.java
index c495e0471..5ef267c8e 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/share/IShareCoreClient.java
+++ b/core/src/main/java/com/chwl/core/share/IShareCoreClient.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.share;
+package com.chwl.core.share;
 
-import com.yizhuan.xchat_android_library.coremanager.ICoreClient;
+import com.chwl.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/chwl/core/share/IShareModel.java
similarity index 83%
rename from core/src/main/java/com/yizhuan/xchat_android_core/share/IShareModel.java
rename to core/src/main/java/com/chwl/core/share/IShareModel.java
index c599ddd8d..1b4d37e8f 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/share/IShareModel.java
+++ b/core/src/main/java/com/chwl/core/share/IShareModel.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.share;
+package com.chwl.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.chwl.core.share.bean.ShareCommonInfo;
+import com.chwl.core.web.bean.WebJsBeanInfo;
+import com.chwl.library.coremanager.IBaseCore;
 
 import java.util.Map;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/share/ShareModel.java b/core/src/main/java/com/chwl/core/share/ShareModel.java
similarity index 95%
rename from core/src/main/java/com/yizhuan/xchat_android_core/share/ShareModel.java
rename to core/src/main/java/com/chwl/core/share/ShareModel.java
index 17fa9149a..4a75dafa2 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/share/ShareModel.java
+++ b/core/src/main/java/com/chwl/core/share/ShareModel.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.share;
+package com.chwl.core.share;
 
 import android.annotation.SuppressLint;
 import android.content.ClipData;
@@ -9,25 +9,25 @@ import android.util.Log;
 import com.netease.nim.uikit.common.util.sys.ClipboardUtil;
 import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder;
 import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage;
-import com.yizhuan.xchat_android_core.R;
+import com.chwl.core.R;
 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.utils.Logger;
-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.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
+import com.chwl.core.UriProvider;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.result.ShareRedPacketResult;
+import com.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.core.im.custom.bean.RoomTipAttachment;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.room.bean.RoomInfo;
+import com.chwl.core.share.bean.ShareCommonInfo;
+import com.chwl.core.user.UserModel;
+import com.chwl.core.user.bean.UserInfo;
+import com.chwl.core.utils.Logger;
+import com.chwl.core.web.bean.WebJsBeanInfo;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SingleToastUtil;
 
 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/chwl/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/chwl/core/share/bean/InAppSharingFamilyInfo.java
index d0f30c649..902530f6e 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/share/bean/InAppSharingFamilyInfo.java
+++ b/core/src/main/java/com/chwl/core/share/bean/InAppSharingFamilyInfo.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.share.bean;
+package com.chwl.core.share.bean;
 
-import com.yizhuan.xchat_android_core.family.bean.FamilyInfo;
+import com.chwl.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/chwl/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/chwl/core/share/bean/InAppSharingInfo.java
index c3c73928a..b96023eae 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/share/bean/InAppSharingInfo.java
+++ b/core/src/main/java/com/chwl/core/share/bean/InAppSharingInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.share.bean;
+package com.chwl.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/chwl/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/chwl/core/share/bean/InAppSharingMiniWorldInfo.java
index 27560b1be..232e381ca 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/share/bean/InAppSharingMiniWorldInfo.java
+++ b/core/src/main/java/com/chwl/core/share/bean/InAppSharingMiniWorldInfo.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.share.bean;
+package com.chwl.core.share.bean;
 
-import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldDetailInfo;
+import com.chwl.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/chwl/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/chwl/core/share/bean/InAppSharingRoomInfo.java
index ae2e26350..fd369c53c 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/share/bean/InAppSharingRoomInfo.java
+++ b/core/src/main/java/com/chwl/core/share/bean/InAppSharingRoomInfo.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.share.bean;
+package com.chwl.core.share.bean;
 
-import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
+import com.chwl.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/chwl/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/chwl/core/share/bean/InAppSharingTeamInfo.java
index 5dc66ee9f..edf700172 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/share/bean/InAppSharingTeamInfo.java
+++ b/core/src/main/java/com/chwl/core/share/bean/InAppSharingTeamInfo.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.share.bean;
+package com.chwl.core.share.bean;
 
-import com.yizhuan.xchat_android_core.team.bean.TeamInfo;
+import com.chwl.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/chwl/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/chwl/core/share/bean/SessionType.java
index 3db629caf..b5a6db848 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/share/bean/SessionType.java
+++ b/core/src/main/java/com/chwl/core/share/bean/SessionType.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.share.bean;
+package com.chwl.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/chwl/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/chwl/core/share/bean/ShareCommonInfo.java
index 16dd1de6f..e0018eaf0 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/share/bean/ShareCommonInfo.java
+++ b/core/src/main/java/com/chwl/core/share/bean/ShareCommonInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.share.bean;
+package com.chwl.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/chwl/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/chwl/core/skill/entity/SkillNotifyEntity.kt
index d6b344484..cee0ddc9c 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/skill/entity/SkillNotifyEntity.kt
+++ b/core/src/main/java/com/chwl/core/skill/entity/SkillNotifyEntity.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.skill.entity
+package com.chwl.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/chwl/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/chwl/core/skill/entity/SkillPostServerEntity.kt
index 44a296a66..61e9b7b98 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/skill/entity/SkillPostServerEntity.kt
+++ b/core/src/main/java/com/chwl/core/skill/entity/SkillPostServerEntity.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.skill.entity
+package com.chwl.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/chwl/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/chwl/core/skill/entity/SkillPropertyEntity.kt
index 13316d1a1..af6398453 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/skill/entity/SkillPropertyEntity.kt
+++ b/core/src/main/java/com/chwl/core/skill/entity/SkillPropertyEntity.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.skill.entity
+package com.chwl.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/chwl/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/chwl/core/skill/entity/SkillRecordEntity.kt
index a65b2756e..d35b9586d 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/skill/entity/SkillRecordEntity.kt
+++ b/core/src/main/java/com/chwl/core/skill/entity/SkillRecordEntity.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.skill.entity
+package com.chwl.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/chwl/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/chwl/core/skill/entity/SkillTypeEntity.kt
index 0100c773a..47783e304 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/skill/entity/SkillTypeEntity.kt
+++ b/core/src/main/java/com/chwl/core/skill/entity/SkillTypeEntity.kt
@@ -1,3 +1,3 @@
-package com.yizhuan.xchat_android_core.skill.entity
+package com.chwl.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/chwl/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/chwl/core/skill/event/SkillEvent.java
index 750a91734..3aa808359 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/skill/event/SkillEvent.java
+++ b/core/src/main/java/com/chwl/core/skill/event/SkillEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.skill.event;
+package com.chwl.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/chwl/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/chwl/core/statistic/StatLogKey.java
index fbb075088..982a3fa02 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatLogKey.java
+++ b/core/src/main/java/com/chwl/core/statistic/StatLogKey.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.statistic;
+package com.chwl.core.statistic;
 
 /**
  * 
 

diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/protocol/StatisticsProtocol.java b/core/src/main/java/com/chwl/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/chwl/core/statistic/protocol/StatisticsProtocol.java
index 2f3c3ab80..78807b6e8 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/protocol/StatisticsProtocol.java
+++ b/core/src/main/java/com/chwl/core/statistic/protocol/StatisticsProtocol.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.statistic.protocol;
+package com.chwl.core.statistic.protocol;
 
 /**
  * @author jiajie
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/support/config/Constants.kt b/core/src/main/java/com/chwl/core/support/config/Constants.kt
similarity index 68%
rename from core/src/main/java/com/yizhuan/xchat_android_core/support/config/Constants.kt
rename to core/src/main/java/com/chwl/core/support/config/Constants.kt
index 9dc4339b2..21b2647e1 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/support/config/Constants.kt
+++ b/core/src/main/java/com/chwl/core/support/config/Constants.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.support.config
+package com.chwl.core.support.config
 
 /**
  * Created by Max on 2023/10/26 22:50
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/FrameLayoutRoomWidget.kt b/core/src/main/java/com/chwl/core/support/room/FrameLayoutRoomWidget.kt
similarity index 97%
rename from core/src/main/java/com/yizhuan/xchat_android_core/support/room/FrameLayoutRoomWidget.kt
rename to core/src/main/java/com/chwl/core/support/room/FrameLayoutRoomWidget.kt
index 633acdd36..76661430a 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/FrameLayoutRoomWidget.kt
+++ b/core/src/main/java/com/chwl/core/support/room/FrameLayoutRoomWidget.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.support.room
+package com.chwl.core.support.room
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/RoomAbility.kt b/core/src/main/java/com/chwl/core/support/room/RoomAbility.kt
similarity index 93%
rename from core/src/main/java/com/yizhuan/xchat_android_core/support/room/RoomAbility.kt
rename to core/src/main/java/com/chwl/core/support/room/RoomAbility.kt
index 1104145f7..c77b9b631 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/RoomAbility.kt
+++ b/core/src/main/java/com/chwl/core/support/room/RoomAbility.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.support.room
+package com.chwl.core.support.room
 
 import androidx.annotation.CallSuper
 import androidx.lifecycle.Lifecycle
@@ -9,8 +9,8 @@ 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_core.support.room.lifecycle.RoomFullLifecycleObserver
-import com.yizhuan.xchat_android_core.support.room.lifecycle.RoomLifecycle
+import com.chwl.core.support.room.lifecycle.RoomFullLifecycleObserver
+import com.chwl.core.support.room.lifecycle.RoomLifecycle
 import io.reactivex.Observable
 import io.reactivex.functions.Function
 import io.reactivex.subjects.BehaviorSubject
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/RoomContext.kt b/core/src/main/java/com/chwl/core/support/room/RoomContext.kt
similarity index 92%
rename from core/src/main/java/com/yizhuan/xchat_android_core/support/room/RoomContext.kt
rename to core/src/main/java/com/chwl/core/support/room/RoomContext.kt
index 4757937c2..1646d2977 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/RoomContext.kt
+++ b/core/src/main/java/com/chwl/core/support/room/RoomContext.kt
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_core.support.room
+package com.chwl.core.support.room
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import com.example.lib_utils.log.ILog
-import com.yizhuan.xchat_android_core.support.room.lifecycle.RoomLifecycle
-import com.yizhuan.xchat_android_core.support.room.lifecycle.RoomLifecycleRegistry
+import com.chwl.core.support.room.lifecycle.RoomLifecycle
+import com.chwl.core.support.room.lifecycle.RoomLifecycleRegistry
 
 /**
  * Created by Max on 2023/10/26 11:50
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/RoomHandler.kt b/core/src/main/java/com/chwl/core/support/room/RoomHandler.kt
similarity index 70%
rename from core/src/main/java/com/yizhuan/xchat_android_core/support/room/RoomHandler.kt
rename to core/src/main/java/com/chwl/core/support/room/RoomHandler.kt
index c8cfbc7d5..4348a2df2 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/RoomHandler.kt
+++ b/core/src/main/java/com/chwl/core/support/room/RoomHandler.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.support.room
+package com.chwl.core.support.room
 
 /**
  * Created by Max on 2023/10/26 11:02
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/RoomService.kt b/core/src/main/java/com/chwl/core/support/room/RoomService.kt
similarity index 84%
rename from core/src/main/java/com/yizhuan/xchat_android_core/support/room/RoomService.kt
rename to core/src/main/java/com/chwl/core/support/room/RoomService.kt
index ef9ef505c..bd6571f39 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/RoomService.kt
+++ b/core/src/main/java/com/chwl/core/support/room/RoomService.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.support.room
+package com.chwl.core.support.room
 
 /**
  * Created by Max on 2023/10/26 12:31
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/RoomView.kt b/core/src/main/java/com/chwl/core/support/room/RoomView.kt
similarity index 91%
rename from core/src/main/java/com/yizhuan/xchat_android_core/support/room/RoomView.kt
rename to core/src/main/java/com/chwl/core/support/room/RoomView.kt
index da5ee0dc2..a13dad943 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/RoomView.kt
+++ b/core/src/main/java/com/chwl/core/support/room/RoomView.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.support.room
+package com.chwl.core.support.room
 
 import android.app.Activity
 import androidx.lifecycle.LifecycleOwner
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/RoomWidget.kt b/core/src/main/java/com/chwl/core/support/room/RoomWidget.kt
similarity index 84%
rename from core/src/main/java/com/yizhuan/xchat_android_core/support/room/RoomWidget.kt
rename to core/src/main/java/com/chwl/core/support/room/RoomWidget.kt
index 16386038e..5fec497c6 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/RoomWidget.kt
+++ b/core/src/main/java/com/chwl/core/support/room/RoomWidget.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.support.room
+package com.chwl.core.support.room
 
 import com.example.lib_utils.log.ILog
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/lifecycle/RoomFullLifecycleObserver.kt b/core/src/main/java/com/chwl/core/support/room/lifecycle/RoomFullLifecycleObserver.kt
similarity index 85%
rename from core/src/main/java/com/yizhuan/xchat_android_core/support/room/lifecycle/RoomFullLifecycleObserver.kt
rename to core/src/main/java/com/chwl/core/support/room/lifecycle/RoomFullLifecycleObserver.kt
index 7f21d1a93..5f092571e 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/lifecycle/RoomFullLifecycleObserver.kt
+++ b/core/src/main/java/com/chwl/core/support/room/lifecycle/RoomFullLifecycleObserver.kt
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.support.room.lifecycle
+package com.chwl.core.support.room.lifecycle
 
-import com.yizhuan.xchat_android_core.support.room.RoomContext
+import com.chwl.core.support.room.RoomContext
 
 
 /**
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/lifecycle/RoomLifecycle.kt b/core/src/main/java/com/chwl/core/support/room/lifecycle/RoomLifecycle.kt
similarity index 92%
rename from core/src/main/java/com/yizhuan/xchat_android_core/support/room/lifecycle/RoomLifecycle.kt
rename to core/src/main/java/com/chwl/core/support/room/lifecycle/RoomLifecycle.kt
index 7d8af95bc..f11afe3d6 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/lifecycle/RoomLifecycle.kt
+++ b/core/src/main/java/com/chwl/core/support/room/lifecycle/RoomLifecycle.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.support.room.lifecycle
+package com.chwl.core.support.room.lifecycle
 
 import com.example.lib_utils.ICleared
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/lifecycle/RoomLifecycleObserver.kt b/core/src/main/java/com/chwl/core/support/room/lifecycle/RoomLifecycleObserver.kt
similarity index 68%
rename from core/src/main/java/com/yizhuan/xchat_android_core/support/room/lifecycle/RoomLifecycleObserver.kt
rename to core/src/main/java/com/chwl/core/support/room/lifecycle/RoomLifecycleObserver.kt
index 27ac33f92..317bde1c6 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/lifecycle/RoomLifecycleObserver.kt
+++ b/core/src/main/java/com/chwl/core/support/room/lifecycle/RoomLifecycleObserver.kt
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.support.room.lifecycle
+package com.chwl.core.support.room.lifecycle
 
-import com.yizhuan.xchat_android_core.support.room.RoomContext
+import com.chwl.core.support.room.RoomContext
 
 
 /**
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/lifecycle/RoomLifecycleOwner.kt b/core/src/main/java/com/chwl/core/support/room/lifecycle/RoomLifecycleOwner.kt
similarity index 71%
rename from core/src/main/java/com/yizhuan/xchat_android_core/support/room/lifecycle/RoomLifecycleOwner.kt
rename to core/src/main/java/com/chwl/core/support/room/lifecycle/RoomLifecycleOwner.kt
index a8a5c007b..1aa56b814 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/lifecycle/RoomLifecycleOwner.kt
+++ b/core/src/main/java/com/chwl/core/support/room/lifecycle/RoomLifecycleOwner.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.support.room.lifecycle
+package com.chwl.core.support.room.lifecycle
 
 /**
  * Created by Max on 2023/10/26 11:50
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/lifecycle/RoomLifecycleRegistry.kt b/core/src/main/java/com/chwl/core/support/room/lifecycle/RoomLifecycleRegistry.kt
similarity index 92%
rename from core/src/main/java/com/yizhuan/xchat_android_core/support/room/lifecycle/RoomLifecycleRegistry.kt
rename to core/src/main/java/com/chwl/core/support/room/lifecycle/RoomLifecycleRegistry.kt
index dfea24187..f12369fe6 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/lifecycle/RoomLifecycleRegistry.kt
+++ b/core/src/main/java/com/chwl/core/support/room/lifecycle/RoomLifecycleRegistry.kt
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.support.room.lifecycle
+package com.chwl.core.support.room.lifecycle
 
 import com.example.lib_utils.log.ILog
-import com.yizhuan.xchat_android_core.support.room.RoomContext
+import com.chwl.core.support.room.RoomContext
 import java.util.concurrent.CopyOnWriteArrayList
 
 /**
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/lifecycle/rx/RoomRxLifecycleEvent.java b/core/src/main/java/com/chwl/core/support/room/lifecycle/rx/RoomRxLifecycleEvent.java
similarity index 68%
rename from core/src/main/java/com/yizhuan/xchat_android_core/support/room/lifecycle/rx/RoomRxLifecycleEvent.java
rename to core/src/main/java/com/chwl/core/support/room/lifecycle/rx/RoomRxLifecycleEvent.java
index 10fb6b7f3..2c42851ad 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/lifecycle/rx/RoomRxLifecycleEvent.java
+++ b/core/src/main/java/com/chwl/core/support/room/lifecycle/rx/RoomRxLifecycleEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.support.room.lifecycle.rx;
+package com.chwl.core.support.room.lifecycle.rx;
 
 
 /**
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/team/bean/RespTeamMemberInfo.java b/core/src/main/java/com/chwl/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/chwl/core/team/bean/RespTeamMemberInfo.java
index 8f05c00a1..30c4e45f2 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/team/bean/RespTeamMemberInfo.java
+++ b/core/src/main/java/com/chwl/core/team/bean/RespTeamMemberInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.team.bean;
+package com.chwl.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/chwl/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/chwl/core/team/bean/TeamEvent.java
index 8c9bf782d..f2144c5eb 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/team/bean/TeamEvent.java
+++ b/core/src/main/java/com/chwl/core/team/bean/TeamEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.team.bean;
+package com.chwl.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/chwl/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/chwl/core/team/bean/TeamInfo.java
index f7c10be7d..1acfa1ca2 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/team/bean/TeamInfo.java
+++ b/core/src/main/java/com/chwl/core/team/bean/TeamInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.team.bean;
+package com.chwl.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/chwl/core/team/bean/TeamMemberInfo.java
similarity index 88%
rename from core/src/main/java/com/yizhuan/xchat_android_core/team/bean/TeamMemberInfo.java
rename to core/src/main/java/com/chwl/core/team/bean/TeamMemberInfo.java
index cb0e4ea22..4834e3926 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/team/bean/TeamMemberInfo.java
+++ b/core/src/main/java/com/chwl/core/team/bean/TeamMemberInfo.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.team.bean;
+package com.chwl.core.team.bean;
 
-import com.yizhuan.xchat_android_core.R;
-import com.yizhuan.xchat_android_core.level.UserLevelVo;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.core.level.UserLevelVo;
+import com.chwl.library.utils.ResUtil;
 
 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/chwl/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/chwl/core/team/bean/TeamTransactionInfo.java
index d62b65f40..bdf542c16 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/team/bean/TeamTransactionInfo.java
+++ b/core/src/main/java/com/chwl/core/team/bean/TeamTransactionInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.team.bean;
+package com.chwl.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/chwl/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/chwl/core/team/bean/TeamTransactionRecordInfo.java
index 86fbb6b99..13b0b486a 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/team/bean/TeamTransactionRecordInfo.java
+++ b/core/src/main/java/com/chwl/core/team/bean/TeamTransactionRecordInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.team.bean;
+package com.chwl.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/chwl/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/chwl/core/team/model/ITeamModel.java
index 6dc300c45..2cd4c8340 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/team/model/ITeamModel.java
+++ b/core/src/main/java/com/chwl/core/team/model/ITeamModel.java
@@ -1,13 +1,13 @@
-package com.yizhuan.xchat_android_core.team.model;
+package com.chwl.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.chwl.core.base.IModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.luckymoney.LuckyMoneyInfo;
+import com.chwl.core.luckymoney.LuckyMoneyRecordsInfo;
+import com.chwl.core.team.bean.RespTeamMemberInfo;
+import com.chwl.core.team.bean.TeamInfo;
+import com.chwl.core.team.bean.TeamMemberInfo;
+import com.chwl.core.team.bean.TeamTransactionInfo;
 
 import java.util.List;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/team/model/TeamModel.java b/core/src/main/java/com/chwl/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/chwl/core/team/model/TeamModel.java
index 01eed4c88..4abba5b90 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/team/model/TeamModel.java
+++ b/core/src/main/java/com/chwl/core/team/model/TeamModel.java
@@ -1,22 +1,22 @@
-package com.yizhuan.xchat_android_core.team.model;
+package com.chwl.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.R;
-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.family.model.FamilyModel;
-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.utils.net.RxHelper;
-import com.yizhuan.xchat_android_library.net.rxnet.RxNet;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.family.model.FamilyModel;
+import com.chwl.core.luckymoney.LuckyMoneyInfo;
+import com.chwl.core.luckymoney.LuckyMoneyRecordsInfo;
+import com.chwl.core.team.bean.RespTeamMemberInfo;
+import com.chwl.core.team.bean.TeamInfo;
+import com.chwl.core.team.bean.TeamMemberInfo;
+import com.chwl.core.team.bean.TeamTransactionInfo;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.utils.ResUtil;
 
 import java.util.Hashtable;
 import java.util.List;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/AttentionModel.java b/core/src/main/java/com/chwl/core/user/AttentionModel.java
similarity index 84%
rename from core/src/main/java/com/yizhuan/xchat_android_core/user/AttentionModel.java
rename to core/src/main/java/com/chwl/core/user/AttentionModel.java
index c74d9fae6..8a738bff1 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/AttentionModel.java
+++ b/core/src/main/java/com/chwl/core/user/AttentionModel.java
@@ -1,12 +1,12 @@
-package com.yizhuan.xchat_android_core.user;
+package com.chwl.core.user;
 
-import com.yizhuan.xchat_android_core.base.BaseModel;
-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.FansListInfo;
-import com.yizhuan.xchat_android_core.utils.net.RxHelper;
-import com.yizhuan.xchat_android_library.net.rxnet.RxNet;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.result.AttentionListResult;
+import com.chwl.core.bean.response.result.FansListResult;
+import com.chwl.core.user.bean.AttentionInfo;
+import com.chwl.core.user.bean.FansListInfo;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.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/chwl/core/user/IAttentionModel.java
similarity index 71%
rename from core/src/main/java/com/yizhuan/xchat_android_core/user/IAttentionModel.java
rename to core/src/main/java/com/chwl/core/user/IAttentionModel.java
index 0667d41f3..119e781f5 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/IAttentionModel.java
+++ b/core/src/main/java/com/chwl/core/user/IAttentionModel.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.user;
+package com.chwl.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.chwl.core.base.IModel;
+import com.chwl.core.user.bean.AttentionInfo;
+import com.chwl.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/chwl/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/chwl/core/user/IUserDynamicModel.java
index 2dac5cb21..5a50e7efc 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/IUserDynamicModel.java
+++ b/core/src/main/java/com/chwl/core/user/IUserDynamicModel.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.user;
+package com.chwl.core.user;
 
-import com.yizhuan.xchat_android_core.base.IModel;
-import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean;
+import com.chwl.core.base.IModel;
+import com.chwl.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/chwl/core/user/IUserModel.java
similarity index 83%
rename from core/src/main/java/com/yizhuan/xchat_android_core/user/IUserModel.java
rename to core/src/main/java/com/chwl/core/user/IUserModel.java
index 469f687a2..a2d2e5a0a 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/IUserModel.java
+++ b/core/src/main/java/com/chwl/core/user/IUserModel.java
@@ -1,21 +1,21 @@
-package com.yizhuan.xchat_android_core.user;
+package com.chwl.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.DiamondGiveHistoryInfo;
-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.UserLabelInfo;
-import com.yizhuan.xchat_android_core.user.bean.UserRandomConfig;
+import com.chwl.core.base.IModel;
+import com.chwl.core.bean.RoomHistoryInfo;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.home.bean.VisitorInfo;
+import com.chwl.core.user.bean.DiamondGiveHistoryInfo;
+import com.chwl.core.user.bean.GiftAchievementInfo;
+import com.chwl.core.user.bean.GiftWallInfo;
+import com.chwl.core.user.bean.NewUserInfo;
+import com.chwl.core.user.bean.ProtocolInfo;
+import com.chwl.core.user.bean.UserDetailInfo;
+import com.chwl.core.user.bean.UserGameInfo;
+import com.chwl.core.user.bean.UserInfo;
+import com.chwl.core.user.bean.UserLabelInfo;
+import com.chwl.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/chwl/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/chwl/core/user/UserDynamicModel.java
index bf12ff04f..bb43dfa74 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/UserDynamicModel.java
+++ b/core/src/main/java/com/chwl/core/user/UserDynamicModel.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.user;
+package com.chwl.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.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.community.bean.WorldDynamicBean;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.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/chwl/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/chwl/core/user/UserInfoUiMgr.java
index dc25f4b93..4481f3129 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/UserInfoUiMgr.java
+++ b/core/src/main/java/com/chwl/core/user/UserInfoUiMgr.java
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_core.user;
+package com.chwl.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.chwl.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/chwl/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/chwl/core/user/UserModel.java
index cd75fb89c..501b5520c 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java
+++ b/core/src/main/java/com/chwl/core/user/UserModel.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.user;
+package com.chwl.core.user;
 
 import android.annotation.SuppressLint;
 import android.text.TextUtils;
@@ -7,42 +7,42 @@ import android.util.LruCache;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.yizhuan.xchat_android_core.DemoCache;
-import com.yizhuan.xchat_android_core.R;
-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.DiamondGiveHistoryInfo;
-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.UserLabelInfo;
-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.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.ResUtil;
-import com.yizhuan.xchat_android_library.utils.StringUtils;
-import com.yizhuan.xchat_android_library.utils.codec.DESUtils;
+import com.chwl.core.DemoCache;
+import com.chwl.core.R;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.auth.event.LoginEvent;
+import com.chwl.core.auth.event.LogoutEvent;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.RoomHistoryInfo;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.bean.response.result.GiftWallListResult;
+import com.chwl.core.bean.response.result.UserListResult;
+import com.chwl.core.bean.response.result.UserResult;
+import com.chwl.core.home.bean.VisitorInfo;
+import com.chwl.core.level.event.CharmLevelUpEvent;
+import com.chwl.core.level.event.LevelUpEvent;
+import com.chwl.core.noble.NobleUtil;
+import com.chwl.core.user.bean.DiamondGiveHistoryInfo;
+import com.chwl.core.user.bean.GiftAchievementInfo;
+import com.chwl.core.user.bean.GiftWallInfo;
+import com.chwl.core.user.bean.NewUserInfo;
+import com.chwl.core.user.bean.ProtocolInfo;
+import com.chwl.core.user.bean.UserDetailInfo;
+import com.chwl.core.user.bean.UserGameInfo;
+import com.chwl.core.user.bean.UserInfo;
+import com.chwl.core.user.bean.UserLabelInfo;
+import com.chwl.core.user.bean.UserRandomConfig;
+import com.chwl.core.user.event.CurrentUserInfoCompleteEvent;
+import com.chwl.core.user.event.CurrentUserInfoCompleteFailEvent;
+import com.chwl.core.user.event.LoadLoginUserInfoEvent;
+import com.chwl.core.user.event.LoginUserInfoUpdateEvent;
+import com.chwl.core.user.event.NeedCompleteInfoEvent;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.utils.ListUtils;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.StringUtils;
+import com.chwl.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/chwl/core/user/bean/AttentionInfo.java
similarity index 80%
rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/AttentionInfo.java
rename to core/src/main/java/com/chwl/core/user/bean/AttentionInfo.java
index c8ff3942a..bad35fb69 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/AttentionInfo.java
+++ b/core/src/main/java/com/chwl/core/user/bean/AttentionInfo.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.user.bean;
+package com.chwl.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.chwl.core.level.UserLevelVo;
+import com.chwl.core.noble.NobleInfo;
+import com.chwl.core.room.bean.RoomInfo;
+import com.chwl.core.vip.UserVipInfo;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/AttentionItem.java b/core/src/main/java/com/chwl/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/chwl/core/user/bean/AttentionItem.java
index 178b7b1c5..fa2b534ec 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/AttentionItem.java
+++ b/core/src/main/java/com/chwl/core/user/bean/AttentionItem.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.user.bean;
+package com.chwl.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/chwl/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/chwl/core/user/bean/BaseInfo.java
index 81d820808..60e6ed450 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/BaseInfo.java
+++ b/core/src/main/java/com/chwl/core/user/bean/BaseInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.user.bean;
+package com.chwl.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/chwl/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/chwl/core/user/bean/BaseUserInfo.java
index af4bd7b73..d6dd7203e 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/BaseUserInfo.java
+++ b/core/src/main/java/com/chwl/core/user/bean/BaseUserInfo.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.user.bean;
+package com.chwl.core.user.bean;
 
-import com.yizhuan.xchat_android_core.vip.UserVipInfo;
+import com.chwl.core.vip.UserVipInfo;
 
 import java.io.Serializable;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/DiamondGiveHistoryInfo.java b/core/src/main/java/com/chwl/core/user/bean/DiamondGiveHistoryInfo.java
similarity index 95%
rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/DiamondGiveHistoryInfo.java
rename to core/src/main/java/com/chwl/core/user/bean/DiamondGiveHistoryInfo.java
index e55d3bb67..0866e37ae 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/DiamondGiveHistoryInfo.java
+++ b/core/src/main/java/com/chwl/core/user/bean/DiamondGiveHistoryInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.user.bean;
+package com.chwl.core.user.bean;
 
 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/chwl/core/user/bean/FansInfo.java
similarity index 79%
rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/FansInfo.java
rename to core/src/main/java/com/chwl/core/user/bean/FansInfo.java
index 5f1127745..cefa522ea 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/FansInfo.java
+++ b/core/src/main/java/com/chwl/core/user/bean/FansInfo.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.user.bean;
+package com.chwl.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.chwl.core.level.UserLevelVo;
+import com.chwl.core.noble.NobleInfo;
+import com.chwl.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/chwl/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/chwl/core/user/bean/FansListInfo.java
index 30902d5de..26df078aa 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/FansListInfo.java
+++ b/core/src/main/java/com/chwl/core/user/bean/FansListInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.user.bean;
+package com.chwl.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/FirstChargeInfo.kt b/core/src/main/java/com/chwl/core/user/bean/FirstChargeInfo.kt
similarity index 75%
rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/FirstChargeInfo.kt
rename to core/src/main/java/com/chwl/core/user/bean/FirstChargeInfo.kt
index e28367fdd..5429139a6 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/FirstChargeInfo.kt
+++ b/core/src/main/java/com/chwl/core/user/bean/FirstChargeInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.user.bean
+package com.chwl.core.user.bean
 
 import lombok.Data
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/GiftAchievementInfo.java b/core/src/main/java/com/chwl/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/chwl/core/user/bean/GiftAchievementInfo.java
index 155881e73..866bc1f8d 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/GiftAchievementInfo.java
+++ b/core/src/main/java/com/chwl/core/user/bean/GiftAchievementInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.user.bean;
+package com.chwl.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/chwl/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/chwl/core/user/bean/GiftAchievementInfoSub.java
index c789c5a2c..e29ff1ef0 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/GiftAchievementInfoSub.java
+++ b/core/src/main/java/com/chwl/core/user/bean/GiftAchievementInfoSub.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.user.bean;
+package com.chwl.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/chwl/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/chwl/core/user/bean/GiftAchievementItem.java
index 00b7d90ea..c5f4672ff 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/GiftAchievementItem.java
+++ b/core/src/main/java/com/chwl/core/user/bean/GiftAchievementItem.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.user.bean;
+package com.chwl.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/chwl/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/chwl/core/user/bean/GiftWallInfo.java
index 2f85910fe..788f11a83 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/GiftWallInfo.java
+++ b/core/src/main/java/com/chwl/core/user/bean/GiftWallInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.user.bean;
+package com.chwl.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/chwl/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/chwl/core/user/bean/InviteUserInfo.java
index 200aba630..0f41b3643 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/InviteUserInfo.java
+++ b/core/src/main/java/com/chwl/core/user/bean/InviteUserInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.user.bean;
+package com.chwl.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/chwl/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/chwl/core/user/bean/JoinWorldInfo.java
index b31c4073f..7bfeecc56 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/JoinWorldInfo.java
+++ b/core/src/main/java/com/chwl/core/user/bean/JoinWorldInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.user.bean;
+package com.chwl.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/chwl/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/chwl/core/user/bean/LiveTagInfo.java
index 9a4ae4fcd..362bc38b7 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/LiveTagInfo.java
+++ b/core/src/main/java/com/chwl/core/user/bean/LiveTagInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.user.bean;
+package com.chwl.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/chwl/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/chwl/core/user/bean/NewUserInfo.java
index 689b0c71c..8b82b8048 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/NewUserInfo.java
+++ b/core/src/main/java/com/chwl/core/user/bean/NewUserInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.user.bean;
+package com.chwl.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/chwl/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/chwl/core/user/bean/ProtocolInfo.kt
index bcb929e64..8ddf1eeae 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/ProtocolInfo.kt
+++ b/core/src/main/java/com/chwl/core/user/bean/ProtocolInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.user.bean
+package com.chwl.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/chwl/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/chwl/core/user/bean/RadishWallInfo.java
index 36c000a57..14a336333 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/RadishWallInfo.java
+++ b/core/src/main/java/com/chwl/core/user/bean/RadishWallInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.user.bean;
+package com.chwl.core.user.bean;
 
 import lombok.Data;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/SearchUserInfo.java b/core/src/main/java/com/chwl/core/user/bean/SearchUserInfo.java
similarity index 90%
rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/SearchUserInfo.java
rename to core/src/main/java/com/chwl/core/user/bean/SearchUserInfo.java
index b858eb4ba..c08f341ec 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/SearchUserInfo.java
+++ b/core/src/main/java/com/chwl/core/user/bean/SearchUserInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.user.bean;
+package com.chwl.core.user.bean;
 
 import java.io.Serializable;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/SimpleUserInfo.java b/core/src/main/java/com/chwl/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/chwl/core/user/bean/SimpleUserInfo.java
index cbfcca1af..57827f68c 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/SimpleUserInfo.java
+++ b/core/src/main/java/com/chwl/core/user/bean/SimpleUserInfo.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.user.bean;
+package com.chwl.core.user.bean;
 
-import com.yizhuan.xchat_android_core.level.UserLevelVo;
+import com.chwl.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/chwl/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/chwl/core/user/bean/UserDetailInfo.java
index dab61529a..af507ce05 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserDetailInfo.java
+++ b/core/src/main/java/com/chwl/core/user/bean/UserDetailInfo.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.user.bean;
+package com.chwl.core.user.bean;
 
 import com.chad.library.adapter.base.entity.MultiItemEntity;
-import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean;
+import com.chwl.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/chwl/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/chwl/core/user/bean/UserGameInfo.java
index cc64dde34..38bac0cd4 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserGameInfo.java
+++ b/core/src/main/java/com/chwl/core/user/bean/UserGameInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.user.bean;
+package com.chwl.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/chwl/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/chwl/core/user/bean/UserInfo.java
index 2f1462224..c24dd4140 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserInfo.java
+++ b/core/src/main/java/com/chwl/core/user/bean/UserInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.user.bean;
+package com.chwl.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.chwl.core.decoration.car.bean.CarInfo;
+import com.chwl.core.decoration.headwear.bean.HeadWearInfo;
+import com.chwl.core.level.UserLevelVo;
+import com.chwl.core.noble.NobleInfo;
+import com.chwl.core.noble.NobleResourceType;
+import com.chwl.core.utils.StarUtils;
+import com.chwl.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/chwl/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/chwl/core/user/bean/UserInfoSkillEntity.kt
index ba082aedd..9fe929d41 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserInfoSkillEntity.kt
+++ b/core/src/main/java/com/chwl/core/user/bean/UserInfoSkillEntity.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.user.bean
+package com.chwl.core.user.bean
 
 /**
  * {
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserLabelInfo.kt b/core/src/main/java/com/chwl/core/user/bean/UserLabelInfo.kt
similarity index 82%
rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserLabelInfo.kt
rename to core/src/main/java/com/chwl/core/user/bean/UserLabelInfo.kt
index e6c46ad8a..6fbc3b2b3 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserLabelInfo.kt
+++ b/core/src/main/java/com/chwl/core/user/bean/UserLabelInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.user.bean
+package com.chwl.core.user.bean
 
 import lombok.Data
 import java.io.Serializable
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserLabelItemInfo.kt b/core/src/main/java/com/chwl/core/user/bean/UserLabelItemInfo.kt
similarity index 79%
rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserLabelItemInfo.kt
rename to core/src/main/java/com/chwl/core/user/bean/UserLabelItemInfo.kt
index cfae8ee70..87716f60a 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserLabelItemInfo.kt
+++ b/core/src/main/java/com/chwl/core/user/bean/UserLabelItemInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.user.bean
+package com.chwl.core.user.bean
 
 import lombok.Data
 import java.io.Serializable
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserPhoto.java b/core/src/main/java/com/chwl/core/user/bean/UserPhoto.java
similarity index 91%
rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserPhoto.java
rename to core/src/main/java/com/chwl/core/user/bean/UserPhoto.java
index 8fed597dd..fe91b9c5a 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserPhoto.java
+++ b/core/src/main/java/com/chwl/core/user/bean/UserPhoto.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.user.bean;
+package com.chwl.core.user.bean;
 
 import java.io.Serializable;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserRandomConfig.java b/core/src/main/java/com/chwl/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/chwl/core/user/bean/UserRandomConfig.java
index 4d6f34b8d..b1a0a7ad0 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserRandomConfig.java
+++ b/core/src/main/java/com/chwl/core/user/bean/UserRandomConfig.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.user.bean;
+package com.chwl.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/chwl/core/user/bean/UserRankInfo.java
similarity index 97%
rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserRankInfo.java
rename to core/src/main/java/com/chwl/core/user/bean/UserRankInfo.java
index 6f48fe334..ecd0c52a6 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserRankInfo.java
+++ b/core/src/main/java/com/chwl/core/user/bean/UserRankInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.user.bean;
+package com.chwl.core.user.bean;
 
 import java.io.Serializable;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserRecommendRoomInfo.java b/core/src/main/java/com/chwl/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/chwl/core/user/bean/UserRecommendRoomInfo.java
index 3c2ed8734..9c92fac47 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserRecommendRoomInfo.java
+++ b/core/src/main/java/com/chwl/core/user/bean/UserRecommendRoomInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.user.bean;
+package com.chwl.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/chwl/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/chwl/core/user/event/CurrentUserInfoCompleteEvent.java
index f4bb7e1ed..6a0322510 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/event/CurrentUserInfoCompleteEvent.java
+++ b/core/src/main/java/com/chwl/core/user/event/CurrentUserInfoCompleteEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.user.event;
+package com.chwl.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/chwl/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/chwl/core/user/event/CurrentUserInfoCompleteFailEvent.java
index e41535a04..bc0c87b6e 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/event/CurrentUserInfoCompleteFailEvent.java
+++ b/core/src/main/java/com/chwl/core/user/event/CurrentUserInfoCompleteFailEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.user.event;
+package com.chwl.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/chwl/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/chwl/core/user/event/LoadLoginUserInfoEvent.java
index dcd1d7639..d51e4258b 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/event/LoadLoginUserInfoEvent.java
+++ b/core/src/main/java/com/chwl/core/user/event/LoadLoginUserInfoEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.user.event;
+package com.chwl.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/chwl/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/chwl/core/user/event/LoginUserInfoUpdateEvent.java
index 24938a389..f08b9c6e9 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/event/LoginUserInfoUpdateEvent.java
+++ b/core/src/main/java/com/chwl/core/user/event/LoginUserInfoUpdateEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.user.event;
+package com.chwl.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/chwl/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/chwl/core/user/event/NeedBindPhoneEvent.java
index 0750d28ad..8aa35cd43 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/event/NeedBindPhoneEvent.java
+++ b/core/src/main/java/com/chwl/core/user/event/NeedBindPhoneEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.user.event;
+package com.chwl.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/chwl/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/chwl/core/user/event/NeedCompleteInfoEvent.java
index efaa5610d..c3b035291 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/event/NeedCompleteInfoEvent.java
+++ b/core/src/main/java/com/chwl/core/user/event/NeedCompleteInfoEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.user.event;
+package com.chwl.core.user.event;
 
 /**
  * create by lvzebiao on 2018/8/31
diff --git a/core/src/main/java/com/chwl/core/user/event/ShowMeEvent.kt b/core/src/main/java/com/chwl/core/user/event/ShowMeEvent.kt
new file mode 100644
index 000000000..2ff6e7cfe
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/user/event/ShowMeEvent.kt
@@ -0,0 +1,3 @@
+package com.chwl.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/chwl/core/utils/APIEncryptUtil.java
similarity index 94%
rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/APIEncryptUtil.java
rename to core/src/main/java/com/chwl/core/utils/APIEncryptUtil.java
index af7e33f7a..28dc3870c 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/APIEncryptUtil.java
+++ b/core/src/main/java/com/chwl/core/utils/APIEncryptUtil.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.utils;
+package com.chwl.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.chwl.library.utils.codec.DESUtils;
+import com.chwl.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.chwl.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/chwl/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/chwl/core/utils/ActivityUtil.java
index 3eba2545c..55198f82d 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/ActivityUtil.java
+++ b/core/src/main/java/com/chwl/core/utils/ActivityUtil.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.utils;
+package com.chwl.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/chwl/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/chwl/core/utils/ArrayUtils.java
index dc260acba..1222bbf35 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/ArrayUtils.java
+++ b/core/src/main/java/com/chwl/core/utils/ArrayUtils.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.utils;
+package com.chwl.core.utils;
 
-import com.yizhuan.xchat_android_library.utils.log.MLog;
+import com.chwl.library.utils.log.MLog;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/AsyncTaskScanMusicFile.java b/core/src/main/java/com/chwl/core/utils/AsyncTaskScanMusicFile.java
similarity index 96%
rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/AsyncTaskScanMusicFile.java
rename to core/src/main/java/com/chwl/core/utils/AsyncTaskScanMusicFile.java
index 0f78e05d4..f5aad1a6a 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/AsyncTaskScanMusicFile.java
+++ b/core/src/main/java/com/chwl/core/utils/AsyncTaskScanMusicFile.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.utils;
+package com.chwl.core.utils;
 
 import android.content.ContentResolver;
 import android.content.ContentUris;
@@ -10,13 +10,13 @@ import android.os.AsyncTask;
 import android.os.Environment;
 import android.provider.MediaStore;
 
-import com.yizhuan.xchat_android_core.R;
-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.common.file.FileHelper;
-import com.yizhuan.xchat_android_library.utils.BlankUtil;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.file.BasicFileUtils;
+import com.chwl.core.R;
+import com.chwl.core.music.db.bean.LocalMusicBean;
+import com.chwl.core.music.db.model.LocalMusicDbModel;
+import com.chwl.library.common.file.FileHelper;
+import com.chwl.library.utils.BlankUtil;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.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/chwl/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/chwl/core/utils/BitmapLruCacheHelper.java
index 682dc6830..a003711a0 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/BitmapLruCacheHelper.java
+++ b/core/src/main/java/com/chwl/core/utils/BitmapLruCacheHelper.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.utils;
+package com.chwl.core.utils;
 
 import android.graphics.Bitmap;
 import android.util.Log;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/BitmapUtils.java b/core/src/main/java/com/chwl/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/chwl/core/utils/BitmapUtils.java
index 0d088db6d..9c355782c 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/BitmapUtils.java
+++ b/core/src/main/java/com/chwl/core/utils/BitmapUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.utils;
+package com.chwl.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/chwl/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/chwl/core/utils/CheckUtils.java
index b896f9a76..6a019ee07 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/CheckUtils.java
+++ b/core/src/main/java/com/chwl/core/utils/CheckUtils.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.utils;
+package com.chwl.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.chwl.core.auth.AuthModel;
+import com.chwl.core.initial.InitialModel;
+import com.chwl.core.initial.bean.InitInfo;
+import com.chwl.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/chwl/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/chwl/core/utils/CurrentTimeUtils.java
index d13a2414e..e4152cc38 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/CurrentTimeUtils.java
+++ b/core/src/main/java/com/chwl/core/utils/CurrentTimeUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.utils;
+package com.chwl.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/chwl/core/utils/DirectoryHelper.java
similarity index 89%
rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/DirectoryHelper.java
rename to core/src/main/java/com/chwl/core/utils/DirectoryHelper.java
index e277f2905..acd938bc7 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/DirectoryHelper.java
+++ b/core/src/main/java/com/chwl/core/utils/DirectoryHelper.java
@@ -1,13 +1,13 @@
-package com.yizhuan.xchat_android_core.utils;
+package com.chwl.core.utils;
 
 import static android.os.Environment.MEDIA_MOUNTED;
 
 import android.content.Context;
 import android.os.Environment;
 
-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.chwl.core.Constants;
+import com.chwl.library.utils.config.BasicConfig;
+import com.chwl.library.utils.file.StorageUtils;
 
 import java.io.File;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/ExtensionUtil.java b/core/src/main/java/com/chwl/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/chwl/core/utils/ExtensionUtil.java
index a15b45fb8..3fd433729 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/ExtensionUtil.java
+++ b/core/src/main/java/com/chwl/core/utils/ExtensionUtil.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.utils;
+package com.chwl.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.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.core.im.custom.bean.FaceAttachment;
+import com.chwl.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/chwl/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/chwl/core/utils/ExtensionUtils.java
index 1c76c5cff..5d471dff9 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/ExtensionUtils.java
+++ b/core/src/main/java/com/chwl/core/utils/ExtensionUtils.java
@@ -1,13 +1,13 @@
-package com.yizhuan.xchat_android_core.utils;
+package com.chwl.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.chwl.core.decoration.car.bean.CarInfo;
+import com.chwl.core.decoration.headwear.bean.HeadWearInfo;
+import com.chwl.core.level.UserLevelVo;
+import com.chwl.core.super_admin.util.SuperAdminUtil;
+import com.chwl.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/chwl/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/chwl/core/utils/IConnectivityClient.java
index 96d91645d..3eb395503 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/IConnectivityClient.java
+++ b/core/src/main/java/com/chwl/core/utils/IConnectivityClient.java
@@ -1,10 +1,10 @@
 /**
  * 
  */
-package com.yizhuan.xchat_android_core.utils;
+package com.chwl.core.utils;
 
 
-import com.yizhuan.xchat_android_library.coremanager.ICoreClient;
+import com.chwl.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/chwl/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/chwl/core/utils/IConnectivityCore.java
index 0fad2d60f..22f2a58a8 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/IConnectivityCore.java
+++ b/core/src/main/java/com/chwl/core/utils/IConnectivityCore.java
@@ -1,10 +1,10 @@
 /**
  * 
  */
-package com.yizhuan.xchat_android_core.utils;
+package com.chwl.core.utils;
 
 
-import com.yizhuan.xchat_android_library.coremanager.IBaseCore;
+import com.chwl.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/chwl/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/chwl/core/utils/IHandlerCore.java
index 2f69262d8..b96bd1dea 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/IHandlerCore.java
+++ b/core/src/main/java/com/chwl/core/utils/IHandlerCore.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.utils;
+package com.chwl.core.utils;
 
 
-import com.yizhuan.xchat_android_library.coremanager.IBaseCore;
-import com.yizhuan.xchat_android_library.coremanager.ICoreClient;
+import com.chwl.library.coremanager.IBaseCore;
+import com.chwl.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/chwl/core/utils/ImageSplitter.java
similarity index 96%
rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/ImageSplitter.java
rename to core/src/main/java/com/chwl/core/utils/ImageSplitter.java
index 8c14435f2..b7685d9a1 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/ImageSplitter.java
+++ b/core/src/main/java/com/chwl/core/utils/ImageSplitter.java
@@ -1,11 +1,11 @@
-package com.yizhuan.xchat_android_core.utils;
+package com.chwl.core.utils;
 
 import android.graphics.Bitmap;
 import android.graphics.Matrix;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 
-import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
+import com.chwl.core.manager.AvRoomDataManager;
 
 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/chwl/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/chwl/core/utils/ImgServiceUrlUtil.java
index 35e454317..0cb0da673 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/ImgServiceUrlUtil.java
+++ b/core/src/main/java/com/chwl/core/utils/ImgServiceUrlUtil.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.utils;
+package com.chwl.core.utils;
 
 
-import com.yizhuan.xchat_android_library.utils.StringUtils;
-import com.yizhuan.xchat_android_library.utils.file.JXFileUtils;
+import com.chwl.library.utils.StringUtils;
+import com.chwl.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/chwl/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/chwl/core/utils/IntentUtils.java
index 79b254410..c8fd0c128 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/IntentUtils.java
+++ b/core/src/main/java/com/chwl/core/utils/IntentUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.utils;
+package com.chwl.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/chwl/core/utils/LogUtils.java
similarity index 93%
rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/LogUtils.java
rename to core/src/main/java/com/chwl/core/utils/LogUtils.java
index 504fd909b..92fa55439 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/LogUtils.java
+++ b/core/src/main/java/com/chwl/core/utils/LogUtils.java
@@ -3,13 +3,13 @@
 // (powered by Fernflower decompiler)
 //
 
-package com.yizhuan.xchat_android_core.utils;
+package com.chwl.core.utils;
 
 import android.util.Log;
 
-import com.yizhuan.xchat_android_core.R;
-import com.yizhuan.xchat_android_core.BuildConfig;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.core.BuildConfig;
+import com.chwl.library.utils.ResUtil;
 
 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/chwl/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/chwl/core/utils/Logger.java
index 2c80f9068..6f543fab6 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/Logger.java
+++ b/core/src/main/java/com/chwl/core/utils/Logger.java
@@ -4,7 +4,7 @@
  * 使用前需要先调用init初始化
  * 内部使用android的Log类实现，并支持写入文件
  */
-package com.yizhuan.xchat_android_core.utils;
+package com.chwl.core.utils;
 
 import android.annotation.SuppressLint;
 import android.os.Bundle;
@@ -12,9 +12,9 @@ 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.config.BasicConfig;
-import com.yizhuan.xchat_android_library.utils.log.MLog;
+import com.chwl.library.utils.StringUtils;
+import com.chwl.library.utils.config.BasicConfig;
+import com.chwl.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/chwl/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/chwl/core/utils/OaidUtil.java
index c5aea8456..ea41eaff9 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/OaidUtil.java
+++ b/core/src/main/java/com/chwl/core/utils/OaidUtil.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.utils;
+package com.chwl.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/chwl/core/utils/OldHttpErrorHandleUtil.java
similarity index 90%
rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/OldHttpErrorHandleUtil.java
rename to core/src/main/java/com/chwl/core/utils/OldHttpErrorHandleUtil.java
index 8f9c56544..95372ecc2 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/OldHttpErrorHandleUtil.java
+++ b/core/src/main/java/com/chwl/core/utils/OldHttpErrorHandleUtil.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.utils;
+package com.chwl.core.utils;
 
 import com.google.gson.Gson;
-import com.yizhuan.xchat_android_core.R;
-import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.library.utils.ResUtil;
 
 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/chwl/core/utils/SharedPreferenceUtils.java
similarity index 98%
rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/SharedPreferenceUtils.java
rename to core/src/main/java/com/chwl/core/utils/SharedPreferenceUtils.java
index 19d230dbc..47ecd7cc5 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/SharedPreferenceUtils.java
+++ b/core/src/main/java/com/chwl/core/utils/SharedPreferenceUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.utils;
+package com.chwl.core.utils;
 
 import android.content.Context;
 import android.content.SharedPreferences;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/SongUtils.java b/core/src/main/java/com/chwl/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/chwl/core/utils/SongUtils.java
index 24946c7dd..1fd6dfc64 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/SongUtils.java
+++ b/core/src/main/java/com/chwl/core/utils/SongUtils.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.utils;
+package com.chwl.core.utils;
 
 
-import com.yizhuan.xchat_android_library.utils.UUIDUtil;
+import com.chwl.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/chwl/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/chwl/core/utils/StarUtils.java
index b6e8680f8..a0a02bb61 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/StarUtils.java
+++ b/core/src/main/java/com/chwl/core/utils/StarUtils.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.utils;
-import com.yizhuan.xchat_android_core.R;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+package com.chwl.core.utils;
+import com.chwl.core.R;
+import com.chwl.library.utils.ResUtil;
 
 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/chwl/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/chwl/core/utils/StringExtension.kt
index d4b1b0045..0c22108f7 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/StringExtension.kt
+++ b/core/src/main/java/com/chwl/core/utils/StringExtension.kt
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.utils
+package com.chwl.core.utils
 
 import android.graphics.Color
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil
+import com.chwl.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/chwl/core/utils/StringUtils.java
similarity index 98%
rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/StringUtils.java
rename to core/src/main/java/com/chwl/core/utils/StringUtils.java
index 00918fe7b..4fce1ff9e 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/StringUtils.java
+++ b/core/src/main/java/com/chwl/core/utils/StringUtils.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.utils;
-import com.yizhuan.xchat_android_core.R;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+package com.chwl.core.utils;
+import com.chwl.core.R;
+import com.chwl.library.utils.ResUtil;
 
 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/chwl/core/utils/SystemUidUtil.java
similarity index 87%
rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/SystemUidUtil.java
rename to core/src/main/java/com/chwl/core/utils/SystemUidUtil.java
index e2da89ad9..8bd823831 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/SystemUidUtil.java
+++ b/core/src/main/java/com/chwl/core/utils/SystemUidUtil.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.utils;
+package com.chwl.core.utils;
 
 
 import com.yizhuan.xchat_android_constants.XChatConstants;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/SystemUtils.java b/core/src/main/java/com/chwl/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/chwl/core/utils/SystemUtils.java
index 94ff3c816..2af50cb93 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/SystemUtils.java
+++ b/core/src/main/java/com/chwl/core/utils/SystemUtils.java
@@ -1,14 +1,14 @@
 /**
  * 
  */
-package com.yizhuan.xchat_android_core.utils;
+package com.chwl.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.chwl.library.utils.config.BasicConfig;
+import com.chwl.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/chwl/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/chwl/core/utils/TestLog.java
index 516687765..024baa9fb 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/TestLog.java
+++ b/core/src/main/java/com/chwl/core/utils/TestLog.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.utils;
+package com.chwl.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/chwl/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/chwl/core/utils/TextUtils.java
index a2f6fbc58..5c54f06bb 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/TextUtils.java
+++ b/core/src/main/java/com/chwl/core/utils/TextUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.utils;
+package com.chwl.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/chwl/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/chwl/core/utils/Transformer.java
index eb74aea93..beee573e7 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/Transformer.java
+++ b/core/src/main/java/com/chwl/core/utils/Transformer.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.utils;
+package com.chwl.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/chwl/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/chwl/core/utils/UploadUtils.java
index ba4c30af3..5177162d3 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/UploadUtils.java
+++ b/core/src/main/java/com/chwl/core/utils/UploadUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.utils;
+package com.chwl.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/chwl/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/chwl/core/utils/net/BalanceNotEnoughExeption.java
index 08dbfa3cb..5b4cf8b80 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/BalanceNotEnoughExeption.java
+++ b/core/src/main/java/com/chwl/core/utils/net/BalanceNotEnoughExeption.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.utils.net;
+package com.chwl.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/chwl/core/utils/net/BeanObserver.java
similarity index 90%
rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/net/BeanObserver.java
rename to core/src/main/java/com/chwl/core/utils/net/BeanObserver.java
index 8afbc9782..e85c5cd67 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/BeanObserver.java
+++ b/core/src/main/java/com/chwl/core/utils/net/BeanObserver.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.utils.net;
+package com.chwl.core.utils.net;
 
 import com.google.gson.JsonParseException;
-import com.yizhuan.xchat_android_core.R;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.library.utils.ResUtil;
 
 import org.json.JSONException;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/DontWarnObserver.java b/core/src/main/java/com/chwl/core/utils/net/DontWarnObserver.java
similarity index 95%
rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/net/DontWarnObserver.java
rename to core/src/main/java/com/chwl/core/utils/net/DontWarnObserver.java
index b25f8f52b..7cc145584 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/DontWarnObserver.java
+++ b/core/src/main/java/com/chwl/core/utils/net/DontWarnObserver.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.utils.net;
+package com.chwl.core.utils.net;
 
 import android.text.TextUtils;
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/ErrorConsumer.java b/core/src/main/java/com/chwl/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/chwl/core/utils/net/ErrorConsumer.java
index 0ba8faa29..b439e74cb 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/ErrorConsumer.java
+++ b/core/src/main/java/com/chwl/core/utils/net/ErrorConsumer.java
@@ -1,14 +1,14 @@
-package com.yizhuan.xchat_android_core.utils.net;
+package com.chwl.core.utils.net;
 
 import android.text.TextUtils;
 
-import com.yizhuan.xchat_android_core.R;
+import com.chwl.core.R;
 import com.yizhuan.xchat_android_constants.XChatConstants;
-import com.yizhuan.xchat_android_core.patriarch.exception.PmRoomLimitException;
-import com.yizhuan.xchat_android_library.rxbus.RxBus;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
-import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
+import com.chwl.core.patriarch.exception.PmRoomLimitException;
+import com.chwl.library.rxbus.RxBus;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SingleToastUtil;
+import com.chwl.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/chwl/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/chwl/core/utils/net/FreezeException.java
index 481fa61a2..40d1924af 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/FreezeException.java
+++ b/core/src/main/java/com/chwl/core/utils/net/FreezeException.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.utils.net;
+package com.chwl.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/IgnoreException.java b/core/src/main/java/com/chwl/core/utils/net/IgnoreException.java
similarity index 78%
rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/net/IgnoreException.java
rename to core/src/main/java/com/chwl/core/utils/net/IgnoreException.java
index b7fcfcbca..e02b2a04e 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/IgnoreException.java
+++ b/core/src/main/java/com/chwl/core/utils/net/IgnoreException.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.utils.net;
+package com.chwl.core.utils.net;
 
 /**
  * 可以忽略的异常,比如不弹toast
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/RadishNotEnoughException.java b/core/src/main/java/com/chwl/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/chwl/core/utils/net/RadishNotEnoughException.java
index 5b4bde1c4..08fb1dae4 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/RadishNotEnoughException.java
+++ b/core/src/main/java/com/chwl/core/utils/net/RadishNotEnoughException.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.utils.net;
+package com.chwl.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/chwl/core/utils/net/RxExtension.kt
similarity index 90%
rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/net/RxExtension.kt
rename to core/src/main/java/com/chwl/core/utils/net/RxExtension.kt
index 4fd3acf5f..904ff0fcc 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/RxExtension.kt
+++ b/core/src/main/java/com/chwl/core/utils/net/RxExtension.kt
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_core.utils.net
+package com.chwl.core.utils.net
 
 
-import com.yizhuan.xchat_android_core.R
-import com.yizhuan.xchat_android_core.bean.response.ServiceResult
-import com.yizhuan.xchat_android_core.utils.ifNullOrEmpty
-import com.yizhuan.xchat_android_library.utils.ResUtil
+import com.chwl.core.R
+import com.chwl.core.bean.response.ServiceResult
+import com.chwl.core.utils.ifNullOrEmpty
+import com.chwl.library.utils.ResUtil
 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/chwl/core/utils/net/RxHelper.java
similarity index 95%
rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/net/RxHelper.java
rename to core/src/main/java/com/chwl/core/utils/net/RxHelper.java
index 352c26097..922b873ce 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/RxHelper.java
+++ b/core/src/main/java/com/chwl/core/utils/net/RxHelper.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.utils.net;
+package com.chwl.core.utils.net;
 
 import android.content.Context;
 import android.text.TextUtils;
@@ -10,14 +10,14 @@ 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_core.R;
+import com.chwl.core.R;
 import com.yizhuan.xchat_android_constants.XChatConstants;
-import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
-import com.yizhuan.xchat_android_core.exception.FailReasonException;
-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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.exception.FailReasonException;
+import com.chwl.core.patriarch.exception.PmRoomLimitException;
+import com.chwl.core.super_admin.model.exception.SAdminCannotGameException;
+import com.chwl.library.rxbus.RxBus;
+import com.chwl.library.utils.ResUtil;
 
 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/chwl/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/chwl/core/utils/net/ServerException.java
index 2244ebb6d..e039938c2 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/ServerException.java
+++ b/core/src/main/java/com/chwl/core/utils/net/ServerException.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.utils.net;
+package com.chwl.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/chwl/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/chwl/core/utils/net/VipLevelNotEnoughException.java
index f9e39537e..0e5962f09 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/VipLevelNotEnoughException.java
+++ b/core/src/main/java/com/chwl/core/utils/net/VipLevelNotEnoughException.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.utils.net;
+package com.chwl.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/chwl/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/chwl/core/vip/UserVipInfo.kt
index 1a3f7dac7..aadfbe841 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/vip/UserVipInfo.kt
+++ b/core/src/main/java/com/chwl/core/vip/UserVipInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.vip
+package com.chwl.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/chwl/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/chwl/core/vip/VipAuthInfo.kt
index 081b009a5..5671fb8bd 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipAuthInfo.kt
+++ b/core/src/main/java/com/chwl/core/vip/VipAuthInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.vip
+package com.chwl.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/chwl/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/chwl/core/vip/VipBroadcastInfo.kt
index 226dd811e..488e03b7a 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipBroadcastInfo.kt
+++ b/core/src/main/java/com/chwl/core/vip/VipBroadcastInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.vip
+package com.chwl.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/chwl/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/chwl/core/vip/VipBroadcastMsgEvent.kt
index e682263cf..85795bb42 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipBroadcastMsgEvent.kt
+++ b/core/src/main/java/com/chwl/core/vip/VipBroadcastMsgEvent.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.vip
+package com.chwl.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/chwl/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/chwl/core/vip/VipInfo.kt
index 448572a39..f3ca62584 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipInfo.kt
+++ b/core/src/main/java/com/chwl/core/vip/VipInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.vip
+package com.chwl.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/chwl/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/chwl/core/vip/VipMessageInfo.java
index 92a3d4217..5666137db 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipMessageInfo.java
+++ b/core/src/main/java/com/chwl/core/vip/VipMessageInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.vip;
+package com.chwl.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/chwl/core/vip/VipModel.kt
similarity index 87%
rename from core/src/main/java/com/yizhuan/xchat_android_core/vip/VipModel.kt
rename to core/src/main/java/com/chwl/core/vip/VipModel.kt
index b1b5da1d8..1ae849998 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipModel.kt
+++ b/core/src/main/java/com/chwl/core/vip/VipModel.kt
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_core.vip
+package com.chwl.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.chwl.core.base.BaseModel
+import com.chwl.core.bean.response.ServiceResult
+import com.chwl.core.manager.AvRoomDataManager
+import com.chwl.core.utils.net.launchRequest
+import com.chwl.library.net.rxnet.RxNet
 import retrofit2.http.*
 
 object VipModel : BaseModel() {
diff --git a/core/src/main/java/com/chwl/core/vip/VipOpenEvent.kt b/core/src/main/java/com/chwl/core/vip/VipOpenEvent.kt
new file mode 100644
index 000000000..df834d88f
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/vip/VipOpenEvent.kt
@@ -0,0 +1,3 @@
+package com.chwl.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/chwl/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/chwl/core/vip/VipPageInfo.kt
index 929e00882..173acb9a9 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipPageInfo.kt
+++ b/core/src/main/java/com/chwl/core/vip/VipPageInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.vip
+package com.chwl.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/chwl/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/chwl/core/vip/VipUpgradeEvent.kt
index 2d4db2c34..7382f893a 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipUpgradeEvent.kt
+++ b/core/src/main/java/com/chwl/core/vip/VipUpgradeEvent.kt
@@ -1,3 +1,3 @@
-package com.yizhuan.xchat_android_core.vip
+package com.chwl.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/chwl/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/chwl/core/web/bean/H5NotifyData.java
index 3dc21b2fd..b9b0bd5ab 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/web/bean/H5NotifyData.java
+++ b/core/src/main/java/com/chwl/core/web/bean/H5NotifyData.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.web.bean;
+package com.chwl.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/chwl/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/chwl/core/web/bean/WebJsBeanInfo.java
index be5b23626..4c2cbe3bc 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/web/bean/WebJsBeanInfo.java
+++ b/core/src/main/java/com/chwl/core/web/bean/WebJsBeanInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.web.bean;
+package com.chwl.core.web.bean;
 
 /**
  * 
 js回调字段信息 

diff --git a/core/src/main/java/com/chwl/core/web/event/WebViewRefreshEvent.java b/core/src/main/java/com/chwl/core/web/event/WebViewRefreshEvent.java
new file mode 100644
index 000000000..9f1e037aa
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/web/event/WebViewRefreshEvent.java
@@ -0,0 +1,4 @@
+package com.chwl.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/chwl/core/withdraw/IWithdrawModel.java
similarity index 73%
rename from core/src/main/java/com/yizhuan/xchat_android_core/withdraw/IWithdrawModel.java
rename to core/src/main/java/com/chwl/core/withdraw/IWithdrawModel.java
index da0d44f15..5a2c6729c 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/IWithdrawModel.java
+++ b/core/src/main/java/com/chwl/core/withdraw/IWithdrawModel.java
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_core.withdraw;
+package com.chwl.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.chwl.core.base.IModel;
+import com.chwl.core.initial.bean.TaxInfo;
+import com.chwl.core.withdraw.bean.ExchangerInfo;
+import com.chwl.core.withdraw.bean.WithdrawInfo;
+import com.chwl.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/chwl/core/withdraw/WithdrawModel.java
similarity index 86%
rename from core/src/main/java/com/yizhuan/xchat_android_core/withdraw/WithdrawModel.java
rename to core/src/main/java/com/chwl/core/withdraw/WithdrawModel.java
index 42e1890bc..617baa6a4 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/WithdrawModel.java
+++ b/core/src/main/java/com/chwl/core/withdraw/WithdrawModel.java
@@ -1,26 +1,26 @@
-package com.yizhuan.xchat_android_core.withdraw;
+package com.chwl.core.withdraw;
 
 import com.google.gson.JsonElement;
-import com.yizhuan.xchat_android_core.R;
-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.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.ResUtil;
-import com.yizhuan.xchat_android_library.utils.codec.DESUtils;
+import com.chwl.core.R;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.bean.response.result.ExchangeInfoResult;
+import com.chwl.core.bean.response.result.WithdrawListResult;
+import com.chwl.core.bean.response.result.WithdrawUserInfoResult;
+import com.chwl.core.initial.bean.TaxInfo;
+import com.chwl.core.user.UserModel;
+import com.chwl.core.utils.APIEncryptUtil;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.core.withdraw.bean.BindAliInfo;
+import com.chwl.core.withdraw.bean.ExchangerInfo;
+import com.chwl.core.withdraw.bean.RefreshInfo;
+import com.chwl.core.withdraw.bean.WithdrawInfo;
+import com.chwl.core.withdraw.bean.WithdrwaListInfo;
+import com.chwl.core.withdraw.event.ExchangeInfoEvent;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.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/chwl/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/chwl/core/withdraw/bean/BindAliInfo.java
index 473f714a8..73bfdadb9 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/BindAliInfo.java
+++ b/core/src/main/java/com/chwl/core/withdraw/bean/BindAliInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.withdraw.bean;
+package com.chwl.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/chwl/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/chwl/core/withdraw/bean/ExchangerInfo.java
index 98b2cd430..f2a2c00a4 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/ExchangerInfo.java
+++ b/core/src/main/java/com/chwl/core/withdraw/bean/ExchangerInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.withdraw.bean;
+package com.chwl.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/chwl/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/chwl/core/withdraw/bean/RefreshInfo.java
index 68c26ca79..5a899254b 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/RefreshInfo.java
+++ b/core/src/main/java/com/chwl/core/withdraw/bean/RefreshInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.withdraw.bean;
+package com.chwl.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/chwl/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/chwl/core/withdraw/bean/WithdrawInfo.java
index 1528067ef..4c834ec0c 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/WithdrawInfo.java
+++ b/core/src/main/java/com/chwl/core/withdraw/bean/WithdrawInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.withdraw.bean;
+package com.chwl.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/chwl/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/chwl/core/withdraw/bean/WithdrwaListInfo.java
index 19ba871aa..0cad9ebb1 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/WithdrwaListInfo.java
+++ b/core/src/main/java/com/chwl/core/withdraw/bean/WithdrwaListInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.withdraw.bean;
+package com.chwl.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/chwl/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/chwl/core/withdraw/event/ExchangeInfoEvent.java
index c8cdc5bbc..f95d6d043 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/event/ExchangeInfoEvent.java
+++ b/core/src/main/java/com/chwl/core/withdraw/event/ExchangeInfoEvent.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.withdraw.event;
+package com.chwl.core.withdraw.event;
 
-import com.yizhuan.xchat_android_core.base.BaseDataEvent;
-import com.yizhuan.xchat_android_core.withdraw.bean.ExchangerInfo;
+import com.chwl.core.base.BaseDataEvent;
+import com.chwl.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/chwl/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/chwl/core/withdraw/event/WithdrawInfoEvent.java
index ebbf344d2..5811f8fd6 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/event/WithdrawInfoEvent.java
+++ b/core/src/main/java/com/chwl/core/withdraw/event/WithdrawInfoEvent.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.withdraw.event;
+package com.chwl.core.withdraw.event;
 
-import com.yizhuan.xchat_android_core.base.BaseDataEvent;
-import com.yizhuan.xchat_android_core.withdraw.bean.WithdrawInfo;
+import com.chwl.core.base.BaseDataEvent;
+import com.chwl.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 ce3c71bd2..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.bean.response.ServiceResult;
-import com.yizhuan.xchat_android_core.redPacket.bean.ActionDialogInfo;
-
-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 14547fe5c..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.bean.response.ServiceResult;
-import com.yizhuan.xchat_android_core.user.bean.AttentionInfo;
-
-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 042616116..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.bean.response.ServiceResult;
-import com.yizhuan.xchat_android_core.room.auction.bean.AuctionInfo;
-
-/**
- * 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 f29181434..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.bean.response.ServiceResult;
-import com.yizhuan.xchat_android_core.room.auction.bean.AuctionListUserInfo;
-
-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 de26b217a..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.bean.response.ServiceResult;
-import com.yizhuan.xchat_android_core.room.auction.bean.AuctionUser;
-
-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 5033228e9..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.bean.response.ServiceResult;
-import com.yizhuan.xchat_android_core.room.auction.bean.AuctionUser;
-
-/**
- * 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 a2ee4bde2..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.bean.response.ServiceResult;
-import com.yizhuan.xchat_android_core.withdraw.bean.ExchangerInfo;
-
-/**
- * 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 a0ce5823c..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.bean.response.ServiceResult;
-import com.yizhuan.xchat_android_core.room.face.FaceListInfo;
-
-/**
- * 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 4ba9d2e02..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.bean.response.ServiceResult;
-import com.yizhuan.xchat_android_core.user.bean.FansListInfo;
-
-/**
- * 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 28888fe7f..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.bean.response.ServiceResult;
-import com.yizhuan.xchat_android_core.bills.bean.TextInfos;
-
-/**
- * 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 7a0ab12ef..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.bean.response.ServiceResult;
-import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo;
-
-/**
- * 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 7205f2dc4..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.bean.response.ServiceResult;
-import com.yizhuan.xchat_android_core.gift.bean.GiftListInfo;
-
-/**
- * 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 601ea7809..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.bean.response.ServiceResult;
-import com.yizhuan.xchat_android_core.user.bean.GiftWallInfo;
-
-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 545c45fd7..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.bean.response.ServiceResult;
-import com.yizhuan.xchat_android_core.initial.bean.InitInfo;
-
-/**
- * @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 5857899b3..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.bean.response.ServiceResult;
-import com.yizhuan.xchat_android_core.gift.bean.MultiGiftReceiveInfo;
-
-/**
- * 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 13b7d9a91..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.bean.response.ServiceResult;
-import com.yizhuan.xchat_android_core.redPacket.bean.RedDrawListInfo;
-
-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 07911a56a..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.bean.response.ServiceResult;
-import com.yizhuan.xchat_android_core.redPacket.bean.RedPacketInfo;
-
-/**
- * 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 6e25cdd2f..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.bean.response.ServiceResult;
-import com.yizhuan.xchat_android_core.room.queue.bean.RoomConsumeInfo;
-
-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 2ef541686..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.bean.response.ServiceResult;
-import com.yizhuan.xchat_android_core.im.custom.bean.RewardBean;
-
-/**
- * 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 04338b2f5..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.bean.response.ServiceResult;
-import com.yizhuan.xchat_android_core.redPacket.bean.ShareRedBagInfo;
-
-/**
- * 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 ff3ace107..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.bean.response.ServiceResult;
-import com.yizhuan.xchat_android_core.user.bean.UserInfo;
-
-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 12aeecc16..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.bean.response.ServiceResult;
-import com.yizhuan.xchat_android_core.user.bean.UserInfo;
-
-/**
- * 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 3e50b0218..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.bean.response.ServiceResult;
-import com.yizhuan.xchat_android_core.pay.bean.WalletInfo;
-
-/**
- * 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 9121ce92a..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.bean.response.ServiceResult;
-import com.yizhuan.xchat_android_core.withdraw.bean.WithdrwaListInfo;
-
-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 eb6e4fa4d..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.bean.response.ServiceResult;
-import com.yizhuan.xchat_android_core.redPacket.bean.WithdrawRedListInfo;
-
-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 58031c54e..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.bean.response.ServiceResult;
-import com.yizhuan.xchat_android_core.redPacket.bean.WithdrawRedSucceedInfo;
-
-/**
- * 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 8b6cd1e9f..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.bean.response.ServiceResult;
-import com.yizhuan.xchat_android_core.withdraw.bean.WithdrawInfo;
-
-/**
- * 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 14d4e9304..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.bean.response.ServiceResult;
-import com.yizhuan.xchat_android_core.bills.bean.ExpendListInfo;
-
-/**
- * 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 a5815545b..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.bean.response.ServiceResult;
-import com.yizhuan.xchat_android_core.bills.bean.ExpendListInfo;
-
-/**
- * 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 9c8d5dd66..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.bean.response.ServiceResult;
-import com.yizhuan.xchat_android_core.bills.bean.IncomeListInfo;
-
-/**
- * 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 26190396a..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.bean.response.ServiceResult;
-import com.yizhuan.xchat_android_core.bills.bean.RedBagListInfo;
-
-/**
- * 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 87b11fce7..000000000
--- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/nameplate/INamePlateModel.java
+++ /dev/null
@@ -1,18 +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.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/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/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/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/bean/BankCardBean.java b/core/src/model_bank_card/java/com/chwl/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/chwl/core/bank_card/bean/BankCardBean.java
index 362b9a69f..14cfee8cf 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/chwl/core/bank_card/bean/BankCardBean.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.bank_card.bean;
+package com.chwl.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/chwl/core/bank_card/bean/BankCardListResp.java
similarity index 90%
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/chwl/core/bank_card/bean/BankCardListResp.java
index 1b9d92b86..cae9615d9 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/chwl/core/bank_card/bean/BankCardListResp.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.bank_card.bean;
+package com.chwl.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/chwl/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/chwl/core/bank_card/exception/NeedBindBankCardException.java
index 2678f0915..3265b3cdc 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/chwl/core/bank_card/exception/NeedBindBankCardException.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.bank_card.exception;
+package com.chwl.core.bank_card.exception;
 
-import com.yizhuan.xchat_android_core.exception.FailReasonException;
+import com.chwl.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/chwl/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/chwl/core/bank_card/model/BankCardModel.java
index fc12c5b77..425d9257a 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/chwl/core/bank_card/model/BankCardModel.java
@@ -1,12 +1,12 @@
-package com.yizhuan.xchat_android_core.bank_card.model;
+package com.chwl.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.chwl.core.Constants;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.bank_card.bean.BankCardListResp;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.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/chwl/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/chwl/core/bank_card/model/IBankCardModel.java
index 0571b4d0a..0c50ab590 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/chwl/core/bank_card/model/IBankCardModel.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.bank_card.model;
+package com.chwl.core.bank_card.model;
 
-import com.yizhuan.xchat_android_core.bank_card.bean.BankCardListResp;
-import com.yizhuan.xchat_android_core.base.IModel;
+import com.chwl.core.bank_card.bean.BankCardListResp;
+import com.chwl.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/chwl/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/chwl/core/bank_card/view/IAddBankCardAgreementView.java
index 1d0bf8c00..4bc2638f9 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/chwl/core/bank_card/view/IAddBankCardAgreementView.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.bank_card.view;
+package com.chwl.core.bank_card.view;
 
-import com.yizhuan.xchat_android_library.base.IMvpBaseView;
+import com.chwl.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/chwl/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/chwl/core/bank_card/view/IBankCardView.java
index 1dbd7893b..07988e96b 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/chwl/core/bank_card/view/IBankCardView.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.bank_card.view;
+package com.chwl.core.bank_card.view;
 
-import com.yizhuan.xchat_android_core.bank_card.bean.BankCardListResp;
-import com.yizhuan.xchat_android_library.base.IMvpBaseView;
+import com.chwl.core.bank_card.bean.BankCardListResp;
+import com.chwl.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/chwl/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/chwl/core/channel_page/bean/ChannelPageInfo.java
index 195325678..e9ef98deb 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/chwl/core/channel_page/bean/ChannelPageInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.channel_page.bean;
+package com.chwl.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/chwl/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/chwl/core/channel_page/bean/HelloMessageInfo.kt
index cb32ace91..601fad760 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/chwl/core/channel_page/bean/HelloMessageInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.channel_page.bean
+package com.chwl.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/chwl/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/chwl/core/channel_page/bean/NewUserHelloInfo.kt
index 0a404fb24..fa5eba2a2 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/chwl/core/channel_page/bean/NewUserHelloInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.channel_page.bean
+package com.chwl.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/chwl/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/chwl/core/channel_page/model/ChannelPageModel.java
index a9127e8c2..b89ff3fc9 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/chwl/core/channel_page/model/ChannelPageModel.java
@@ -1,16 +1,16 @@
-package com.yizhuan.xchat_android_core.channel_page.model;
+package com.chwl.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.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.channel_page.bean.ChannelPageInfo;
+import com.chwl.core.channel_page.bean.HelloMessageInfo;
+import com.chwl.core.channel_page.bean.NewUserHelloInfo;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.user.bean.InviteUserInfo;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.utils.NetworkUtils;
+import com.chwl.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/chwl/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/chwl/core/channel_page/model/IChannelPageModel.java
index 8b70c984b..7ec3bdb3e 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/chwl/core/channel_page/model/IChannelPageModel.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.channel_page.model;
+package com.chwl.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.chwl.core.channel_page.bean.ChannelPageInfo;
+import com.chwl.core.channel_page.bean.HelloMessageInfo;
+import com.chwl.core.channel_page.bean.NewUserHelloInfo;
+import com.chwl.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/chwl/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/chwl/core/community/CommunityConstant.java
index 1014608c6..5c9068ff0 100644
--- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/CommunityConstant.java
+++ b/core/src/model_community/java/com/chwl/core/community/CommunityConstant.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.community;
+package com.chwl.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/chwl/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/chwl/core/community/IPublishModel.java
index cbf37d647..cdd414af5 100644
--- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/IPublishModel.java
+++ b/core/src/model_community/java/com/chwl/core/community/IPublishModel.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.community;
+package com.chwl.core.community;
 
-import com.yizhuan.xchat_android_core.community.bean.MiniWorldChooseInfo;
-import com.yizhuan.xchat_android_core.community.bean.PublishBody;
+import com.chwl.core.community.bean.MiniWorldChooseInfo;
+import com.chwl.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/chwl/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/chwl/core/community/ImageUploadConfig.java
index 247125648..b857c2b0c 100644
--- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/ImageUploadConfig.java
+++ b/core/src/model_community/java/com/chwl/core/community/ImageUploadConfig.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.community;
+package com.chwl.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/chwl/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/chwl/core/community/PublishModel.java
index 6ad59ab93..953d31460 100644
--- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/PublishModel.java
+++ b/core/src/model_community/java/com/chwl/core/community/PublishModel.java
@@ -1,14 +1,14 @@
-package com.yizhuan.xchat_android_core.community;
+package com.chwl.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.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.community.bean.MiniWorldChooseInfo;
+import com.chwl.core.community.bean.PublishBody;
+import com.chwl.core.community.event.DynamicPublishEvent;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.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/chwl/core/community/attachment/DynamicSysAttachment.java
similarity index 83%
rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/attachment/DynamicSysAttachment.java
rename to core/src/model_community/java/com/chwl/core/community/attachment/DynamicSysAttachment.java
index 1c530d296..d3a8322d9 100644
--- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/attachment/DynamicSysAttachment.java
+++ b/core/src/model_community/java/com/chwl/core/community/attachment/DynamicSysAttachment.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.community.attachment;
+package com.chwl.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 com.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.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/chwl/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/chwl/core/community/attachment/UnReadCountAttachment.java
index ba86e9d2a..3bc008efa 100644
--- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/attachment/UnReadCountAttachment.java
+++ b/core/src/model_community/java/com/chwl/core/community/attachment/UnReadCountAttachment.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.community.attachment;
+package com.chwl.core.community.attachment;
 
 import com.alibaba.fastjson.JSONObject;
-import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment;
+import com.chwl.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/chwl/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/chwl/core/community/bean/Comment.java
index 2937723dc..08c420196 100644
--- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/Comment.java
+++ b/core/src/model_community/java/com/chwl/core/community/bean/Comment.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.community.bean;
+package com.chwl.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.chwl.core.community.bean.comment.Reply;
+import com.chwl.core.community.bean.comment.ReplyResult;
+import com.chwl.core.vip.UserVipInfo;
+import com.chwl.library.utils.ListUtils;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/CommentResult.java b/core/src/model_community/java/com/chwl/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/chwl/core/community/bean/CommentResult.java
index cf967eeb9..324b19c58 100644
--- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/CommentResult.java
+++ b/core/src/model_community/java/com/chwl/core/community/bean/CommentResult.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.community.bean;
+package com.chwl.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/chwl/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/chwl/core/community/bean/CommunityNoticeInfo.java
index 72dd5f09f..f3a625719 100644
--- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/CommunityNoticeInfo.java
+++ b/core/src/model_community/java/com/chwl/core/community/bean/CommunityNoticeInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.community.bean;
+package com.chwl.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/chwl/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/chwl/core/community/bean/DyChangeData.java
index 25ec551f8..74b769724 100644
--- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/DyChangeData.java
+++ b/core/src/model_community/java/com/chwl/core/community/bean/DyChangeData.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.community.bean;
+package com.chwl.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/chwl/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/chwl/core/community/bean/DynamicMedia.java
index 8e5a55155..4e99a3f21 100644
--- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/DynamicMedia.java
+++ b/core/src/model_community/java/com/chwl/core/community/bean/DynamicMedia.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.community.bean;
+package com.chwl.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/chwl/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/chwl/core/community/bean/MiniWorldChooseInfo.java
index c0aa21d98..c7c0fa139 100644
--- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/MiniWorldChooseInfo.java
+++ b/core/src/model_community/java/com/chwl/core/community/bean/MiniWorldChooseInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.community.bean;
+package com.chwl.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/chwl/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/chwl/core/community/bean/PublishBody.java
index d72f27fcb..ffe7ad9eb 100644
--- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/PublishBody.java
+++ b/core/src/model_community/java/com/chwl/core/community/bean/PublishBody.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.community.bean;
+package com.chwl.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/chwl/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/chwl/core/community/bean/PublishItem.java
index c3763cb76..f9a3105cf 100644
--- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/PublishItem.java
+++ b/core/src/model_community/java/com/chwl/core/community/bean/PublishItem.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.community.bean;
+package com.chwl.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/chwl/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/chwl/core/community/bean/UnReadCountInfo.java
index 665af358c..ea5d4f142 100644
--- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/UnReadCountInfo.java
+++ b/core/src/model_community/java/com/chwl/core/community/bean/UnReadCountInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.community.bean;
+package com.chwl.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/chwl/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/chwl/core/community/bean/UserDynamicItem.java
index 88982e69b..6d744de5f 100644
--- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/UserDynamicItem.java
+++ b/core/src/model_community/java/com/chwl/core/community/bean/UserDynamicItem.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.community.bean;
+package com.chwl.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/chwl/core/community/bean/WorldDynamicBean.java
similarity index 95%
rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/WorldDynamicBean.java
rename to core/src/model_community/java/com/chwl/core/community/bean/WorldDynamicBean.java
index 743c145f5..ee5ae7aa8 100644
--- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/WorldDynamicBean.java
+++ b/core/src/model_community/java/com/chwl/core/community/bean/WorldDynamicBean.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.community.bean;
+package com.chwl.core.community.bean;
 
 
 import android.text.TextUtils;
 
-import com.yizhuan.xchat_android_core.user.bean.BaseUserInfo;
+import com.chwl.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/chwl/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/chwl/core/community/bean/WorldDynamicListResult.java
index a73d967cf..ba55006ec 100644
--- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/WorldDynamicListResult.java
+++ b/core/src/model_community/java/com/chwl/core/community/bean/WorldDynamicListResult.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.community.bean;
+package com.chwl.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/chwl/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/chwl/core/community/bean/comment/PopupParams.java
index 70e48f59f..4d07b8b8b 100644
--- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/comment/PopupParams.java
+++ b/core/src/model_community/java/com/chwl/core/community/bean/comment/PopupParams.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.community.bean.comment;
+package com.chwl.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/chwl/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/chwl/core/community/bean/comment/Reply.java
index 18d90cb98..30cc9542b 100644
--- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/comment/Reply.java
+++ b/core/src/model_community/java/com/chwl/core/community/bean/comment/Reply.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.community.bean.comment;
+package com.chwl.core.community.bean.comment;
 
-import com.yizhuan.xchat_android_core.vip.UserVipInfo;
+import com.chwl.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/chwl/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/chwl/core/community/bean/comment/ReplyResult.java
index f81d89569..be27a2cfa 100644
--- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/comment/ReplyResult.java
+++ b/core/src/model_community/java/com/chwl/core/community/bean/comment/ReplyResult.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.community.bean.comment;
+package com.chwl.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/dynamic/DynamicDetailModel.java b/core/src/model_community/java/com/chwl/core/community/dynamic/DynamicDetailModel.java
similarity index 87%
rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/DynamicDetailModel.java
rename to core/src/model_community/java/com/chwl/core/community/dynamic/DynamicDetailModel.java
index d76049272..9f1fe4c5c 100644
--- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/DynamicDetailModel.java
+++ b/core/src/model_community/java/com/chwl/core/community/dynamic/DynamicDetailModel.java
@@ -1,15 +1,15 @@
-package com.yizhuan.xchat_android_core.community.dynamic;
+package com.chwl.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.utils.net.RxHelper;
-import com.yizhuan.xchat_android_library.net.rxnet.RxNet;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.community.bean.CommentResult;
+import com.chwl.core.community.bean.WorldDynamicBean;
+import com.chwl.core.community.bean.comment.Reply;
+import com.chwl.core.community.bean.comment.ReplyResult;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.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/chwl/core/community/dynamic/DynamicModel.java
similarity index 90%
rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/DynamicModel.java
rename to core/src/model_community/java/com/chwl/core/community/dynamic/DynamicModel.java
index 52324cc39..77196f1b3 100644
--- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/DynamicModel.java
+++ b/core/src/model_community/java/com/chwl/core/community/dynamic/DynamicModel.java
@@ -1,13 +1,13 @@
-package com.yizhuan.xchat_android_core.community.dynamic;
+package com.chwl.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.CommunityConstant;
-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.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.community.CommunityConstant;
+import com.chwl.core.community.bean.WorldDynamicListResult;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
 
 import io.reactivex.Single;
 import retrofit2.http.POST;
diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/IDynamicDetailModel.java b/core/src/model_community/java/com/chwl/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/chwl/core/community/dynamic/IDynamicDetailModel.java
index 2263779e3..416737303 100644
--- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/IDynamicDetailModel.java
+++ b/core/src/model_community/java/com/chwl/core/community/dynamic/IDynamicDetailModel.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.community.dynamic;
+package com.chwl.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.chwl.core.community.bean.CommentResult;
+import com.chwl.core.community.bean.WorldDynamicBean;
+import com.chwl.core.community.bean.comment.Reply;
+import com.chwl.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/chwl/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/chwl/core/community/dynamic/IDynamicModel.java
index 7ca2f51fe..4e9237f33 100644
--- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/IDynamicModel.java
+++ b/core/src/model_community/java/com/chwl/core/community/dynamic/IDynamicModel.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.community.dynamic;
+package com.chwl.core.community.dynamic;
 
-import com.yizhuan.xchat_android_core.community.bean.WorldDynamicListResult;
+import com.chwl.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/chwl/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/chwl/core/community/event/DynamicDetailFinishEvent.java
index 87460847e..765768abc 100644
--- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/event/DynamicDetailFinishEvent.java
+++ b/core/src/model_community/java/com/chwl/core/community/event/DynamicDetailFinishEvent.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.community.event;
+package com.chwl.core.community.event;
 
-import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean;
+import com.chwl.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/chwl/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/chwl/core/community/event/DynamicPublishEvent.java
index 225037a17..d1dad0b96 100644
--- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/event/DynamicPublishEvent.java
+++ b/core/src/model_community/java/com/chwl/core/community/event/DynamicPublishEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.community.event;
+package com.chwl.core.community.event;
 
 /**
  * create by lvzebiao @2019/12/1
diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/event/DynamicRefreshEvent.java b/core/src/model_community/java/com/chwl/core/community/event/DynamicRefreshEvent.java
similarity index 58%
rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/event/DynamicRefreshEvent.java
rename to core/src/model_community/java/com/chwl/core/community/event/DynamicRefreshEvent.java
index 2bd6e8a69..e6040cce8 100644
--- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/event/DynamicRefreshEvent.java
+++ b/core/src/model_community/java/com/chwl/core/community/event/DynamicRefreshEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.community.event;
+package com.chwl.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/chwl/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/chwl/core/community/event/SquareTaskEvent.java
index 17bc9262b..065ea272f 100644
--- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/event/SquareTaskEvent.java
+++ b/core/src/model_community/java/com/chwl/core/community/event/SquareTaskEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.community.event;
+package com.chwl.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/chwl/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/chwl/core/community/event/UnReadCountEvent.java
index 117b38e03..f5a394c52 100644
--- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/event/UnReadCountEvent.java
+++ b/core/src/model_community/java/com/chwl/core/community/event/UnReadCountEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.community.event;
+package com.chwl.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/chwl/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/chwl/core/community/im/DynamicImMsg.java
index 28953ed4e..ffbc83872 100644
--- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/im/DynamicImMsg.java
+++ b/core/src/model_community/java/com/chwl/core/community/im/DynamicImMsg.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.community.im;
+package com.chwl.core.community.im;
 
-import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean;
+import com.chwl.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/chwl/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/chwl/core/community/im/WorldDynamicAttachment.java
index 718da67f9..46b885e58 100644
--- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/im/WorldDynamicAttachment.java
+++ b/core/src/model_community/java/com/chwl/core/community/im/WorldDynamicAttachment.java
@@ -1,11 +1,11 @@
-package com.yizhuan.xchat_android_core.community.im;
+package com.chwl.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.chwl.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/chwl/core/community/square/ISquareModel.java
similarity index 65%
rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/square/ISquareModel.java
rename to core/src/model_community/java/com/chwl/core/community/square/ISquareModel.java
index 8dfc10d76..a159bdf4c 100644
--- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/square/ISquareModel.java
+++ b/core/src/model_community/java/com/chwl/core/community/square/ISquareModel.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.community.square;
+package com.chwl.core.community.square;
 
-import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
-import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean;
-import com.yizhuan.xchat_android_core.community.bean.WorldDynamicListResult;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.community.bean.WorldDynamicBean;
+import com.chwl.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/chwl/core/community/square/SquareModel.java
similarity index 85%
rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/square/SquareModel.java
rename to core/src/model_community/java/com/chwl/core/community/square/SquareModel.java
index cae9d5ced..fce1a8bbc 100644
--- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/square/SquareModel.java
+++ b/core/src/model_community/java/com/chwl/core/community/square/SquareModel.java
@@ -1,12 +1,12 @@
-package com.yizhuan.xchat_android_core.community.square;
+package com.chwl.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.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.community.CommunityConstant;
+import com.chwl.core.community.bean.WorldDynamicBean;
+import com.chwl.core.community.bean.WorldDynamicListResult;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.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/chwl/tutu/database/AppDataBase.java
similarity index 80%
rename from core/src/model_database_room/java/com/yizhuan/tutu/database/AppDataBase.java
rename to core/src/model_database_room/java/com/chwl/tutu/database/AppDataBase.java
index 5c798ada6..852cbf5ec 100644
--- a/core/src/model_database_room/java/com/yizhuan/tutu/database/AppDataBase.java
+++ b/core/src/model_database_room/java/com/chwl/tutu/database/AppDataBase.java
@@ -1,4 +1,4 @@
-package com.yizhuan.habu.database;
+package com.chwl.tutu.database;
 
 import androidx.annotation.NonNull;
 import androidx.room.Database;
@@ -8,11 +8,11 @@ import androidx.room.migration.Migration;
 import androidx.sqlite.db.SupportSQLiteDatabase;
 
 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.chwl.core.music.db.bean.LocalMusicBean;
+import com.chwl.core.music.db.bean.SongBean;
+import com.chwl.core.music.db.dao.LocalMusicDao;
+import com.chwl.core.music.db.dao.SongDao;
+import com.chwl.library.utils.config.BasicConfig;
 
 @Database(entities = {LocalMusicBean.class, SongBean.class}, version = 2, 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/chwl/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/chwl/core/module_hall/hall/HallModel.java
index ef7022774..d1ca84f8a 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/chwl/core/module_hall/hall/HallModel.java
@@ -1,30 +1,30 @@
-package com.yizhuan.xchat_android_core.module_hall.hall;
+package com.chwl.core.module_hall.hall;
 
-import com.yizhuan.xchat_android_core.R;
-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.JoinRoomInfo;
-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.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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.auth.event.LogoutEvent;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.module_hall.hall.bean.ApplyResult;
+import com.chwl.core.module_hall.hall.bean.AuthInfo;
+import com.chwl.core.module_hall.hall.bean.AuthListResult;
+import com.chwl.core.module_hall.hall.bean.ClanAndHallInfo;
+import com.chwl.core.module_hall.hall.bean.ClanInfo;
+import com.chwl.core.module_hall.hall.bean.HallInfo;
+import com.chwl.core.module_hall.hall.bean.HallMenuByUidResult;
+import com.chwl.core.module_hall.hall.bean.JoinRoomInfo;
+import com.chwl.core.module_hall.hall.bean.ListMemberInfo;
+import com.chwl.core.module_hall.hall.bean.OptionInfo;
+import com.chwl.core.module_hall.hall.bean.OwnerHallInfo;
+import com.chwl.core.module_hall.hall.bean.SuperAdminHall;
+import com.chwl.core.module_hall.hall.bean.SuperAdminInfo;
+import com.chwl.core.module_hall.hall.event.UserHallUpdateEvent;
+import com.chwl.core.user.UserModel;
+import com.chwl.core.user.bean.UserInfo;
+import com.chwl.core.user.event.LoginUserInfoUpdateEvent;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.utils.ResUtil;
 
 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/chwl/core/module_hall/hall/HallNameModel.java
similarity index 80%
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/chwl/core/module_hall/hall/HallNameModel.java
index 16a9c5289..3b2f29046 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/chwl/core/module_hall/hall/HallNameModel.java
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_core.module_hall.hall;
+package com.chwl.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.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
 
 import io.reactivex.Single;
 import retrofit2.http.POST;
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/chwl/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/chwl/core/module_hall/hall/IHallModel.java
index 846f00802..1e3e21da8 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/chwl/core/module_hall/hall/IHallModel.java
@@ -1,16 +1,16 @@
-package com.yizhuan.xchat_android_core.module_hall.hall;
+package com.chwl.core.module_hall.hall;
 
 
-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.ClanAndHallInfo;
-import com.yizhuan.xchat_android_core.module_hall.hall.bean.HallInfo;
-import com.yizhuan.xchat_android_core.module_hall.hall.bean.JoinRoomInfo;
-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.chwl.core.module_hall.hall.bean.ApplyResult;
+import com.chwl.core.module_hall.hall.bean.AuthInfo;
+import com.chwl.core.module_hall.hall.bean.ClanAndHallInfo;
+import com.chwl.core.module_hall.hall.bean.HallInfo;
+import com.chwl.core.module_hall.hall.bean.JoinRoomInfo;
+import com.chwl.core.module_hall.hall.bean.ListMemberInfo;
+import com.chwl.core.module_hall.hall.bean.OptionInfo;
+import com.chwl.core.module_hall.hall.bean.OwnerHallInfo;
+import com.chwl.core.module_hall.hall.bean.SuperAdminHall;
+import com.chwl.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/chwl/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/chwl/core/module_hall/hall/IHallNameModel.java
index 5356717f0..9e2d739a0 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/chwl/core/module_hall/hall/IHallNameModel.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.module_hall.hall;
+package com.chwl.core.module_hall.hall;
 
-import com.yizhuan.xchat_android_core.base.IModel;
+import com.chwl.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/chwl/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/chwl/core/module_hall/hall/bean/ApplyResult.java
index 7ffb9429c..7be9178dc 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/chwl/core/module_hall/hall/bean/ApplyResult.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.module_hall.hall.bean;
+package com.chwl.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/chwl/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/chwl/core/module_hall/hall/bean/AuthInfo.java
index 0d662971e..41e7f95a7 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/chwl/core/module_hall/hall/bean/AuthInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.module_hall.hall.bean;
+package com.chwl.core.module_hall.hall.bean;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/core/src/model_labour_union/java/com/chwl/core/module_hall/hall/bean/AuthListResult.java b/core/src/model_labour_union/java/com/chwl/core/module_hall/hall/bean/AuthListResult.java
new file mode 100644
index 000000000..fa346e47f
--- /dev/null
+++ b/core/src/model_labour_union/java/com/chwl/core/module_hall/hall/bean/AuthListResult.java
@@ -0,0 +1,8 @@
+package com.chwl.core.module_hall.hall.bean;
+
+import com.chwl.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/chwl/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/chwl/core/module_hall/hall/bean/ClanAndHallInfo.java
index c39c10edb..00de42ec2 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/chwl/core/module_hall/hall/bean/ClanAndHallInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.module_hall.hall.bean;
+package com.chwl.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/chwl/core/module_hall/hall/bean/ClanInfo.java
similarity index 86%
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/chwl/core/module_hall/hall/bean/ClanInfo.java
index 1b27b1065..61bb0636b 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/chwl/core/module_hall/hall/bean/ClanInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.module_hall.hall.bean;
+package com.chwl.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/chwl/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/chwl/core/module_hall/hall/bean/GroupListInfo.java
index 274ad6ef5..8833e804f 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/chwl/core/module_hall/hall/bean/GroupListInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.module_hall.hall.bean;
+package com.chwl.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/chwl/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/chwl/core/module_hall/hall/bean/HTeamInfo.java
index ce828c0cd..17e6a04d2 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/chwl/core/module_hall/hall/bean/HTeamInfo.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.module_hall.hall.bean;
+package com.chwl.core.module_hall.hall.bean;
 
-import com.yizhuan.xchat_android_core.module_hall.team.bean.HTeamType;
+import com.chwl.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/chwl/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/chwl/core/module_hall/hall/bean/HTeamMember.java
index 64309d99a..7d3fa80b0 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/chwl/core/module_hall/hall/bean/HTeamMember.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.module_hall.hall.bean;
+package com.chwl.core.module_hall.hall.bean;
 
-import com.yizhuan.xchat_android_core.user.bean.SimpleUserInfo;
+import com.chwl.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/chwl/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/chwl/core/module_hall/hall/bean/HallInfo.java
index a5418b1e6..a92dd21ac 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/chwl/core/module_hall/hall/bean/HallInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.module_hall.hall.bean;
+package com.chwl.core.module_hall.hall.bean;
 
 import lombok.Data;
 
diff --git a/core/src/model_labour_union/java/com/chwl/core/module_hall/hall/bean/HallMenuByUidResult.java b/core/src/model_labour_union/java/com/chwl/core/module_hall/hall/bean/HallMenuByUidResult.java
new file mode 100644
index 000000000..4007c75c5
--- /dev/null
+++ b/core/src/model_labour_union/java/com/chwl/core/module_hall/hall/bean/HallMenuByUidResult.java
@@ -0,0 +1,8 @@
+package com.chwl.core.module_hall.hall.bean;
+
+import com.chwl.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/JoinRoomInfo.kt b/core/src/model_labour_union/java/com/chwl/core/module_hall/hall/bean/JoinRoomInfo.kt
similarity index 73%
rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/JoinRoomInfo.kt
rename to core/src/model_labour_union/java/com/chwl/core/module_hall/hall/bean/JoinRoomInfo.kt
index 1bf80e19f..8c83d6d12 100644
--- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/JoinRoomInfo.kt
+++ b/core/src/model_labour_union/java/com/chwl/core/module_hall/hall/bean/JoinRoomInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.module_hall.hall.bean
+package com.chwl.core.module_hall.hall.bean
 
 data class JoinRoomInfo(
     val recordId: Long = 0,
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/chwl/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/chwl/core/module_hall/hall/bean/ListHTeamMember.java
index c5aadbd3e..3619246c1 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/chwl/core/module_hall/hall/bean/ListHTeamMember.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.module_hall.hall.bean;
+package com.chwl.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/chwl/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/chwl/core/module_hall/hall/bean/ListMemberInfo.java
index fa42ca693..2f0121fbc 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/chwl/core/module_hall/hall/bean/ListMemberInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.module_hall.hall.bean;
+package com.chwl.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/chwl/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/chwl/core/module_hall/hall/bean/MemberInfo.java
index 145d88e17..fdaee791b 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/chwl/core/module_hall/hall/bean/MemberInfo.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.module_hall.hall.bean;
+package com.chwl.core.module_hall.hall.bean;
 
-import com.yizhuan.xchat_android_core.user.bean.SimpleUserInfo;
+import com.chwl.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/chwl/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/chwl/core/module_hall/hall/bean/OptionInfo.java
index b136149ca..048197dfe 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/chwl/core/module_hall/hall/bean/OptionInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.module_hall.hall.bean;
+package com.chwl.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/chwl/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/chwl/core/module_hall/hall/bean/OwnerHallInfo.java
index 7efed4f8e..ac6b3791f 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/chwl/core/module_hall/hall/bean/OwnerHallInfo.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.module_hall.hall.bean;
+package com.chwl.core.module_hall.hall.bean;
 
-import com.yizhuan.xchat_android_core.module_hall.team.bean.HTeamType;
+import com.chwl.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/chwl/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/chwl/core/module_hall/hall/bean/RoleType.java
index f4e82066c..c6ad3a9d0 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/chwl/core/module_hall/hall/bean/RoleType.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.module_hall.hall.bean;
+package com.chwl.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/chwl/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/chwl/core/module_hall/hall/bean/SuperAdminHall.kt
index dd4dabd19..fadea958d 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/chwl/core/module_hall/hall/bean/SuperAdminHall.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.module_hall.hall.bean
+package com.chwl.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/chwl/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/chwl/core/module_hall/hall/bean/SuperAdminInfo.kt
index 7b9688466..c700ebf89 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/chwl/core/module_hall/hall/bean/SuperAdminInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.module_hall.hall.bean
+package com.chwl.core.module_hall.hall.bean
 
 data class SuperAdminInfo(
     val avatar: String? = "",
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/chwl/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/chwl/core/module_hall/hall/event/UserHallUpdateEvent.java
index 0e65db512..d5a687917 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/chwl/core/module_hall/hall/event/UserHallUpdateEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.module_hall.hall.event;
+package com.chwl.core.module_hall.hall.event;
 
 /**
  * 用户模厅更新事件
diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/im/ClanAttachment.java b/core/src/model_labour_union/java/com/chwl/core/module_hall/im/ClanAttachment.java
similarity index 86%
rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/im/ClanAttachment.java
rename to core/src/model_labour_union/java/com/chwl/core/module_hall/im/ClanAttachment.java
index 5ea50b438..4771df137 100644
--- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/im/ClanAttachment.java
+++ b/core/src/model_labour_union/java/com/chwl/core/module_hall/im/ClanAttachment.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.module_hall.im;
+package com.chwl.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.chwl.core.im.custom.bean.CustomAttachment;
 
 /**
  * 公会消息
diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/im/ClanImMsgInfo.java b/core/src/model_labour_union/java/com/chwl/core/module_hall/im/ClanImMsgInfo.java
similarity index 93%
rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/im/ClanImMsgInfo.java
rename to core/src/model_labour_union/java/com/chwl/core/module_hall/im/ClanImMsgInfo.java
index 5f6c60dfe..8f9437879 100644
--- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/im/ClanImMsgInfo.java
+++ b/core/src/model_labour_union/java/com/chwl/core/module_hall/im/ClanImMsgInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.module_hall.im;
+package com.chwl.core.module_hall.im;
 
 import java.io.Serializable;
 import java.util.HashMap;
@@ -33,7 +33,7 @@ public class ClanImMsgInfo implements Serializable{
     private int type;
     /**后台给的显示内容*/
     private String layout;
-    /**{@link com.yizhuan.xchat_android_core.im.custom.bean.RouterType}*/
+    /**{@link com.chwl.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/HallAttachment.java b/core/src/model_labour_union/java/com/chwl/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/chwl/core/module_hall/im/HallAttachment.java
index b36ecb10a..7649773f7 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/chwl/core/module_hall/im/HallAttachment.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.module_hall.im;
+package com.chwl.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.chwl.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/chwl/core/module_hall/im/HallImMsgInfo.java
similarity index 93%
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/chwl/core/module_hall/im/HallImMsgInfo.java
index cb23486b6..7d9e7e207 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/chwl/core/module_hall/im/HallImMsgInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.module_hall.im;
+package com.chwl.core.module_hall.im;
 
 import java.io.Serializable;
 import java.util.HashMap;
@@ -33,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.chwl.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/chwl/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/chwl/core/module_hall/im/bean/HallMsgComponent.java
index fd673e753..cd5b9a7e3 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/chwl/core/module_hall/im/bean/HallMsgComponent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.module_hall.im.bean;
+package com.chwl.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/chwl/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/chwl/core/module_hall/im/bean/HallMsgLayout.java
index 6b5914771..46c7f5357 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/chwl/core/module_hall/im/bean/HallMsgLayout.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.module_hall.im.bean;
+package com.chwl.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/chwl/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/chwl/core/module_hall/income/IIncomeModel.java
index 0337f17d6..c8e1ec5f1 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/chwl/core/module_hall/income/IIncomeModel.java
@@ -1,12 +1,12 @@
-package com.yizhuan.xchat_android_core.module_hall.income;
+package com.chwl.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.HallTotalIncomeInfo;
-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.LiveTotalIncomeInfo;
-import com.yizhuan.xchat_android_core.module_hall.income.bean.SingleRoomTotalIncomeInfo;
+import com.chwl.core.base.IModel;
+import com.chwl.core.module_hall.income.bean.ClanTotalIncomeInfo;
+import com.chwl.core.module_hall.income.bean.HallTotalIncomeInfo;
+import com.chwl.core.module_hall.income.bean.IncomeGiftInfo;
+import com.chwl.core.module_hall.income.bean.IncomeTotalInfo;
+import com.chwl.core.module_hall.income.bean.LiveTotalIncomeInfo;
+import com.chwl.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/chwl/core/module_hall/income/IncomeModel.java
similarity index 89%
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/chwl/core/module_hall/income/IncomeModel.java
index 113fe460d..e87308be1 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/chwl/core/module_hall/income/IncomeModel.java
@@ -1,16 +1,16 @@
-package com.yizhuan.xchat_android_core.module_hall.income;
+package com.chwl.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.HallTotalIncomeInfo;
-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.LiveTotalIncomeInfo;
-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.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.module_hall.income.bean.ClanTotalIncomeInfo;
+import com.chwl.core.module_hall.income.bean.HallTotalIncomeInfo;
+import com.chwl.core.module_hall.income.bean.IncomeGiftInfo;
+import com.chwl.core.module_hall.income.bean.IncomeTotalInfo;
+import com.chwl.core.module_hall.income.bean.LiveTotalIncomeInfo;
+import com.chwl.core.module_hall.income.bean.SingleRoomTotalIncomeInfo;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.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/chwl/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/chwl/core/module_hall/income/bean/ClanIncomeInfo.java
index 6f880497d..7ff89a8d9 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/chwl/core/module_hall/income/bean/ClanIncomeInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.module_hall.income.bean;
+package com.chwl.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/chwl/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/chwl/core/module_hall/income/bean/ClanTotalIncomeInfo.java
index 732fa4900..2e38c9f04 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/chwl/core/module_hall/income/bean/ClanTotalIncomeInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.module_hall.income.bean;
+package com.chwl.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/HallIncomeInfo.java b/core/src/model_labour_union/java/com/chwl/core/module_hall/income/bean/HallIncomeInfo.java
similarity index 98%
rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/HallIncomeInfo.java
rename to core/src/model_labour_union/java/com/chwl/core/module_hall/income/bean/HallIncomeInfo.java
index 93f3350c9..9e9b6c81c 100644
--- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/HallIncomeInfo.java
+++ b/core/src/model_labour_union/java/com/chwl/core/module_hall/income/bean/HallIncomeInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.module_hall.income.bean;
+package com.chwl.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/HallTotalIncomeInfo.java b/core/src/model_labour_union/java/com/chwl/core/module_hall/income/bean/HallTotalIncomeInfo.java
similarity index 97%
rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/HallTotalIncomeInfo.java
rename to core/src/model_labour_union/java/com/chwl/core/module_hall/income/bean/HallTotalIncomeInfo.java
index 9921afa13..70c87f1c2 100644
--- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/HallTotalIncomeInfo.java
+++ b/core/src/model_labour_union/java/com/chwl/core/module_hall/income/bean/HallTotalIncomeInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.module_hall.income.bean;
+package com.chwl.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/chwl/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/chwl/core/module_hall/income/bean/IncomeGiftInfo.java
index 10d6f0306..cc40a66c8 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/chwl/core/module_hall/income/bean/IncomeGiftInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.module_hall.income.bean;
+package com.chwl.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/chwl/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/chwl/core/module_hall/income/bean/IncomeInfo.java
index ef296cc0e..7b73a0ec6 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/chwl/core/module_hall/income/bean/IncomeInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.module_hall.income.bean;
+package com.chwl.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/chwl/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/chwl/core/module_hall/income/bean/IncomeTotalInfo.java
index c772cdc82..38ef0a83d 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/chwl/core/module_hall/income/bean/IncomeTotalInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.module_hall.income.bean;
+package com.chwl.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/LiveIncomeInfo.java b/core/src/model_labour_union/java/com/chwl/core/module_hall/income/bean/LiveIncomeInfo.java
similarity index 83%
rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/LiveIncomeInfo.java
rename to core/src/model_labour_union/java/com/chwl/core/module_hall/income/bean/LiveIncomeInfo.java
index 53f6082f6..86f42ec0d 100644
--- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/LiveIncomeInfo.java
+++ b/core/src/model_labour_union/java/com/chwl/core/module_hall/income/bean/LiveIncomeInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.module_hall.income.bean;
+package com.chwl.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/LiveTotalIncomeInfo.java b/core/src/model_labour_union/java/com/chwl/core/module_hall/income/bean/LiveTotalIncomeInfo.java
similarity index 71%
rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/LiveTotalIncomeInfo.java
rename to core/src/model_labour_union/java/com/chwl/core/module_hall/income/bean/LiveTotalIncomeInfo.java
index cc284d066..9122ca592 100644
--- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/LiveTotalIncomeInfo.java
+++ b/core/src/model_labour_union/java/com/chwl/core/module_hall/income/bean/LiveTotalIncomeInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.module_hall.income.bean;
+package com.chwl.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/chwl/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/chwl/core/module_hall/income/bean/SingleRoomIncomeInfo.java
index 5e64ddb81..9c12c48a3 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/chwl/core/module_hall/income/bean/SingleRoomIncomeInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.module_hall.income.bean;
+package com.chwl.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/chwl/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/chwl/core/module_hall/income/bean/SingleRoomTotalIncomeInfo.java
index 3edf88586..597383230 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/chwl/core/module_hall/income/bean/SingleRoomTotalIncomeInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.module_hall.income.bean;
+package com.chwl.core.module_hall.income.bean;
 
 import java.util.List;
 
diff --git a/core/src/model_labour_union/java/com/chwl/core/module_hall/income/event/UpdateMemberListEvent.java b/core/src/model_labour_union/java/com/chwl/core/module_hall/income/event/UpdateMemberListEvent.java
new file mode 100644
index 000000000..f5016ab6a
--- /dev/null
+++ b/core/src/model_labour_union/java/com/chwl/core/module_hall/income/event/UpdateMemberListEvent.java
@@ -0,0 +1,4 @@
+package com.chwl.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/chwl/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/chwl/core/module_hall/secretcode/ISecretCodeModel.java
index f569a50ba..be1797ca6 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/chwl/core/module_hall/secretcode/ISecretCodeModel.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.module_hall.secretcode;
+package com.chwl.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.chwl.core.module_hall.secretcode.bean.CheckCodeResult;
+import com.chwl.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/chwl/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/chwl/core/module_hall/secretcode/SecretCodeModel.java
index a58af3c9c..6b29903e2 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/chwl/core/module_hall/secretcode/SecretCodeModel.java
@@ -1,15 +1,15 @@
-package com.yizhuan.xchat_android_core.module_hall.secretcode;
+package com.chwl.core.module_hall.secretcode;
 
 import com.google.gson.JsonElement;
-import com.yizhuan.xchat_android_core.R;
-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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.module_hall.secretcode.bean.CheckCodeResult;
+import com.chwl.core.module_hall.secretcode.bean.SecretCodeInfo;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.utils.ResUtil;
 
 import io.reactivex.Single;
 import retrofit2.http.Field;
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/chwl/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/chwl/core/module_hall/secretcode/bean/CheckCodeResult.java
index 1780ebd63..d4cbd6b1f 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/chwl/core/module_hall/secretcode/bean/CheckCodeResult.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.module_hall.secretcode.bean;
+package com.chwl.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/chwl/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/chwl/core/module_hall/secretcode/bean/SecretCodeInfo.java
index 9c5003d6f..e24942621 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/chwl/core/module_hall/secretcode/bean/SecretCodeInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.module_hall.secretcode.bean;
+package com.chwl.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/chwl/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/chwl/core/module_hall/team/HTeamModel.java
index 2cdaeb677..33ae0a683 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/chwl/core/module_hall/team/HTeamModel.java
@@ -1,23 +1,23 @@
-package com.yizhuan.xchat_android_core.module_hall.team;
+package com.chwl.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.R;
-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.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.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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.module_hall.hall.HallModel;
+import com.chwl.core.module_hall.hall.bean.HTeamInfo;
+import com.chwl.core.module_hall.hall.bean.ListHTeamMember;
+import com.chwl.core.module_hall.hall.bean.ListMemberInfo;
+import com.chwl.core.module_hall.team.bean.HTeamChatLimit;
+import com.chwl.core.module_hall.team.event.HteamInfoUpdateInfoEvent;
+import com.chwl.core.module_hall.team.event.HteamListChangeEvent;
+import com.chwl.core.module_hall.team.event.HteamMemberNumChangeEvent;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.utils.ResUtil;
 
 import org.greenrobot.eventbus.EventBus;
 
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/chwl/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/chwl/core/module_hall/team/IHTeamModel.java
index 54b1b3054..b3f856b3a 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/chwl/core/module_hall/team/IHTeamModel.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.module_hall.team;
+package com.chwl.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.chwl.core.module_hall.hall.bean.HTeamInfo;
+import com.chwl.core.module_hall.hall.bean.ListHTeamMember;
+import com.chwl.core.module_hall.hall.bean.ListMemberInfo;
+import com.chwl.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/chwl/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/chwl/core/module_hall/team/bean/HTeamChatLimit.java
index bc43f60bc..352c35aa3 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/chwl/core/module_hall/team/bean/HTeamChatLimit.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.module_hall.team.bean;
+package com.chwl.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/chwl/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/chwl/core/module_hall/team/bean/HTeamType.java
index 7671d9c9b..f27785523 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/chwl/core/module_hall/team/bean/HTeamType.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.module_hall.team.bean;
+package com.chwl.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/chwl/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/chwl/core/module_hall/team/event/HteamInfoUpdateInfoEvent.java
index e07169e4a..73eb4fd14 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/chwl/core/module_hall/team/event/HteamInfoUpdateInfoEvent.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.module_hall.team.event;
+package com.chwl.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.chwl.core.base.BaseBusEvent;
+import com.chwl.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/chwl/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/chwl/core/module_hall/team/event/HteamListChangeEvent.java
index e6a1bc850..f39d2c7ca 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/chwl/core/module_hall/team/event/HteamListChangeEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.module_hall.team.event;
+package com.chwl.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/chwl/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/chwl/core/module_hall/team/event/HteamMemberNumChangeEvent.java
index 802275421..40b9d999e 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/chwl/core/module_hall/team/event/HteamMemberNumChangeEvent.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.module_hall.team.event;
+package com.chwl.core.module_hall.team.event;
 
-import com.yizhuan.xchat_android_core.base.BaseBusEvent;
+import com.chwl.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 6b9616259..000000000
--- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/HallMenuByUidResult.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 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/chwl/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/chwl/core/mentoring_relationship/attachment/MentoringApprenticeMissionFourAttachment.java
index a7f17b0b4..bf25f69b2 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/chwl/core/mentoring_relationship/attachment/MentoringApprenticeMissionFourAttachment.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.attachment;
+package com.chwl.core.mentoring_relationship.attachment;
 
-import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment;
+import com.chwl.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/chwl/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/chwl/core/mentoring_relationship/attachment/MentoringApprenticeMissionOneAttachment.java
index 97751c647..b38065fcc 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/chwl/core/mentoring_relationship/attachment/MentoringApprenticeMissionOneAttachment.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.attachment;
+package com.chwl.core.mentoring_relationship.attachment;
 
-import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment;
+import com.chwl.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/chwl/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/chwl/core/mentoring_relationship/attachment/MentoringApprenticeMissionThreeAttachment.java
index 05756e1f0..b9afd9ae7 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/chwl/core/mentoring_relationship/attachment/MentoringApprenticeMissionThreeAttachment.java
@@ -1,11 +1,11 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.attachment;
+package com.chwl.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.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.core.mentoring_relationship.bean.MissionVo;
+import com.chwl.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/chwl/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/chwl/core/mentoring_relationship/attachment/MentoringApprenticeMissionTwoAttachment.java
index ba2aa4851..b6f7fa80f 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/chwl/core/mentoring_relationship/attachment/MentoringApprenticeMissionTwoAttachment.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.attachment;
+package com.chwl.core.mentoring_relationship.attachment;
 
-import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment;
+import com.chwl.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/chwl/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/chwl/core/mentoring_relationship/attachment/MentoringGrabApprenticesAttachment.java
index e47257880..e1e3c089a 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/chwl/core/mentoring_relationship/attachment/MentoringGrabApprenticesAttachment.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.attachment;
+package com.chwl.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.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.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/chwl/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/chwl/core/mentoring_relationship/attachment/MentoringMasterMissionFourAttachment.java
index 8b9002eef..7ecf1513b 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/chwl/core/mentoring_relationship/attachment/MentoringMasterMissionFourAttachment.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.attachment;
+package com.chwl.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.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.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/chwl/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/chwl/core/mentoring_relationship/attachment/MentoringMasterMissionOneAttachment.java
index ae94ead4a..4e7b2fd7c 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/chwl/core/mentoring_relationship/attachment/MentoringMasterMissionOneAttachment.java
@@ -1,11 +1,11 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.attachment;
+package com.chwl.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.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.core.mentoring_relationship.bean.MissionVo;
+import com.chwl.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/chwl/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/chwl/core/mentoring_relationship/attachment/MentoringMasterMissionThreeAttachment.java
index eed37b113..bffc72424 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/chwl/core/mentoring_relationship/attachment/MentoringMasterMissionThreeAttachment.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.attachment;
+package com.chwl.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.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.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/chwl/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/chwl/core/mentoring_relationship/attachment/MentoringMasterMissionTwoAttachment.java
index 7b01f02bc..c3adf0c26 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/chwl/core/mentoring_relationship/attachment/MentoringMasterMissionTwoAttachment.java
@@ -1,11 +1,11 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.attachment;
+package com.chwl.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.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.core.mentoring_relationship.bean.MissionVo;
+import com.chwl.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/chwl/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/chwl/core/mentoring_relationship/attachment/MentoringMissionTipsAttachment.java
index 06eec9800..ae0e62927 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/chwl/core/mentoring_relationship/attachment/MentoringMissionTipsAttachment.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.attachment;
+package com.chwl.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.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.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/chwl/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/chwl/core/mentoring_relationship/attachment/MentoringSharingRoomAttachment.java
index 0ff59eadc..0726313e6 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/chwl/core/mentoring_relationship/attachment/MentoringSharingRoomAttachment.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.attachment;
+package com.chwl.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.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.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.kt b/core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/bean/GrabApprenticesInfo.kt
similarity index 86%
rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesInfo.kt
rename to core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/bean/GrabApprenticesInfo.kt
index 600596dc1..010b46962 100644
--- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesInfo.kt
+++ b/core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/bean/GrabApprenticesInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.bean
+package com.chwl.core.mentoring_relationship.bean
 
 data class GrabApprenticesInfo(
     /**
diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesMissionInfo.kt b/core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/bean/GrabApprenticesMissionInfo.kt
similarity index 69%
rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesMissionInfo.kt
rename to core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/bean/GrabApprenticesMissionInfo.kt
index e82a6f834..0101a505f 100644
--- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesMissionInfo.kt
+++ b/core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/bean/GrabApprenticesMissionInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.bean
+package com.chwl.core.mentoring_relationship.bean
 
 data class GrabApprenticesMissionInfo(
     /**
diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringRankingDataInfo.kt b/core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/bean/MentoringRankingDataInfo.kt
similarity index 99%
rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringRankingDataInfo.kt
rename to core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/bean/MentoringRankingDataInfo.kt
index c320bc71c..24b4eb2e9 100644
--- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringRankingDataInfo.kt
+++ b/core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/bean/MentoringRankingDataInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.bean
+package com.chwl.core.mentoring_relationship.bean
 
 data class MentoringRankingDataInfo(
     /**
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/chwl/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/chwl/core/mentoring_relationship/bean/MentoringResultMarqueeInfo.java
index ca577c8d5..d0805509a 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/chwl/core/mentoring_relationship/bean/MentoringResultMarqueeInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.bean;
+package com.chwl.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/chwl/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/chwl/core/mentoring_relationship/bean/MentoringSharingRoomInfo.java
index 8166b1d68..8445f6fb5 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/chwl/core/mentoring_relationship/bean/MentoringSharingRoomInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.bean;
+package com.chwl.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.kt b/core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/bean/MentoringTipsInfo.kt
similarity index 80%
rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringTipsInfo.kt
rename to core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/bean/MentoringTipsInfo.kt
index 8a135b9de..704ef7a28 100644
--- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringTipsInfo.kt
+++ b/core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/bean/MentoringTipsInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.bean
+package com.chwl.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.kt b/core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/bean/MentoringUserInfo.kt
similarity index 96%
rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringUserInfo.kt
rename to core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/bean/MentoringUserInfo.kt
index 63e7d8c2a..2136b645d 100644
--- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringUserInfo.kt
+++ b/core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/bean/MentoringUserInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.bean
+package com.chwl.core.mentoring_relationship.bean
 
 data class MentoringUserInfo(
     /**
diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MissionVo.kt b/core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/bean/MissionVo.kt
similarity index 90%
rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MissionVo.kt
rename to core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/bean/MissionVo.kt
index ff3e60d50..07f620dc5 100644
--- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MissionVo.kt
+++ b/core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/bean/MissionVo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.bean
+package com.chwl.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/PickUpApprenticeInfo.kt b/core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/bean/PickUpApprenticeInfo.kt
similarity index 82%
rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/PickUpApprenticeInfo.kt
rename to core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/bean/PickUpApprenticeInfo.kt
index 44eaee60a..fc524f238 100644
--- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/PickUpApprenticeInfo.kt
+++ b/core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/bean/PickUpApprenticeInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.bean
+package com.chwl.core.mentoring_relationship.bean
 
 data class PickUpApprenticeInfo(
     /**
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/chwl/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/chwl/core/mentoring_relationship/bean/SimpleGiftVo.java
index 03e5b2085..17d16a49e 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/chwl/core/mentoring_relationship/bean/SimpleGiftVo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.bean;
+package com.chwl.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.kt b/core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/bean/SimpleUserVo.kt
similarity index 86%
rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/SimpleUserVo.kt
rename to core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/bean/SimpleUserVo.kt
index 160937c77..25fc22ee3 100644
--- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/SimpleUserVo.kt
+++ b/core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/bean/SimpleUserVo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.bean
+package com.chwl.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/chwl/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/chwl/core/mentoring_relationship/event/GrabApprenticesDataEvent.java
index 776d39046..dcdff9c3f 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/chwl/core/mentoring_relationship/event/GrabApprenticesDataEvent.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.event;
+package com.chwl.core.mentoring_relationship.event;
 
-import com.yizhuan.xchat_android_core.mentoring_relationship.bean.GrabApprenticesInfo;
+import com.chwl.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/chwl/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/chwl/core/mentoring_relationship/event/GrabApprenticesEvent.java
index 82bb871d7..e9a17a2ba 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/chwl/core/mentoring_relationship/event/GrabApprenticesEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.event;
+package com.chwl.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/chwl/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/chwl/core/mentoring_relationship/event/MentoringCountingEvent.java
index ad66e26a0..f57b2c25c 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/chwl/core/mentoring_relationship/event/MentoringCountingEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.event;
+package com.chwl.core.mentoring_relationship.event;
 
 import lombok.Data;
 
diff --git a/core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/event/MentoringCountingFinishEvent.java b/core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/event/MentoringCountingFinishEvent.java
new file mode 100644
index 000000000..6a1bffc7c
--- /dev/null
+++ b/core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/event/MentoringCountingFinishEvent.java
@@ -0,0 +1,4 @@
+package com.chwl.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/chwl/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/chwl/core/mentoring_relationship/event/MentoringRelationshipMissionEvent.java
index 10b4c076e..b273142b5 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/chwl/core/mentoring_relationship/event/MentoringRelationshipMissionEvent.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.event;
+package com.chwl.core.mentoring_relationship.event;
 
-import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment;
+import com.chwl.core.im.custom.bean.CustomAttachment;
 
 import lombok.Data;
 
diff --git a/core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/event/MentoringStartCountingEvent.java b/core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/event/MentoringStartCountingEvent.java
new file mode 100644
index 000000000..28c6b032d
--- /dev/null
+++ b/core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/event/MentoringStartCountingEvent.java
@@ -0,0 +1,4 @@
+package com.chwl.core.mentoring_relationship.event;
+
+public class MentoringStartCountingEvent {
+}
diff --git a/core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/event/MentoringStopCountingEvent.java b/core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/event/MentoringStopCountingEvent.java
new file mode 100644
index 000000000..9eba64d57
--- /dev/null
+++ b/core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/event/MentoringStopCountingEvent.java
@@ -0,0 +1,4 @@
+package com.chwl.core.mentoring_relationship.event;
+
+public class MentoringStopCountingEvent {
+}
diff --git a/core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/event/MentoringSuccessEvent.java b/core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/event/MentoringSuccessEvent.java
new file mode 100644
index 000000000..0bb760ffc
--- /dev/null
+++ b/core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/event/MentoringSuccessEvent.java
@@ -0,0 +1,4 @@
+package com.chwl.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/chwl/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/chwl/core/mentoring_relationship/exception/MentoringAlreadyHasMasterException.java
index 7ae9081b6..42b6c99af 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/chwl/core/mentoring_relationship/exception/MentoringAlreadyHasMasterException.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.exception;
+package com.chwl.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/chwl/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/chwl/core/mentoring_relationship/exception/MentoringCanNotPickUpApprenticeException.java
index a2c1e78bc..3dbaece0d 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/chwl/core/mentoring_relationship/exception/MentoringCanNotPickUpApprenticeException.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.exception;
+package com.chwl.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/chwl/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/chwl/core/mentoring_relationship/exception/MentoringLessThanFiveMinutesException.java
index 783ad9965..532992167 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/chwl/core/mentoring_relationship/exception/MentoringLessThanFiveMinutesException.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.exception;
+package com.chwl.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/chwl/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/chwl/core/mentoring_relationship/exception/MentoringMissionExpiredException.java
index d8748c451..9ffaf61ab 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/chwl/core/mentoring_relationship/exception/MentoringMissionExpiredException.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.exception;
+package com.chwl.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/chwl/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/chwl/core/mentoring_relationship/model/IMentoringRelationshipModel.java
index 418de5faf..42cedbdaf 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/chwl/core/mentoring_relationship/model/IMentoringRelationshipModel.java
@@ -1,12 +1,12 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.model;
+package com.chwl.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.chwl.core.base.IModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.gift.bean.GiftReceiveInfo;
+import com.chwl.core.mentoring_relationship.bean.MentoringRankingDataInfo;
+import com.chwl.core.mentoring_relationship.bean.MentoringResultMarqueeInfo;
+import com.chwl.core.mentoring_relationship.bean.MentoringUserInfo;
+import com.chwl.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/chwl/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/chwl/core/mentoring_relationship/model/MentoringRelationshipModel.java
index a0022ea4e..50545cfbd 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/chwl/core/mentoring_relationship/model/MentoringRelationshipModel.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.model;
+package com.chwl.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.chwl.core.Constants;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.auth.event.LogoutEvent;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.exception.FailReasonException;
+import com.chwl.core.exception.UnKnowException;
+import com.chwl.core.gift.bean.GiftReceiveInfo;
+import com.chwl.core.gift.exception.GiftOutOfDateException;
+import com.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.mentoring_relationship.attachment.MentoringApprenticeMissionFourAttachment;
+import com.chwl.core.mentoring_relationship.attachment.MentoringApprenticeMissionOneAttachment;
+import com.chwl.core.mentoring_relationship.attachment.MentoringApprenticeMissionThreeAttachment;
+import com.chwl.core.mentoring_relationship.attachment.MentoringApprenticeMissionTwoAttachment;
+import com.chwl.core.mentoring_relationship.attachment.MentoringGrabApprenticesAttachment;
+import com.chwl.core.mentoring_relationship.attachment.MentoringMasterMissionFourAttachment;
+import com.chwl.core.mentoring_relationship.attachment.MentoringMasterMissionOneAttachment;
+import com.chwl.core.mentoring_relationship.attachment.MentoringMasterMissionThreeAttachment;
+import com.chwl.core.mentoring_relationship.attachment.MentoringMasterMissionTwoAttachment;
+import com.chwl.core.mentoring_relationship.attachment.MentoringMissionTipsAttachment;
+import com.chwl.core.mentoring_relationship.bean.GrabApprenticesInfo;
+import com.chwl.core.mentoring_relationship.bean.GrabApprenticesMissionInfo;
+import com.chwl.core.mentoring_relationship.bean.MentoringRankingDataInfo;
+import com.chwl.core.mentoring_relationship.bean.MentoringResultMarqueeInfo;
+import com.chwl.core.mentoring_relationship.bean.MentoringTipsInfo;
+import com.chwl.core.mentoring_relationship.bean.MentoringUserInfo;
+import com.chwl.core.mentoring_relationship.bean.MissionVo;
+import com.chwl.core.mentoring_relationship.bean.PickUpApprenticeInfo;
+import com.chwl.core.mentoring_relationship.bean.SimpleGiftVo;
+import com.chwl.core.mentoring_relationship.bean.SimpleUserVo;
+import com.chwl.core.mentoring_relationship.event.GrabApprenticesDataEvent;
+import com.chwl.core.mentoring_relationship.event.GrabApprenticesEvent;
+import com.chwl.core.mentoring_relationship.event.MentoringCountingEvent;
+import com.chwl.core.mentoring_relationship.event.MentoringCountingFinishEvent;
+import com.chwl.core.mentoring_relationship.event.MentoringRelationshipMissionEvent;
+import com.chwl.core.mentoring_relationship.event.MentoringStartCountingEvent;
+import com.chwl.core.mentoring_relationship.event.MentoringStopCountingEvent;
+import com.chwl.core.mentoring_relationship.event.MentoringSuccessEvent;
+import com.chwl.core.msg.sys.ErbanSysMsgInfo;
+import com.chwl.core.utils.SharedPreferenceUtils;
+import com.chwl.core.utils.net.BalanceNotEnoughExeption;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.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/chwl/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/chwl/core/mentoring_relationship/view/IMentoringRelationshipView.java
index 72ba2cb2a..c9cba2332 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/chwl/core/mentoring_relationship/view/IMentoringRelationshipView.java
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.view;
+package com.chwl.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.chwl.core.mentoring_relationship.bean.MentoringRankingDataInfo;
+import com.chwl.core.mentoring_relationship.bean.MentoringResultMarqueeInfo;
+import com.chwl.core.mentoring_relationship.bean.MentoringUserInfo;
+import com.chwl.core.mentoring_relationship.bean.PickUpApprenticeInfo;
+import com.chwl.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/chwl/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/chwl/core/miniworld/bean/AudioPartyInfo.java
index c7d1fc1b1..fd9b4b7af 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/chwl/core/miniworld/bean/AudioPartyInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.miniworld.bean;
+package com.chwl.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/chwl/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/chwl/core/miniworld/bean/AudioPartyItem.java
index 5e577ae04..5e965583b 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/chwl/core/miniworld/bean/AudioPartyItem.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.miniworld.bean;
+package com.chwl.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/chwl/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/chwl/core/miniworld/bean/AudioPartyListInfo.java
index 76dafc929..367cfe6ea 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/chwl/core/miniworld/bean/AudioPartyListInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.miniworld.bean;
+package com.chwl.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/chwl/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/chwl/core/miniworld/bean/MWChatInfo.java
index 80efb08fb..bf5e09d70 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/chwl/core/miniworld/bean/MWChatInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.miniworld.bean;
+package com.chwl.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/chwl/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/chwl/core/miniworld/bean/MWChatMemberCountAttachment.java
index 64eec818a..0b4fb6cc3 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/chwl/core/miniworld/bean/MWChatMemberCountAttachment.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.miniworld.bean;
+package com.chwl.core.miniworld.bean;
 
 import com.alibaba.fastjson.JSONObject;
-import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment;
+import com.chwl.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/chwl/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/chwl/core/miniworld/bean/MWChatTopicAttachment.java
index d40ef0792..2c4162c1b 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/chwl/core/miniworld/bean/MWChatTopicAttachment.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.miniworld.bean;
+package com.chwl.core.miniworld.bean;
 
 import com.alibaba.fastjson.JSONObject;
-import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment;
+import com.chwl.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/chwl/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/chwl/core/miniworld/bean/MiniWorldCategoryInfo.java
index c3914d5ab..6c5b7a6b3 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/chwl/core/miniworld/bean/MiniWorldCategoryInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.miniworld.bean;
+package com.chwl.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/chwl/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/chwl/core/miniworld/bean/MiniWorldDetailInfo.java
index 0d4925abb..0177a65d3 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/chwl/core/miniworld/bean/MiniWorldDetailInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.miniworld.bean;
+package com.chwl.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/chwl/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/chwl/core/miniworld/bean/MiniWorldDetailInfoWithCurrentMember.java
index 12b2926b6..c3d04eece 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/chwl/core/miniworld/bean/MiniWorldDetailInfoWithCurrentMember.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.miniworld.bean;
+package com.chwl.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/chwl/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/chwl/core/miniworld/bean/MiniWorldDetailInfoWithMemberInfo.java
index b6474e84b..59ede7ba6 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/chwl/core/miniworld/bean/MiniWorldDetailInfoWithMemberInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.miniworld.bean;
+package com.chwl.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/chwl/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/chwl/core/miniworld/bean/MiniWorldEditClassifyInfo.java
index 33287b54d..0ebdedd0d 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/chwl/core/miniworld/bean/MiniWorldEditClassifyInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.miniworld.bean;
+package com.chwl.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/chwl/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/chwl/core/miniworld/bean/MiniWorldInWorldInfo.java
index da0f95e73..5f45bd4e2 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/chwl/core/miniworld/bean/MiniWorldInWorldInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.miniworld.bean;
+package com.chwl.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/chwl/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/chwl/core/miniworld/bean/MiniWorldInfo.java
index b2aa3a140..4bdd43a60 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/chwl/core/miniworld/bean/MiniWorldInfo.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.miniworld.bean;
+package com.chwl.core.miniworld.bean;
 
-import com.yizhuan.xchat_android_core.user.bean.UserInfo;
+import com.chwl.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/chwl/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/chwl/core/miniworld/bean/MiniWorldListInfo.java
index 7edbd0cf4..b61cb5fb3 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/chwl/core/miniworld/bean/MiniWorldListInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.miniworld.bean;
+package com.chwl.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/chwl/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/chwl/core/miniworld/bean/MiniWorldMainInfo.java
index b1e9ad79e..8b3563550 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/chwl/core/miniworld/bean/MiniWorldMainInfo.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.miniworld.bean;
+package com.chwl.core.miniworld.bean;
 
-import com.yizhuan.xchat_android_core.home.bean.BannerInfo;
+import com.chwl.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/chwl/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/chwl/core/miniworld/bean/MiniWorldMainItemInfo.java
index e87322a8c..d478e1553 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/chwl/core/miniworld/bean/MiniWorldMainItemInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.miniworld.bean;
+package com.chwl.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/chwl/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/chwl/core/miniworld/bean/MiniWorldMemberListInfo.java
index ca800dd59..d23f18351 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/chwl/core/miniworld/bean/MiniWorldMemberListInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.miniworld.bean;
+package com.chwl.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/chwl/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/chwl/core/miniworld/bean/MiniWorldMemberListMemberInfo.java
index 95b77615b..671c036d6 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/chwl/core/miniworld/bean/MiniWorldMemberListMemberInfo.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.miniworld.bean;
+package com.chwl.core.miniworld.bean;
 
-import com.yizhuan.xchat_android_core.level.UserLevelVo;
+import com.chwl.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/chwl/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/chwl/core/miniworld/bean/OpenAudioPartyAttachment.java
index 15911b96e..e8f5e5baa 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/chwl/core/miniworld/bean/OpenAudioPartyAttachment.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.miniworld.bean;
+package com.chwl.core.miniworld.bean;
 
 import com.alibaba.fastjson.JSONObject;
-import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment;
+import com.chwl.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/chwl/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/chwl/core/miniworld/bean/OpenSuccessInfo.java
index 7cf9a2d83..244a9a875 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/chwl/core/miniworld/bean/OpenSuccessInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.miniworld.bean;
+package com.chwl.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/chwl/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/chwl/core/miniworld/bean/TopicInfo.java
index 5a0e880ba..47995018e 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/chwl/core/miniworld/bean/TopicInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.miniworld.bean;
+package com.chwl.core.miniworld.bean;
 
 import lombok.Data;
 
diff --git a/core/src/model_mini_world/java/com/chwl/core/miniworld/event/AudioPartyOpenEvent.java b/core/src/model_mini_world/java/com/chwl/core/miniworld/event/AudioPartyOpenEvent.java
new file mode 100644
index 000000000..7c00e6fd6
--- /dev/null
+++ b/core/src/model_mini_world/java/com/chwl/core/miniworld/event/AudioPartyOpenEvent.java
@@ -0,0 +1,4 @@
+package com.chwl.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/chwl/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/chwl/core/miniworld/event/MWChatTopicEvent.java
index 164d75d01..f8e2ea5dd 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/chwl/core/miniworld/event/MWChatTopicEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.miniworld.event;
+package com.chwl.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/chwl/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/chwl/core/miniworld/event/MWGroupChatMemberEvent.java
index e63804446..5c73a07cc 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/chwl/core/miniworld/event/MWGroupChatMemberEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.miniworld.event;
+package com.chwl.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/chwl/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/chwl/core/miniworld/event/MWOpenAudioPartyEvent.java
index c301cd5db..c45b23433 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/chwl/core/miniworld/event/MWOpenAudioPartyEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.miniworld.event;
+package com.chwl.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/chwl/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/chwl/core/miniworld/event/MiniWorldJoinVerifiedEvent.java
index 688ba2b55..e9fa060e9 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/chwl/core/miniworld/event/MiniWorldJoinVerifiedEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.miniworld.event;
+package com.chwl.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/chwl/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/chwl/core/miniworld/event/MiniWorldStateChangedEvent.java
index 3eaf6ee81..a8cc37cb6 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/chwl/core/miniworld/event/MiniWorldStateChangedEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.miniworld.event;
+package com.chwl.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/chwl/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/chwl/core/miniworld/event/MiniWorldTeamExitEvent.java
index 5510dee6d..ca3af89d1 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/chwl/core/miniworld/event/MiniWorldTeamExitEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.miniworld.event;
+package com.chwl.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/chwl/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/chwl/core/miniworld/event/OpenedMyMiniWorldEvent.java
index a064506ca..e1819cebe 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/chwl/core/miniworld/event/OpenedMyMiniWorldEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.miniworld.event;
+package com.chwl.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/chwl/core/miniworld/model/IMiniWorldModel.java
similarity index 78%
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/chwl/core/miniworld/model/IMiniWorldModel.java
index 85ee79caa..a099bd2e8 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/chwl/core/miniworld/model/IMiniWorldModel.java
@@ -1,18 +1,18 @@
-package com.yizhuan.xchat_android_core.miniworld.model;
+package com.chwl.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.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.MiniWorldMainInfo;
-import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMemberListInfo;
-import com.yizhuan.xchat_android_core.miniworld.bean.TopicInfo;
+import com.chwl.core.base.IModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.miniworld.bean.AudioPartyInfo;
+import com.chwl.core.miniworld.bean.AudioPartyListInfo;
+import com.chwl.core.miniworld.bean.MWChatInfo;
+import com.chwl.core.miniworld.bean.MiniWorldCategoryInfo;
+import com.chwl.core.miniworld.bean.MiniWorldDetailInfo;
+import com.chwl.core.miniworld.bean.MiniWorldEditClassifyInfo;
+import com.chwl.core.miniworld.bean.MiniWorldInWorldInfo;
+import com.chwl.core.miniworld.bean.MiniWorldInfo;
+import com.chwl.core.miniworld.bean.MiniWorldMainInfo;
+import com.chwl.core.miniworld.bean.MiniWorldMemberListInfo;
+import com.chwl.core.miniworld.bean.TopicInfo;
 
 import java.util.List;
 
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/chwl/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/chwl/core/miniworld/model/MiniWorldHelper.java
index 79532ff2a..c50e788f4 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/chwl/core/miniworld/model/MiniWorldHelper.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.miniworld.model;
+package com.chwl.core.miniworld.model;
 
-import com.yizhuan.xchat_android_core.auth.AuthModel;
-import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.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/chwl/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/chwl/core/miniworld/model/MiniWorldModel.java
index d3e182c0c..9bc07ace6 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/chwl/core/miniworld/model/MiniWorldModel.java
@@ -1,29 +1,29 @@
-package com.yizhuan.xchat_android_core.miniworld.model;
+package com.chwl.core.miniworld.model;
 
 import androidx.annotation.Nullable;
 
 import com.google.gson.JsonElement;
-import com.yizhuan.xchat_android_core.R;
-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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.exception.FailReasonException;
+import com.chwl.core.miniworld.bean.AudioPartyInfo;
+import com.chwl.core.miniworld.bean.AudioPartyListInfo;
+import com.chwl.core.miniworld.bean.MWChatInfo;
+import com.chwl.core.miniworld.bean.MiniWorldCategoryInfo;
+import com.chwl.core.miniworld.bean.MiniWorldDetailInfo;
+import com.chwl.core.miniworld.bean.MiniWorldEditClassifyInfo;
+import com.chwl.core.miniworld.bean.MiniWorldInWorldInfo;
+import com.chwl.core.miniworld.bean.MiniWorldInfo;
+import com.chwl.core.miniworld.bean.MiniWorldListInfo;
+import com.chwl.core.miniworld.bean.MiniWorldMainInfo;
+import com.chwl.core.miniworld.bean.MiniWorldMemberListInfo;
+import com.chwl.core.miniworld.bean.OpenSuccessInfo;
+import com.chwl.core.miniworld.bean.TopicInfo;
+import com.chwl.core.monsterhunting.model.MonsterHuntingModel;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.utils.ResUtil;
 
 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/chwl/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/chwl/core/music/bean/BaseMusicInfo.java
index 6e9fdc753..7e3bfe0b1 100644
--- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/bean/BaseMusicInfo.java
+++ b/core/src/model_music/java/com/chwl/core/music/bean/BaseMusicInfo.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.music.bean;
+package com.chwl.core.music.bean;
 
-import com.yizhuan.xchat_android_library.utils.BlankUtil;
-import com.yizhuan.xchat_android_library.utils.json.JsonParser;
+import com.chwl.library.utils.BlankUtil;
+import com.chwl.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/chwl/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/chwl/core/music/bean/LocalMusicInfo.java
index 5b384a53c..9ac4fa408 100644
--- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/bean/LocalMusicInfo.java
+++ b/core/src/model_music/java/com/chwl/core/music/bean/LocalMusicInfo.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.music.bean;
+package com.chwl.core.music.bean;
 
-import com.yizhuan.xchat_android_library.utils.BlankUtil;
-import com.yizhuan.xchat_android_library.utils.json.JsonParser;
+import com.chwl.library.utils.BlankUtil;
+import com.chwl.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/chwl/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/chwl/core/music/bean/ShareMusicInfo.java
index 91e1cb5bb..4d14a34ae 100644
--- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/bean/ShareMusicInfo.java
+++ b/core/src/model_music/java/com/chwl/core/music/bean/ShareMusicInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.music.bean;
+package com.chwl.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/chwl/core/music/db/bean/LocalMusicBean.java
similarity index 95%
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/chwl/core/music/db/bean/LocalMusicBean.java
index 84b195c50..ac12ef965 100644
--- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/bean/LocalMusicBean.java
+++ b/core/src/model_music/java/com/chwl/core/music/db/bean/LocalMusicBean.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.music.db.bean;
+package com.chwl.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/chwl/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/chwl/core/music/db/bean/SongBean.java
index 62e6a76c9..ba9547b4c 100644
--- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/bean/SongBean.java
+++ b/core/src/model_music/java/com/chwl/core/music/db/bean/SongBean.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.music.db.bean;
+package com.chwl.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/chwl/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/chwl/core/music/db/converter/LocalMusicBeanConverter.java
index 63139a48a..702eebb84 100644
--- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/converter/LocalMusicBeanConverter.java
+++ b/core/src/model_music/java/com/chwl/core/music/db/converter/LocalMusicBeanConverter.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.music.db.converter;
+package com.chwl.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.chwl.core.music.bean.LocalMusicInfo;
+import com.chwl.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/chwl/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/chwl/core/music/db/converter/ShareMusicConverter.java
index a4839bf2b..ab4c851f8 100644
--- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/converter/ShareMusicConverter.java
+++ b/core/src/model_music/java/com/chwl/core/music/db/converter/ShareMusicConverter.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.music.db.converter;
+package com.chwl.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.chwl.core.music.bean.ShareMusicInfo;
+import com.chwl.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/chwl/core/music/db/dao/LocalMusicDao.java
similarity index 93%
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/chwl/core/music/db/dao/LocalMusicDao.java
index 2c06bf7c5..c5770660a 100644
--- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/dao/LocalMusicDao.java
+++ b/core/src/model_music/java/com/chwl/core/music/db/dao/LocalMusicDao.java
@@ -1,11 +1,11 @@
-package com.yizhuan.xchat_android_core.music.db.dao;
+package com.chwl.core.music.db.dao;
 
 import androidx.room.Dao;
 import androidx.room.Insert;
 import androidx.room.OnConflictStrategy;
 import androidx.room.Query;
 
-import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean;
+import com.chwl.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/chwl/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/chwl/core/music/db/dao/SongDao.java
index 405303cb9..dd798bb2c 100644
--- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/dao/SongDao.java
+++ b/core/src/model_music/java/com/chwl/core/music/db/dao/SongDao.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.music.db.dao;
+package com.chwl.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.chwl.core.music.db.bean.LocalMusicBean;
+import com.chwl.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/chwl/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/chwl/core/music/db/model/ILocalMusicDbModel.java
index ee3be5319..ebe1fda92 100644
--- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/model/ILocalMusicDbModel.java
+++ b/core/src/model_music/java/com/chwl/core/music/db/model/ILocalMusicDbModel.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.music.db.model;
+package com.chwl.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.chwl.core.base.IModel;
+import com.chwl.core.music.bean.LocalMusicInfo;
+import com.chwl.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/chwl/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/chwl/core/music/db/model/IPlayerDbModel.java
index 215f2d991..ee4dacf53 100644
--- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/model/IPlayerDbModel.java
+++ b/core/src/model_music/java/com/chwl/core/music/db/model/IPlayerDbModel.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.music.db.model;
+package com.chwl.core.music.db.model;
 
-import com.yizhuan.xchat_android_core.base.IModel;
-import com.yizhuan.xchat_android_core.music.bean.LocalMusicInfo;
+import com.chwl.core.base.IModel;
+import com.chwl.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/chwl/core/music/db/model/LocalMusicDbModel.java
similarity index 94%
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/chwl/core/music/db/model/LocalMusicDbModel.java
index acc603b8c..e394709da 100644
--- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/model/LocalMusicDbModel.java
+++ b/core/src/model_music/java/com/chwl/core/music/db/model/LocalMusicDbModel.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.music.db.model;
+package com.chwl.core.music.db.model;
 
 import android.annotation.SuppressLint;
 import android.content.ContentUris;
@@ -9,17 +9,17 @@ import android.provider.MediaStore;
 
 import androidx.annotation.Nullable;
 
-import com.yizhuan.habu.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.chwl.tutu.database.AppDataBase;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.music.bean.LocalMusicInfo;
+import com.chwl.core.music.db.bean.LocalMusicBean;
+import com.chwl.core.music.db.converter.LocalMusicBeanConverter;
+import com.chwl.core.music.event.RefreshLocalMusicEvent;
+import com.chwl.core.utils.AsyncTaskScanMusicFile;
+import com.chwl.core.utils.SongUtils;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.utils.ListUtils;
+import com.chwl.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/chwl/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/chwl/core/music/db/model/PlayerDbModel.java
index 3c9800441..62e67479d 100644
--- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/model/PlayerDbModel.java
+++ b/core/src/model_music/java/com/chwl/core/music/db/model/PlayerDbModel.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.music.db.model;
+package com.chwl.core.music.db.model;
 
-import com.yizhuan.xchat_android_core.base.BaseModel;
-import com.yizhuan.xchat_android_core.music.bean.LocalMusicInfo;
+import com.chwl.core.base.BaseModel;
+import com.chwl.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/chwl/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/chwl/core/music/event/CurrentMusicUpdateEvent.java
index 6acf9c02b..56e8f0716 100644
--- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/CurrentMusicUpdateEvent.java
+++ b/core/src/model_music/java/com/chwl/core/music/event/CurrentMusicUpdateEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.music.event;
+package com.chwl.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/chwl/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/chwl/core/music/event/JumpToShareMusicListFragmentEvent.java
index bd22fc0ff..25f30eb12 100644
--- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/JumpToShareMusicListFragmentEvent.java
+++ b/core/src/model_music/java/com/chwl/core/music/event/JumpToShareMusicListFragmentEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.music.event;
+package com.chwl.core.music.event;
 
 public class JumpToShareMusicListFragmentEvent {
 }
diff --git a/core/src/model_music/java/com/chwl/core/music/event/MusicAddEvent.java b/core/src/model_music/java/com/chwl/core/music/event/MusicAddEvent.java
new file mode 100644
index 000000000..fcab6cba4
--- /dev/null
+++ b/core/src/model_music/java/com/chwl/core/music/event/MusicAddEvent.java
@@ -0,0 +1,11 @@
+package com.chwl.core.music.event;
+
+import com.chwl.core.music.bean.LocalMusicInfo;
+
+import lombok.Data;
+
+@Data
+public class MusicAddEvent {
+
+    private LocalMusicInfo localMusicInfo;
+}
diff --git a/core/src/model_music/java/com/chwl/core/music/event/MusicDeleteEvent.java b/core/src/model_music/java/com/chwl/core/music/event/MusicDeleteEvent.java
new file mode 100644
index 000000000..19991eb15
--- /dev/null
+++ b/core/src/model_music/java/com/chwl/core/music/event/MusicDeleteEvent.java
@@ -0,0 +1,11 @@
+package com.chwl.core.music.event;
+
+import com.chwl.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/chwl/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/chwl/core/music/event/MusicPauseEvent.java
index 3498148be..9c4ad2097 100644
--- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/MusicPauseEvent.java
+++ b/core/src/model_music/java/com/chwl/core/music/event/MusicPauseEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.music.event;
+package com.chwl.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/chwl/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/chwl/core/music/event/MusicPlayingEvent.java
index 6e7ea987e..a54f3e948 100644
--- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/MusicPlayingEvent.java
+++ b/core/src/model_music/java/com/chwl/core/music/event/MusicPlayingEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.music.event;
+package com.chwl.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/chwl/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/chwl/core/music/event/MusicStopEvent.java
index 95dd25b6a..17120cb42 100644
--- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/MusicStopEvent.java
+++ b/core/src/model_music/java/com/chwl/core/music/event/MusicStopEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.music.event;
+package com.chwl.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/chwl/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/chwl/core/music/event/RefreshLocalMusicEvent.java
index 48d58386b..a56728199 100644
--- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/RefreshLocalMusicEvent.java
+++ b/core/src/model_music/java/com/chwl/core/music/event/RefreshLocalMusicEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.music.event;
+package com.chwl.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/chwl/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/chwl/core/music/event/RefreshPlayerListEvent.java
index 4e168b6de..90c940648 100644
--- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/RefreshPlayerListEvent.java
+++ b/core/src/model_music/java/com/chwl/core/music/event/RefreshPlayerListEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.music.event;
+package com.chwl.core.music.event;
 
 /**
  * create by lvzebiao on 2018/9/5
diff --git a/core/src/model_music/java/com/chwl/core/music/model/ILocalMusicListModel.java b/core/src/model_music/java/com/chwl/core/music/model/ILocalMusicListModel.java
new file mode 100644
index 000000000..d54e60f16
--- /dev/null
+++ b/core/src/model_music/java/com/chwl/core/music/model/ILocalMusicListModel.java
@@ -0,0 +1,6 @@
+package com.chwl.core.music.model;
+
+import com.chwl.core.base.IModel;
+
+public interface ILocalMusicListModel extends IModel {
+}
diff --git a/core/src/model_music/java/com/chwl/core/music/model/IMusicListModel.java b/core/src/model_music/java/com/chwl/core/music/model/IMusicListModel.java
new file mode 100644
index 000000000..72c22d83a
--- /dev/null
+++ b/core/src/model_music/java/com/chwl/core/music/model/IMusicListModel.java
@@ -0,0 +1,6 @@
+package com.chwl.core.music.model;
+
+import com.chwl.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/chwl/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/chwl/core/music/model/IPlayerModel.java
index 5ce4a2c51..f6123dd84 100644
--- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/IPlayerModel.java
+++ b/core/src/model_music/java/com/chwl/core/music/model/IPlayerModel.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.music.model;
+package com.chwl.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.chwl.core.base.IModel;
+import com.chwl.core.music.bean.LocalMusicInfo;
+import com.chwl.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/chwl/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/chwl/core/music/model/IShareMusicListModel.java
index 979f30201..5d7c856cc 100644
--- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/IShareMusicListModel.java
+++ b/core/src/model_music/java/com/chwl/core/music/model/IShareMusicListModel.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.music.model;
+package com.chwl.core.music.model;
 
-import com.yizhuan.xchat_android_core.base.IModel;
-import com.yizhuan.xchat_android_core.music.bean.ShareMusicInfo;
+import com.chwl.core.base.IModel;
+import com.chwl.core.music.bean.ShareMusicInfo;
 
 import java.util.List;
 
diff --git a/core/src/model_music/java/com/chwl/core/music/model/LocalMusicListModel.java b/core/src/model_music/java/com/chwl/core/music/model/LocalMusicListModel.java
new file mode 100644
index 000000000..c23949a01
--- /dev/null
+++ b/core/src/model_music/java/com/chwl/core/music/model/LocalMusicListModel.java
@@ -0,0 +1,7 @@
+package com.chwl.core.music.model;
+
+import com.chwl.core.base.BaseModel;
+import com.chwl.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/chwl/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/chwl/core/music/model/MusicListModel.java
index e380c88cb..03d665ee6 100644
--- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/MusicListModel.java
+++ b/core/src/model_music/java/com/chwl/core/music/model/MusicListModel.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.music.model;
+package com.chwl.core.music.model;
 
-import com.yizhuan.xchat_android_core.base.BaseModel;
+import com.chwl.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/chwl/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/chwl/core/music/model/PlayerModel.java
index 1b7471a96..0568a9234 100644
--- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/PlayerModel.java
+++ b/core/src/model_music/java/com/chwl/core/music/model/PlayerModel.java
@@ -1,24 +1,24 @@
-package com.yizhuan.xchat_android_core.music.model;
+package com.chwl.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.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.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.chwl.core.DemoCache;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.manager.AudioEngineManager;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.manager.RoomEvent;
+import com.chwl.core.music.bean.LocalMusicInfo;
+import com.chwl.core.music.db.bean.LocalMusicBean;
+import com.chwl.core.music.db.model.LocalMusicDbModel;
+import com.chwl.core.music.db.model.PlayerDbModel;
+import com.chwl.core.music.event.MusicPauseEvent;
+import com.chwl.core.music.event.MusicPlayingEvent;
+import com.chwl.core.music.event.MusicStopEvent;
+import com.chwl.library.utils.config.BasicConfig;
+import com.chwl.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/chwl/core/music/model/ShareMusicListModel.java
similarity index 88%
rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/ShareMusicListModel.java
rename to core/src/model_music/java/com/chwl/core/music/model/ShareMusicListModel.java
index 709bb2b44..e6707e66b 100644
--- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/ShareMusicListModel.java
+++ b/core/src/model_music/java/com/chwl/core/music/model/ShareMusicListModel.java
@@ -1,17 +1,17 @@
-package com.yizhuan.xchat_android_core.music.model;
+package com.chwl.core.music.model;
 
-import com.yizhuan.xchat_android_core.R;
-import com.yizhuan.habu.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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.tutu.database.AppDataBase;
+import com.chwl.core.Constants;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.music.bean.ShareMusicInfo;
+import com.chwl.core.music.db.bean.LocalMusicBean;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.utils.ListUtils;
+import com.chwl.library.utils.ResUtil;
 
 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/chwl/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/chwl/core/music/view/IAddLocalMusicListView.java
index 58c6b73f4..3d9873bc7 100644
--- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/view/IAddLocalMusicListView.java
+++ b/core/src/model_music/java/com/chwl/core/music/view/IAddLocalMusicListView.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.music.view;
+package com.chwl.core.music.view;
 
-import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean;
-import com.yizhuan.xchat_android_library.base.IMvpBaseView;
+import com.chwl.core.music.db.bean.LocalMusicBean;
+import com.chwl.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/chwl/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/chwl/core/music/view/ILocalMusicListView.java
index 2884c6031..3815e2e68 100644
--- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/view/ILocalMusicListView.java
+++ b/core/src/model_music/java/com/chwl/core/music/view/ILocalMusicListView.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.music.view;
+package com.chwl.core.music.view;
 
-import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean;
-import com.yizhuan.xchat_android_library.base.IMvpBaseView;
+import com.chwl.core.music.db.bean.LocalMusicBean;
+import com.chwl.library.base.IMvpBaseView;
 
 import java.util.List;
 
diff --git a/core/src/model_music/java/com/chwl/core/music/view/IMusicListView.java b/core/src/model_music/java/com/chwl/core/music/view/IMusicListView.java
new file mode 100644
index 000000000..5b9d056a4
--- /dev/null
+++ b/core/src/model_music/java/com/chwl/core/music/view/IMusicListView.java
@@ -0,0 +1,6 @@
+package com.chwl.core.music.view;
+
+import com.chwl.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/chwl/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/chwl/core/music/view/IShareMusicListView.java
index 0a5011533..73ba4d7e9 100644
--- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/view/IShareMusicListView.java
+++ b/core/src/model_music/java/com/chwl/core/music/view/IShareMusicListView.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_core.music.view;
+package com.chwl.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.chwl.core.music.bean.ShareMusicInfo;
+import com.chwl.core.music.db.bean.LocalMusicBean;
+import com.chwl.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_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/attachment/AitFriendsAttachment.java b/core/src/model_public_chat_hall/java/com/chwl/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/chwl/core/public_chat_hall/attachment/AitFriendsAttachment.java
index cbadd9816..d5f898b40 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/chwl/core/public_chat_hall/attachment/AitFriendsAttachment.java
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_core.public_chat_hall.attachment;
+package com.chwl.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.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.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/chwl/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/chwl/core/public_chat_hall/attachment/AitMeAttachment.java
index f0e5bb52c..d66773da9 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/chwl/core/public_chat_hall/attachment/AitMeAttachment.java
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_core.public_chat_hall.attachment;
+package com.chwl.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.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.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/chwl/core/public_chat_hall/bean/AitFriendsInfo.java
similarity index 92%
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/chwl/core/public_chat_hall/bean/AitFriendsInfo.java
index 9b04e7eab..b594fc3f7 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/chwl/core/public_chat_hall/bean/AitFriendsInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.public_chat_hall.bean;
+package com.chwl.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/chwl/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/chwl/core/public_chat_hall/bean/AitMeInfo.java
index cbcfcc7c0..55f31c2ff 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/chwl/core/public_chat_hall/bean/AitMeInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.public_chat_hall.bean;
+package com.chwl.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/chwl/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/chwl/core/public_chat_hall/bean/PublicChatHallMessage.java
index a3887821e..3cca8ad37 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/chwl/core/public_chat_hall/bean/PublicChatHallMessage.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.public_chat_hall.bean;
+package com.chwl.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/chwl/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/chwl/core/public_chat_hall/event/PublicChatHallAitMeEvent.java
index 01f0aef1c..7ac538451 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/chwl/core/public_chat_hall/event/PublicChatHallAitMeEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.public_chat_hall.event;
+package com.chwl.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/chwl/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/chwl/core/public_chat_hall/event/PublicChatHallHistoryEvent.java
index b8afdb9b6..dcb2231b7 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/chwl/core/public_chat_hall/event/PublicChatHallHistoryEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.public_chat_hall.event;
+package com.chwl.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/chwl/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/chwl/core/public_chat_hall/event/PublicChatHallMsgCountingDownEvent.java
index c8bf24ebc..707e5818d 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/chwl/core/public_chat_hall/event/PublicChatHallMsgCountingDownEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.public_chat_hall.event;
+package com.chwl.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/chwl/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/chwl/core/public_chat_hall/event/PublicChatHallMsgIncomingEvent.java
index 4e86a30ce..b0875a564 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/chwl/core/public_chat_hall/event/PublicChatHallMsgIncomingEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.public_chat_hall.event;
+package com.chwl.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/chwl/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/chwl/core/public_chat_hall/event/PublicChatHallPlayGiftAnimationEvent.java
index 484ae3499..1151cc1ae 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/chwl/core/public_chat_hall/event/PublicChatHallPlayGiftAnimationEvent.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.public_chat_hall.event;
+package com.chwl.core.public_chat_hall.event;
 
-import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo;
+import com.chwl.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/chwl/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/chwl/core/public_chat_hall/manager/PublicChatHallDataManager.java
index d9568d486..45ebc51fc 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/chwl/core/public_chat_hall/manager/PublicChatHallDataManager.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.public_chat_hall.manager;
+package com.chwl.core.public_chat_hall.manager;
 
 import static com.netease.nimlib.sdk.msg.constant.NotificationType.ChatRoomMemberTempMuteAdd;
 
@@ -24,23 +24,23 @@ 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.R;
-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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.gift.GiftModel;
+import com.chwl.core.gift.bean.GiftInfo;
+import com.chwl.core.gift.bean.GiftReceiveInfo;
+import com.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.core.im.custom.bean.GiftAttachment;
+import com.chwl.core.public_chat_hall.attachment.AitFriendsAttachment;
+import com.chwl.core.public_chat_hall.bean.AitFriendsInfo;
+import com.chwl.core.public_chat_hall.event.PublicChatHallAitMeEvent;
+import com.chwl.core.public_chat_hall.event.PublicChatHallHistoryEvent;
+import com.chwl.core.public_chat_hall.event.PublicChatHallMsgCountingDownEvent;
+import com.chwl.core.public_chat_hall.event.PublicChatHallMsgIncomingEvent;
+import com.chwl.core.public_chat_hall.event.PublicChatHallPlayGiftAnimationEvent;
+import com.chwl.core.public_chat_hall.model.PublicChatHallModel;
+import com.chwl.library.utils.ListUtils;
+import com.chwl.library.utils.ResUtil;
 
 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/chwl/core/public_chat_hall/model/IPublicChatHallModel.java
similarity index 78%
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/chwl/core/public_chat_hall/model/IPublicChatHallModel.java
index cfc064409..ab05dd0b7 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/chwl/core/public_chat_hall/model/IPublicChatHallModel.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_core.public_chat_hall.model;
+package com.chwl.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.chwl.core.base.IModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.public_chat_hall.bean.PublicChatHallMessage;
 
 import java.util.List;
 
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/chwl/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/chwl/core/public_chat_hall/model/PublicChatHallModel.java
index a3d6bfa85..7f80b93c6 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/chwl/core/public_chat_hall/model/PublicChatHallModel.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.public_chat_hall.model;
+package com.chwl.core.public_chat_hall.model;
 
 import android.annotation.SuppressLint;
 
@@ -12,25 +12,25 @@ 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.R;
-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.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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.core.Constants;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.decoration.car.bean.CarInfo;
+import com.chwl.core.decoration.headwear.bean.HeadWearInfo;
+import com.chwl.core.initial.InitialModel;
+import com.chwl.core.level.UserLevelVo;
+import com.chwl.core.noble.NobleInfo;
+import com.chwl.core.public_chat_hall.bean.PublicChatHallMessage;
+import com.chwl.core.public_chat_hall.manager.PublicChatHallDataManager;
+import com.chwl.core.user.UserModel;
+import com.chwl.core.user.bean.UserInfo;
+import com.chwl.core.user.event.LoadLoginUserInfoEvent;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.utils.ListUtils;
+import com.chwl.library.utils.ResUtil;
 
 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/chwl/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/chwl/core/public_chat_hall/util/PublicChatHallMessageConvertor.java
index 3781cea4a..619833eec 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/chwl/core/public_chat_hall/util/PublicChatHallMessageConvertor.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.public_chat_hall.util;
+package com.chwl.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/chwl/core/code/CodeModel.java
similarity index 84%
rename from core/src/model_smscode/java/com/yizhuan/xchat_android_core/code/CodeModel.java
rename to core/src/model_smscode/java/com/chwl/core/code/CodeModel.java
index e7700782b..fe4c26c24 100644
--- a/core/src/model_smscode/java/com/yizhuan/xchat_android_core/code/CodeModel.java
+++ b/core/src/model_smscode/java/com/chwl/core/code/CodeModel.java
@@ -1,14 +1,14 @@
-package com.yizhuan.xchat_android_core.code;
+package com.chwl.core.code;
 
 import android.text.TextUtils;
 
-import com.yizhuan.xchat_android_core.R;
-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.ResUtil;
-import com.yizhuan.xchat_android_library.utils.codec.DESUtils;
+import com.chwl.core.R;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.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/chwl/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/chwl/core/code/CodeType.java
index d6e6bf93e..b0784de83 100644
--- a/core/src/model_smscode/java/com/yizhuan/xchat_android_core/code/CodeType.java
+++ b/core/src/model_smscode/java/com/chwl/core/code/CodeType.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.code;
+package com.chwl.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/chwl/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/chwl/core/code/ICodeModel.java
index 83023c7ae..d0aaf430e 100644
--- a/core/src/model_smscode/java/com/yizhuan/xchat_android_core/code/ICodeModel.java
+++ b/core/src/model_smscode/java/com/chwl/core/code/ICodeModel.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.code;
+package com.chwl.core.code;
 
-import com.yizhuan.xchat_android_core.base.IModel;
+import com.chwl.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.chwl.core.super_admin/SaConstant.java
similarity index 56%
rename from core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/SaConstant.java
rename to core/src/model_super_admin/java/com.chwl.core.super_admin/SaConstant.java
index 384f3ae1c..2d57c0366 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.chwl.core.super_admin/SaConstant.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_core.super_admin;
+package com.chwl.core.super_admin;
 
-import com.yizhuan.xchat_android_core.R;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.library.utils.ResUtil;
 
 /**
  * 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.chwl.core.super_admin/SuperAdminDataMrg.java
similarity index 90%
rename from core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/SuperAdminDataMrg.java
rename to core/src/model_super_admin/java/com.chwl.core.super_admin/SuperAdminDataMrg.java
index 83b771b08..5bd7f865d 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.chwl.core.super_admin/SuperAdminDataMrg.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.super_admin;
+package com.chwl.core.super_admin;
 
 import android.annotation.SuppressLint;
 import android.text.TextUtils;
@@ -7,13 +7,13 @@ 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.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.room.model.AvRoomModel;
+import com.chwl.core.room.model.RoomBaseModel;
+import com.chwl.core.super_admin.util.SuperAdminUtil;
+import com.chwl.core.utils.ExtensionUtil;
+import com.chwl.core.utils.net.DontWarnObserver;
+import com.chwl.library.utils.ListUtils;
 
 import java.util.ArrayList;
 import java.util.List;
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.chwl.core.super_admin/attachment/SuperAdminOpAttachment.java
similarity index 85%
rename from core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/attachment/SuperAdminOpAttachment.java
rename to core/src/model_super_admin/java/com.chwl.core.super_admin/attachment/SuperAdminOpAttachment.java
index bed2dd3ef..559654472 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.chwl.core.super_admin/attachment/SuperAdminOpAttachment.java
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_core.super_admin.attachment;
+package com.chwl.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.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.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.chwl.core.super_admin/bean/KickOutExtBean.java
similarity index 87%
rename from core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/bean/KickOutExtBean.java
rename to core/src/model_super_admin/java/com.chwl.core.super_admin/bean/KickOutExtBean.java
index 45266397f..3b101d8da 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.chwl.core.super_admin/bean/KickOutExtBean.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.super_admin.bean;
+package com.chwl.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.chwl.core.super_admin/bean/SaOpInfo.java
similarity index 86%
rename from core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/bean/SaOpInfo.java
rename to core/src/model_super_admin/java/com.chwl.core.super_admin/bean/SaOpInfo.java
index 75708f63b..0d9520374 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.chwl.core.super_admin/bean/SaOpInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.super_admin.bean;
+package com.chwl.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.chwl.core.super_admin/model/ISuperAdminModel.java
similarity index 74%
rename from core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/model/ISuperAdminModel.java
rename to core/src/model_super_admin/java/com.chwl.core.super_admin/model/ISuperAdminModel.java
index 9712fd289..4df042803 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.chwl.core.super_admin/model/ISuperAdminModel.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.super_admin.model;
+package com.chwl.core.super_admin.model;
 
-import com.yizhuan.xchat_android_core.base.IModel;
+import com.chwl.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.chwl.core.super_admin/model/SuperAdminModel.java
similarity index 89%
rename from core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/model/SuperAdminModel.java
rename to core/src/model_super_admin/java/com.chwl.core.super_admin/model/SuperAdminModel.java
index 5b43aa8d6..b987f4561 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.chwl.core.super_admin/model/SuperAdminModel.java
@@ -1,12 +1,12 @@
-package com.yizhuan.xchat_android_core.super_admin.model;
+package com.chwl.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.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
 
 import io.reactivex.Single;
 import retrofit2.http.POST;
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.chwl.core.super_admin/model/exception/SAdminCannotGameException.java
similarity index 78%
rename from core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/model/exception/SAdminCannotGameException.java
rename to core/src/model_super_admin/java/com.chwl.core.super_admin/model/exception/SAdminCannotGameException.java
index 8232bcfdc..5f0d02fb7 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.chwl.core.super_admin/model/exception/SAdminCannotGameException.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.super_admin.model.exception;
+package com.chwl.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.chwl.core.super_admin/util/SAdminOptUtil.java
similarity index 85%
rename from core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SAdminOptUtil.java
rename to core/src/model_super_admin/java/com.chwl.core.super_admin/util/SAdminOptUtil.java
index 130a8ab56..8ec3587b3 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.chwl.core.super_admin/util/SAdminOptUtil.java
@@ -1,16 +1,16 @@
-package com.yizhuan.xchat_android_core.super_admin.util;
+package com.chwl.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.chwl.core.auth.AuthModel;
+import com.chwl.core.kick.KickModel;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.room.model.AvRoomModel;
+import com.chwl.core.super_admin.bean.KickOutExtBean;
+import com.chwl.core.utils.net.DontWarnObserver;
+import com.chwl.library.utils.JavaUtil;
+import com.chwl.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.chwl.core.super_admin/util/SaAttachmentFactory.java
similarity index 86%
rename from core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SaAttachmentFactory.java
rename to core/src/model_super_admin/java/com.chwl.core.super_admin/util/SaAttachmentFactory.java
index e9747e8bc..8d85deb19 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.chwl.core.super_admin/util/SaAttachmentFactory.java
@@ -1,13 +1,13 @@
-package com.yizhuan.xchat_android_core.super_admin.util;
+package com.chwl.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.chwl.core.auth.AuthModel;
+import com.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.super_admin.attachment.SuperAdminOpAttachment;
+import com.chwl.core.super_admin.bean.SaOpInfo;
+import com.chwl.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.chwl.core.super_admin/util/SaMsgUtil.java
similarity index 90%
rename from core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SaMsgUtil.java
rename to core/src/model_super_admin/java/com.chwl.core.super_admin/util/SaMsgUtil.java
index 2eea07ce3..aa1793123 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.chwl.core.super_admin/util/SaMsgUtil.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.super_admin.util;
+package com.chwl.core.super_admin.util;
 
-import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment;
+import com.chwl.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.chwl.core.super_admin/util/SuperAdminUtil.java
similarity index 90%
rename from core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SuperAdminUtil.java
rename to core/src/model_super_admin/java/com.chwl.core.super_admin/util/SuperAdminUtil.java
index b5404eb8f..acce65206 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.chwl.core.super_admin/util/SuperAdminUtil.java
@@ -1,13 +1,13 @@
-package com.yizhuan.xchat_android_core.super_admin.util;
+package com.chwl.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.chwl.core.user.UserModel;
+import com.chwl.core.user.bean.UserInfo;
+import com.chwl.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/chwl/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/chwl/treasure_box/bean/BoxOpenStatusInfo.java
index 4453a63ab..fdf23d794 100644
--- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/BoxOpenStatusInfo.java
+++ b/core/src/model_treasure_box/java/com/chwl/treasure_box/bean/BoxOpenStatusInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.treasure_box.bean;
+package com.chwl.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/chwl/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/chwl/treasure_box/bean/ConfigImgUrl.java
index b7886f8c1..75924046b 100644
--- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/ConfigImgUrl.java
+++ b/core/src/model_treasure_box/java/com/chwl/treasure_box/bean/ConfigImgUrl.java
@@ -1,4 +1,4 @@
-package com.yizhuan.treasure_box.bean;
+package com.chwl.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/chwl/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/chwl/treasure_box/bean/HonourBuyKeyResultInfo.java
index 0e8f85c3e..d7d547ce6 100644
--- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/HonourBuyKeyResultInfo.java
+++ b/core/src/model_treasure_box/java/com/chwl/treasure_box/bean/HonourBuyKeyResultInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.treasure_box.bean;
+package com.chwl.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/chwl/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/chwl/treasure_box/bean/HonourKeyInfo.java
index 61b90c113..710c04858 100644
--- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/HonourKeyInfo.java
+++ b/core/src/model_treasure_box/java/com/chwl/treasure_box/bean/HonourKeyInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.treasure_box.bean;
+package com.chwl.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/chwl/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/chwl/treasure_box/bean/KeyInfo.java
index 1c6c08b75..f1aebcd08 100644
--- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/KeyInfo.java
+++ b/core/src/model_treasure_box/java/com/chwl/treasure_box/bean/KeyInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.treasure_box.bean;
+package com.chwl.treasure_box.bean;
 
 import java.io.Serializable;
 
diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/OpenBoxDrawResult.java b/core/src/model_treasure_box/java/com/chwl/treasure_box/bean/OpenBoxDrawResult.java
similarity index 90%
rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/OpenBoxDrawResult.java
rename to core/src/model_treasure_box/java/com/chwl/treasure_box/bean/OpenBoxDrawResult.java
index ef188673d..fb88a0d83 100644
--- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/OpenBoxDrawResult.java
+++ b/core/src/model_treasure_box/java/com/chwl/treasure_box/bean/OpenBoxDrawResult.java
@@ -1,4 +1,4 @@
-package com.yizhuan.treasure_box.bean;
+package com.chwl.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/OpenBoxHonourResult.java b/core/src/model_treasure_box/java/com/chwl/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/chwl/treasure_box/bean/OpenBoxHonourResult.java
index 6c5ddc37c..ad4408e1c 100644
--- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/OpenBoxHonourResult.java
+++ b/core/src/model_treasure_box/java/com/chwl/treasure_box/bean/OpenBoxHonourResult.java
@@ -1,4 +1,4 @@
-package com.yizhuan.treasure_box.bean;
+package com.chwl.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/chwl/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/chwl/treasure_box/bean/OpenBoxResult.java
index 5c227ba72..dd9560851 100644
--- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/OpenBoxResult.java
+++ b/core/src/model_treasure_box/java/com/chwl/treasure_box/bean/OpenBoxResult.java
@@ -1,4 +1,4 @@
-package com.yizhuan.treasure_box.bean;
+package com.chwl.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/chwl/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/chwl/treasure_box/bean/PrizeInfo.java
index 56c887141..0b148caa1 100644
--- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/PrizeInfo.java
+++ b/core/src/model_treasure_box/java/com/chwl/treasure_box/bean/PrizeInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.treasure_box.bean;
+package com.chwl.treasure_box.bean;
 
 import java.io.Serializable;
 
diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/PrizeNewInfo.java b/core/src/model_treasure_box/java/com/chwl/treasure_box/bean/PrizeNewInfo.java
similarity index 96%
rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/PrizeNewInfo.java
rename to core/src/model_treasure_box/java/com/chwl/treasure_box/bean/PrizeNewInfo.java
index 95073485b..6376229c4 100644
--- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/PrizeNewInfo.java
+++ b/core/src/model_treasure_box/java/com/chwl/treasure_box/bean/PrizeNewInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.treasure_box.bean;
+package com.chwl.treasure_box.bean;
 
 import java.io.Serializable;
 
diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/UserTicketInfo.kt b/core/src/model_treasure_box/java/com/chwl/treasure_box/bean/UserTicketInfo.kt
similarity index 79%
rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/UserTicketInfo.kt
rename to core/src/model_treasure_box/java/com/chwl/treasure_box/bean/UserTicketInfo.kt
index b9ae43219..4aa233270 100644
--- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/UserTicketInfo.kt
+++ b/core/src/model_treasure_box/java/com/chwl/treasure_box/bean/UserTicketInfo.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.treasure_box.bean
+package com.chwl.treasure_box.bean
 
 data class UserTicketInfo(
     val diamond: Double = 0.0,
diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/event/AutoOpenBoxEvent.java b/core/src/model_treasure_box/java/com/chwl/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/chwl/treasure_box/event/AutoOpenBoxEvent.java
index 58866d2cf..c8620ce14 100644
--- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/event/AutoOpenBoxEvent.java
+++ b/core/src/model_treasure_box/java/com/chwl/treasure_box/event/AutoOpenBoxEvent.java
@@ -1,6 +1,6 @@
-package com.yizhuan.treasure_box.event;
+package com.chwl.treasure_box.event;
 
-import com.yizhuan.treasure_box.bean.OpenBoxResult;
+import com.chwl.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/chwl/treasure_box/event/AutoOpenHonourBoxEvent.java
similarity index 81%
rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/event/AutoOpenHonourBoxEvent.java
rename to core/src/model_treasure_box/java/com/chwl/treasure_box/event/AutoOpenHonourBoxEvent.java
index 463993302..a560c2435 100644
--- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/event/AutoOpenHonourBoxEvent.java
+++ b/core/src/model_treasure_box/java/com/chwl/treasure_box/event/AutoOpenHonourBoxEvent.java
@@ -1,6 +1,6 @@
-package com.yizhuan.treasure_box.event;
+package com.chwl.treasure_box.event;
 
-import com.yizhuan.treasure_box.bean.OpenBoxHonourResult;
+import com.chwl.treasure_box.bean.OpenBoxHonourResult;
 
 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/chwl/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/chwl/treasure_box/event/BoxBuyKeyEvent.java
index 248c4abdc..68e9261e4 100644
--- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/event/BoxBuyKeyEvent.java
+++ b/core/src/model_treasure_box/java/com/chwl/treasure_box/event/BoxBuyKeyEvent.java
@@ -1,6 +1,6 @@
-package com.yizhuan.treasure_box.event;
+package com.chwl.treasure_box.event;
 
-import com.yizhuan.treasure_box.bean.KeyInfo;
+import com.chwl.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/chwl/treasure_box/event/HonourBoxBuyKeyEvent.java
similarity index 89%
rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/event/HonourBoxBuyKeyEvent.java
rename to core/src/model_treasure_box/java/com/chwl/treasure_box/event/HonourBoxBuyKeyEvent.java
index e2b570397..252def01b 100644
--- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/event/HonourBoxBuyKeyEvent.java
+++ b/core/src/model_treasure_box/java/com/chwl/treasure_box/event/HonourBoxBuyKeyEvent.java
@@ -1,6 +1,6 @@
-package com.yizhuan.treasure_box.event;
+package com.chwl.treasure_box.event;
 
-import com.yizhuan.treasure_box.bean.HonourBuyKeyResultInfo;
+import com.chwl.treasure_box.bean.HonourBuyKeyResultInfo;
 
 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/chwl/treasure_box/model/BoxModel.java
similarity index 91%
rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/model/BoxModel.java
rename to core/src/model_treasure_box/java/com/chwl/treasure_box/model/BoxModel.java
index df6647f87..b4fcf3fa5 100644
--- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/model/BoxModel.java
+++ b/core/src/model_treasure_box/java/com/chwl/treasure_box/model/BoxModel.java
@@ -1,25 +1,25 @@
-package com.yizhuan.treasure_box.model;
+package com.chwl.treasure_box.model;
 
-import com.yizhuan.treasure_box.bean.BoxOpenStatusInfo;
-import com.yizhuan.treasure_box.bean.ConfigImgUrl;
-import com.yizhuan.treasure_box.bean.HonourBuyKeyResultInfo;
-import com.yizhuan.treasure_box.bean.HonourKeyInfo;
-import com.yizhuan.treasure_box.bean.KeyInfo;
-import com.yizhuan.treasure_box.bean.OpenBoxHonourResult;
-import com.yizhuan.treasure_box.bean.OpenBoxResult;
-import com.yizhuan.treasure_box.bean.PrizeInfo;
-import com.yizhuan.treasure_box.bean.PrizeNewInfo;
-import com.yizhuan.treasure_box.bean.UserTicketInfo;
-import com.yizhuan.xchat_android_core.R;
-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.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.utils.ResUtil;
+import com.chwl.treasure_box.bean.BoxOpenStatusInfo;
+import com.chwl.treasure_box.bean.ConfigImgUrl;
+import com.chwl.treasure_box.bean.HonourBuyKeyResultInfo;
+import com.chwl.treasure_box.bean.HonourKeyInfo;
+import com.chwl.treasure_box.bean.KeyInfo;
+import com.chwl.treasure_box.bean.OpenBoxHonourResult;
+import com.chwl.treasure_box.bean.OpenBoxResult;
+import com.chwl.treasure_box.bean.PrizeInfo;
+import com.chwl.treasure_box.bean.PrizeNewInfo;
+import com.chwl.treasure_box.bean.UserTicketInfo;
+import com.chwl.core.R;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.exception.FailReasonException;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.utils.net.BalanceNotEnoughExeption;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.utils.ResUtil;
 
 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/chwl/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/chwl/treasure_box/model/IBoxModel.java
index 98dece075..43b88fad9 100644
--- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/model/IBoxModel.java
+++ b/core/src/model_treasure_box/java/com/chwl/treasure_box/model/IBoxModel.java
@@ -1,17 +1,17 @@
-package com.yizhuan.treasure_box.model;
+package com.chwl.treasure_box.model;
 
-import com.yizhuan.treasure_box.bean.BoxOpenStatusInfo;
-import com.yizhuan.treasure_box.bean.ConfigImgUrl;
-import com.yizhuan.treasure_box.bean.HonourBuyKeyResultInfo;
-import com.yizhuan.treasure_box.bean.HonourKeyInfo;
-import com.yizhuan.treasure_box.bean.KeyInfo;
-import com.yizhuan.treasure_box.bean.OpenBoxHonourResult;
-import com.yizhuan.treasure_box.bean.OpenBoxResult;
-import com.yizhuan.treasure_box.bean.PrizeInfo;
-import com.yizhuan.treasure_box.bean.PrizeNewInfo;
-import com.yizhuan.treasure_box.bean.UserTicketInfo;
-import com.yizhuan.xchat_android_core.base.IModel;
-import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
+import com.chwl.treasure_box.bean.BoxOpenStatusInfo;
+import com.chwl.treasure_box.bean.ConfigImgUrl;
+import com.chwl.treasure_box.bean.HonourBuyKeyResultInfo;
+import com.chwl.treasure_box.bean.HonourKeyInfo;
+import com.chwl.treasure_box.bean.KeyInfo;
+import com.chwl.treasure_box.bean.OpenBoxHonourResult;
+import com.chwl.treasure_box.bean.OpenBoxResult;
+import com.chwl.treasure_box.bean.PrizeInfo;
+import com.chwl.treasure_box.bean.PrizeNewInfo;
+import com.chwl.treasure_box.bean.UserTicketInfo;
+import com.chwl.core.base.IModel;
+import com.chwl.core.bean.response.ServiceResult;
 
 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/chwl/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/chwl/treasure_box/model/IRadishModel.java
index add703875..c150073d7 100644
--- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/model/IRadishModel.java
+++ b/core/src/model_treasure_box/java/com/chwl/treasure_box/model/IRadishModel.java
@@ -1,12 +1,12 @@
-package com.yizhuan.treasure_box.model;
+package com.chwl.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.chwl.treasure_box.bean.BoxOpenStatusInfo;
+import com.chwl.treasure_box.bean.KeyInfo;
+import com.chwl.treasure_box.bean.OpenBoxResult;
+import com.chwl.treasure_box.bean.PrizeInfo;
+import com.chwl.core.base.IModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.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/chwl/treasure_box/model/RadishModel.java
similarity index 87%
rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/model/RadishModel.java
rename to core/src/model_treasure_box/java/com/chwl/treasure_box/model/RadishModel.java
index c0afe7d9a..3f31b5da8 100644
--- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/model/RadishModel.java
+++ b/core/src/model_treasure_box/java/com/chwl/treasure_box/model/RadishModel.java
@@ -1,20 +1,20 @@
-package com.yizhuan.treasure_box.model;
+package com.chwl.treasure_box.model;
 
-import com.yizhuan.xchat_android_core.R;
-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.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.core.R;
+import com.chwl.treasure_box.bean.BoxOpenStatusInfo;
+import com.chwl.treasure_box.bean.KeyInfo;
+import com.chwl.treasure_box.bean.OpenBoxResult;
+import com.chwl.treasure_box.bean.PrizeInfo;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.community.CommunityConstant;
+import com.chwl.core.exception.FailReasonException;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.room.treasure_box.bean.BoxRankingInfo;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.utils.ResUtil;
 
 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/chwl/core/upgrade/bean/NewestVersionInfo.java
similarity index 96%
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/chwl/core/upgrade/bean/NewestVersionInfo.java
index c6616fc0e..bb5440d78 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/chwl/core/upgrade/bean/NewestVersionInfo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.upgrade.bean;
+package com.chwl.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/chwl/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/chwl/core/upgrade/bean/UpgradeCache.java
index a88c11ebe..f23819042 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/chwl/core/upgrade/bean/UpgradeCache.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core.upgrade.bean;
+package com.chwl.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/chwl/core/upgrade/event/ImPushUpdateAppEvent.java
similarity index 77%
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/chwl/core/upgrade/event/ImPushUpdateAppEvent.java
index 80c005c9d..6f237a13a 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/chwl/core/upgrade/event/ImPushUpdateAppEvent.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.upgrade.event;
+package com.chwl.core.upgrade.event;
 
-import com.yizhuan.xchat_android_core.upgrade.bean.NewestVersionInfo;
+import com.chwl.core.upgrade.bean.NewestVersionInfo;
 
 /**
  * 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/chwl/core/upgrade/model/IUpgradeModel.java
similarity index 75%
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/chwl/core/upgrade/model/IUpgradeModel.java
index b41e8b9f5..b7c5d8376 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/chwl/core/upgrade/model/IUpgradeModel.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_core.upgrade.model;
+package com.chwl.core.upgrade.model;
 
-import com.yizhuan.xchat_android_core.upgrade.bean.NewestVersionInfo;
+import com.chwl.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/chwl/core/upgrade/model/UpgradeModel.java
similarity index 82%
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/chwl/core/upgrade/model/UpgradeModel.java
index 3e06b02b3..a6b6503b0 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/chwl/core/upgrade/model/UpgradeModel.java
@@ -1,12 +1,12 @@
-package com.yizhuan.xchat_android_core.upgrade.model;
+package com.chwl.core.upgrade.model;
 
-import com.yizhuan.xchat_android_core.R;
-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.ResUtil;
+import com.chwl.core.R;
+import com.chwl.core.base.BaseModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.upgrade.bean.NewestVersionInfo;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.utils.ResUtil;
 
 import io.reactivex.Single;
 import io.reactivex.SingleSource;
diff --git a/core/src/test/java/com/yizhuan/xchat_android_core/ExampleUnitTest.java b/core/src/test/java/com/chwl/core/ExampleUnitTest.java
similarity index 96%
rename from core/src/test/java/com/yizhuan/xchat_android_core/ExampleUnitTest.java
rename to core/src/test/java/com/chwl/core/ExampleUnitTest.java
index cb91ce0d3..7c65e4937 100644
--- a/core/src/test/java/com/yizhuan/xchat_android_core/ExampleUnitTest.java
+++ b/core/src/test/java/com/chwl/core/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_core;
+package com.chwl.core;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/library/src/androidTest/java/com/yizhuan/xchat_android_library/ExampleInstrumentedTest.java b/library/src/androidTest/java/com/chwl/library/ExampleInstrumentedTest.java
similarity index 83%
rename from library/src/androidTest/java/com/yizhuan/xchat_android_library/ExampleInstrumentedTest.java
rename to library/src/androidTest/java/com/chwl/library/ExampleInstrumentedTest.java
index d0c5e4fa8..c78d07d81 100644
--- a/library/src/androidTest/java/com/yizhuan/xchat_android_library/ExampleInstrumentedTest.java
+++ b/library/src/androidTest/java/com/chwl/library/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library;
+package com.chwl.library;
 
 import static org.junit.Assert.assertEquals;
 
@@ -22,6 +22,6 @@ public class ExampleInstrumentedTest {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getTargetContext();
 
-        assertEquals("com.yizhuan.xchat_android_library", appContext.getPackageName());
+        assertEquals("com.chwl.library", appContext.getPackageName());
     }
 }
diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
index eb9e9db67..561130d6e 100644
--- a/library/src/main/AndroidManifest.xml
+++ b/library/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 
 
     
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/adapters/BaseListRecyclerViewAdapter.java b/library/src/main/java/com/chwl/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/chwl/library/adapters/BaseListRecyclerViewAdapter.java
index 3df7ed175..ddfad6b11 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/adapters/BaseListRecyclerViewAdapter.java
+++ b/library/src/main/java/com/chwl/library/adapters/BaseListRecyclerViewAdapter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.adapters;
+package com.chwl.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/chwl/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/chwl/library/animator/AbstractPathAnimator.java
index 46f19818d..4d463342f 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/animator/AbstractPathAnimator.java
+++ b/library/src/main/java/com/chwl/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.chwl.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.chwl.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/chwl/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/chwl/library/animator/PathAnimator.java
index 21b388cfc..22d046548 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/animator/PathAnimator.java
+++ b/library/src/main/java/com/chwl/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.chwl.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/chwl/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/chwl/library/annatation/ActLayoutRes.java
index acf027efc..217594b4b 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/annatation/ActLayoutRes.java
+++ b/library/src/main/java/com/chwl/library/annatation/ActLayoutRes.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.annatation;
+package com.chwl.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/chwl/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/chwl/library/base/IMvpBaseView.java
index 24534494f..a2828b051 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/base/IMvpBaseView.java
+++ b/library/src/main/java/com/chwl/library/base/IMvpBaseView.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.base;
+package com.chwl.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/chwl/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/chwl/library/base/PresenterEvent.java
index faa0b04f4..f29b41ca2 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/base/PresenterEvent.java
+++ b/library/src/main/java/com/chwl/library/base/PresenterEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.base;
+package com.chwl.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/chwl/library/base/factory/AbstractMvpPresenter.java
similarity index 96%
rename from library/src/main/java/com/yizhuan/xchat_android_library/base/factory/AbstractMvpPresenter.java
rename to library/src/main/java/com/chwl/library/base/factory/AbstractMvpPresenter.java
index a4ff08cb9..f192692a8 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/base/factory/AbstractMvpPresenter.java
+++ b/library/src/main/java/com/chwl/library/base/factory/AbstractMvpPresenter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.base.factory;
+package com.chwl.library.base.factory;
 
 import android.os.Bundle;
 import android.util.Log;
@@ -10,8 +10,8 @@ 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.base.IMvpBaseView;
-import com.yizhuan.xchat_android_library.base.PresenterEvent;
+import com.chwl.library.base.IMvpBaseView;
+import com.chwl.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/chwl/library/base/factory/BaseMvpProxy.java
similarity index 94%
rename from library/src/main/java/com/yizhuan/xchat_android_library/base/factory/BaseMvpProxy.java
rename to library/src/main/java/com/chwl/library/base/factory/BaseMvpProxy.java
index 07acbdf84..87df05d72 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/base/factory/BaseMvpProxy.java
+++ b/library/src/main/java/com/chwl/library/base/factory/BaseMvpProxy.java
@@ -1,11 +1,11 @@
-package com.yizhuan.xchat_android_library.base.factory;
+package com.chwl.library.base.factory;
 
 import android.os.Bundle;
 import android.util.Log;
 
-import com.yizhuan.xchat_android_library.R;
-import com.yizhuan.xchat_android_library.base.IMvpBaseView;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.library.R;
+import com.chwl.library.base.IMvpBaseView;
+import com.chwl.library.utils.ResUtil;
 
 
 /**
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/base/factory/CreatePresenter.java b/library/src/main/java/com/chwl/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/chwl/library/base/factory/CreatePresenter.java
index 1a19b8160..c59acd34a 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/base/factory/CreatePresenter.java
+++ b/library/src/main/java/com/chwl/library/base/factory/CreatePresenter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.base.factory;
+package com.chwl.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/chwl/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/chwl/library/base/factory/PresenterMvpFactory.java
index 52b126be6..6acae82c1 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/base/factory/PresenterMvpFactory.java
+++ b/library/src/main/java/com/chwl/library/base/factory/PresenterMvpFactory.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_library.base.factory;
+package com.chwl.library.base.factory;
 
 
-import com.yizhuan.xchat_android_library.base.IMvpBaseView;
+import com.chwl.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/chwl/library/base/factory/PresenterMvpFactoryImpl.java
similarity index 86%
rename from library/src/main/java/com/yizhuan/xchat_android_library/base/factory/PresenterMvpFactoryImpl.java
rename to library/src/main/java/com/chwl/library/base/factory/PresenterMvpFactoryImpl.java
index 2387dd067..7cb789ded 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/base/factory/PresenterMvpFactoryImpl.java
+++ b/library/src/main/java/com/chwl/library/base/factory/PresenterMvpFactoryImpl.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_library.base.factory;
+package com.chwl.library.base.factory;
 
-import com.yizhuan.xchat_android_library.R;
-import com.yizhuan.xchat_android_library.base.IMvpBaseView;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.library.R;
+import com.chwl.library.base.IMvpBaseView;
+import com.chwl.library.utils.ResUtil;
 
 /**
  * 
 Presenter 工厂实现类 

diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/base/factory/PresenterProxyInterface.java b/library/src/main/java/com/chwl/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/chwl/library/base/factory/PresenterProxyInterface.java
index 0eaed00c9..cb1a98825 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/base/factory/PresenterProxyInterface.java
+++ b/library/src/main/java/com/chwl/library/base/factory/PresenterProxyInterface.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_library.base.factory;
+package com.chwl.library.base.factory;
 
 
-import com.yizhuan.xchat_android_library.base.IMvpBaseView;
+import com.chwl.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/chwl/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/chwl/library/bindinglist/BaseItem.java
index a8ab512c8..b9ec688dd 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/bindinglist/BaseItem.java
+++ b/library/src/main/java/com/chwl/library/bindinglist/BaseItem.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.bindinglist;
+package com.chwl.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/chwl/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/chwl/library/bindinglist/IItem.java
index e332e5129..61345e765 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/bindinglist/IItem.java
+++ b/library/src/main/java/com/chwl/library/bindinglist/IItem.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.bindinglist;
+package com.chwl.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/chwl/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/chwl/library/bindinglist/ItemViewHolder.java
index 95099478d..dc36579ef 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/bindinglist/ItemViewHolder.java
+++ b/library/src/main/java/com/chwl/library/bindinglist/ItemViewHolder.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.bindinglist;
+package com.chwl.library.bindinglist;
 
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/bindinglist/MultiTypeAdapter.java b/library/src/main/java/com/chwl/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/chwl/library/bindinglist/MultiTypeAdapter.java
index 251f6ae10..72942e8d7 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/bindinglist/MultiTypeAdapter.java
+++ b/library/src/main/java/com/chwl/library/bindinglist/MultiTypeAdapter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.bindinglist;
+package com.chwl.library.bindinglist;
 
 import android.os.Looper;
 import android.view.ViewGroup;
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/coremanager/AbstractBaseCore.java b/library/src/main/java/com/chwl/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/chwl/library/coremanager/AbstractBaseCore.java
index 616b120b3..fc1e8446a 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/coremanager/AbstractBaseCore.java
+++ b/library/src/main/java/com/chwl/library/coremanager/AbstractBaseCore.java
@@ -2,11 +2,11 @@
  * 每个core实现类都应该继承此类
  * 提供一些基础设施给子类使用
  */
-package com.yizhuan.xchat_android_library.coremanager;
+package com.chwl.library.coremanager;
 
 import android.content.Context;
 
-import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
+import com.chwl.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/chwl/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/chwl/library/coremanager/CoreError.java
index f83f98bee..6034f14e1 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/coremanager/CoreError.java
+++ b/library/src/main/java/com/chwl/library/coremanager/CoreError.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.yizhuan.xchat_android_library.coremanager;
+package com.chwl.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/chwl/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/chwl/library/coremanager/CoreEvent.java
index 050c84527..55a28e378 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/coremanager/CoreEvent.java
+++ b/library/src/main/java/com/chwl/library/coremanager/CoreEvent.java
@@ -1,7 +1,7 @@
 /**
  * 用于使用annotation实现监听某个client的某个回调
  */
-package com.yizhuan.xchat_android_library.coremanager;
+package com.chwl.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/chwl/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/chwl/library/coremanager/CoreEventListener.java
index 51e7e9f2e..b69fee97e 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/coremanager/CoreEventListener.java
+++ b/library/src/main/java/com/chwl/library/coremanager/CoreEventListener.java
@@ -1,7 +1,7 @@
 /**
  * 用于使用annotation实现监听某个client的某个回调
  */
-package com.yizhuan.xchat_android_library.coremanager;
+package com.chwl.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/chwl/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/chwl/library/coremanager/CoreException.java
index 54d56344a..dafe457a8 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/coremanager/CoreException.java
+++ b/library/src/main/java/com/chwl/library/coremanager/CoreException.java
@@ -1,7 +1,7 @@
 /**
  * 用于封装core层的异常
  */
-package com.yizhuan.xchat_android_library.coremanager;
+package com.chwl.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/chwl/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/chwl/library/coremanager/CoreFactory.java
index 099e258d6..d8a90ef4e 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/coremanager/CoreFactory.java
+++ b/library/src/main/java/com/chwl/library/coremanager/CoreFactory.java
@@ -2,10 +2,10 @@
  * Core对象工厂。使用getCore前需要注册对应core接口实现类
  * 此类是非线程安全的，必须在主线程调用
  */
-package com.yizhuan.xchat_android_library.coremanager;
+package com.chwl.library.coremanager;
 
 
-import com.yizhuan.xchat_android_library.utils.log.MLog;
+import com.chwl.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/chwl/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/chwl/library/coremanager/CoreManager.java
index b2b5ca365..aaaed99f4 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/coremanager/CoreManager.java
+++ b/library/src/main/java/com/chwl/library/coremanager/CoreManager.java
@@ -4,12 +4,12 @@
  * 上层未注册core实现类话，注册一个默认实现（调用init函数）
  * 此类不是线程安全的，应该只在主线程调用
  */
-package com.yizhuan.xchat_android_library.coremanager;
+package com.chwl.library.coremanager;
 
 import android.content.Context;
 import android.text.TextUtils;
 
-import com.yizhuan.xchat_android_library.utils.log.MLog;
+import com.chwl.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/chwl/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/chwl/library/coremanager/IBaseCore.java
index ff2bac5b7..e84ee9f66 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/coremanager/IBaseCore.java
+++ b/library/src/main/java/com/chwl/library/coremanager/IBaseCore.java
@@ -1,7 +1,7 @@
 /**
  * 所有的core接口必须继承此接口
  */
-package com.yizhuan.xchat_android_library.coremanager;
+package com.chwl.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/chwl/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/chwl/library/coremanager/ICoreClient.java
index 0ca637394..1f14e7500 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/coremanager/ICoreClient.java
+++ b/library/src/main/java/com/chwl/library/coremanager/ICoreClient.java
@@ -1,7 +1,7 @@
 /**
  * 所有的core client接口必须继承于此接口
  */
-package com.yizhuan.xchat_android_library.coremanager;
+package com.chwl.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/chwl/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/chwl/library/list/AnimatedExpandableListView.java
index 37f9bbc42..b71b04ac5 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/list/AnimatedExpandableListView.java
+++ b/library/src/main/java/com/chwl/library/list/AnimatedExpandableListView.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.list;
+package com.chwl.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/chwl/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/chwl/library/list/ArrayListAdapter.java
index fe2fcb3c8..2ce03dff4 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/list/ArrayListAdapter.java
+++ b/library/src/main/java/com/chwl/library/list/ArrayListAdapter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.list;
+package com.chwl.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/chwl/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/chwl/library/list/BaseAnimatedExpandableListAdapter.java
index a5dd8c495..8075748be 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/list/BaseAnimatedExpandableListAdapter.java
+++ b/library/src/main/java/com/chwl/library/list/BaseAnimatedExpandableListAdapter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.list;
+package com.chwl.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/chwl/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/chwl/library/list/BaseGroupItem.java
index cdf846099..e8dd40501 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/list/BaseGroupItem.java
+++ b/library/src/main/java/com/chwl/library/list/BaseGroupItem.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.list;
+package com.chwl.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/chwl/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/chwl/library/list/BaseListAdapter.java
index a7c01b1c7..6044a4f7b 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/list/BaseListAdapter.java
+++ b/library/src/main/java/com/chwl/library/list/BaseListAdapter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.list;
+package com.chwl.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/chwl/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/chwl/library/list/BaseListItem.java
index ca4932a54..065f417f1 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/list/BaseListItem.java
+++ b/library/src/main/java/com/chwl/library/list/BaseListItem.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.list;
+package com.chwl.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/chwl/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/chwl/library/list/GroupItem.java
index f1b22f60d..c363d9af0 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/list/GroupItem.java
+++ b/library/src/main/java/com/chwl/library/list/GroupItem.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.list;
+package com.chwl.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/chwl/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/chwl/library/list/ListItem.java
index 6038f7c71..ad782d82b 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/list/ListItem.java
+++ b/library/src/main/java/com/chwl/library/list/ListItem.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.list;
+package com.chwl.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/chwl/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/chwl/library/list/NoScrollingLinearLayoutManager.java
index 7d29a985e..b9f082428 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/list/NoScrollingLinearLayoutManager.java
+++ b/library/src/main/java/com/chwl/library/list/NoScrollingLinearLayoutManager.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.list;
+package com.chwl.library.list;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/list/ViewHolder.java b/library/src/main/java/com/chwl/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/chwl/library/list/ViewHolder.java
index 9beb02436..d740dff6b 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/list/ViewHolder.java
+++ b/library/src/main/java/com/chwl/library/list/ViewHolder.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.list;
+package com.chwl.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/chwl/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/chwl/library/manager/TracingManager.java
index 72cd6c718..ed7760346 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/manager/TracingManager.java
+++ b/library/src/main/java/com/chwl/library/manager/TracingManager.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.manager;
+package com.chwl.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/chwl/library/net/rxnet/RxNet.java
similarity index 80%
rename from library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/RxNet.java
rename to library/src/main/java/com/chwl/library/net/rxnet/RxNet.java
index c47b6c6a3..db2cba156 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/RxNet.java
+++ b/library/src/main/java/com/chwl/library/net/rxnet/RxNet.java
@@ -1,11 +1,11 @@
-package com.yizhuan.xchat_android_library.net.rxnet;
+package com.chwl.library.net.rxnet;
 
 import android.content.Context;
 
-import com.yizhuan.xchat_android_library.R;
-import com.yizhuan.xchat_android_library.net.rxnet.manager.RxNetManager;
-import com.yizhuan.xchat_android_library.utils.NullUtils;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.library.R;
+import com.chwl.library.net.rxnet.manager.RxNetManager;
+import com.chwl.library.utils.NullUtils;
+import com.chwl.library.utils.ResUtil;
 
 
 /**
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/callback/CallBack.java b/library/src/main/java/com/chwl/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/chwl/library/net/rxnet/callback/CallBack.java
index a94d3eec8..15440d1fe 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/callback/CallBack.java
+++ b/library/src/main/java/com/chwl/library/net/rxnet/callback/CallBack.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.net.rxnet.callback;
+package com.chwl.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/chwl/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/chwl/library/net/rxnet/converter/GsonConverterFactory.java
index 4d2a191b7..ea173a846 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/converter/GsonConverterFactory.java
+++ b/library/src/main/java/com/chwl/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.chwl.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/chwl/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/chwl/library/net/rxnet/converter/GsonConverterPlugins.java
index d4a678a8b..87c92f579 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/converter/GsonConverterPlugins.java
+++ b/library/src/main/java/com/chwl/library/net/rxnet/converter/GsonConverterPlugins.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.net.rxnet.converter;
+package com.chwl.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/chwl/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/chwl/library/net/rxnet/converter/GsonRequestBodyConverter.java
index bba0398fa..211424580 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/converter/GsonRequestBodyConverter.java
+++ b/library/src/main/java/com/chwl/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.chwl.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/chwl/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/chwl/library/net/rxnet/converter/GsonResponseBodyConverter.java
index 6e7eb118f..3cd5f3598 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/converter/GsonResponseBodyConverter.java
+++ b/library/src/main/java/com/chwl/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.chwl.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/exception/ApiException.kt b/library/src/main/java/com/chwl/library/net/rxnet/exception/ApiException.kt
similarity index 87%
rename from library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/exception/ApiException.kt
rename to library/src/main/java/com/chwl/library/net/rxnet/exception/ApiException.kt
index fb23ff3f4..35f7d81bf 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/exception/ApiException.kt
+++ b/library/src/main/java/com/chwl/library/net/rxnet/exception/ApiException.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.net.rxnet.exception
+package com.chwl.library.net.rxnet.exception
 
 /**
  * Created by qisan 2022/5/26
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/exception/ErrorStatus.kt b/library/src/main/java/com/chwl/library/net/rxnet/exception/ErrorStatus.kt
similarity index 90%
rename from library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/exception/ErrorStatus.kt
rename to library/src/main/java/com/chwl/library/net/rxnet/exception/ErrorStatus.kt
index 17d62eeeb..dbef2b9e1 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/exception/ErrorStatus.kt
+++ b/library/src/main/java/com/chwl/library/net/rxnet/exception/ErrorStatus.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.net.rxnet.exception
+package com.chwl.library.net.rxnet.exception
 
 /**
  * Created by qisan 2022/5/26
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/exception/ExceptionHandle.kt b/library/src/main/java/com/chwl/library/net/rxnet/exception/ExceptionHandle.kt
similarity index 96%
rename from library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/exception/ExceptionHandle.kt
rename to library/src/main/java/com/chwl/library/net/rxnet/exception/ExceptionHandle.kt
index 2f9dd7bc6..55161549a 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/exception/ExceptionHandle.kt
+++ b/library/src/main/java/com/chwl/library/net/rxnet/exception/ExceptionHandle.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.net.rxnet.exception
+package com.chwl.library.net.rxnet.exception
 
 import android.util.Log
 import com.google.gson.JsonParseException
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/factory/Tls12SocketFactory.java b/library/src/main/java/com/chwl/library/net/rxnet/factory/Tls12SocketFactory.java
similarity index 97%
rename from library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/factory/Tls12SocketFactory.java
rename to library/src/main/java/com/chwl/library/net/rxnet/factory/Tls12SocketFactory.java
index 5f82c8368..45edfd87f 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/factory/Tls12SocketFactory.java
+++ b/library/src/main/java/com/chwl/library/net/rxnet/factory/Tls12SocketFactory.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.net.rxnet.factory;
+package com.chwl.library.net.rxnet.factory;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.Socket;
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/https/HttpsUtils.java b/library/src/main/java/com/chwl/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/chwl/library/net/rxnet/https/HttpsUtils.java
index a469d6f71..7b6d970ec 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/https/HttpsUtils.java
+++ b/library/src/main/java/com/chwl/library/net/rxnet/https/HttpsUtils.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_library.net.rxnet.https;
+package com.chwl.library.net.rxnet.https;
 
 
-import com.yizhuan.xchat_android_library.net.rxnet.utils.RxNetLog;
+import com.chwl.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/chwl/library/net/rxnet/interceptor/HttpCacheInterceptor.java
similarity index 83%
rename from library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/interceptor/HttpCacheInterceptor.java
rename to library/src/main/java/com/chwl/library/net/rxnet/interceptor/HttpCacheInterceptor.java
index 7b60b0a72..9a43bfacc 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/interceptor/HttpCacheInterceptor.java
+++ b/library/src/main/java/com/chwl/library/net/rxnet/interceptor/HttpCacheInterceptor.java
@@ -1,11 +1,11 @@
-package com.yizhuan.xchat_android_library.net.rxnet.interceptor;
+package com.chwl.library.net.rxnet.interceptor;
 
 import android.content.Context;
 
-import com.yizhuan.xchat_android_library.R;
-import com.yizhuan.xchat_android_library.net.rxnet.utils.RxNetLog;
-import com.yizhuan.xchat_android_library.net.rxnet.utils.RxNetWorkUtils;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.library.R;
+import com.chwl.library.net.rxnet.utils.RxNetLog;
+import com.chwl.library.net.rxnet.utils.RxNetWorkUtils;
+import com.chwl.library.utils.ResUtil;
 
 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/chwl/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/chwl/library/net/rxnet/interceptor/HttpLoggingInterceptor.java
index e78cad7e3..4fae361f1 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/interceptor/HttpLoggingInterceptor.java
+++ b/library/src/main/java/com/chwl/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.chwl.library.net.rxnet.interceptor;
 
 import static okhttp3.internal.platform.Platform.INFO;
 
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/manager/CacheManager.java b/library/src/main/java/com/chwl/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/chwl/library/net/rxnet/manager/CacheManager.java
index 2f8d8b419..34c55da78 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/manager/CacheManager.java
+++ b/library/src/main/java/com/chwl/library/net/rxnet/manager/CacheManager.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_library.net.rxnet.manager;
+package com.chwl.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.chwl.library.net.rxnet.interceptor.HttpCacheInterceptor;
+import com.chwl.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/chwl/library/net/rxnet/manager/RxNetManager.java
similarity index 95%
rename from library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/manager/RxNetManager.java
rename to library/src/main/java/com/chwl/library/net/rxnet/manager/RxNetManager.java
index d9a35a784..b9f60bda3 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/manager/RxNetManager.java
+++ b/library/src/main/java/com/chwl/library/net/rxnet/manager/RxNetManager.java
@@ -1,12 +1,12 @@
-package com.yizhuan.xchat_android_library.net.rxnet.manager;
+package com.chwl.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.utils.RxNetLog;
+import com.chwl.library.BuildConfig;
+import com.chwl.library.net.rxnet.converter.GsonConverterFactory;
+import com.chwl.library.net.rxnet.https.HttpsUtils;
+import com.chwl.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/chwl/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/chwl/library/net/rxnet/model/HttpHeaders.java
index a4bc3a7a4..2ce1a4be5 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/model/HttpHeaders.java
+++ b/library/src/main/java/com/chwl/library/net/rxnet/model/HttpHeaders.java
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_library.net.rxnet.model;
+package com.chwl.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.chwl.library.net.rxnet.RxNet;
+import com.chwl.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/chwl/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/chwl/library/net/rxnet/utils/RxFileUtils.java
index 98cdb16a8..752031398 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/utils/RxFileUtils.java
+++ b/library/src/main/java/com/chwl/library/net/rxnet/utils/RxFileUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.net.rxnet.utils;
+package com.chwl.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/chwl/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/chwl/library/net/rxnet/utils/RxNetLog.java
index 475d71a9c..10e7c13d5 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/utils/RxNetLog.java
+++ b/library/src/main/java/com/chwl/library/net/rxnet/utils/RxNetLog.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.net.rxnet.utils;
+package com.chwl.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/chwl/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/chwl/library/net/rxnet/utils/RxNetWorkUtils.java
index 79e3b8081..9e98f4b77 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/utils/RxNetWorkUtils.java
+++ b/library/src/main/java/com/chwl/library/net/rxnet/utils/RxNetWorkUtils.java
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_library.net.rxnet.utils;
+package com.chwl.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.chwl.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/chwl/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/chwl/library/record/AuditRecorderConfiguration.java
index b5302570f..0e41af709 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/record/AuditRecorderConfiguration.java
+++ b/library/src/main/java/com/chwl/library/record/AuditRecorderConfiguration.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.record;
+package com.chwl.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/chwl/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/chwl/library/record/ExtAudioRecorder.java
index 34a32eb0a..bbc8e4d52 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/record/ExtAudioRecorder.java
+++ b/library/src/main/java/com/chwl/library/record/ExtAudioRecorder.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.record;
+package com.chwl.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/chwl/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/chwl/library/record/FailRecorder.java
index 6b4016038..cd2a15df1 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/record/FailRecorder.java
+++ b/library/src/main/java/com/chwl/library/record/FailRecorder.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.record;
+package com.chwl.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/chwl/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/chwl/library/record/SimpleRecordFailed.java
index 64d5b59e9..4047d54a9 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/record/SimpleRecordFailed.java
+++ b/library/src/main/java/com/chwl/library/record/SimpleRecordFailed.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.record;
+package com.chwl.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/chwl/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/chwl/library/rx/RxRetryWithDelay.java
index 454af1b73..f9471d513 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/rx/RxRetryWithDelay.java
+++ b/library/src/main/java/com/chwl/library/rx/RxRetryWithDelay.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.rx;
+package com.chwl.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/chwl/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/chwl/library/rxbus/RxBus.java
index d204eea8e..f633b2cfe 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/rxbus/RxBus.java
+++ b/library/src/main/java/com/chwl/library/rxbus/RxBus.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.rxbus;
+package com.chwl.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/chwl/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/chwl/library/rxbus/RxBusHelper.java
index dec255fff..3fb76bdbf 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/rxbus/RxBusHelper.java
+++ b/library/src/main/java/com/chwl/library/rxbus/RxBusHelper.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.rxbus;
+package com.chwl.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/chwl/library/service/ErBanService.java
similarity index 85%
rename from library/src/main/java/com/yizhuan/xchat_android_library/service/ErBanService.java
rename to library/src/main/java/com/chwl/library/service/ErBanService.java
index 0e3ec48b6..7418b5983 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/service/ErBanService.java
+++ b/library/src/main/java/com/chwl/library/service/ErBanService.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.service;
+package com.chwl.library.service;
 
 import android.app.job.JobParameters;
 import android.app.job.JobService;
@@ -7,8 +7,8 @@ import android.os.Build;
 import androidx.annotation.RequiresApi;
 
 import com.orhanobut.logger.Logger;
-import com.yizhuan.xchat_android_library.R;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.library.R;
+import com.chwl.library.utils.ResUtil;
 
 /**
  * 
 在电量充足，wifi等情况下处理后台耗时任务

diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/softinput/SoftHideKeyBoardUtil.java b/library/src/main/java/com/chwl/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/chwl/library/softinput/SoftHideKeyBoardUtil.java
index c049b91e7..5a275b471 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/softinput/SoftHideKeyBoardUtil.java
+++ b/library/src/main/java/com/chwl/library/softinput/SoftHideKeyBoardUtil.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.softinput;
+package com.chwl.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/chwl/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/chwl/library/swipeactivity/SwipeBackActivity.java
index 8d95f303c..25fed1316 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/SwipeBackActivity.java
+++ b/library/src/main/java/com/chwl/library/swipeactivity/SwipeBackActivity.java
@@ -1,5 +1,5 @@
 
-package com.yizhuan.xchat_android_library.swipeactivity;
+package com.chwl.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/chwl/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/chwl/library/swipeactivity/SwipeBackActivityBase.java
index 355bc0c5f..271c2c710 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/SwipeBackActivityBase.java
+++ b/library/src/main/java/com/chwl/library/swipeactivity/SwipeBackActivityBase.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.swipeactivity;
+package com.chwl.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/chwl/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/chwl/library/swipeactivity/SwipeBackActivityHelper.java
index 96317cd52..04b9d3aff 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/SwipeBackActivityHelper.java
+++ b/library/src/main/java/com/chwl/library/swipeactivity/SwipeBackActivityHelper.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.swipeactivity;
+package com.chwl.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.chwl.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/chwl/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/chwl/library/swipeactivity/SwipeBackLayout.java
index 5bd33bbe1..33ef946f3 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/SwipeBackLayout.java
+++ b/library/src/main/java/com/chwl/library/swipeactivity/SwipeBackLayout.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.swipeactivity;
+package com.chwl.library.swipeactivity;
 
 import android.app.Activity;
 import android.content.Context;
@@ -14,7 +14,7 @@ import android.widget.FrameLayout;
 
 import androidx.core.view.ViewCompat;
 
-import com.yizhuan.xchat_android_library.R;
+import com.chwl.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/chwl/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/chwl/library/swipeactivity/Utils.java
index 4ca96be9c..b755c8c6f 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/Utils.java
+++ b/library/src/main/java/com/chwl/library/swipeactivity/Utils.java
@@ -1,5 +1,5 @@
 
-package com.yizhuan.xchat_android_library.swipeactivity;
+package com.chwl.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/chwl/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/chwl/library/swipeactivity/ViewDragHelper.java
index bc568a84b..84673efa1 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/ViewDragHelper.java
+++ b/library/src/main/java/com/chwl/library/swipeactivity/ViewDragHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.yizhuan.xchat_android_library.swipeactivity;
+package com.chwl.library.swipeactivity;
 
 import android.content.Context;
 import android.view.MotionEvent;
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/threadmgr/SchedulePolicy.java b/library/src/main/java/com/chwl/library/threadmgr/SchedulePolicy.java
similarity index 74%
rename from library/src/main/java/com/yizhuan/xchat_android_library/threadmgr/SchedulePolicy.java
rename to library/src/main/java/com/chwl/library/threadmgr/SchedulePolicy.java
index cd1e4af84..997d14349 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/threadmgr/SchedulePolicy.java
+++ b/library/src/main/java/com/chwl/library/threadmgr/SchedulePolicy.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_library.threadmgr;
+package com.chwl.library.threadmgr;
 
 import android.util.Log;
 
-import com.yizhuan.xchat_android_library.R;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.library.R;
+import com.chwl.library.utils.ResUtil;
 
 import java.util.concurrent.RejectedExecutionHandler;
 import java.util.concurrent.ThreadPoolExecutor;
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/threadmgr/SpeakPolicy.java b/library/src/main/java/com/chwl/library/threadmgr/SpeakPolicy.java
similarity index 74%
rename from library/src/main/java/com/yizhuan/xchat_android_library/threadmgr/SpeakPolicy.java
rename to library/src/main/java/com/chwl/library/threadmgr/SpeakPolicy.java
index 222be11b2..9cace11bc 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/threadmgr/SpeakPolicy.java
+++ b/library/src/main/java/com/chwl/library/threadmgr/SpeakPolicy.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_library.threadmgr;
+package com.chwl.library.threadmgr;
 
 import android.util.Log;
 
-import com.yizhuan.xchat_android_library.R;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.library.R;
+import com.chwl.library.utils.ResUtil;
 
 import java.util.concurrent.RejectedExecutionHandler;
 import java.util.concurrent.ThreadPoolExecutor;
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/threadmgr/SpeakThreadFactory.java b/library/src/main/java/com/chwl/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/chwl/library/threadmgr/SpeakThreadFactory.java
index 6a42a27f9..5e83de090 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/threadmgr/SpeakThreadFactory.java
+++ b/library/src/main/java/com/chwl/library/threadmgr/SpeakThreadFactory.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.threadmgr;
+package com.chwl.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/chwl/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/chwl/library/threadmgr/ThreadPoolManager.java
index 057655fff..dbe39c1b1 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/threadmgr/ThreadPoolManager.java
+++ b/library/src/main/java/com/chwl/library/threadmgr/ThreadPoolManager.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.threadmgr;
+package com.chwl.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/chwl/library/utils/AppMetaDataUtil.java
similarity index 86%
rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/AppMetaDataUtil.java
rename to library/src/main/java/com/chwl/library/utils/AppMetaDataUtil.java
index 7e46a87ab..6e82f07f2 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/AppMetaDataUtil.java
+++ b/library/src/main/java/com/chwl/library/utils/AppMetaDataUtil.java
@@ -1,13 +1,13 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.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.common.Constants;
-import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
-import com.yizhuan.xchat_android_library.utils.log.MLog;
+import com.chwl.library.common.Constants;
+import com.chwl.library.utils.config.BasicConfig;
+import com.chwl.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/chwl/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/chwl/library/utils/AppUtils.java
index 09e94cdac..f5255365c 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/AppUtils.java
+++ b/library/src/main/java/com/chwl/library/utils/AppUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.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/chwl/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/chwl/library/utils/ArrayUtils.java
index b0b1cf05b..445dbfbd9 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ArrayUtils.java
+++ b/library/src/main/java/com/chwl/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.chwl.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/chwl/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/chwl/library/utils/BlankUtil.java
index 08920c549..ab682d82c 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/BlankUtil.java
+++ b/library/src/main/java/com/chwl/library/utils/BlankUtil.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.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/chwl/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/chwl/library/utils/CenterDrawableHelper.java
index 719a755cd..a34f0286c 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/CenterDrawableHelper.java
+++ b/library/src/main/java/com/chwl/library/utils/CenterDrawableHelper.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.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/chwl/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/chwl/library/utils/CharSequenceUtils.java
index bc1d6e81e..ddd0199e5 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/CharSequenceUtils.java
+++ b/library/src/main/java/com/chwl/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.chwl.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/chwl/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/chwl/library/utils/CharUtils.java
index 1e8e2aab2..199815ba5 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/CharUtils.java
+++ b/library/src/main/java/com/chwl/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.chwl.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/chwl/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/chwl/library/utils/ColorUtil.java
index 4233fde4e..051b3ccf3 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ColorUtil.java
+++ b/library/src/main/java/com/chwl/library/utils/ColorUtil.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.library.utils;
 
 
 /**
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/CommonUtils.java b/library/src/main/java/com/chwl/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/chwl/library/utils/CommonUtils.java
index 253b0a6b4..25ac9d77b 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/CommonUtils.java
+++ b/library/src/main/java/com/chwl/library/utils/CommonUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.library.utils;
 
 public class CommonUtils {
     private static long lastClickTime;
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/DeviceUtils.java b/library/src/main/java/com/chwl/library/utils/DeviceUtils.java
similarity index 95%
rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/DeviceUtils.java
rename to library/src/main/java/com/chwl/library/utils/DeviceUtils.java
index 54067c628..e5a347e83 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/DeviceUtils.java
+++ b/library/src/main/java/com/chwl/library/utils/DeviceUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.library.utils;
 
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/DeviceUuidFactory.java b/library/src/main/java/com/chwl/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/chwl/library/utils/DeviceUuidFactory.java
index 871a90d31..30be07f46 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/DeviceUuidFactory.java
+++ b/library/src/main/java/com/chwl/library/utils/DeviceUuidFactory.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.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/chwl/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/chwl/library/utils/FP.java
index 63f4e8578..a5b767002 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/FP.java
+++ b/library/src/main/java/com/chwl/library/utils/FP.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.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/chwl/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/chwl/library/utils/FileUtils.java
index a8cd05d5f..6531682b8 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/FileUtils.java
+++ b/library/src/main/java/com/chwl/library/utils/FileUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.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/chwl/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/chwl/library/utils/FormatUtils.java
index ebdf600cb..556f9fc24 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/FormatUtils.java
+++ b/library/src/main/java/com/chwl/library/utils/FormatUtils.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.library.utils;
 
-import com.yizhuan.xchat_android_library.R;
+import com.chwl.library.R;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/IOUtils.java b/library/src/main/java/com/chwl/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/chwl/library/utils/IOUtils.java
index be6d6a00b..473698f60 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/IOUtils.java
+++ b/library/src/main/java/com/chwl/library/utils/IOUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.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/chwl/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/chwl/library/utils/ImageUtils.java
index 630bbf0db..556bf89ac 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ImageUtils.java
+++ b/library/src/main/java/com/chwl/library/utils/ImageUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.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/chwl/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/chwl/library/utils/ImeUtil.java
index 63f7a177c..06213c55f 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ImeUtil.java
+++ b/library/src/main/java/com/chwl/library/utils/ImeUtil.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.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.chwl.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/chwl/library/utils/JavaUtil.java
similarity index 98%
rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/JavaUtil.java
rename to library/src/main/java/com/chwl/library/utils/JavaUtil.java
index 6a24c834a..f23cc534f 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/JavaUtil.java
+++ b/library/src/main/java/com/chwl/library/utils/JavaUtil.java
@@ -1,11 +1,11 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.library.utils;
 
 import android.annotation.SuppressLint;
 import android.text.TextUtils;
 import android.util.Base64;
 import android.util.Log;
 
-import com.yizhuan.xchat_android_library.R;
+import com.chwl.library.R;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ListUtils.java b/library/src/main/java/com/chwl/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/chwl/library/utils/ListUtils.java
index e3b6f8fa2..cf1d4e3a3 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ListUtils.java
+++ b/library/src/main/java/com/chwl/library/utils/ListUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.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/chwl/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/chwl/library/utils/LogCallerUtils.java
index 347d3341a..1fc6aba70 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/LogCallerUtils.java
+++ b/library/src/main/java/com/chwl/library/utils/LogCallerUtils.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.library.utils;
 
-import com.yizhuan.xchat_android_library.utils.log.MLog;
+import com.chwl.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/chwl/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/chwl/library/utils/LogUtil.java
index a224d0bc2..953641f3d 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/LogUtil.java
+++ b/library/src/main/java/com/chwl/library/utils/LogUtil.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.library.utils;
 
 import android.util.Log;
 
-import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
+import com.chwl.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/chwl/library/utils/MacAddressUtils.java
similarity index 98%
rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/MacAddressUtils.java
rename to library/src/main/java/com/chwl/library/utils/MacAddressUtils.java
index 3023d11f2..5e45ac1f9 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/MacAddressUtils.java
+++ b/library/src/main/java/com/chwl/library/utils/MacAddressUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.library.utils;
 
 import android.content.Context;
 import android.content.pm.PackageManager;
@@ -8,8 +8,8 @@ import android.os.Build;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.yizhuan.xchat_android_library.BuildConfig;
-import com.yizhuan.xchat_android_library.R;
+import com.chwl.library.BuildConfig;
+import com.chwl.library.R;
 
 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/chwl/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/chwl/library/utils/MimeType.java
index f1802e430..6aa516c03 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/MimeType.java
+++ b/library/src/main/java/com/chwl/library/utils/MimeType.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.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/chwl/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/chwl/library/utils/NetworkUtils.java
index b8e4d4cb7..0006847ab 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/NetworkUtils.java
+++ b/library/src/main/java/com/chwl/library/utils/NetworkUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.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.chwl.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/chwl/library/utils/NullUtils.java
similarity index 83%
rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/NullUtils.java
rename to library/src/main/java/com/chwl/library/utils/NullUtils.java
index d32577075..a9f972c32 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/NullUtils.java
+++ b/library/src/main/java/com/chwl/library/utils/NullUtils.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.library.utils;
 
-import com.yizhuan.xchat_android_library.R;
+import com.chwl.library.R;
 
 /**
  * 
 

diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ObjectUtils.java b/library/src/main/java/com/chwl/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/chwl/library/utils/ObjectUtils.java
index ff07184b0..dee5ac56a 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ObjectUtils.java
+++ b/library/src/main/java/com/chwl/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.chwl.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/chwl/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/chwl/library/utils/OperationTimer.java
index 51b9e460f..9cca10880 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/OperationTimer.java
+++ b/library/src/main/java/com/chwl/library/utils/OperationTimer.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.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/chwl/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/chwl/library/utils/RandomStringUtil.java
index 60d08f92e..272071c34 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/RandomStringUtil.java
+++ b/library/src/main/java/com/chwl/library/utils/RandomStringUtil.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.library.utils;
 
 import java.util.Random;
 
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ResUtil.java b/library/src/main/java/com/chwl/library/utils/ResUtil.java
similarity index 87%
rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/ResUtil.java
rename to library/src/main/java/com/chwl/library/utils/ResUtil.java
index 272eb11df..f6f603170 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ResUtil.java
+++ b/library/src/main/java/com/chwl/library/utils/ResUtil.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.library.utils;
 
 import android.app.Application;
 
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ResolutionUtils.java b/library/src/main/java/com/chwl/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/chwl/library/utils/ResolutionUtils.java
index 419cbfc8d..c473fe5a1 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ResolutionUtils.java
+++ b/library/src/main/java/com/chwl/library/utils/ResolutionUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.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/chwl/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/chwl/library/utils/SafeDispatchHandler.java
index d9aada896..0b9bca3f3 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/SafeDispatchHandler.java
+++ b/library/src/main/java/com/chwl/library/utils/SafeDispatchHandler.java
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.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.chwl.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/chwl/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/chwl/library/utils/ScreenUtils.java
index 4b22b3991..a7b968b34 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ScreenUtils.java
+++ b/library/src/main/java/com/chwl/library/utils/ScreenUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.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/chwl/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/chwl/library/utils/SingleToastUtil.java
index b8f25ebf0..21d2cf0da 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/SingleToastUtil.java
+++ b/library/src/main/java/com/chwl/library/utils/SingleToastUtil.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.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/chwl/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/chwl/library/utils/SizeUtils.java
index 2f6eaf36d..5f8ce5463 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/SizeUtils.java
+++ b/library/src/main/java/com/chwl/library/utils/SizeUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.library.utils;
 
 import android.content.Context;
 import android.util.DisplayMetrics;
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/StringCutUtils.java b/library/src/main/java/com/chwl/library/utils/StringCutUtils.java
similarity index 98%
rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/StringCutUtils.java
rename to library/src/main/java/com/chwl/library/utils/StringCutUtils.java
index d719b80fc..c3ccfdeb1 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/StringCutUtils.java
+++ b/library/src/main/java/com/chwl/library/utils/StringCutUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.library.utils;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/StringUtils.java b/library/src/main/java/com/chwl/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/chwl/library/utils/StringUtils.java
index 599dd7016..bcf1c3561 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/StringUtils.java
+++ b/library/src/main/java/com/chwl/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.chwl.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/chwl/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/chwl/library/utils/SystemUtils.java
index 0fe00809a..4d069f924 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/SystemUtils.java
+++ b/library/src/main/java/com/chwl/library/utils/SystemUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.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/chwl/library/utils/TelephonyUtils.java
similarity index 98%
rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/TelephonyUtils.java
rename to library/src/main/java/com/chwl/library/utils/TelephonyUtils.java
index 76db36bc0..e04b9c9ac 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/TelephonyUtils.java
+++ b/library/src/main/java/com/chwl/library/utils/TelephonyUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.library.utils;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -6,7 +6,7 @@ import android.os.Build;
 import android.telephony.TelephonyManager;
 import android.util.Log;
 
-import com.yizhuan.xchat_android_library.R;
+import com.chwl.library.R;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/TextWatcherWrapper.java b/library/src/main/java/com/chwl/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/chwl/library/utils/TextWatcherWrapper.java
index 87f968891..c7e06c6a1 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/TextWatcherWrapper.java
+++ b/library/src/main/java/com/chwl/library/utils/TextWatcherWrapper.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.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/chwl/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/chwl/library/utils/TimeUtils.java
index 82ede33b9..e3792d6f6 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/TimeUtils.java
+++ b/library/src/main/java/com/chwl/library/utils/TimeUtils.java
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.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.chwl.library.R;
+import com.chwl.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/chwl/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/chwl/library/utils/UIUtils.java
index 47696e2a2..87cbce624 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/UIUtils.java
+++ b/library/src/main/java/com/chwl/library/utils/UIUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.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.chwl.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/chwl/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/chwl/library/utils/UUIDUtil.java
index dfce81193..dbc53f06b 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/UUIDUtil.java
+++ b/library/src/main/java/com/chwl/library/utils/UUIDUtil.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.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/chwl/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/chwl/library/utils/UriUtil.java
index 36eed9119..e88942f7a 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/UriUtil.java
+++ b/library/src/main/java/com/chwl/library/utils/UriUtil.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.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/chwl/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/chwl/library/utils/Validate.java
index 4d6b3489f..9b2cc85c0 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/Validate.java
+++ b/library/src/main/java/com/chwl/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.chwl.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/chwl/library/utils/VersionUtil.java
similarity index 97%
rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/VersionUtil.java
rename to library/src/main/java/com/chwl/library/utils/VersionUtil.java
index 2dd60d49e..73a303095 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/VersionUtil.java
+++ b/library/src/main/java/com/chwl/library/utils/VersionUtil.java
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.library.utils;
 
 import android.content.Context;
 import android.content.pm.PackageManager.NameNotFoundException;
 
-import com.yizhuan.xchat_android_library.R;
-import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
+import com.chwl.library.R;
+import com.chwl.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/chwl/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/chwl/library/utils/ViewUtils.java
index c6fdcf2ba..d7192130b 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ViewUtils.java
+++ b/library/src/main/java/com/chwl/library/utils/ViewUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.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/chwl/library/utils/ZipUtils.java
similarity index 98%
rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/ZipUtils.java
rename to library/src/main/java/com/chwl/library/utils/ZipUtils.java
index e2f75e47f..5a05a6358 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ZipUtils.java
+++ b/library/src/main/java/com/chwl/library/utils/ZipUtils.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_library.utils;
+package com.chwl.library.utils;
 
 import android.text.TextUtils;
 
 import com.orhanobut.logger.Logger;
-import com.yizhuan.xchat_android_library.R;
+import com.chwl.library.R;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/anim/AnimUtils.java b/library/src/main/java/com/chwl/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/chwl/library/utils/anim/AnimUtils.java
index ae1f4a6e5..51a9bf856 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/anim/AnimUtils.java
+++ b/library/src/main/java/com/chwl/library/utils/anim/AnimUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils.anim;
+package com.chwl.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/chwl/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/chwl/library/utils/anim/PauseableAnimManager.java
index 18e3ba87a..4a0f72029 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/anim/PauseableAnimManager.java
+++ b/library/src/main/java/com/chwl/library/utils/anim/PauseableAnimManager.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_library.utils.anim;
+package com.chwl.library.utils.anim;
 
 import android.animation.Animator;
 import android.animation.ValueAnimator;
 
-import com.yizhuan.xchat_android_library.utils.log.MLog;
+import com.chwl.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/chwl/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/chwl/library/utils/asynctask/AsyncTask.java
index 8205309b0..07f3ddb25 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/asynctask/AsyncTask.java
+++ b/library/src/main/java/com/chwl/library/utils/asynctask/AsyncTask.java
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_library.utils.asynctask;
+package com.chwl.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.chwl.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/chwl/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/chwl/library/utils/asynctask/ScheduledTask.java
index 987cb9382..c4d94ac43 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/asynctask/ScheduledTask.java
+++ b/library/src/main/java/com/chwl/library/utils/asynctask/ScheduledTask.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_library.utils.asynctask;
+package com.chwl.library.utils.asynctask;
 
 import android.os.HandlerThread;
 import android.os.Looper;
 
-import com.yizhuan.xchat_android_library.utils.SafeDispatchHandler;
+import com.chwl.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/chwl/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/chwl/library/utils/cache/Cache.java
index 23c7f2316..433bb7372 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/Cache.java
+++ b/library/src/main/java/com/chwl/library/utils/cache/Cache.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils.cache;
+package com.chwl.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/chwl/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/chwl/library/utils/cache/CacheClient.java
index 2d3a976fc..69a59b1a2 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/CacheClient.java
+++ b/library/src/main/java/com/chwl/library/utils/cache/CacheClient.java
@@ -1,15 +1,15 @@
-package com.yizhuan.xchat_android_library.utils.cache;
+package com.chwl.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.chwl.library.utils.StringUtils;
+import com.chwl.library.utils.TimeUtils;
+import com.chwl.library.utils.asynctask.AsyncTask;
+import com.chwl.library.utils.json.JsonParser;
+import com.chwl.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/chwl/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/chwl/library/utils/cache/CacheClientFactory.java
index 5fd6b61b2..79db6b802 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/CacheClientFactory.java
+++ b/library/src/main/java/com/chwl/library/utils/cache/CacheClientFactory.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils.cache;
+package com.chwl.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/chwl/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/chwl/library/utils/cache/CacheException.java
index 3f0cdadec..3fc35c395 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/CacheException.java
+++ b/library/src/main/java/com/chwl/library/utils/cache/CacheException.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils.cache;
+package com.chwl.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/chwl/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/chwl/library/utils/cache/CacheManager.java
index eae919cf7..7735daf0b 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/CacheManager.java
+++ b/library/src/main/java/com/chwl/library/utils/cache/CacheManager.java
@@ -1,13 +1,13 @@
-package com.yizhuan.xchat_android_library.utils.cache;
+package com.chwl.library.utils.cache;
 
 import android.content.Context;
 
-import com.yizhuan.xchat_android_library.utils.StringUtils;
-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.file.StorageUtils;
-import com.yizhuan.xchat_android_library.utils.json.JsonParser;
-import com.yizhuan.xchat_android_library.utils.log.MLog;
+import com.chwl.library.utils.StringUtils;
+import com.chwl.library.utils.codec.MD5Utils;
+import com.chwl.library.utils.config.BasicConfig;
+import com.chwl.library.utils.file.StorageUtils;
+import com.chwl.library.utils.json.JsonParser;
+import com.chwl.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/chwl/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/chwl/library/utils/cache/ErrorCallback.java
index 16f48337e..7771c83b9 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/ErrorCallback.java
+++ b/library/src/main/java/com/chwl/library/utils/cache/ErrorCallback.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils.cache;
+package com.chwl.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/chwl/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/chwl/library/utils/cache/NoSuchKeyException.java
index 95dad3029..15400bb3a 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/NoSuchKeyException.java
+++ b/library/src/main/java/com/chwl/library/utils/cache/NoSuchKeyException.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils.cache;
+package com.chwl.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/chwl/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/chwl/library/utils/cache/ReturnCallback.java
index 2b95e4d85..9a2f4aabb 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/ReturnCallback.java
+++ b/library/src/main/java/com/chwl/library/utils/cache/ReturnCallback.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils.cache;
+package com.chwl.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/chwl/library/utils/cache/StringDiskCache.java
similarity index 96%
rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/StringDiskCache.java
rename to library/src/main/java/com/chwl/library/utils/cache/StringDiskCache.java
index c902730be..827ba74ca 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/StringDiskCache.java
+++ b/library/src/main/java/com/chwl/library/utils/cache/StringDiskCache.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils.cache;
+package com.chwl.library.utils.cache;
 
 import android.annotation.TargetApi;
 import android.os.Build;
@@ -6,12 +6,12 @@ import android.os.Environment;
 import android.os.StatFs;
 import android.util.Log;
 
-import com.yizhuan.xchat_android_library.R;
-import com.yizhuan.xchat_android_library.common.file.FileHelper;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-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.chwl.library.R;
+import com.chwl.library.common.file.FileHelper;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.StringUtils;
+import com.chwl.library.utils.json.JsonParser;
+import com.chwl.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/chwl/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/chwl/library/utils/cache/StringLruCache.java
index 4cad75fde..3f21a34ff 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/StringLruCache.java
+++ b/library/src/main/java/com/chwl/library/utils/cache/StringLruCache.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils.cache;
+package com.chwl.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/chwl/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/chwl/library/utils/codec/Base64Utils.java
index 08ae1a001..2f92231df 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/codec/Base64Utils.java
+++ b/library/src/main/java/com/chwl/library/utils/codec/Base64Utils.java
@@ -1,11 +1,11 @@
-package com.yizhuan.xchat_android_library.utils.codec;
+package com.chwl.library.utils.codec;
 
 /**
  * Created by Zhanghuiping on 14/6/9.
  */
 
 
-import com.yizhuan.xchat_android_library.BuildConfig;
+import com.chwl.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/chwl/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/chwl/library/utils/codec/CipherHelper.java
index 18b3754a8..4ce061287 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/codec/CipherHelper.java
+++ b/library/src/main/java/com/chwl/library/utils/codec/CipherHelper.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_library.utils.codec;
+package com.chwl.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.chwl.library.utils.StringUtils;
+import com.chwl.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/chwl/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/chwl/library/utils/codec/DES3Utils.java
index b84c2b2da..b220a0e45 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/codec/DES3Utils.java
+++ b/library/src/main/java/com/chwl/library/utils/codec/DES3Utils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils.codec;
+package com.chwl.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/chwl/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/chwl/library/utils/codec/DESUtils.java
index a7979cd75..320fe9cc1 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/codec/DESUtils.java
+++ b/library/src/main/java/com/chwl/library/utils/codec/DESUtils.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_library.utils.codec;
+package com.chwl.library.utils.codec;
 
 import android.util.Base64;
 
-import com.yizhuan.xchat_android_library.utils.StringUtils;
+import com.chwl.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/chwl/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/chwl/library/utils/codec/MD5Utils.java
index 2ff985722..36c8b2803 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/codec/MD5Utils.java
+++ b/library/src/main/java/com/chwl/library/utils/codec/MD5Utils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils.codec;
+package com.chwl.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/chwl/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/chwl/library/utils/codec/RC4Utils.java
index 2b769d9c7..57847d568 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/codec/RC4Utils.java
+++ b/library/src/main/java/com/chwl/library/utils/codec/RC4Utils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils.codec;
+package com.chwl.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/chwl/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/chwl/library/utils/codec/SHAUtils.java
index 7d43558e2..7ebdad3fe 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/codec/SHAUtils.java
+++ b/library/src/main/java/com/chwl/library/utils/codec/SHAUtils.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_library.utils.codec;
+package com.chwl.library.utils.codec;
 
-import com.yizhuan.xchat_android_library.utils.log.MLog;
+import com.chwl.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/chwl/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/chwl/library/utils/config/BasicConfig.java
index 820eb64a5..c45c7c1b3 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/config/BasicConfig.java
+++ b/library/src/main/java/com/chwl/library/utils/config/BasicConfig.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils.config;
+package com.chwl.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.chwl.library.utils.cache.CacheClientFactory;
+import com.chwl.library.utils.file.StorageUtils;
+import com.chwl.library.utils.log.MLog;
 
 import java.io.File;
 
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/constant/PackageNameConstants.kt b/library/src/main/java/com/chwl/library/utils/constant/PackageNameConstants.kt
similarity index 83%
rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/constant/PackageNameConstants.kt
rename to library/src/main/java/com/chwl/library/utils/constant/PackageNameConstants.kt
index 03ea8ac55..8c674064d 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/constant/PackageNameConstants.kt
+++ b/library/src/main/java/com/chwl/library/utils/constant/PackageNameConstants.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils.constant
+package com.chwl.library.utils.constant
 
 /**
  * author: wushaocheng
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/file/BasicFileUtils.java b/library/src/main/java/com/chwl/library/utils/file/BasicFileUtils.java
similarity index 98%
rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/file/BasicFileUtils.java
rename to library/src/main/java/com/chwl/library/utils/file/BasicFileUtils.java
index dfdd8f538..aeebceecc 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/file/BasicFileUtils.java
+++ b/library/src/main/java/com/chwl/library/utils/file/BasicFileUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils.file;
+package com.chwl.library.utils.file;
 
 import android.content.Context;
 import android.media.MediaScannerConnection;
@@ -6,10 +6,10 @@ import android.os.Build;
 import android.os.Environment;
 import android.os.StatFs;
 
-import com.yizhuan.xchat_android_library.R;
-import com.yizhuan.xchat_android_library.utils.FP;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.log.MLog;
+import com.chwl.library.R;
+import com.chwl.library.utils.FP;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.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/chwl/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/chwl/library/utils/file/CMDExecute.java
index 3d2239cf7..8e843fb8d 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/file/CMDExecute.java
+++ b/library/src/main/java/com/chwl/library/utils/file/CMDExecute.java
@@ -1,5 +1,5 @@
 
-package com.yizhuan.xchat_android_library.utils.file;
+package com.chwl.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/chwl/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/chwl/library/utils/file/CustomFileException.java
index 18d49a93b..159124006 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/file/CustomFileException.java
+++ b/library/src/main/java/com/chwl/library/utils/file/CustomFileException.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils.file;
+package com.chwl.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/chwl/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/chwl/library/utils/file/FileNoSpaceException.java
index 2b8854c4b..c7ce52d1f 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/file/FileNoSpaceException.java
+++ b/library/src/main/java/com/chwl/library/utils/file/FileNoSpaceException.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils.file;
+package com.chwl.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/chwl/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/chwl/library/utils/file/JXFileUtils.java
index 2584d43f0..3920f0756 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/file/JXFileUtils.java
+++ b/library/src/main/java/com/chwl/library/utils/file/JXFileUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils.file;
+package com.chwl.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.BlankUtil;
-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.config.BasicConfig;
-import com.yizhuan.xchat_android_library.utils.log.MLog;
+import com.chwl.library.utils.BlankUtil;
+import com.chwl.library.utils.FP;
+import com.chwl.library.utils.StringUtils;
+import com.chwl.library.utils.codec.MD5Utils;
+import com.chwl.library.utils.config.BasicConfig;
+import com.chwl.library.utils.log.MLog;
 
 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/chwl/library/utils/file/StorageUtils.java
similarity index 98%
rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/file/StorageUtils.java
rename to library/src/main/java/com/chwl/library/utils/file/StorageUtils.java
index 1e23cca68..3722385ed 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/file/StorageUtils.java
+++ b/library/src/main/java/com/chwl/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.chwl.library.utils.file;
 
 import static android.os.Environment.MEDIA_MOUNTED;
 
@@ -23,10 +23,10 @@ import android.os.Build;
 import android.os.Environment;
 import android.text.TextUtils;
 
-import com.yizhuan.xchat_android_library.R;
-import com.yizhuan.xchat_android_library.common.file.FileHelper;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.StringUtils;
+import com.chwl.library.R;
+import com.chwl.library.common.file.FileHelper;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.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/chwl/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/chwl/library/utils/file/TargetNotPreparedException.java
index 1e65bc980..472d36804 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/file/TargetNotPreparedException.java
+++ b/library/src/main/java/com/chwl/library/utils/file/TargetNotPreparedException.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils.file;
+package com.chwl.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/chwl/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/chwl/library/utils/image/Blur.java
index 3fc4cbee4..1d22283dc 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/image/Blur.java
+++ b/library/src/main/java/com/chwl/library/utils/image/Blur.java
@@ -1,11 +1,11 @@
-package com.yizhuan.xchat_android_library.utils.image;
+package com.chwl.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.chwl.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/chwl/library/utils/image/JXImageUtils.java
similarity index 98%
rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/image/JXImageUtils.java
rename to library/src/main/java/com/chwl/library/utils/image/JXImageUtils.java
index afddac6dd..d6b38c889 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/image/JXImageUtils.java
+++ b/library/src/main/java/com/chwl/library/utils/image/JXImageUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils.image;
+package com.chwl.library.utils.image;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -19,12 +19,12 @@ import android.graphics.RectF;
 import android.media.ExifInterface;
 import android.util.Log;
 
-import com.yizhuan.xchat_android_library.R;
-import com.yizhuan.xchat_android_library.utils.LogUtil;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-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.chwl.library.R;
+import com.chwl.library.utils.LogUtil;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.StringUtils;
+import com.chwl.library.utils.file.JXFileUtils;
+import com.chwl.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/chwl/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/chwl/library/utils/json/JsonParser.java
index 41b0cf256..046e8800f 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/json/JsonParser.java
+++ b/library/src/main/java/com/chwl/library/utils/json/JsonParser.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils.json;
+package com.chwl.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.chwl.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/chwl/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/chwl/library/utils/json/JsonUtils.java
index 6c3c441d6..f84c404b8 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/json/JsonUtils.java
+++ b/library/src/main/java/com/chwl/library/utils/json/JsonUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils.json;
+package com.chwl.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/chwl/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/chwl/library/utils/keyboard/AutoActivityLifecycleCallback.java
index e2296ea7f..e00879712 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/keyboard/AutoActivityLifecycleCallback.java
+++ b/library/src/main/java/com/chwl/library/utils/keyboard/AutoActivityLifecycleCallback.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils.keyboard;
+package com.chwl.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/chwl/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/chwl/library/utils/keyboard/KeyboardUtil.java
index bd9f51352..186d19520 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/keyboard/KeyboardUtil.java
+++ b/library/src/main/java/com/chwl/library/utils/keyboard/KeyboardUtil.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils.keyboard;
+package com.chwl.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/chwl/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/chwl/library/utils/keyboard/KeyboardVisibilityEvent.java
index 760141b12..9d94cf77b 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/keyboard/KeyboardVisibilityEvent.java
+++ b/library/src/main/java/com/chwl/library/utils/keyboard/KeyboardVisibilityEvent.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils.keyboard;
+package com.chwl.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/chwl/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/chwl/library/utils/keyboard/KeyboardVisibilityEventListener.java
index 1b3ee3972..423089418 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/keyboard/KeyboardVisibilityEventListener.java
+++ b/library/src/main/java/com/chwl/library/utils/keyboard/KeyboardVisibilityEventListener.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils.keyboard;
+package com.chwl.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/chwl/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/chwl/library/utils/keyboard/SimpleUnregister.java
index 4580f9a94..93f50c7ce 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/keyboard/SimpleUnregister.java
+++ b/library/src/main/java/com/chwl/library/utils/keyboard/SimpleUnregister.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils.keyboard;
+package com.chwl.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/chwl/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/chwl/library/utils/keyboard/Unregister.java
index 31d644577..fe2ea6dd1 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/keyboard/Unregister.java
+++ b/library/src/main/java/com/chwl/library/utils/keyboard/Unregister.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils.keyboard;
+package com.chwl.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/chwl/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/chwl/library/utils/log/FastDateFormat.java
index 8d5f29520..8b13709d2 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/log/FastDateFormat.java
+++ b/library/src/main/java/com/chwl/library/utils/log/FastDateFormat.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils.log;
+package com.chwl.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/chwl/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/chwl/library/utils/log/FormatCache.java
index 659e04d7d..77935b114 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/log/FormatCache.java
+++ b/library/src/main/java/com/chwl/library/utils/log/FormatCache.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils.log;
+package com.chwl.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/chwl/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/chwl/library/utils/log/LogToES.java
index 276efeee9..e63afdadf 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/log/LogToES.java
+++ b/library/src/main/java/com/chwl/library/utils/log/LogToES.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils.log;
+package com.chwl.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/chwl/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/chwl/library/utils/log/MLog.java
index 9497a103c..31f72bc28 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/log/MLog.java
+++ b/library/src/main/java/com/chwl/library/utils/log/MLog.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils.log;
+package com.chwl.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.FP;
-import com.yizhuan.xchat_android_library.utils.LogCallerUtils;
-import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
+import com.chwl.library.utils.FP;
+import com.chwl.library.utils.LogCallerUtils;
+import com.chwl.library.utils.config.BasicConfig;
 
 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/chwl/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/chwl/library/utils/net/MobileNumberUtils.java
index 290fa79e2..c65b4dd85 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/net/MobileNumberUtils.java
+++ b/library/src/main/java/com/chwl/library/utils/net/MobileNumberUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils.net;
+package com.chwl.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/chwl/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/chwl/library/utils/net/NetworkMonitor.java
index 5a9838c48..0f2894d57 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/net/NetworkMonitor.java
+++ b/library/src/main/java/com/chwl/library/utils/net/NetworkMonitor.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils.net;
+package com.chwl.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.chwl.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/chwl/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/chwl/library/utils/pref/CommonPref.java
index 377229b67..e4ea30a94 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/pref/CommonPref.java
+++ b/library/src/main/java/com/chwl/library/utils/pref/CommonPref.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils.pref;
+package com.chwl.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/chwl/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/chwl/library/utils/pref/ObjectPref.java
index c84a350c2..ba5857d49 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/pref/ObjectPref.java
+++ b/library/src/main/java/com/chwl/library/utils/pref/ObjectPref.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_library.utils.pref;
+package com.chwl.library.utils.pref;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 
-import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
+import com.chwl.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/chwl/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/chwl/library/utils/pref/SettingsPref.java
index 618c8e646..ac93b4b6e 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/pref/SettingsPref.java
+++ b/library/src/main/java/com/chwl/library/utils/pref/SettingsPref.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_library.utils.pref;
+package com.chwl.library.utils.pref;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 
-import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
+import com.chwl.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/chwl/library/utils/pref/XSharedPref.java
similarity index 98%
rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/pref/XSharedPref.java
rename to library/src/main/java/com/chwl/library/utils/pref/XSharedPref.java
index 023429fb8..bfc623545 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/pref/XSharedPref.java
+++ b/library/src/main/java/com/chwl/library/utils/pref/XSharedPref.java
@@ -1,11 +1,11 @@
-package com.yizhuan.xchat_android_library.utils.pref;
+package com.chwl.library.utils.pref;
 
 import android.content.SharedPreferences;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.yizhuan.xchat_android_library.R;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.library.R;
+import com.chwl.library.utils.ResUtil;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/pref/YSharedPref.java b/library/src/main/java/com/chwl/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/chwl/library/utils/pref/YSharedPref.java
index 03f1945bd..67d2f7b4c 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/pref/YSharedPref.java
+++ b/library/src/main/java/com/chwl/library/utils/pref/YSharedPref.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_library.utils.pref;
+package com.chwl.library.utils.pref;
 
 import android.content.SharedPreferences;
 import android.text.TextUtils;
 
-import com.yizhuan.xchat_android_library.utils.log.MLog;
+import com.chwl.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/chwl/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/chwl/library/utils/valid/Validateable.java
index 0f90da5c5..afb3e5df2 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/valid/Validateable.java
+++ b/library/src/main/java/com/chwl/library/utils/valid/Validateable.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.utils.valid;
+package com.chwl.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/chwl/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/chwl/library/utils/valid/Validation.java
index a976dbcb8..02528e492 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/valid/Validation.java
+++ b/library/src/main/java/com/chwl/library/utils/valid/Validation.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_library.utils.valid;
+package com.chwl.library.utils.valid;
 
 
-import com.yizhuan.xchat_android_library.utils.BlankUtil;
-import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
+import com.chwl.library.utils.BlankUtil;
+import com.chwl.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/chwl/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/chwl/library/widget/DrawableCenterTextView.java
index 8177a70ff..72dacfc9b 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/widget/DrawableCenterTextView.java
+++ b/library/src/main/java/com/chwl/library/widget/DrawableCenterTextView.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.widget;
+package com.chwl.library.widget;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -6,7 +6,7 @@ import android.util.AttributeSet;
 
 import androidx.annotation.Nullable;
 
-import com.yizhuan.xchat_android_library.utils.CenterDrawableHelper;
+import com.chwl.library.utils.CenterDrawableHelper;
 
 
 /**
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/widget/IOSSwitchView.java b/library/src/main/java/com/chwl/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/chwl/library/widget/IOSSwitchView.java
index 97dc21b30..e42a08816 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/widget/IOSSwitchView.java
+++ b/library/src/main/java/com/chwl/library/widget/IOSSwitchView.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.widget;
+package com.chwl.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.chwl.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/chwl/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/chwl/library/widget/ShapeConstrainLayout.java
index bc3639c20..68a62941a 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/widget/ShapeConstrainLayout.java
+++ b/library/src/main/java/com/chwl/library/widget/ShapeConstrainLayout.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.widget;
+package com.chwl.library.widget;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -8,7 +8,7 @@ import android.util.AttributeSet;
 
 import androidx.constraintlayout.widget.ConstraintLayout;
 
-import com.yizhuan.xchat_android_library.R;
+import com.chwl.library.R;
 
 /**
  * 带圆角的约束布局
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/widget/ViewItem.java b/library/src/main/java/com/chwl/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/chwl/library/widget/ViewItem.java
index f7c02c9c1..40bd983de 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/widget/ViewItem.java
+++ b/library/src/main/java/com/chwl/library/widget/ViewItem.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_library.widget;
+package com.chwl.library.widget;
 
-import com.yizhuan.xchat_android_library.R;
+import com.chwl.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/chwl/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/chwl/library/widget/decoration/RowColumnDifItemDecoration.java
index 2446732e5..6388eba77 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/widget/decoration/RowColumnDifItemDecoration.java
+++ b/library/src/main/java/com/chwl/library/widget/decoration/RowColumnDifItemDecoration.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.widget.decoration;
+package com.chwl.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/chwl/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/chwl/library/widget/xlist/FamiliarDefaultItemDecoration.java
index f43f9e687..9acd2de1f 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/widget/xlist/FamiliarDefaultItemDecoration.java
+++ b/library/src/main/java/com/chwl/library/widget/xlist/FamiliarDefaultItemDecoration.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.widget.xlist;
+package com.chwl.library.widget.xlist;
 
 import android.graphics.Canvas;
 import android.graphics.Rect;
@@ -12,8 +12,8 @@ import androidx.recyclerview.widget.OrientationHelper;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 
-import com.yizhuan.xchat_android_library.R;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.library.R;
+import com.chwl.library.utils.ResUtil;
 
 /**
  * FamiliarRecyclerView Default ItemDecoration
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/widget/xlist/FamiliarRecyclerView.java b/library/src/main/java/com/chwl/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/chwl/library/widget/xlist/FamiliarRecyclerView.java
index c3fb1d6f7..229a23b0f 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/widget/xlist/FamiliarRecyclerView.java
+++ b/library/src/main/java/com/chwl/library/widget/xlist/FamiliarRecyclerView.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.widget.xlist;
+package com.chwl.library.widget.xlist;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -12,7 +12,7 @@ import androidx.recyclerview.widget.OrientationHelper;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 
-import com.yizhuan.xchat_android_library.R;
+import com.chwl.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..79935c5d5 100644
--- a/library/src/main/res/layout/swipeback_layout.xml
+++ b/library/src/main/res/layout/swipeback_layout.xml
@@ -1,5 +1,5 @@
 
- extends AppCompatActivity implements ISupportActivity {
     private final String TAG = getClass().getSimpleName();
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/base/BaseDialogFragment.java b/library/src/module_common/java/com/chwl/library/common/base/BaseDialogFragment.java
similarity index 92%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/base/BaseDialogFragment.java
rename to library/src/module_common/java/com/chwl/library/common/base/BaseDialogFragment.java
index 285741046..07b5fd41e 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/base/BaseDialogFragment.java
+++ b/library/src/module_common/java/com/chwl/library/common/base/BaseDialogFragment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.common.base;
+package com.chwl.library.common.base;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -14,13 +14,13 @@ import androidx.annotation.Nullable;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.viewbinding.ViewBinding;
-import com.yizhuan.xchat_android_library.common.fragmentation.ISupportActivity;
-import com.yizhuan.xchat_android_library.common.fragmentation.ISupportFragment;
-import com.yizhuan.xchat_android_library.common.fragmentation.SupportFragmentDelegate;
-import com.yizhuan.xchat_android_library.common.fragmentation.windowcallback.WindowCallbackProxyUtil;
-import com.yizhuan.xchat_android_library.common.util.ActivityHelper;
-import com.yizhuan.xchat_android_library.common.util.Logger;
-import com.yizhuan.xchat_android_library.common.util.ViewBindingUtil;
+import com.chwl.library.common.fragmentation.ISupportActivity;
+import com.chwl.library.common.fragmentation.ISupportFragment;
+import com.chwl.library.common.fragmentation.SupportFragmentDelegate;
+import com.chwl.library.common.fragmentation.windowcallback.WindowCallbackProxyUtil;
+import com.chwl.library.common.util.ActivityHelper;
+import com.chwl.library.common.util.Logger;
+import com.chwl.library.common.util.ViewBindingUtil;
 
 public abstract class BaseDialogFragment extends DialogFragment implements ISupportFragment {
     private final String TAG = getClass().getSimpleName();
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/base/BaseLinearLayout.java b/library/src/module_common/java/com/chwl/library/common/base/BaseLinearLayout.java
similarity index 95%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/base/BaseLinearLayout.java
rename to library/src/module_common/java/com/chwl/library/common/base/BaseLinearLayout.java
index 4825224e2..8ac9cd1bb 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/base/BaseLinearLayout.java
+++ b/library/src/module_common/java/com/chwl/library/common/base/BaseLinearLayout.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.common.base;
+package com.chwl.library.common.base;
 
 import android.app.Activity;
 import android.content.Context;
@@ -13,8 +13,8 @@ import androidx.lifecycle.DefaultLifecycleObserver;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.viewbinding.ViewBinding;
 
-import com.yizhuan.xchat_android_library.common.util.ActivityHelper;
-import com.yizhuan.xchat_android_library.common.util.ViewBindingUtil;
+import com.chwl.library.common.util.ActivityHelper;
+import com.chwl.library.common.util.ViewBindingUtil;
 
 public abstract class BaseLinearLayout extends LinearLayout implements DefaultLifecycleObserver {
     private boolean mViewCreatedCalled = false;
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/base/BaseViewTag.java b/library/src/module_common/java/com/chwl/library/common/base/BaseViewTag.java
similarity index 96%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/base/BaseViewTag.java
rename to library/src/module_common/java/com/chwl/library/common/base/BaseViewTag.java
index 33de1d5cd..9da858b87 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/base/BaseViewTag.java
+++ b/library/src/module_common/java/com/chwl/library/common/base/BaseViewTag.java
@@ -1,13 +1,13 @@
-package com.yizhuan.xchat_android_library.common.base;
+package com.chwl.library.common.base;
 
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;
 import androidx.lifecycle.LifecycleObserver;
 import androidx.lifecycle.LifecycleOwner;
-import com.yizhuan.xchat_android_library.R;
+import com.chwl.library.R;
 
-import com.yizhuan.xchat_android_library.common.util.Logger;
+import com.chwl.library.common.util.Logger;
 
 /**
  * author: wushaocheng
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/delegate/SpDelegate.kt b/library/src/module_common/java/com/chwl/library/common/delegate/SpDelegate.kt
similarity index 90%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/delegate/SpDelegate.kt
rename to library/src/module_common/java/com/chwl/library/common/delegate/SpDelegate.kt
index a607c75cc..66f6b71f0 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/delegate/SpDelegate.kt
+++ b/library/src/module_common/java/com/chwl/library/common/delegate/SpDelegate.kt
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_library.common.delegate
+package com.chwl.library.common.delegate
 
-import com.yizhuan.xchat_android_library.common.application.BaseApp
-import com.yizhuan.xchat_android_library.common.util.SPUtils
+import com.chwl.library.common.application.BaseApp
+import com.chwl.library.common.util.SPUtils
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
 
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/entity/CommonTabEntity.kt b/library/src/module_common/java/com/chwl/library/common/entity/CommonTabEntity.kt
similarity index 76%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/entity/CommonTabEntity.kt
rename to library/src/module_common/java/com/chwl/library/common/entity/CommonTabEntity.kt
index 0e2fd0ffd..a9981f19a 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/entity/CommonTabEntity.kt
+++ b/library/src/module_common/java/com/chwl/library/common/entity/CommonTabEntity.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.common.entity
+package com.chwl.library.common.entity
 
 import androidx.fragment.app.Fragment
 
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/file/FileHelper.java b/library/src/module_common/java/com/chwl/library/common/file/FileHelper.java
similarity index 99%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/file/FileHelper.java
rename to library/src/module_common/java/com/chwl/library/common/file/FileHelper.java
index 24bc5948d..75ff15d8d 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/file/FileHelper.java
+++ b/library/src/module_common/java/com/chwl/library/common/file/FileHelper.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.common.file;
+package com.chwl.library.common.file;
 
 import android.graphics.Bitmap;
 import android.net.Uri;
@@ -6,9 +6,9 @@ import android.os.Environment;
 import android.text.TextUtils;
 
 import com.qiniu.android.utils.StringUtils;
-import com.yizhuan.xchat_android_library.common.application.BaseApp;
-import com.yizhuan.xchat_android_library.common.util.Logger;
-import com.yizhuan.xchat_android_library.utils.FP;
+import com.chwl.library.common.application.BaseApp;
+import com.chwl.library.common.util.Logger;
+import com.chwl.library.utils.FP;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/ISupportActivity.java b/library/src/module_common/java/com/chwl/library/common/fragmentation/ISupportActivity.java
similarity index 75%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/ISupportActivity.java
rename to library/src/module_common/java/com/chwl/library/common/fragmentation/ISupportActivity.java
index bbb4e3d72..591177078 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/ISupportActivity.java
+++ b/library/src/module_common/java/com/chwl/library/common/fragmentation/ISupportActivity.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.common.fragmentation;
+package com.chwl.library.common.fragmentation;
 
 /**
  * Created by YoKey on 17/6/13.
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/ISupportFragment.java b/library/src/module_common/java/com/chwl/library/common/fragmentation/ISupportFragment.java
similarity index 91%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/ISupportFragment.java
rename to library/src/module_common/java/com/chwl/library/common/fragmentation/ISupportFragment.java
index 2c04b25e0..1d82d12a5 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/ISupportFragment.java
+++ b/library/src/module_common/java/com/chwl/library/common/fragmentation/ISupportFragment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.common.fragmentation;
+package com.chwl.library.common.fragmentation;
 
 import android.os.Bundle;
 
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/SupportActivityDelegate.java b/library/src/module_common/java/com/chwl/library/common/fragmentation/SupportActivityDelegate.java
similarity index 96%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/SupportActivityDelegate.java
rename to library/src/module_common/java/com/chwl/library/common/fragmentation/SupportActivityDelegate.java
index 67e66c3db..7e09ea34b 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/SupportActivityDelegate.java
+++ b/library/src/module_common/java/com/chwl/library/common/fragmentation/SupportActivityDelegate.java
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_library.common.fragmentation;
+package com.chwl.library.common.fragmentation;
 
 import androidx.core.app.ActivityCompat;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 
-import com.yizhuan.xchat_android_library.common.fragmentation.queue.Action;
+import com.chwl.library.common.fragmentation.queue.Action;
 
 public class SupportActivityDelegate {
     private final ISupportActivity mSupport;
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/SupportFragmentDelegate.java b/library/src/module_common/java/com/chwl/library/common/fragmentation/SupportFragmentDelegate.java
similarity index 96%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/SupportFragmentDelegate.java
rename to library/src/module_common/java/com/chwl/library/common/fragmentation/SupportFragmentDelegate.java
index fb22809e9..b77fc704b 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/SupportFragmentDelegate.java
+++ b/library/src/module_common/java/com/chwl/library/common/fragmentation/SupportFragmentDelegate.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.common.fragmentation;
+package com.chwl.library.common.fragmentation;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -11,8 +11,8 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 
-import com.yizhuan.xchat_android_library.common.fragmentation.internal.ResultRecord;
-import com.yizhuan.xchat_android_library.common.fragmentation.internal.TransactionRecord;
+import com.chwl.library.common.fragmentation.internal.ResultRecord;
+import com.chwl.library.common.fragmentation.internal.TransactionRecord;
 
 public class SupportFragmentDelegate {
     int mContainerId;
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/SupportHelper.java b/library/src/module_common/java/com/chwl/library/common/fragmentation/SupportHelper.java
similarity index 99%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/SupportHelper.java
rename to library/src/module_common/java/com/chwl/library/common/fragmentation/SupportHelper.java
index 3f267d61c..a3efae8e0 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/SupportHelper.java
+++ b/library/src/module_common/java/com/chwl/library/common/fragmentation/SupportHelper.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.common.fragmentation;
+package com.chwl.library.common.fragmentation;
 
 import android.content.Context;
 import android.view.View;
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/TransactionDelegate.java b/library/src/module_common/java/com/chwl/library/common/fragmentation/TransactionDelegate.java
similarity index 96%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/TransactionDelegate.java
rename to library/src/module_common/java/com/chwl/library/common/fragmentation/TransactionDelegate.java
index f79af3e49..1bfe2aeb4 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/TransactionDelegate.java
+++ b/library/src/module_common/java/com/chwl/library/common/fragmentation/TransactionDelegate.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.common.fragmentation;
+package com.chwl.library.common.fragmentation;
 
 import android.os.Bundle;
 import android.os.Handler;
@@ -9,10 +9,10 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 
-import com.yizhuan.xchat_android_library.common.fragmentation.internal.ResultRecord;
-import com.yizhuan.xchat_android_library.common.fragmentation.internal.TransactionRecord;
-import com.yizhuan.xchat_android_library.common.fragmentation.queue.Action;
-import com.yizhuan.xchat_android_library.common.fragmentation.queue.ActionQueue;
+import com.chwl.library.common.fragmentation.internal.ResultRecord;
+import com.chwl.library.common.fragmentation.internal.TransactionRecord;
+import com.chwl.library.common.fragmentation.queue.Action;
+import com.chwl.library.common.fragmentation.queue.ActionQueue;
 
 import java.util.List;
 
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/internal/ResultRecord.java b/library/src/module_common/java/com/chwl/library/common/fragmentation/internal/ResultRecord.java
similarity index 93%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/internal/ResultRecord.java
rename to library/src/module_common/java/com/chwl/library/common/fragmentation/internal/ResultRecord.java
index 2d6b78a4a..002a0f353 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/internal/ResultRecord.java
+++ b/library/src/module_common/java/com/chwl/library/common/fragmentation/internal/ResultRecord.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.common.fragmentation.internal;
+package com.chwl.library.common.fragmentation.internal;
 
 import android.os.Bundle;
 import android.os.Parcel;
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/internal/TransactionRecord.java b/library/src/module_common/java/com/chwl/library/common/fragmentation/internal/TransactionRecord.java
similarity index 68%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/internal/TransactionRecord.java
rename to library/src/module_common/java/com/chwl/library/common/fragmentation/internal/TransactionRecord.java
index df7ae377d..1e942bfc8 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/internal/TransactionRecord.java
+++ b/library/src/module_common/java/com/chwl/library/common/fragmentation/internal/TransactionRecord.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.common.fragmentation.internal;
+package com.chwl.library.common.fragmentation.internal;
 
 /**
  * @hide Created by YoKey on 16/11/25.
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/queue/Action.java b/library/src/module_common/java/com/chwl/library/common/fragmentation/queue/Action.java
similarity index 92%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/queue/Action.java
rename to library/src/module_common/java/com/chwl/library/common/fragmentation/queue/Action.java
index da267a861..88fbdb168 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/queue/Action.java
+++ b/library/src/module_common/java/com/chwl/library/common/fragmentation/queue/Action.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.common.fragmentation.queue;
+package com.chwl.library.common.fragmentation.queue;
 
 import androidx.fragment.app.FragmentManager;
 
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/queue/ActionQueue.java b/library/src/module_common/java/com/chwl/library/common/fragmentation/queue/ActionQueue.java
similarity index 96%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/queue/ActionQueue.java
rename to library/src/module_common/java/com/chwl/library/common/fragmentation/queue/ActionQueue.java
index 4bb54a96a..d984a4b28 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/queue/ActionQueue.java
+++ b/library/src/module_common/java/com/chwl/library/common/fragmentation/queue/ActionQueue.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.common.fragmentation.queue;
+package com.chwl.library.common.fragmentation.queue;
 
 import android.os.Handler;
 import android.os.Looper;
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/windowcallback/IWindowCallbackProxy.kt b/library/src/module_common/java/com/chwl/library/common/fragmentation/windowcallback/IWindowCallbackProxy.kt
similarity index 75%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/windowcallback/IWindowCallbackProxy.kt
rename to library/src/module_common/java/com/chwl/library/common/fragmentation/windowcallback/IWindowCallbackProxy.kt
index 2e3aa1817..2383da913 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/windowcallback/IWindowCallbackProxy.kt
+++ b/library/src/module_common/java/com/chwl/library/common/fragmentation/windowcallback/IWindowCallbackProxy.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.common.fragmentation.windowcallback
+package com.chwl.library.common.fragmentation.windowcallback
 
 import android.view.Window
 
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/windowcallback/WindowCallbackProxyUtil.kt b/library/src/module_common/java/com/chwl/library/common/fragmentation/windowcallback/WindowCallbackProxyUtil.kt
similarity index 88%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/windowcallback/WindowCallbackProxyUtil.kt
rename to library/src/module_common/java/com/chwl/library/common/fragmentation/windowcallback/WindowCallbackProxyUtil.kt
index f23a9504f..d5d226f13 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/windowcallback/WindowCallbackProxyUtil.kt
+++ b/library/src/module_common/java/com/chwl/library/common/fragmentation/windowcallback/WindowCallbackProxyUtil.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.common.fragmentation.windowcallback
+package com.chwl.library.common.fragmentation.windowcallback
 
 import android.view.Window
 
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/glide/GlideEngine.java b/library/src/module_common/java/com/chwl/library/common/glide/GlideEngine.java
similarity index 94%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/glide/GlideEngine.java
rename to library/src/module_common/java/com/chwl/library/common/glide/GlideEngine.java
index 09f4bf804..c60d15a06 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/glide/GlideEngine.java
+++ b/library/src/module_common/java/com/chwl/library/common/glide/GlideEngine.java
@@ -1,11 +1,11 @@
-package com.yizhuan.xchat_android_library.common.glide;
+package com.chwl.library.common.glide;
 
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.widget.ImageView;
 import androidx.annotation.NonNull;
-import com.yizhuan.xchat_android_library.easyphoto.engine.ImageEngine;
+import com.chwl.library.easyphoto.engine.ImageEngine;
 
 /**
  * Created by wushaocheng on 2021/3/29  15:18.
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/glide/GlideUtils.kt b/library/src/module_common/java/com/chwl/library/common/glide/GlideUtils.kt
similarity index 99%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/glide/GlideUtils.kt
rename to library/src/module_common/java/com/chwl/library/common/glide/GlideUtils.kt
index 652276a4f..a204ecf15 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/glide/GlideUtils.kt
+++ b/library/src/module_common/java/com/chwl/library/common/glide/GlideUtils.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.common.glide
+package com.chwl.library.common.glide
 
 import android.app.Activity
 import android.app.Application
@@ -27,11 +27,11 @@ import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
 import com.bumptech.glide.request.RequestListener
 import com.bumptech.glide.request.target.DrawableImageViewTarget
 import com.bumptech.glide.request.target.Target
-import com.yizhuan.xchat_android_library.common.transform.AssignScaleTransformation
-import com.yizhuan.xchat_android_library.common.transform.ComplexTransformation
-import com.yizhuan.xchat_android_library.common.util.ActivityHelper
-import com.yizhuan.xchat_android_library.common.util.Logger
-import com.yizhuan.xchat_android_library.common.util.Utils
+import com.chwl.library.common.transform.AssignScaleTransformation
+import com.chwl.library.common.transform.ComplexTransformation
+import com.chwl.library.common.util.ActivityHelper
+import com.chwl.library.common.util.Logger
+import com.chwl.library.common.util.Utils
 import jp.wasabeef.glide.transformations.RoundedCornersTransformation
 import java.io.File
 
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/photo/PhotoProviderNew.kt b/library/src/module_common/java/com/chwl/library/common/photo/PhotoProviderNew.kt
similarity index 93%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/photo/PhotoProviderNew.kt
rename to library/src/module_common/java/com/chwl/library/common/photo/PhotoProviderNew.kt
index 86a7e3c33..88dbcff43 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/photo/PhotoProviderNew.kt
+++ b/library/src/module_common/java/com/chwl/library/common/photo/PhotoProviderNew.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.common.photo
+package com.chwl.library.common.photo
 
 import android.app.Activity
 import android.content.Intent
@@ -7,16 +7,16 @@ import android.os.Build
 import android.os.Environment
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
-import com.yizhuan.xchat_android_library.common.application.BaseApp
-import com.yizhuan.xchat_android_library.common.delegate.SpDelegate
-import com.yizhuan.xchat_android_library.common.file.FileHelper
-import com.yizhuan.xchat_android_library.common.glide.GlideEngine
-import com.yizhuan.xchat_android_library.common.util.Logger
-import com.yizhuan.xchat_android_library.easyphoto.EasyPhotos
-import com.yizhuan.xchat_android_library.easyphoto.constant.Type.*
-import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo
-import com.yizhuan.xchat_android_library.utils.TimeUtils
-import com.yizhuan.xchat_android_library.utils.TimeUtils.TIME_FORMAT
+import com.chwl.library.common.application.BaseApp
+import com.chwl.library.common.delegate.SpDelegate
+import com.chwl.library.common.file.FileHelper
+import com.chwl.library.common.glide.GlideEngine
+import com.chwl.library.common.util.Logger
+import com.chwl.library.easyphoto.EasyPhotos
+import com.chwl.library.easyphoto.constant.Type.*
+import com.chwl.library.easyphoto.models.album.entity.Photo
+import com.chwl.library.utils.TimeUtils
+import com.chwl.library.utils.TimeUtils.TIME_FORMAT
 import kotlinx.coroutines.*
 import java.io.File
 
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/transform/AssignScaleTransformation.kt b/library/src/module_common/java/com/chwl/library/common/transform/AssignScaleTransformation.kt
similarity index 98%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/transform/AssignScaleTransformation.kt
rename to library/src/module_common/java/com/chwl/library/common/transform/AssignScaleTransformation.kt
index c0886fe2f..455ec2473 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/transform/AssignScaleTransformation.kt
+++ b/library/src/module_common/java/com/chwl/library/common/transform/AssignScaleTransformation.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.common.transform
+package com.chwl.library.common.transform
 
 import android.graphics.Bitmap
 import android.graphics.Canvas
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/transform/ComplexTransformation.java b/library/src/module_common/java/com/chwl/library/common/transform/ComplexTransformation.java
similarity index 98%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/transform/ComplexTransformation.java
rename to library/src/module_common/java/com/chwl/library/common/transform/ComplexTransformation.java
index e8132cedc..faa10f13f 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/transform/ComplexTransformation.java
+++ b/library/src/module_common/java/com/chwl/library/common/transform/ComplexTransformation.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.common.transform;
+package com.chwl.library.common.transform;
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapShader;
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/ActivityHelper.java b/library/src/module_common/java/com/chwl/library/common/util/ActivityHelper.java
similarity index 96%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/ActivityHelper.java
rename to library/src/module_common/java/com/chwl/library/common/util/ActivityHelper.java
index 89015a5f3..f4154affc 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/ActivityHelper.java
+++ b/library/src/module_common/java/com/chwl/library/common/util/ActivityHelper.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.common.util;
+package com.chwl.library.common.util;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/AlbumUtils.kt b/library/src/module_common/java/com/chwl/library/common/util/AlbumUtils.kt
similarity index 97%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/AlbumUtils.kt
rename to library/src/module_common/java/com/chwl/library/common/util/AlbumUtils.kt
index c8975a6e8..ab15f4e2f 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/AlbumUtils.kt
+++ b/library/src/module_common/java/com/chwl/library/common/util/AlbumUtils.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.common.util
+package com.chwl.library.common.util
 
 import android.content.ContentValues
 import android.content.Context
@@ -10,9 +10,9 @@ import com.bumptech.glide.load.DataSource
 import com.bumptech.glide.load.engine.GlideException
 import com.bumptech.glide.request.RequestListener
 import com.bumptech.glide.request.target.Target
-import com.yizhuan.xchat_android_library.common.application.BaseApp
-import com.yizhuan.xchat_android_library.common.file.FileHelper
-import com.yizhuan.xchat_android_library.common.glide.GlideUtils
+import com.chwl.library.common.application.BaseApp
+import com.chwl.library.common.file.FileHelper
+import com.chwl.library.common.glide.GlideUtils
 import java.io.*
 
 /**
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/ClickUtils.kt b/library/src/module_common/java/com/chwl/library/common/util/ClickUtils.kt
similarity index 97%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/ClickUtils.kt
rename to library/src/module_common/java/com/chwl/library/common/util/ClickUtils.kt
index d959c89e1..a327501e8 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/ClickUtils.kt
+++ b/library/src/module_common/java/com/chwl/library/common/util/ClickUtils.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.common.util
+package com.chwl.library.common.util
 
 import android.view.View
 
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/Config.java b/library/src/module_common/java/com/chwl/library/common/util/Config.java
similarity index 98%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/Config.java
rename to library/src/module_common/java/com/chwl/library/common/util/Config.java
index 78478aa2a..7493d6531 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/Config.java
+++ b/library/src/module_common/java/com/chwl/library/common/util/Config.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.common.util;
+package com.chwl.library.common.util;
 
 import android.content.Context;
 import android.content.SharedPreferences;
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/CoreUtils.java b/library/src/module_common/java/com/chwl/library/common/util/CoreUtils.java
similarity index 96%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/CoreUtils.java
rename to library/src/module_common/java/com/chwl/library/common/util/CoreUtils.java
index 2f46e5361..2f9847517 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/CoreUtils.java
+++ b/library/src/module_common/java/com/chwl/library/common/util/CoreUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.common.util;
+package com.chwl.library.common.util;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.EventBusException;
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/DeviceUtil.kt b/library/src/module_common/java/com/chwl/library/common/util/DeviceUtil.kt
similarity index 98%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/DeviceUtil.kt
rename to library/src/module_common/java/com/chwl/library/common/util/DeviceUtil.kt
index 41a4d9a59..579b89cbb 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/DeviceUtil.kt
+++ b/library/src/module_common/java/com/chwl/library/common/util/DeviceUtil.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.common.util
+package com.chwl.library.common.util
 
 import android.annotation.SuppressLint
 import android.app.ActivityManager
@@ -9,7 +9,7 @@ import android.provider.Settings
 import android.telephony.TelephonyManager
 import android.text.TextUtils
 import com.ut.device.UTDevice
-import com.yizhuan.xchat_android_library.common.application.BaseApp
+import com.chwl.library.common.application.BaseApp
 import java.io.RandomAccessFile
 import java.util.*
 
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/DoubleUtils.java b/library/src/module_common/java/com/chwl/library/common/util/DoubleUtils.java
similarity index 98%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/DoubleUtils.java
rename to library/src/module_common/java/com/chwl/library/common/util/DoubleUtils.java
index 399ea8c0f..f99ee30a3 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/DoubleUtils.java
+++ b/library/src/module_common/java/com/chwl/library/common/util/DoubleUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.common.util;
+package com.chwl.library.common.util;
 
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/ExecutorCenter.java b/library/src/module_common/java/com/chwl/library/common/util/ExecutorCenter.java
similarity index 96%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/ExecutorCenter.java
rename to library/src/module_common/java/com/chwl/library/common/util/ExecutorCenter.java
index 78cbb70f9..4f69b942e 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/ExecutorCenter.java
+++ b/library/src/module_common/java/com/chwl/library/common/util/ExecutorCenter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.common.util;
+package com.chwl.library.common.util;
 
 import java.util.concurrent.Executor;
 import java.util.concurrent.Future;
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/LimitClickUtils.java b/library/src/module_common/java/com/chwl/library/common/util/LimitClickUtils.java
similarity index 96%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/LimitClickUtils.java
rename to library/src/module_common/java/com/chwl/library/common/util/LimitClickUtils.java
index 1df44e0f2..6d53fc675 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/LimitClickUtils.java
+++ b/library/src/module_common/java/com/chwl/library/common/util/LimitClickUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.common.util;
+package com.chwl.library.common.util;
 
 import java.util.Calendar;
 import java.util.HashMap;
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/Logger.java b/library/src/module_common/java/com/chwl/library/common/util/Logger.java
similarity index 98%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/Logger.java
rename to library/src/module_common/java/com/chwl/library/common/util/Logger.java
index 663c4ae31..1bbfe16fb 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/Logger.java
+++ b/library/src/module_common/java/com/chwl/library/common/util/Logger.java
@@ -4,7 +4,7 @@
  * 使用前需要先调用init初始化
  * 内部使用android的Log类实现，并支持写入文件
  */
-package com.yizhuan.xchat_android_library.common.util;
+package com.chwl.library.common.util;
 
 import android.annotation.SuppressLint;
 import android.os.Bundle;
@@ -12,9 +12,9 @@ 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.config.BasicConfig;
-import com.yizhuan.xchat_android_library.utils.log.MLog;
+import com.chwl.library.utils.StringUtils;
+import com.chwl.library.utils.config.BasicConfig;
+import com.chwl.library.utils.log.MLog;
 
 import java.io.BufferedWriter;
 import java.io.File;
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/PhotoCompressUtil.kt b/library/src/module_common/java/com/chwl/library/common/util/PhotoCompressUtil.kt
similarity index 95%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/PhotoCompressUtil.kt
rename to library/src/module_common/java/com/chwl/library/common/util/PhotoCompressUtil.kt
index 1c55fc230..b380af347 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/PhotoCompressUtil.kt
+++ b/library/src/module_common/java/com/chwl/library/common/util/PhotoCompressUtil.kt
@@ -1,13 +1,13 @@
-package com.yizhuan.xchat_android_library.common.util
+package com.chwl.library.common.util
 
 import android.content.Context
 import android.os.Environment
 import android.text.TextUtils
 import android.util.Log
-import com.yizhuan.xchat_android_library.luban.Luban
-import com.yizhuan.xchat_android_library.common.file.FileHelper
-import com.yizhuan.xchat_android_library.common.Constants
-import com.yizhuan.xchat_android_library.common.application.BaseApp
+import com.chwl.library.luban.Luban
+import com.chwl.library.common.file.FileHelper
+import com.chwl.library.common.Constants
+import com.chwl.library.common.application.BaseApp
 import kotlinx.coroutines.*
 import java.io.File
 
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/Pools.java b/library/src/module_common/java/com/chwl/library/common/util/Pools.java
similarity index 96%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/Pools.java
rename to library/src/module_common/java/com/chwl/library/common/util/Pools.java
index c370464de..83f8e452b 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/Pools.java
+++ b/library/src/module_common/java/com/chwl/library/common/util/Pools.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.common.util;
+package com.chwl.library.common.util;
 
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.ThreadFactory;
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/ReflectionUtils.java b/library/src/module_common/java/com/chwl/library/common/util/ReflectionUtils.java
similarity index 95%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/ReflectionUtils.java
rename to library/src/module_common/java/com/chwl/library/common/util/ReflectionUtils.java
index c5e348830..8d21ef7d7 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/ReflectionUtils.java
+++ b/library/src/module_common/java/com/chwl/library/common/util/ReflectionUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.common.util;
+package com.chwl.library.common.util;
 
 import java.lang.reflect.Field;
 
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/SPUtils.java b/library/src/module_common/java/com/chwl/library/common/util/SPUtils.java
similarity index 94%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/SPUtils.java
rename to library/src/module_common/java/com/chwl/library/common/util/SPUtils.java
index e62f9dfbd..517718143 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/SPUtils.java
+++ b/library/src/module_common/java/com/chwl/library/common/util/SPUtils.java
@@ -1,9 +1,9 @@
-package com.yizhuan.xchat_android_library.common.util;
+package com.chwl.library.common.util;
 
 import android.os.Parcelable;
 
-import com.yizhuan.xchat_android_library.common.application.BaseApp;
-import com.yizhuan.xchat_android_library.utils.TimeUtils;
+import com.chwl.library.common.application.BaseApp;
+import com.chwl.library.utils.TimeUtils;
 
 import java.util.Date;
 import java.util.Set;
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/ScheduledExecutor.java b/library/src/module_common/java/com/chwl/library/common/util/ScheduledExecutor.java
similarity index 80%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/ScheduledExecutor.java
rename to library/src/module_common/java/com/chwl/library/common/util/ScheduledExecutor.java
index 23a9cb440..eb1669f5c 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/ScheduledExecutor.java
+++ b/library/src/module_common/java/com/chwl/library/common/util/ScheduledExecutor.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.common.util;
+package com.chwl.library.common.util;
 
 import java.util.concurrent.Executor;
 import java.util.concurrent.Future;
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/ScheduledExecutorAdapter.java b/library/src/module_common/java/com/chwl/library/common/util/ScheduledExecutorAdapter.java
similarity index 94%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/ScheduledExecutorAdapter.java
rename to library/src/module_common/java/com/chwl/library/common/util/ScheduledExecutorAdapter.java
index f1f1e544b..1dddaff50 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/ScheduledExecutorAdapter.java
+++ b/library/src/module_common/java/com/chwl/library/common/util/ScheduledExecutorAdapter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.common.util;
+package com.chwl.library.common.util;
 
 import androidx.annotation.NonNull;
 
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/SoftKeyboardStateHelper.java b/library/src/module_common/java/com/chwl/library/common/util/SoftKeyboardStateHelper.java
similarity index 98%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/SoftKeyboardStateHelper.java
rename to library/src/module_common/java/com/chwl/library/common/util/SoftKeyboardStateHelper.java
index f5d4c34b7..338f057cf 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/SoftKeyboardStateHelper.java
+++ b/library/src/module_common/java/com/chwl/library/common/util/SoftKeyboardStateHelper.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.common.util;
+package com.chwl.library.common.util;
 
 import android.graphics.Rect;
 import android.view.View;
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/Utils.java b/library/src/module_common/java/com/chwl/library/common/util/Utils.java
similarity index 99%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/Utils.java
rename to library/src/module_common/java/com/chwl/library/common/util/Utils.java
index 300c265d1..5b3557085 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/Utils.java
+++ b/library/src/module_common/java/com/chwl/library/common/util/Utils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.common.util;
+package com.chwl.library.common.util;
 
 import android.annotation.TargetApi;
 import android.content.Context;
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/ViewBindingUtil.kt b/library/src/module_common/java/com/chwl/library/common/util/ViewBindingUtil.kt
similarity index 98%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/ViewBindingUtil.kt
rename to library/src/module_common/java/com/chwl/library/common/util/ViewBindingUtil.kt
index ad004b2aa..145a6c867 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/ViewBindingUtil.kt
+++ b/library/src/module_common/java/com/chwl/library/common/util/ViewBindingUtil.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.common.util
+package com.chwl.library.common.util
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/widget/LinesFlexBoxLayoutManager.java b/library/src/module_common/java/com/chwl/library/common/widget/LinesFlexBoxLayoutManager.java
similarity index 95%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/widget/LinesFlexBoxLayoutManager.java
rename to library/src/module_common/java/com/chwl/library/common/widget/LinesFlexBoxLayoutManager.java
index 9e0ed987b..9956cda88 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/widget/LinesFlexBoxLayoutManager.java
+++ b/library/src/module_common/java/com/chwl/library/common/widget/LinesFlexBoxLayoutManager.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.common.widget;
+package com.chwl.library.common.widget;
 
 import android.content.Context;
 
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/widget/VpRecyclerView.kt b/library/src/module_common/java/com/chwl/library/common/widget/VpRecyclerView.kt
similarity index 97%
rename from library/src/module_common/java/com/yizhuan/xchat_android_library/common/widget/VpRecyclerView.kt
rename to library/src/module_common/java/com/chwl/library/common/widget/VpRecyclerView.kt
index 519a7ecc4..5a8121e6f 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/widget/VpRecyclerView.kt
+++ b/library/src/module_common/java/com/chwl/library/common/widget/VpRecyclerView.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.common.widget
+package com.chwl.library.common.widget
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/AfterPermissionGranted.java b/library/src/module_easypermission/java/com/chwl/library/easypermisssion/AfterPermissionGranted.java
similarity index 93%
rename from library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/AfterPermissionGranted.java
rename to library/src/module_easypermission/java/com/chwl/library/easypermisssion/AfterPermissionGranted.java
index 31bd907e3..3a1c3645c 100644
--- a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/AfterPermissionGranted.java
+++ b/library/src/module_easypermission/java/com/chwl/library/easypermisssion/AfterPermissionGranted.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.easypermisssion;
+package com.chwl.library.easypermisssion;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/AppSettingsDialog.java b/library/src/module_easypermission/java/com/chwl/library/easypermisssion/AppSettingsDialog.java
similarity index 99%
rename from library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/AppSettingsDialog.java
rename to library/src/module_easypermission/java/com/chwl/library/easypermisssion/AppSettingsDialog.java
index 84e5f35a7..cae6c1fc0 100644
--- a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/AppSettingsDialog.java
+++ b/library/src/module_easypermission/java/com/chwl/library/easypermisssion/AppSettingsDialog.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easypermisssion;
+package com.chwl.library.easypermisssion;
 
 import android.app.Activity;
 import android.content.Context;
@@ -17,7 +17,7 @@ import androidx.annotation.StyleRes;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.Fragment;
 
-import com.yizhuan.xchat_android_library.R;
+import com.chwl.library.R;
 
 /**
  * Dialog to prompt the user to go to the app's settings screen and enable permissions. If the user
diff --git a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/AppSettingsDialogHolderActivity.java b/library/src/module_easypermission/java/com/chwl/library/easypermisssion/AppSettingsDialogHolderActivity.java
similarity index 97%
rename from library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/AppSettingsDialogHolderActivity.java
rename to library/src/module_easypermission/java/com/chwl/library/easypermisssion/AppSettingsDialogHolderActivity.java
index 592d4c59a..5d6b7df33 100644
--- a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/AppSettingsDialogHolderActivity.java
+++ b/library/src/module_easypermission/java/com/chwl/library/easypermisssion/AppSettingsDialogHolderActivity.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easypermisssion;
+package com.chwl.library.easypermisssion;
 
 import android.app.Activity;
 import android.app.Dialog;
diff --git a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/EasyPermissions.java b/library/src/module_easypermission/java/com/chwl/library/easypermisssion/EasyPermissions.java
similarity index 99%
rename from library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/EasyPermissions.java
rename to library/src/module_easypermission/java/com/chwl/library/easypermisssion/EasyPermissions.java
index 4e9f9603c..7e18cf031 100644
--- a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/EasyPermissions.java
+++ b/library/src/module_easypermission/java/com/chwl/library/easypermisssion/EasyPermissions.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.easypermisssion;
+package com.chwl.library.easypermisssion;
 
 import android.Manifest;
 import android.app.Activity;
@@ -31,7 +31,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
-import com.yizhuan.xchat_android_library.easypermisssion.helper.PermissionHelper;
+import com.chwl.library.easypermisssion.helper.PermissionHelper;
 
 /**
  * Utility to request and check System permissions for apps targeting Android M (API >= 23).
diff --git a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/PermissionRequest.java b/library/src/module_easypermission/java/com/chwl/library/easypermisssion/PermissionRequest.java
similarity index 97%
rename from library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/PermissionRequest.java
rename to library/src/module_easypermission/java/com/chwl/library/easypermisssion/PermissionRequest.java
index 8cd6c16e0..49ece5edb 100644
--- a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/PermissionRequest.java
+++ b/library/src/module_easypermission/java/com/chwl/library/easypermisssion/PermissionRequest.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easypermisssion;
+package com.chwl.library.easypermisssion;
 
 import android.app.Activity;
 import androidx.annotation.NonNull;
@@ -11,8 +11,8 @@ import androidx.fragment.app.Fragment;
 
 import java.util.Arrays;
 
-import com.yizhuan.xchat_android_library.R;
-import com.yizhuan.xchat_android_library.easypermisssion.helper.PermissionHelper;
+import com.chwl.library.R;
+import com.chwl.library.easypermisssion.helper.PermissionHelper;
 
 /**
  * An immutable model object that holds all of the parameters associated with a permission request,
diff --git a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/RationaleDialogClickListener.java b/library/src/module_easypermission/java/com/chwl/library/easypermisssion/RationaleDialogClickListener.java
similarity index 95%
rename from library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/RationaleDialogClickListener.java
rename to library/src/module_easypermission/java/com/chwl/library/easypermisssion/RationaleDialogClickListener.java
index dd0a1d21b..4543bd3f9 100644
--- a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/RationaleDialogClickListener.java
+++ b/library/src/module_easypermission/java/com/chwl/library/easypermisssion/RationaleDialogClickListener.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easypermisssion;
+package com.chwl.library.easypermisssion;
 
 import android.app.Activity;
 import android.app.Dialog;
@@ -7,7 +7,7 @@ import androidx.fragment.app.Fragment;
 
 import java.util.Arrays;
 
-import com.yizhuan.xchat_android_library.easypermisssion.helper.PermissionHelper;
+import com.chwl.library.easypermisssion.helper.PermissionHelper;
 
 /**
  * Click listener for either {@link RationaleDialogFragment} or {@link RationaleDialogFragmentCompat}.
diff --git a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/RationaleDialogConfig.java b/library/src/module_easypermission/java/com/chwl/library/easypermisssion/RationaleDialogConfig.java
similarity index 98%
rename from library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/RationaleDialogConfig.java
rename to library/src/module_easypermission/java/com/chwl/library/easypermisssion/RationaleDialogConfig.java
index 143a9c5a9..bf1f06c72 100644
--- a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/RationaleDialogConfig.java
+++ b/library/src/module_easypermission/java/com/chwl/library/easypermisssion/RationaleDialogConfig.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easypermisssion;
+package com.chwl.library.easypermisssion;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -13,7 +13,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.StyleRes;
 import androidx.appcompat.app.AlertDialog;
 
-import com.yizhuan.xchat_android_library.R;
+import com.chwl.library.R;
 
 /**
  * Configuration for either {@link RationaleDialogFragment} or {@link RationaleDialogFragmentCompat}.
diff --git a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/RationaleDialogFragment.java b/library/src/module_easypermission/java/com/chwl/library/easypermisssion/RationaleDialogFragment.java
similarity index 98%
rename from library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/RationaleDialogFragment.java
rename to library/src/module_easypermission/java/com/chwl/library/easypermisssion/RationaleDialogFragment.java
index 546c2b1b7..dcfb5c762 100644
--- a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/RationaleDialogFragment.java
+++ b/library/src/module_easypermission/java/com/chwl/library/easypermisssion/RationaleDialogFragment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easypermisssion;
+package com.chwl.library.easypermisssion;
 
 import android.app.Dialog;
 import android.app.DialogFragment;
diff --git a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/RationaleDialogFragmentCompat.java b/library/src/module_easypermission/java/com/chwl/library/easypermisssion/RationaleDialogFragmentCompat.java
similarity index 98%
rename from library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/RationaleDialogFragmentCompat.java
rename to library/src/module_easypermission/java/com/chwl/library/easypermisssion/RationaleDialogFragmentCompat.java
index 837a619f0..20077c1b4 100644
--- a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/RationaleDialogFragmentCompat.java
+++ b/library/src/module_easypermission/java/com/chwl/library/easypermisssion/RationaleDialogFragmentCompat.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easypermisssion;
+package com.chwl.library.easypermisssion;
 
 import android.app.Dialog;
 import android.content.Context;
diff --git a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/ActivityPermissionHelper.java b/library/src/module_easypermission/java/com/chwl/library/easypermisssion/helper/ActivityPermissionHelper.java
similarity index 93%
rename from library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/ActivityPermissionHelper.java
rename to library/src/module_easypermission/java/com/chwl/library/easypermisssion/helper/ActivityPermissionHelper.java
index a38e23cd6..25d42a78b 100644
--- a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/ActivityPermissionHelper.java
+++ b/library/src/module_easypermission/java/com/chwl/library/easypermisssion/helper/ActivityPermissionHelper.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easypermisssion.helper;
+package com.chwl.library.easypermisssion.helper;
 
 import android.app.Activity;
 import android.app.Fragment;
@@ -9,7 +9,7 @@ import androidx.annotation.StyleRes;
 import androidx.core.app.ActivityCompat;
 import android.util.Log;
 
-import com.yizhuan.xchat_android_library.easypermisssion.RationaleDialogFragment;
+import com.chwl.library.easypermisssion.RationaleDialogFragment;
 
 /**
  * Permissions helper for {@link Activity}.
diff --git a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/AppCompatActivityPermissionsHelper.java b/library/src/module_easypermission/java/com/chwl/library/easypermisssion/helper/AppCompatActivityPermissionsHelper.java
similarity index 94%
rename from library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/AppCompatActivityPermissionsHelper.java
rename to library/src/module_easypermission/java/com/chwl/library/easypermisssion/helper/AppCompatActivityPermissionsHelper.java
index bc637f721..e5fbdd837 100644
--- a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/AppCompatActivityPermissionsHelper.java
+++ b/library/src/module_easypermission/java/com/chwl/library/easypermisssion/helper/AppCompatActivityPermissionsHelper.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easypermisssion.helper;
+package com.chwl.library.easypermisssion.helper;
 
 import android.content.Context;
 import androidx.annotation.NonNull;
diff --git a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/BaseSupportPermissionsHelper.java b/library/src/module_easypermission/java/com/chwl/library/easypermisssion/helper/BaseSupportPermissionsHelper.java
similarity index 91%
rename from library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/BaseSupportPermissionsHelper.java
rename to library/src/module_easypermission/java/com/chwl/library/easypermisssion/helper/BaseSupportPermissionsHelper.java
index 5874fd3da..b864d1fea 100644
--- a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/BaseSupportPermissionsHelper.java
+++ b/library/src/module_easypermission/java/com/chwl/library/easypermisssion/helper/BaseSupportPermissionsHelper.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easypermisssion.helper;
+package com.chwl.library.easypermisssion.helper;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.StyleRes;
@@ -6,7 +6,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import android.util.Log;
 
-import com.yizhuan.xchat_android_library.easypermisssion.RationaleDialogFragmentCompat;
+import com.chwl.library.easypermisssion.RationaleDialogFragmentCompat;
 
 /**
  * Implementation of {@link PermissionHelper} for Support Library host classes.
diff --git a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/LowApiPermissionsHelper.java b/library/src/module_easypermission/java/com/chwl/library/easypermisssion/helper/LowApiPermissionsHelper.java
similarity index 96%
rename from library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/LowApiPermissionsHelper.java
rename to library/src/module_easypermission/java/com/chwl/library/easypermisssion/helper/LowApiPermissionsHelper.java
index 550d926f9..1e4137443 100644
--- a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/LowApiPermissionsHelper.java
+++ b/library/src/module_easypermission/java/com/chwl/library/easypermisssion/helper/LowApiPermissionsHelper.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easypermisssion.helper;
+package com.chwl.library.easypermisssion.helper;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/PermissionHelper.java b/library/src/module_easypermission/java/com/chwl/library/easypermisssion/helper/PermissionHelper.java
similarity index 98%
rename from library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/PermissionHelper.java
rename to library/src/module_easypermission/java/com/chwl/library/easypermisssion/helper/PermissionHelper.java
index fd5ab8ae8..677c4740c 100644
--- a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/PermissionHelper.java
+++ b/library/src/module_easypermission/java/com/chwl/library/easypermisssion/helper/PermissionHelper.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easypermisssion.helper;
+package com.chwl.library.easypermisssion.helper;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/SupportFragmentPermissionHelper.java b/library/src/module_easypermission/java/com/chwl/library/easypermisssion/helper/SupportFragmentPermissionHelper.java
similarity index 93%
rename from library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/SupportFragmentPermissionHelper.java
rename to library/src/module_easypermission/java/com/chwl/library/easypermisssion/helper/SupportFragmentPermissionHelper.java
index b5ea04d45..21988a4f3 100644
--- a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/SupportFragmentPermissionHelper.java
+++ b/library/src/module_easypermission/java/com/chwl/library/easypermisssion/helper/SupportFragmentPermissionHelper.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easypermisssion.helper;
+package com.chwl.library.easypermisssion.helper;
 
 import android.content.Context;
 import androidx.annotation.NonNull;
diff --git a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/package-info.java b/library/src/module_easypermission/java/com/chwl/library/easypermisssion/helper/package-info.java
similarity index 56%
rename from library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/package-info.java
rename to library/src/module_easypermission/java/com/chwl/library/easypermisssion/helper/package-info.java
index 80acd7fd8..2cec35c4d 100644
--- a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/package-info.java
+++ b/library/src/module_easypermission/java/com/chwl/library/easypermisssion/helper/package-info.java
@@ -1,4 +1,4 @@
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-package com.yizhuan.xchat_android_library.easypermisssion.helper;
+package com.chwl.library.easypermisssion.helper;
 
 import androidx.annotation.RestrictTo;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/EasyPhotos.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/EasyPhotos.java
similarity index 92%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/EasyPhotos.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/EasyPhotos.java
index 3806a477d..bbcb5cc5e 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/EasyPhotos.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/EasyPhotos.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto;
+package com.chwl.library.easyphoto;
 
 import android.app.Activity;
 import android.app.Fragment;
@@ -9,19 +9,19 @@ import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.FragmentActivity;
 
-import com.yizhuan.xchat_android_library.easyphoto.builder.AlbumBuilder;
-import com.yizhuan.xchat_android_library.easyphoto.callback.PuzzleCallback;
-import com.yizhuan.xchat_android_library.easyphoto.engine.ImageEngine;
-import com.yizhuan.xchat_android_library.easyphoto.models.ad.AdListener;
-import com.yizhuan.xchat_android_library.easyphoto.models.album.AlbumModel;
-import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo;
-import com.yizhuan.xchat_android_library.easyphoto.models.sticker.StickerModel;
-import com.yizhuan.xchat_android_library.easyphoto.models.sticker.entity.TextStickerData;
-import com.yizhuan.xchat_android_library.easyphoto.ui.PuzzleActivity;
-import com.yizhuan.xchat_android_library.easyphoto.utils.bitmap.BitmapUtils;
-import com.yizhuan.xchat_android_library.easyphoto.utils.bitmap.SaveBitmapCallBack;
-import com.yizhuan.xchat_android_library.easyphoto.utils.media.MediaScannerConnectionUtils;
-import com.yizhuan.xchat_android_library.easyphoto.utils.result.EasyResult;
+import com.chwl.library.easyphoto.builder.AlbumBuilder;
+import com.chwl.library.easyphoto.callback.PuzzleCallback;
+import com.chwl.library.easyphoto.engine.ImageEngine;
+import com.chwl.library.easyphoto.models.ad.AdListener;
+import com.chwl.library.easyphoto.models.album.AlbumModel;
+import com.chwl.library.easyphoto.models.album.entity.Photo;
+import com.chwl.library.easyphoto.models.sticker.StickerModel;
+import com.chwl.library.easyphoto.models.sticker.entity.TextStickerData;
+import com.chwl.library.easyphoto.ui.PuzzleActivity;
+import com.chwl.library.easyphoto.utils.bitmap.BitmapUtils;
+import com.chwl.library.easyphoto.utils.bitmap.SaveBitmapCallBack;
+import com.chwl.library.easyphoto.utils.media.MediaScannerConnectionUtils;
+import com.chwl.library.easyphoto.utils.result.EasyResult;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/builder/AlbumBuilder.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/builder/AlbumBuilder.java
similarity index 96%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/builder/AlbumBuilder.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/builder/AlbumBuilder.java
index b4bd86249..9dd7b05d8 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/builder/AlbumBuilder.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/builder/AlbumBuilder.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.builder;
+package com.chwl.library.easyphoto.builder;
 
 import android.app.Activity;
 import android.net.Uri;
@@ -8,16 +8,16 @@ import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 
-import com.yizhuan.xchat_android_library.easyphoto.callback.SelectCallback;
-import com.yizhuan.xchat_android_library.easyphoto.constant.Type;
-import com.yizhuan.xchat_android_library.easyphoto.engine.ImageEngine;
-import com.yizhuan.xchat_android_library.easyphoto.models.ad.AdListener;
-import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo;
-import com.yizhuan.xchat_android_library.easyphoto.result.Result;
-import com.yizhuan.xchat_android_library.easyphoto.setting.Setting;
-import com.yizhuan.xchat_android_library.easyphoto.ui.EasyPhotosActivity;
-import com.yizhuan.xchat_android_library.easyphoto.utils.result.EasyResult;
-import com.yizhuan.xchat_android_library.easyphoto.utils.uri.UriUtils;
+import com.chwl.library.easyphoto.callback.SelectCallback;
+import com.chwl.library.easyphoto.constant.Type;
+import com.chwl.library.easyphoto.engine.ImageEngine;
+import com.chwl.library.easyphoto.models.ad.AdListener;
+import com.chwl.library.easyphoto.models.album.entity.Photo;
+import com.chwl.library.easyphoto.result.Result;
+import com.chwl.library.easyphoto.setting.Setting;
+import com.chwl.library.easyphoto.ui.EasyPhotosActivity;
+import com.chwl.library.easyphoto.utils.result.EasyResult;
+import com.chwl.library.easyphoto.utils.uri.UriUtils;
 
 import java.io.File;
 import java.lang.ref.WeakReference;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/callback/PuzzleCallback.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/callback/PuzzleCallback.java
similarity index 76%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/callback/PuzzleCallback.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/callback/PuzzleCallback.java
index 1f701edcc..c79e039cc 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/callback/PuzzleCallback.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/callback/PuzzleCallback.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_library.easyphoto.callback;
+package com.chwl.library.easyphoto.callback;
 
-import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo;
+import com.chwl.library.easyphoto.models.album.entity.Photo;
 
 /**
  * PuzzleCallback
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/callback/SelectCallback.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/callback/SelectCallback.java
similarity index 82%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/callback/SelectCallback.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/callback/SelectCallback.java
index c24d83f34..ee9935518 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/callback/SelectCallback.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/callback/SelectCallback.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_library.easyphoto.callback;
+package com.chwl.library.easyphoto.callback;
 
-import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo;
+import com.chwl.library.easyphoto.models.album.entity.Photo;
 
 import java.util.ArrayList;
 
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/constant/Code.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/constant/Code.java
similarity index 90%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/constant/Code.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/constant/Code.java
index 3b78f0e62..56938f551 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/constant/Code.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/constant/Code.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.constant;
+package com.chwl.library.easyphoto.constant;
 
 /**
  * Code常量
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/constant/Key.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/constant/Key.java
similarity index 93%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/constant/Key.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/constant/Key.java
index 66fcaec34..ffa242eef 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/constant/Key.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/constant/Key.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.constant;
+package com.chwl.library.easyphoto.constant;
 
 /**
  * key的常量
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/constant/Type.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/constant/Type.java
similarity index 85%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/constant/Type.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/constant/Type.java
index 6bf095b5c..ad52134f3 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/constant/Type.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/constant/Type.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.constant;
+package com.chwl.library.easyphoto.constant;
 
 /**
  * Created by huan on 2018/1/9.
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/engine/ImageEngine.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/engine/ImageEngine.java
similarity index 97%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/engine/ImageEngine.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/engine/ImageEngine.java
index 0422b9a2f..b625f1008 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/engine/ImageEngine.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/engine/ImageEngine.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.engine;
+package com.chwl.library.easyphoto.engine;
 
 import android.content.Context;
 import android.graphics.Bitmap;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/ad/AdEntity.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/ad/AdEntity.java
similarity index 81%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/ad/AdEntity.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/ad/AdEntity.java
index 046536455..e5d81a657 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/ad/AdEntity.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/ad/AdEntity.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.ad;
+package com.chwl.library.easyphoto.models.ad;
 
 import android.view.View;
 
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/ad/AdListener.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/ad/AdListener.java
similarity index 70%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/ad/AdListener.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/ad/AdListener.java
index 479a0a1ff..f6a6f4c97 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/ad/AdListener.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/ad/AdListener.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.ad;
+package com.chwl.library.easyphoto.models.ad;
 
 /**
  * 广告监听
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/ad/AdViewHolder.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/ad/AdViewHolder.java
similarity index 79%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/ad/AdViewHolder.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/ad/AdViewHolder.java
index 928592fd6..bc89781c4 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/ad/AdViewHolder.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/ad/AdViewHolder.java
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.ad;
+package com.chwl.library.easyphoto.models.ad;
 
 import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.widget.FrameLayout;
 
-import com.yizhuan.xchat_android_library.R;
+import com.chwl.library.R;
 
 /**
  * 广告viewolder
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/album/AlbumModel.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/album/AlbumModel.java
similarity index 95%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/album/AlbumModel.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/album/AlbumModel.java
index f06c5de91..365b47508 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/album/AlbumModel.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/album/AlbumModel.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.album;
+package com.chwl.library.easyphoto.models.album;
 
 import android.Manifest;
 import android.content.ContentResolver;
@@ -13,14 +13,14 @@ import android.text.TextUtils;
 
 import androidx.core.content.PermissionChecker;
 
-import com.yizhuan.xchat_android_library.R;
-import com.yizhuan.xchat_android_library.easyphoto.constant.Type;
-import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Album;
-import com.yizhuan.xchat_android_library.easyphoto.result.Result;
-import com.yizhuan.xchat_android_library.easyphoto.setting.Setting;
-import com.yizhuan.xchat_android_library.easyphoto.utils.string.StringUtils;
-import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.AlbumItem;
-import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo;
+import com.chwl.library.R;
+import com.chwl.library.easyphoto.constant.Type;
+import com.chwl.library.easyphoto.models.album.entity.Album;
+import com.chwl.library.easyphoto.result.Result;
+import com.chwl.library.easyphoto.setting.Setting;
+import com.chwl.library.easyphoto.utils.string.StringUtils;
+import com.chwl.library.easyphoto.models.album.entity.AlbumItem;
+import com.chwl.library.easyphoto.models.album.entity.Photo;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/album/entity/Album.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/album/entity/Album.java
similarity index 94%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/album/entity/Album.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/album/entity/Album.java
index 6b561acbc..5e6b0c431 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/album/entity/Album.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/album/entity/Album.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.album.entity;
+package com.chwl.library.easyphoto.models.album.entity;
 
 import android.net.Uri;
 
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/album/entity/AlbumItem.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/album/entity/AlbumItem.java
similarity index 91%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/album/entity/AlbumItem.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/album/entity/AlbumItem.java
index 24ad1f283..fe59dfbb4 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/album/entity/AlbumItem.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/album/entity/AlbumItem.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.album.entity;
+package com.chwl.library.easyphoto.models.album.entity;
 
 import android.net.Uri;
 
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/album/entity/Photo.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/album/entity/Photo.java
similarity index 98%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/album/entity/Photo.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/album/entity/Photo.java
index d62dd79dc..3b17cd240 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/album/entity/Photo.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/album/entity/Photo.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.album.entity;
+package com.chwl.library.easyphoto.models.album.entity;
 
 import android.net.Uri;
 import android.os.Parcel;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/Area.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/Area.java
similarity index 93%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/Area.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/Area.java
index 83667ab55..5fb1b522a 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/Area.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/Area.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.puzzle;
+package com.chwl.library.easyphoto.models.puzzle;
 
 import android.graphics.Path;
 import android.graphics.PointF;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/DegreeSeekBar.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/DegreeSeekBar.java
similarity index 99%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/DegreeSeekBar.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/DegreeSeekBar.java
index 15bde7bb7..292fed09a 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/DegreeSeekBar.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/DegreeSeekBar.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.puzzle;
+package com.chwl.library.easyphoto.models.puzzle;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -14,7 +14,7 @@ import android.view.View;
 
 import androidx.core.content.ContextCompat;
 
-import com.yizhuan.xchat_android_library.R;
+import com.chwl.library.R;
 
 /**
  * @author wupanjie
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/Line.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/Line.java
similarity index 91%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/Line.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/Line.java
index 93fd37441..d6c9208c9 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/Line.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/Line.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.puzzle;
+package com.chwl.library.easyphoto.models.puzzle;
 
 import android.graphics.PointF;
 
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/MatrixUtils.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/MatrixUtils.java
similarity index 98%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/MatrixUtils.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/MatrixUtils.java
index 456a4543e..a63b77493 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/MatrixUtils.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/MatrixUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.puzzle;
+package com.chwl.library.easyphoto.models.puzzle;
 
 import android.graphics.Matrix;
 import android.graphics.RectF;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/PuzzleLayout.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/PuzzleLayout.java
similarity index 96%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/PuzzleLayout.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/PuzzleLayout.java
index 73ff7a555..cad3ee52f 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/PuzzleLayout.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/PuzzleLayout.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.puzzle;
+package com.chwl.library.easyphoto.models.puzzle;
 
 import android.graphics.RectF;
 
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/PuzzlePiece.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/PuzzlePiece.java
similarity index 96%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/PuzzlePiece.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/PuzzlePiece.java
index 401b8f1a4..fcf8e22fb 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/PuzzlePiece.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/PuzzlePiece.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.puzzle;
+package com.chwl.library.easyphoto.models.puzzle;
 
 import android.animation.ValueAnimator;
 import android.graphics.Bitmap;
@@ -18,9 +18,9 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.animation.DecelerateInterpolator;
 
-import static com.yizhuan.xchat_android_library.easyphoto.models.puzzle.MatrixUtils.calculateImageIndents;
-import static com.yizhuan.xchat_android_library.easyphoto.models.puzzle.MatrixUtils.getMinMatrixScale;
-import static com.yizhuan.xchat_android_library.easyphoto.models.puzzle.MatrixUtils.judgeIsImageContainsBorder;
+import static com.chwl.library.easyphoto.models.puzzle.MatrixUtils.calculateImageIndents;
+import static com.chwl.library.easyphoto.models.puzzle.MatrixUtils.getMinMatrixScale;
+import static com.chwl.library.easyphoto.models.puzzle.MatrixUtils.judgeIsImageContainsBorder;
 
 
 /**
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/PuzzleUtils.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/PuzzleUtils.java
similarity index 65%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/PuzzleUtils.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/PuzzleUtils.java
index 939346209..63db04b99 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/PuzzleUtils.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/PuzzleUtils.java
@@ -1,20 +1,20 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.puzzle;
+package com.chwl.library.easyphoto.models.puzzle;
 
 
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.slant.OneSlantLayout;
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.slant.SlantLayoutHelper;
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.slant.ThreeSlantLayout;
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.slant.TwoSlantLayout;
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight.EightStraightLayout;
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight.FiveStraightLayout;
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight.FourStraightLayout;
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight.NineStraightLayout;
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight.OneStraightLayout;
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight.SevenStraightLayout;
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight.SixStraightLayout;
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight.StraightLayoutHelper;
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight.ThreeStraightLayout;
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight.TwoStraightLayout;
+import com.chwl.library.easyphoto.models.puzzle.template.slant.OneSlantLayout;
+import com.chwl.library.easyphoto.models.puzzle.template.slant.SlantLayoutHelper;
+import com.chwl.library.easyphoto.models.puzzle.template.slant.ThreeSlantLayout;
+import com.chwl.library.easyphoto.models.puzzle.template.slant.TwoSlantLayout;
+import com.chwl.library.easyphoto.models.puzzle.template.straight.EightStraightLayout;
+import com.chwl.library.easyphoto.models.puzzle.template.straight.FiveStraightLayout;
+import com.chwl.library.easyphoto.models.puzzle.template.straight.FourStraightLayout;
+import com.chwl.library.easyphoto.models.puzzle.template.straight.NineStraightLayout;
+import com.chwl.library.easyphoto.models.puzzle.template.straight.OneStraightLayout;
+import com.chwl.library.easyphoto.models.puzzle.template.straight.SevenStraightLayout;
+import com.chwl.library.easyphoto.models.puzzle.template.straight.SixStraightLayout;
+import com.chwl.library.easyphoto.models.puzzle.template.straight.StraightLayoutHelper;
+import com.chwl.library.easyphoto.models.puzzle.template.straight.ThreeStraightLayout;
+import com.chwl.library.easyphoto.models.puzzle.template.straight.TwoStraightLayout;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/PuzzleView.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/PuzzleView.java
similarity index 99%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/PuzzleView.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/PuzzleView.java
index 3e8b1b4b2..000888d20 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/PuzzleView.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/PuzzleView.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.puzzle;
+package com.chwl.library.easyphoto.models.puzzle;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -18,7 +18,7 @@ import android.view.View;
 
 import androidx.core.content.ContextCompat;
 
-import com.yizhuan.xchat_android_library.R;
+import com.chwl.library.R;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/SquarePuzzleView.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/SquarePuzzleView.java
similarity index 92%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/SquarePuzzleView.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/SquarePuzzleView.java
index 04f790401..1cafc1603 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/SquarePuzzleView.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/SquarePuzzleView.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.puzzle;
+package com.chwl.library.easyphoto.models.puzzle;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/slant/CrossoverPointF.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/slant/CrossoverPointF.java
similarity index 89%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/slant/CrossoverPointF.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/slant/CrossoverPointF.java
index 901324b2f..63a43b3ca 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/slant/CrossoverPointF.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/slant/CrossoverPointF.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.slant;
+package com.chwl.library.easyphoto.models.puzzle.slant;
 
 import android.graphics.PointF;
 
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/slant/SlantArea.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/slant/SlantArea.java
similarity index 97%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/slant/SlantArea.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/slant/SlantArea.java
index 5844fb22a..f58fffa19 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/slant/SlantArea.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/slant/SlantArea.java
@@ -1,12 +1,12 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.slant;
+package com.chwl.library.easyphoto.models.puzzle.slant;
 
 import android.graphics.Path;
 import android.graphics.PointF;
 import android.graphics.RectF;
 
 
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Area;
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line;
+import com.chwl.library.easyphoto.models.puzzle.Area;
+import com.chwl.library.easyphoto.models.puzzle.Line;
 
 import java.util.Arrays;
 import java.util.Comparator;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/slant/SlantLine.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/slant/SlantLine.java
similarity index 96%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/slant/SlantLine.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/slant/SlantLine.java
index eabdecf9e..fb87a2dd3 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/slant/SlantLine.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/slant/SlantLine.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.slant;
+package com.chwl.library.easyphoto.models.puzzle.slant;
 
 import android.graphics.PointF;
 
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line;
+import com.chwl.library.easyphoto.models.puzzle.Line;
 
 import static java.lang.Math.max;
 import static java.lang.Math.min;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/slant/SlantPuzzleLayout.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/slant/SlantPuzzleLayout.java
similarity index 95%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/slant/SlantPuzzleLayout.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/slant/SlantPuzzleLayout.java
index 3031c0cc1..398acc4dd 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/slant/SlantPuzzleLayout.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/slant/SlantPuzzleLayout.java
@@ -1,18 +1,18 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.slant;
+package com.chwl.library.easyphoto.models.puzzle.slant;
 
 import android.graphics.RectF;
 import android.util.Pair;
 
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Area;
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line;
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.PuzzleLayout;
+import com.chwl.library.easyphoto.models.puzzle.Area;
+import com.chwl.library.easyphoto.models.puzzle.Line;
+import com.chwl.library.easyphoto.models.puzzle.PuzzleLayout;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import static com.yizhuan.xchat_android_library.easyphoto.models.puzzle.slant.SlantUtils.cutAreaWith;
+import static com.chwl.library.easyphoto.models.puzzle.slant.SlantUtils.cutAreaWith;
 
 
 /**
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/slant/SlantUtils.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/slant/SlantUtils.java
similarity index 99%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/slant/SlantUtils.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/slant/SlantUtils.java
index 8628f8d7b..128812293 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/slant/SlantUtils.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/slant/SlantUtils.java
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.slant;
+package com.chwl.library.easyphoto.models.puzzle.slant;
 
 import android.graphics.PointF;
 import android.util.Pair;
 
 
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line;
+import com.chwl.library.easyphoto.models.puzzle.Line;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/straight/StraightArea.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/straight/StraightArea.java
similarity index 96%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/straight/StraightArea.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/straight/StraightArea.java
index c66e131a2..a2b214d3e 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/straight/StraightArea.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/straight/StraightArea.java
@@ -1,11 +1,11 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.straight;
+package com.chwl.library.easyphoto.models.puzzle.straight;
 
 import android.graphics.Path;
 import android.graphics.PointF;
 import android.graphics.RectF;
 
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Area;
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line;
+import com.chwl.library.easyphoto.models.puzzle.Area;
+import com.chwl.library.easyphoto.models.puzzle.Line;
 
 import java.util.Arrays;
 import java.util.Comparator;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/straight/StraightLine.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/straight/StraightLine.java
similarity index 97%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/straight/StraightLine.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/straight/StraightLine.java
index 7a321c6ad..c5f6b36d8 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/straight/StraightLine.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/straight/StraightLine.java
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.straight;
+package com.chwl.library.easyphoto.models.puzzle.straight;
 
 import android.graphics.PointF;
 import android.graphics.RectF;
 import android.util.Log;
 
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line;
+import com.chwl.library.easyphoto.models.puzzle.Line;
 
 import static java.lang.Math.max;
 import static java.lang.Math.min;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/straight/StraightPuzzleLayout.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/straight/StraightPuzzleLayout.java
similarity index 93%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/straight/StraightPuzzleLayout.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/straight/StraightPuzzleLayout.java
index 60a5a24ec..839e359b5 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/straight/StraightPuzzleLayout.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/straight/StraightPuzzleLayout.java
@@ -1,21 +1,21 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.straight;
+package com.chwl.library.easyphoto.models.puzzle.straight;
 
 import android.graphics.PointF;
 import android.graphics.RectF;
 import android.util.Pair;
 
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Area;
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line;
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.PuzzleLayout;
+import com.chwl.library.easyphoto.models.puzzle.Area;
+import com.chwl.library.easyphoto.models.puzzle.Line;
+import com.chwl.library.easyphoto.models.puzzle.PuzzleLayout;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import static com.yizhuan.xchat_android_library.easyphoto.models.puzzle.straight.StraightUtils.createLine;
-import static com.yizhuan.xchat_android_library.easyphoto.models.puzzle.straight.StraightUtils.cutAreaCross;
-import static com.yizhuan.xchat_android_library.easyphoto.models.puzzle.straight.StraightUtils.cutAreaSpiral;
+import static com.chwl.library.easyphoto.models.puzzle.straight.StraightUtils.createLine;
+import static com.chwl.library.easyphoto.models.puzzle.straight.StraightUtils.cutAreaCross;
+import static com.chwl.library.easyphoto.models.puzzle.straight.StraightUtils.cutAreaSpiral;
 
 
 /**
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/straight/StraightUtils.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/straight/StraightUtils.java
similarity index 98%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/straight/StraightUtils.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/straight/StraightUtils.java
index f1e02663f..538cd1487 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/straight/StraightUtils.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/straight/StraightUtils.java
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.straight;
+package com.chwl.library.easyphoto.models.puzzle.straight;
 
 import android.graphics.PointF;
 import android.util.Pair;
 
 
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line;
+import com.chwl.library.easyphoto.models.puzzle.Line;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/slant/NumberSlantLayout.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/slant/NumberSlantLayout.java
similarity index 79%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/slant/NumberSlantLayout.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/slant/NumberSlantLayout.java
index dd123ab7c..78802fc46 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/slant/NumberSlantLayout.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/slant/NumberSlantLayout.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.slant;
+package com.chwl.library.easyphoto.models.puzzle.template.slant;
 
 import android.util.Log;
 
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.slant.SlantPuzzleLayout;
+import com.chwl.library.easyphoto.models.puzzle.slant.SlantPuzzleLayout;
 
 
 /**
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/slant/OneSlantLayout.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/slant/OneSlantLayout.java
similarity index 82%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/slant/OneSlantLayout.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/slant/OneSlantLayout.java
index 12ae2f6e1..262e41982 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/slant/OneSlantLayout.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/slant/OneSlantLayout.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.slant;
+package com.chwl.library.easyphoto.models.puzzle.template.slant;
 
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line;
+import com.chwl.library.easyphoto.models.puzzle.Line;
 
 /**
  * @author wupanjie
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/slant/SlantLayoutHelper.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/slant/SlantLayoutHelper.java
similarity index 92%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/slant/SlantLayoutHelper.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/slant/SlantLayoutHelper.java
index 6795494eb..dd365d2e1 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/slant/SlantLayoutHelper.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/slant/SlantLayoutHelper.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.slant;
+package com.chwl.library.easyphoto.models.puzzle.template.slant;
 
 
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.PuzzleLayout;
+import com.chwl.library.easyphoto.models.puzzle.PuzzleLayout;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/slant/ThreeSlantLayout.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/slant/ThreeSlantLayout.java
similarity index 89%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/slant/ThreeSlantLayout.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/slant/ThreeSlantLayout.java
index 54dc45732..c2038a5ff 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/slant/ThreeSlantLayout.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/slant/ThreeSlantLayout.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.slant;
+package com.chwl.library.easyphoto.models.puzzle.template.slant;
 
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line;
+import com.chwl.library.easyphoto.models.puzzle.Line;
 
 /**
  * @author wupanjie
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/slant/TwoSlantLayout.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/slant/TwoSlantLayout.java
similarity index 77%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/slant/TwoSlantLayout.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/slant/TwoSlantLayout.java
index 81b505370..fb63bc8b1 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/slant/TwoSlantLayout.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/slant/TwoSlantLayout.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.slant;
+package com.chwl.library.easyphoto.models.puzzle.template.slant;
 
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line;
+import com.chwl.library.easyphoto.models.puzzle.Line;
 
 /**
  * @author wupanjie
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/EightStraightLayout.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/straight/EightStraightLayout.java
similarity index 95%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/EightStraightLayout.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/straight/EightStraightLayout.java
index 6b5ef5282..6eaa6d25d 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/EightStraightLayout.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/straight/EightStraightLayout.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight;
+package com.chwl.library.easyphoto.models.puzzle.template.straight;
 
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line;
+import com.chwl.library.easyphoto.models.puzzle.Line;
 
 /**
  * @author wupanjie
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/FiveStraightLayout.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/straight/FiveStraightLayout.java
similarity index 95%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/FiveStraightLayout.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/straight/FiveStraightLayout.java
index 402c26cb2..65152ae50 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/FiveStraightLayout.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/straight/FiveStraightLayout.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight;
+package com.chwl.library.easyphoto.models.puzzle.template.straight;
 
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line;
+import com.chwl.library.easyphoto.models.puzzle.Line;
 
 /**
  * @author wupanjie
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/FourStraightLayout.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/straight/FourStraightLayout.java
similarity index 90%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/FourStraightLayout.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/straight/FourStraightLayout.java
index 981edc693..f70734830 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/FourStraightLayout.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/straight/FourStraightLayout.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight;
+package com.chwl.library.easyphoto.models.puzzle.template.straight;
 
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line;
+import com.chwl.library.easyphoto.models.puzzle.Line;
 
 /**
  * @author wupanjie
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/NineStraightLayout.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/straight/NineStraightLayout.java
similarity index 94%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/NineStraightLayout.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/straight/NineStraightLayout.java
index b5f2ff1bf..ce1ed4f5f 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/NineStraightLayout.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/straight/NineStraightLayout.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight;
+package com.chwl.library.easyphoto.models.puzzle.template.straight;
 
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line;
+import com.chwl.library.easyphoto.models.puzzle.Line;
 
 /**
  * @author wupanjie
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/NumberStraightLayout.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/straight/NumberStraightLayout.java
similarity index 79%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/NumberStraightLayout.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/straight/NumberStraightLayout.java
index 6dcb6690a..495f71635 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/NumberStraightLayout.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/straight/NumberStraightLayout.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight;
+package com.chwl.library.easyphoto.models.puzzle.template.straight;
 
 import android.util.Log;
 
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.straight.StraightPuzzleLayout;
+import com.chwl.library.easyphoto.models.puzzle.straight.StraightPuzzleLayout;
 
 
 /**
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/OneStraightLayout.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/straight/OneStraightLayout.java
similarity index 86%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/OneStraightLayout.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/straight/OneStraightLayout.java
index 89d264428..7cfe9cd50 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/OneStraightLayout.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/straight/OneStraightLayout.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight;
+package com.chwl.library.easyphoto.models.puzzle.template.straight;
 
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line;
+import com.chwl.library.easyphoto.models.puzzle.Line;
 
 /**
  * @author wupanjie
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/SevenStraightLayout.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/straight/SevenStraightLayout.java
similarity index 94%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/SevenStraightLayout.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/straight/SevenStraightLayout.java
index d0792b560..c16a46bb6 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/SevenStraightLayout.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/straight/SevenStraightLayout.java
@@ -1,6 +1,6 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight;
+package com.chwl.library.easyphoto.models.puzzle.template.straight;
 
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line;
+import com.chwl.library.easyphoto.models.puzzle.Line;
 
 /**
  * @author wupanjie
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/SixStraightLayout.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/straight/SixStraightLayout.java
similarity index 95%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/SixStraightLayout.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/straight/SixStraightLayout.java
index b37af498a..2f243d758 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/SixStraightLayout.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/straight/SixStraightLayout.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight;
+package com.chwl.library.easyphoto.models.puzzle.template.straight;
 
 
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line;
+import com.chwl.library.easyphoto.models.puzzle.Line;
 
 /**
  * @author wupanjie
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/StraightLayoutHelper.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/straight/StraightLayoutHelper.java
similarity index 92%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/StraightLayoutHelper.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/straight/StraightLayoutHelper.java
index f16a52e04..732e943de 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/StraightLayoutHelper.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/straight/StraightLayoutHelper.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight;
+package com.chwl.library.easyphoto.models.puzzle.template.straight;
 
 
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.PuzzleLayout;
+import com.chwl.library.easyphoto.models.puzzle.PuzzleLayout;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/ThreeStraightLayout.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/straight/ThreeStraightLayout.java
similarity index 89%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/ThreeStraightLayout.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/straight/ThreeStraightLayout.java
index d75dcdf8b..0c21e527b 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/ThreeStraightLayout.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/straight/ThreeStraightLayout.java
@@ -1,7 +1,7 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight;
+package com.chwl.library.easyphoto.models.puzzle.template.straight;
 
 
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line;
+import com.chwl.library.easyphoto.models.puzzle.Line;
 
 /**
  * @author wupanjie
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/TwoStraightLayout.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/straight/TwoStraightLayout.java
similarity index 89%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/TwoStraightLayout.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/straight/TwoStraightLayout.java
index 6f74be7f9..f1a7741b6 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/TwoStraightLayout.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/puzzle/template/straight/TwoStraightLayout.java
@@ -1,8 +1,8 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight;
+package com.chwl.library.easyphoto.models.puzzle.template.straight;
 
 import android.util.Log;
 
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line;
+import com.chwl.library.easyphoto.models.puzzle.Line;
 
 
 /**
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/StickerModel.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/sticker/StickerModel.java
similarity index 89%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/StickerModel.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/sticker/StickerModel.java
index 5ffd21baf..34255bc29 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/StickerModel.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/sticker/StickerModel.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.sticker;
+package com.chwl.library.easyphoto.models.sticker;
 
 import android.app.Activity;
 import android.content.Context;
@@ -9,15 +9,15 @@ import android.view.ViewGroup;
 
 import androidx.fragment.app.FragmentManager;
 
-import com.yizhuan.xchat_android_library.easyphoto.EasyPhotos;
-import com.yizhuan.xchat_android_library.easyphoto.models.sticker.cache.StickerCache;
-import com.yizhuan.xchat_android_library.easyphoto.models.sticker.entity.TextStickerData;
-import com.yizhuan.xchat_android_library.easyphoto.models.sticker.view.BitmapSticker;
-import com.yizhuan.xchat_android_library.easyphoto.models.sticker.view.EditFragment;
-import com.yizhuan.xchat_android_library.easyphoto.models.sticker.view.TextSticker;
-import com.yizhuan.xchat_android_library.easyphoto.models.sticker.listener.OnStickerClickListener;
-import com.yizhuan.xchat_android_library.easyphoto.utils.bitmap.BitmapUtils;
-import com.yizhuan.xchat_android_library.easyphoto.utils.bitmap.SaveBitmapCallBack;
+import com.chwl.library.easyphoto.EasyPhotos;
+import com.chwl.library.easyphoto.models.sticker.cache.StickerCache;
+import com.chwl.library.easyphoto.models.sticker.entity.TextStickerData;
+import com.chwl.library.easyphoto.models.sticker.view.BitmapSticker;
+import com.chwl.library.easyphoto.models.sticker.view.EditFragment;
+import com.chwl.library.easyphoto.models.sticker.view.TextSticker;
+import com.chwl.library.easyphoto.models.sticker.listener.OnStickerClickListener;
+import com.chwl.library.easyphoto.utils.bitmap.BitmapUtils;
+import com.chwl.library.easyphoto.utils.bitmap.SaveBitmapCallBack;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/cache/StickerCache.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/sticker/cache/StickerCache.java
similarity index 95%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/cache/StickerCache.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/sticker/cache/StickerCache.java
index d0c875a52..12eb74071 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/cache/StickerCache.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/sticker/cache/StickerCache.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.sticker.cache;
+package com.chwl.library.easyphoto.models.sticker.cache;
 
 import android.content.res.Resources;
 import android.graphics.Bitmap;
@@ -7,7 +7,7 @@ import android.graphics.Matrix;
 
 import androidx.annotation.IdRes;
 
-import com.yizhuan.xchat_android_library.easyphoto.EasyPhotos;
+import com.chwl.library.easyphoto.EasyPhotos;
 
 import java.util.LinkedHashMap;
 
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/entity/TextStickerData.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/sticker/entity/TextStickerData.java
similarity index 94%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/entity/TextStickerData.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/sticker/entity/TextStickerData.java
index 078f04f73..2f917e765 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/entity/TextStickerData.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/sticker/entity/TextStickerData.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.sticker.entity;
+package com.chwl.library.easyphoto.models.sticker.entity;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/listener/OnStickerClickListener.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/sticker/listener/OnStickerClickListener.java
similarity index 71%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/listener/OnStickerClickListener.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/sticker/listener/OnStickerClickListener.java
index aa0f81f90..95e2c7f19 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/listener/OnStickerClickListener.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/sticker/listener/OnStickerClickListener.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.sticker.listener;
+package com.chwl.library.easyphoto.models.sticker.listener;
 
 /**
  * 贴纸的点击监听
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/view/BitmapSticker.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/sticker/view/BitmapSticker.java
similarity index 97%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/view/BitmapSticker.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/sticker/view/BitmapSticker.java
index 948371396..1835e1f54 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/view/BitmapSticker.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/sticker/view/BitmapSticker.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.sticker.view;
+package com.chwl.library.easyphoto.models.sticker.view;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -17,9 +17,9 @@ import android.view.View;
 
 import androidx.core.content.ContextCompat;
 
-import com.yizhuan.xchat_android_library.R;
-import com.yizhuan.xchat_android_library.easyphoto.models.sticker.cache.StickerCache;
-import com.yizhuan.xchat_android_library.easyphoto.models.sticker.listener.OnStickerClickListener;
+import com.chwl.library.R;
+import com.chwl.library.easyphoto.models.sticker.cache.StickerCache;
+import com.chwl.library.easyphoto.models.sticker.listener.OnStickerClickListener;
 
 
 /**
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/view/EditFragment.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/sticker/view/EditFragment.java
similarity index 98%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/view/EditFragment.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/sticker/view/EditFragment.java
index d1a55838e..f87ebc0f4 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/view/EditFragment.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/sticker/view/EditFragment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.sticker.view;
+package com.chwl.library.easyphoto.models.sticker.view;
 
 import android.content.Context;
 import android.graphics.drawable.ColorDrawable;
@@ -21,7 +21,7 @@ import androidx.core.content.ContextCompat;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.FragmentManager;
 
-import com.yizhuan.xchat_android_library.R;
+import com.chwl.library.R;
 
 /**
  * 文字贴纸，编辑界面
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/view/TextSticker.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/sticker/view/TextSticker.java
similarity index 98%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/view/TextSticker.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/sticker/view/TextSticker.java
index 364446592..dc5674155 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/view/TextSticker.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/models/sticker/view/TextSticker.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.models.sticker.view;
+package com.chwl.library.easyphoto.models.sticker.view;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -22,9 +22,9 @@ import android.view.View;
 
 import androidx.core.content.ContextCompat;
 
-import com.yizhuan.xchat_android_library.easyphoto.EasyPhotos;
-import com.yizhuan.xchat_android_library.R;
-import com.yizhuan.xchat_android_library.easyphoto.models.sticker.listener.OnStickerClickListener;
+import com.chwl.library.easyphoto.EasyPhotos;
+import com.chwl.library.R;
+import com.chwl.library.easyphoto.models.sticker.listener.OnStickerClickListener;
 
 
 /**
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/result/Result.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/result/Result.java
similarity index 92%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/result/Result.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/result/Result.java
index c7d2307c5..9d75ea10d 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/result/Result.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/result/Result.java
@@ -1,10 +1,10 @@
-package com.yizhuan.xchat_android_library.easyphoto.result;
+package com.chwl.library.easyphoto.result;
 
 import android.net.Uri;
 
-import com.yizhuan.xchat_android_library.easyphoto.constant.Type;
-import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo;
-import com.yizhuan.xchat_android_library.easyphoto.setting.Setting;
+import com.chwl.library.easyphoto.constant.Type;
+import com.chwl.library.easyphoto.models.album.entity.Photo;
+import com.chwl.library.easyphoto.setting.Setting;
 
 import java.util.ArrayList;
 
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/setting/Setting.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/setting/Setting.java
similarity index 92%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/setting/Setting.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/setting/Setting.java
index 1203eb5d5..312d154e9 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/setting/Setting.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/setting/Setting.java
@@ -1,12 +1,12 @@
-package com.yizhuan.xchat_android_library.easyphoto.setting;
+package com.chwl.library.easyphoto.setting;
 
 import android.view.View;
 
 import androidx.annotation.IntDef;
 
-import com.yizhuan.xchat_android_library.easyphoto.constant.Type;
-import com.yizhuan.xchat_android_library.easyphoto.engine.ImageEngine;
-import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo;
+import com.chwl.library.easyphoto.constant.Type;
+import com.chwl.library.easyphoto.engine.ImageEngine;
+import com.chwl.library.easyphoto.models.album.entity.Photo;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/EasyPhotosActivity.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/EasyPhotosActivity.java
similarity index 96%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/EasyPhotosActivity.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/EasyPhotosActivity.java
index 8a6c711cb..e6b705fab 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/EasyPhotosActivity.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/EasyPhotosActivity.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.ui;
+package com.chwl.library.easyphoto.ui;
 
 import android.Manifest;
 import android.animation.Animator;
@@ -44,27 +44,27 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.SimpleItemAnimator;
 
-import com.yizhuan.xchat_android_library.easyphoto.EasyPhotos;
-import com.yizhuan.xchat_android_library.R;
-import com.yizhuan.xchat_android_library.easyphoto.constant.Code;
-import com.yizhuan.xchat_android_library.easyphoto.constant.Key;
-import com.yizhuan.xchat_android_library.easyphoto.result.Result;
-import com.yizhuan.xchat_android_library.easyphoto.setting.Setting;
-import com.yizhuan.xchat_android_library.easyphoto.ui.adapter.AlbumItemsAdapter;
-import com.yizhuan.xchat_android_library.easyphoto.ui.adapter.PhotosAdapter;
-import com.yizhuan.xchat_android_library.easyphoto.ui.dialog.LoadingDialog;
-import com.yizhuan.xchat_android_library.easyphoto.ui.widget.PressedTextView;
-import com.yizhuan.xchat_android_library.easyphoto.models.ad.AdListener;
-import com.yizhuan.xchat_android_library.easyphoto.models.album.AlbumModel;
-import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo;
-import com.yizhuan.xchat_android_library.easyphoto.utils.color.ColorUtils;
-import com.yizhuan.xchat_android_library.easyphoto.utils.media.DurationUtils;
-import com.yizhuan.xchat_android_library.easyphoto.utils.media.MediaScannerConnectionUtils;
-import com.yizhuan.xchat_android_library.easyphoto.utils.permission.PermissionUtil;
-import com.yizhuan.xchat_android_library.easyphoto.utils.settings.SettingsUtils;
-import com.yizhuan.xchat_android_library.easyphoto.utils.string.StringUtils;
-import com.yizhuan.xchat_android_library.easyphoto.utils.system.SystemUtils;
-import com.yizhuan.xchat_android_library.easyphoto.utils.uri.UriUtils;
+import com.chwl.library.easyphoto.EasyPhotos;
+import com.chwl.library.R;
+import com.chwl.library.easyphoto.constant.Code;
+import com.chwl.library.easyphoto.constant.Key;
+import com.chwl.library.easyphoto.result.Result;
+import com.chwl.library.easyphoto.setting.Setting;
+import com.chwl.library.easyphoto.ui.adapter.AlbumItemsAdapter;
+import com.chwl.library.easyphoto.ui.adapter.PhotosAdapter;
+import com.chwl.library.easyphoto.ui.dialog.LoadingDialog;
+import com.chwl.library.easyphoto.ui.widget.PressedTextView;
+import com.chwl.library.easyphoto.models.ad.AdListener;
+import com.chwl.library.easyphoto.models.album.AlbumModel;
+import com.chwl.library.easyphoto.models.album.entity.Photo;
+import com.chwl.library.easyphoto.utils.color.ColorUtils;
+import com.chwl.library.easyphoto.utils.media.DurationUtils;
+import com.chwl.library.easyphoto.utils.media.MediaScannerConnectionUtils;
+import com.chwl.library.easyphoto.utils.permission.PermissionUtil;
+import com.chwl.library.easyphoto.utils.settings.SettingsUtils;
+import com.chwl.library.easyphoto.utils.string.StringUtils;
+import com.chwl.library.easyphoto.utils.system.SystemUtils;
+import com.chwl.library.easyphoto.utils.uri.UriUtils;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/PreviewActivity.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/PreviewActivity.java
similarity index 95%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/PreviewActivity.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/PreviewActivity.java
index 84c72213c..d8f1157a9 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/PreviewActivity.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/PreviewActivity.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.ui;
+package com.chwl.library.easyphoto.ui;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -26,17 +26,17 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.PagerSnapHelper;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.yizhuan.xchat_android_library.R;
-import com.yizhuan.xchat_android_library.easyphoto.constant.Code;
-import com.yizhuan.xchat_android_library.easyphoto.constant.Key;
-import com.yizhuan.xchat_android_library.easyphoto.result.Result;
-import com.yizhuan.xchat_android_library.easyphoto.setting.Setting;
-import com.yizhuan.xchat_android_library.easyphoto.ui.adapter.PreviewPhotosAdapter;
-import com.yizhuan.xchat_android_library.easyphoto.ui.widget.PressedTextView;
-import com.yizhuan.xchat_android_library.easyphoto.models.album.AlbumModel;
-import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo;
-import com.yizhuan.xchat_android_library.easyphoto.utils.color.ColorUtils;
-import com.yizhuan.xchat_android_library.easyphoto.utils.system.SystemUtils;
+import com.chwl.library.R;
+import com.chwl.library.easyphoto.constant.Code;
+import com.chwl.library.easyphoto.constant.Key;
+import com.chwl.library.easyphoto.result.Result;
+import com.chwl.library.easyphoto.setting.Setting;
+import com.chwl.library.easyphoto.ui.adapter.PreviewPhotosAdapter;
+import com.chwl.library.easyphoto.ui.widget.PressedTextView;
+import com.chwl.library.easyphoto.models.album.AlbumModel;
+import com.chwl.library.easyphoto.models.album.entity.Photo;
+import com.chwl.library.easyphoto.utils.color.ColorUtils;
+import com.chwl.library.easyphoto.utils.system.SystemUtils;
 
 import java.util.ArrayList;
 
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/PreviewFragment.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/PreviewFragment.java
similarity index 91%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/PreviewFragment.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/PreviewFragment.java
index 15d4573c1..af9c7e4b1 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/PreviewFragment.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/PreviewFragment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.ui;
+package com.chwl.library.easyphoto.ui;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -10,8 +10,8 @@ import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.yizhuan.xchat_android_library.R;
-import com.yizhuan.xchat_android_library.easyphoto.ui.adapter.PreviewPhotosFragmentAdapter;
+import com.chwl.library.R;
+import com.chwl.library.easyphoto.ui.adapter.PreviewPhotosFragmentAdapter;
 
 
 public class PreviewFragment extends Fragment implements PreviewPhotosFragmentAdapter.OnClickListener {
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/PuzzleActivity.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/PuzzleActivity.java
similarity index 93%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/PuzzleActivity.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/PuzzleActivity.java
index 95657c357..479f3879e 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/PuzzleActivity.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/PuzzleActivity.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.ui;
+package com.chwl.library.easyphoto.ui;
 
 import android.Manifest;
 import android.app.Activity;
@@ -27,27 +27,27 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.snackbar.Snackbar;
-import com.yizhuan.xchat_android_library.easyphoto.EasyPhotos;
-import com.yizhuan.xchat_android_library.R;
-import com.yizhuan.xchat_android_library.easyphoto.constant.Code;
-import com.yizhuan.xchat_android_library.easyphoto.constant.Key;
-import com.yizhuan.xchat_android_library.easyphoto.models.sticker.StickerModel;
-import com.yizhuan.xchat_android_library.easyphoto.setting.Setting;
-import com.yizhuan.xchat_android_library.easyphoto.ui.adapter.PuzzleAdapter;
-import com.yizhuan.xchat_android_library.easyphoto.ui.adapter.TextStickerAdapter;
-import com.yizhuan.xchat_android_library.easyphoto.engine.ImageEngine;
-import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo;
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Area;
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.DegreeSeekBar;
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.PuzzleLayout;
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.PuzzlePiece;
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.PuzzleUtils;
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.PuzzleView;
-import com.yizhuan.xchat_android_library.easyphoto.utils.bitmap.SaveBitmapCallBack;
-import com.yizhuan.xchat_android_library.easyphoto.utils.media.DurationUtils;
-import com.yizhuan.xchat_android_library.easyphoto.utils.permission.PermissionUtil;
-import com.yizhuan.xchat_android_library.easyphoto.utils.settings.SettingsUtils;
-import com.yizhuan.xchat_android_library.easyphoto.utils.uri.UriUtils;
+import com.chwl.library.easyphoto.EasyPhotos;
+import com.chwl.library.R;
+import com.chwl.library.easyphoto.constant.Code;
+import com.chwl.library.easyphoto.constant.Key;
+import com.chwl.library.easyphoto.models.sticker.StickerModel;
+import com.chwl.library.easyphoto.setting.Setting;
+import com.chwl.library.easyphoto.ui.adapter.PuzzleAdapter;
+import com.chwl.library.easyphoto.ui.adapter.TextStickerAdapter;
+import com.chwl.library.easyphoto.engine.ImageEngine;
+import com.chwl.library.easyphoto.models.album.entity.Photo;
+import com.chwl.library.easyphoto.models.puzzle.Area;
+import com.chwl.library.easyphoto.models.puzzle.DegreeSeekBar;
+import com.chwl.library.easyphoto.models.puzzle.PuzzleLayout;
+import com.chwl.library.easyphoto.models.puzzle.PuzzlePiece;
+import com.chwl.library.easyphoto.models.puzzle.PuzzleUtils;
+import com.chwl.library.easyphoto.models.puzzle.PuzzleView;
+import com.chwl.library.easyphoto.utils.bitmap.SaveBitmapCallBack;
+import com.chwl.library.easyphoto.utils.media.DurationUtils;
+import com.chwl.library.easyphoto.utils.permission.PermissionUtil;
+import com.chwl.library.easyphoto.utils.settings.SettingsUtils;
+import com.chwl.library.easyphoto.utils.uri.UriUtils;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/PuzzleSelectorActivity.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/PuzzleSelectorActivity.java
similarity index 91%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/PuzzleSelectorActivity.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/PuzzleSelectorActivity.java
index 7714f6e8c..db145c71b 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/PuzzleSelectorActivity.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/PuzzleSelectorActivity.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.ui;
+package com.chwl.library.easyphoto.ui;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -24,17 +24,17 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.SimpleItemAnimator;
 
-import com.yizhuan.xchat_android_library.R;
-import com.yizhuan.xchat_android_library.easyphoto.constant.Code;
-import com.yizhuan.xchat_android_library.easyphoto.setting.Setting;
-import com.yizhuan.xchat_android_library.easyphoto.ui.adapter.AlbumItemsAdapter;
-import com.yizhuan.xchat_android_library.easyphoto.ui.adapter.PuzzleSelectorAdapter;
-import com.yizhuan.xchat_android_library.easyphoto.ui.widget.PressedTextView;
-import com.yizhuan.xchat_android_library.easyphoto.models.album.AlbumModel;
-import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo;
-import com.yizhuan.xchat_android_library.easyphoto.ui.adapter.PuzzleSelectorPreviewAdapter;
-import com.yizhuan.xchat_android_library.easyphoto.utils.color.ColorUtils;
-import com.yizhuan.xchat_android_library.easyphoto.utils.system.SystemUtils;
+import com.chwl.library.R;
+import com.chwl.library.easyphoto.constant.Code;
+import com.chwl.library.easyphoto.setting.Setting;
+import com.chwl.library.easyphoto.ui.adapter.AlbumItemsAdapter;
+import com.chwl.library.easyphoto.ui.adapter.PuzzleSelectorAdapter;
+import com.chwl.library.easyphoto.ui.widget.PressedTextView;
+import com.chwl.library.easyphoto.models.album.AlbumModel;
+import com.chwl.library.easyphoto.models.album.entity.Photo;
+import com.chwl.library.easyphoto.ui.adapter.PuzzleSelectorPreviewAdapter;
+import com.chwl.library.easyphoto.utils.color.ColorUtils;
+import com.chwl.library.easyphoto.utils.system.SystemUtils;
 
 import java.util.ArrayList;
 
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/AlbumItemsAdapter.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/adapter/AlbumItemsAdapter.java
similarity index 95%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/AlbumItemsAdapter.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/adapter/AlbumItemsAdapter.java
index d8128aca8..d838e35df 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/AlbumItemsAdapter.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/adapter/AlbumItemsAdapter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.ui.adapter;
+package com.chwl.library.easyphoto.ui.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -11,10 +11,10 @@ import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.yizhuan.xchat_android_library.R;
-import com.yizhuan.xchat_android_library.easyphoto.setting.Setting;
-import com.yizhuan.xchat_android_library.easyphoto.models.ad.AdViewHolder;
-import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.AlbumItem;
+import com.chwl.library.R;
+import com.chwl.library.easyphoto.setting.Setting;
+import com.chwl.library.easyphoto.models.ad.AdViewHolder;
+import com.chwl.library.easyphoto.models.album.entity.AlbumItem;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/PhotosAdapter.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/adapter/PhotosAdapter.java
similarity index 94%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/PhotosAdapter.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/adapter/PhotosAdapter.java
index 6b59632c5..9d26510f3 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/PhotosAdapter.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/adapter/PhotosAdapter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.ui.adapter;
+package com.chwl.library.easyphoto.ui.adapter;
 
 import android.content.Context;
 import android.net.Uri;
@@ -13,14 +13,14 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.yizhuan.xchat_android_library.R;
-import com.yizhuan.xchat_android_library.easyphoto.constant.Type;
-import com.yizhuan.xchat_android_library.easyphoto.result.Result;
-import com.yizhuan.xchat_android_library.easyphoto.setting.Setting;
-import com.yizhuan.xchat_android_library.easyphoto.ui.widget.PressedImageView;
-import com.yizhuan.xchat_android_library.easyphoto.models.ad.AdViewHolder;
-import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo;
-import com.yizhuan.xchat_android_library.easyphoto.utils.media.DurationUtils;
+import com.chwl.library.R;
+import com.chwl.library.easyphoto.constant.Type;
+import com.chwl.library.easyphoto.result.Result;
+import com.chwl.library.easyphoto.setting.Setting;
+import com.chwl.library.easyphoto.ui.widget.PressedImageView;
+import com.chwl.library.easyphoto.models.ad.AdViewHolder;
+import com.chwl.library.easyphoto.models.album.entity.Photo;
+import com.chwl.library.easyphoto.utils.media.DurationUtils;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/PreviewPhotosAdapter.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/adapter/PreviewPhotosAdapter.java
similarity index 94%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/PreviewPhotosAdapter.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/adapter/PreviewPhotosAdapter.java
index cc46bf53c..03ed3a02f 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/PreviewPhotosAdapter.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/adapter/PreviewPhotosAdapter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.ui.adapter;
+package com.chwl.library.easyphoto.ui.adapter;
 
 import android.content.Context;
 import android.content.Intent;
@@ -17,10 +17,10 @@ import com.davemorrissey.labs.subscaleview.ImageSource;
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView;
 import com.github.chrisbanes.photoview.OnScaleChangedListener;
 import com.github.chrisbanes.photoview.PhotoView;
-import com.yizhuan.xchat_android_library.R;
-import com.yizhuan.xchat_android_library.easyphoto.constant.Type;
-import com.yizhuan.xchat_android_library.easyphoto.setting.Setting;
-import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo;
+import com.chwl.library.R;
+import com.chwl.library.easyphoto.constant.Type;
+import com.chwl.library.easyphoto.setting.Setting;
+import com.chwl.library.easyphoto.models.album.entity.Photo;
 
 import java.util.ArrayList;
 
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/PreviewPhotosFragmentAdapter.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/adapter/PreviewPhotosFragmentAdapter.java
similarity index 87%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/PreviewPhotosFragmentAdapter.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/adapter/PreviewPhotosFragmentAdapter.java
index 5b91d8f58..47162a254 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/PreviewPhotosFragmentAdapter.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/adapter/PreviewPhotosFragmentAdapter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.ui.adapter;
+package com.chwl.library.easyphoto.ui.adapter;
 
 import android.content.Context;
 import android.net.Uri;
@@ -9,12 +9,12 @@ import android.widget.TextView;
 
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.yizhuan.xchat_android_library.R;
-import com.yizhuan.xchat_android_library.easyphoto.constant.Type;
-import com.yizhuan.xchat_android_library.easyphoto.result.Result;
-import com.yizhuan.xchat_android_library.easyphoto.setting.Setting;
-import com.yizhuan.xchat_android_library.easyphoto.ui.widget.PressedImageView;
-import com.yizhuan.xchat_android_library.easyphoto.utils.media.DurationUtils;
+import com.chwl.library.R;
+import com.chwl.library.easyphoto.constant.Type;
+import com.chwl.library.easyphoto.result.Result;
+import com.chwl.library.easyphoto.setting.Setting;
+import com.chwl.library.easyphoto.ui.widget.PressedImageView;
+import com.chwl.library.easyphoto.utils.media.DurationUtils;
 
 /**
  * 预览所有选中图片集合的适配器
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/PuzzleAdapter.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/adapter/PuzzleAdapter.java
similarity index 87%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/PuzzleAdapter.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/adapter/PuzzleAdapter.java
index 63292f734..67882e5e0 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/PuzzleAdapter.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/adapter/PuzzleAdapter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.ui.adapter;
+package com.chwl.library.easyphoto.ui.adapter;
 
 import android.view.LayoutInflater;
 import android.view.View;
@@ -6,11 +6,11 @@ import android.view.ViewGroup;
 
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.yizhuan.xchat_android_library.R;
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.PuzzleLayout;
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.SquarePuzzleView;
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.slant.NumberSlantLayout;
-import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight.NumberStraightLayout;
+import com.chwl.library.R;
+import com.chwl.library.easyphoto.models.puzzle.PuzzleLayout;
+import com.chwl.library.easyphoto.models.puzzle.SquarePuzzleView;
+import com.chwl.library.easyphoto.models.puzzle.template.slant.NumberSlantLayout;
+import com.chwl.library.easyphoto.models.puzzle.template.straight.NumberStraightLayout;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/PuzzleSelectorAdapter.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/adapter/PuzzleSelectorAdapter.java
similarity index 88%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/PuzzleSelectorAdapter.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/adapter/PuzzleSelectorAdapter.java
index 529c05fe6..bc10bc476 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/PuzzleSelectorAdapter.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/adapter/PuzzleSelectorAdapter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.ui.adapter;
+package com.chwl.library.easyphoto.ui.adapter;
 
 import android.content.Context;
 import android.net.Uri;
@@ -10,11 +10,11 @@ import android.widget.TextView;
 
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.yizhuan.xchat_android_library.R;
-import com.yizhuan.xchat_android_library.easyphoto.constant.Type;
-import com.yizhuan.xchat_android_library.easyphoto.setting.Setting;
-import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo;
-import com.yizhuan.xchat_android_library.easyphoto.utils.media.DurationUtils;
+import com.chwl.library.R;
+import com.chwl.library.easyphoto.constant.Type;
+import com.chwl.library.easyphoto.setting.Setting;
+import com.chwl.library.easyphoto.models.album.entity.Photo;
+import com.chwl.library.easyphoto.utils.media.DurationUtils;
 
 import java.util.ArrayList;
 
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/PuzzleSelectorPreviewAdapter.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/adapter/PuzzleSelectorPreviewAdapter.java
similarity index 89%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/PuzzleSelectorPreviewAdapter.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/adapter/PuzzleSelectorPreviewAdapter.java
index dbe20edc8..d92d35c8f 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/PuzzleSelectorPreviewAdapter.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/adapter/PuzzleSelectorPreviewAdapter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.ui.adapter;
+package com.chwl.library.easyphoto.ui.adapter;
 
 import android.content.Context;
 import android.net.Uri;
@@ -10,11 +10,11 @@ import android.widget.TextView;
 
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.yizhuan.xchat_android_library.R;
-import com.yizhuan.xchat_android_library.easyphoto.constant.Type;
-import com.yizhuan.xchat_android_library.easyphoto.setting.Setting;
-import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo;
-import com.yizhuan.xchat_android_library.easyphoto.utils.media.DurationUtils;
+import com.chwl.library.R;
+import com.chwl.library.easyphoto.constant.Type;
+import com.chwl.library.easyphoto.setting.Setting;
+import com.chwl.library.easyphoto.models.album.entity.Photo;
+import com.chwl.library.easyphoto.utils.media.DurationUtils;
 
 import java.util.ArrayList;
 
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/TextStickerAdapter.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/adapter/TextStickerAdapter.java
similarity index 89%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/TextStickerAdapter.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/adapter/TextStickerAdapter.java
index cbde770ca..9f93b23af 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/TextStickerAdapter.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/adapter/TextStickerAdapter.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.ui.adapter;
+package com.chwl.library.easyphoto.ui.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -8,9 +8,9 @@ import android.widget.TextView;
 
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.yizhuan.xchat_android_library.R;
-import com.yizhuan.xchat_android_library.easyphoto.models.sticker.StickerModel;
-import com.yizhuan.xchat_android_library.easyphoto.models.sticker.entity.TextStickerData;
+import com.chwl.library.R;
+import com.chwl.library.easyphoto.models.sticker.StickerModel;
+import com.chwl.library.easyphoto.models.sticker.entity.TextStickerData;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/dialog/LoadingDialog.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/dialog/LoadingDialog.java
similarity index 93%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/dialog/LoadingDialog.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/dialog/LoadingDialog.java
index bc8a376f3..1b118b793 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/dialog/LoadingDialog.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/dialog/LoadingDialog.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.ui.dialog;
+package com.chwl.library.easyphoto.ui.dialog;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -10,7 +10,7 @@ import android.view.WindowManager;
 
 import androidx.annotation.NonNull;
 
-import com.yizhuan.xchat_android_library.R;
+import com.chwl.library.R;
 
 public class LoadingDialog extends Dialog {
 
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/widget/PressedImageView.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/widget/PressedImageView.java
similarity index 94%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/widget/PressedImageView.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/widget/PressedImageView.java
index bdf94c8a0..2554569c6 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/widget/PressedImageView.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/widget/PressedImageView.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.ui.widget;
+package com.chwl.library.easyphoto.ui.widget;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/widget/PressedTextView.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/widget/PressedTextView.java
similarity index 97%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/widget/PressedTextView.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/widget/PressedTextView.java
index 90d8412f2..2c8e010d6 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/widget/PressedTextView.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/widget/PressedTextView.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.ui.widget;
+package com.chwl.library.easyphoto.ui.widget;
 
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/widget/PreviewRecyclerView.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/widget/PreviewRecyclerView.java
similarity index 96%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/widget/PreviewRecyclerView.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/widget/PreviewRecyclerView.java
index 92866b220..c9343985a 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/widget/PreviewRecyclerView.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/ui/widget/PreviewRecyclerView.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.ui.widget;
+package com.chwl.library.easyphoto.ui.widget;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/bitmap/BitmapUtils.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/bitmap/BitmapUtils.java
similarity index 98%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/bitmap/BitmapUtils.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/bitmap/BitmapUtils.java
index 261328c1c..2fa9b6bed 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/bitmap/BitmapUtils.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/bitmap/BitmapUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.utils.bitmap;
+package com.chwl.library.easyphoto.utils.bitmap;
 
 import android.app.Activity;
 import android.content.ContentResolver;
@@ -20,9 +20,9 @@ import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.exifinterface.media.ExifInterface;
 
-import com.yizhuan.xchat_android_library.easyphoto.EasyPhotos;
-import com.yizhuan.xchat_android_library.easyphoto.utils.uri.UriUtils;
-import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo;
+import com.chwl.library.easyphoto.EasyPhotos;
+import com.chwl.library.easyphoto.utils.uri.UriUtils;
+import com.chwl.library.easyphoto.models.album.entity.Photo;
 
 import java.io.File;
 import java.io.FileOutputStream;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/bitmap/SaveBitmapCallBack.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/bitmap/SaveBitmapCallBack.java
similarity index 80%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/bitmap/SaveBitmapCallBack.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/bitmap/SaveBitmapCallBack.java
index 2b1c12d98..42d79229e 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/bitmap/SaveBitmapCallBack.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/bitmap/SaveBitmapCallBack.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.utils.bitmap;
+package com.chwl.library.easyphoto.utils.bitmap;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/color/ColorUtils.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/color/ColorUtils.java
similarity index 91%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/color/ColorUtils.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/color/ColorUtils.java
index ca3a57358..600973e78 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/color/ColorUtils.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/color/ColorUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.utils.color;
+package com.chwl.library.easyphoto.utils.color;
 
 /**
  * Created by huan on 2018/1/9.
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/media/DurationUtils.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/media/DurationUtils.java
similarity index 94%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/media/DurationUtils.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/media/DurationUtils.java
index 00d4fc8ee..24beb03a1 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/media/DurationUtils.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/media/DurationUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.utils.media;
+package com.chwl.library.easyphoto.utils.media;
 
 import android.media.MediaMetadataRetriever;
 import android.text.format.DateUtils;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/media/MediaScannerConnectionUtils.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/media/MediaScannerConnectionUtils.java
similarity index 92%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/media/MediaScannerConnectionUtils.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/media/MediaScannerConnectionUtils.java
index 406af4405..8d308e314 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/media/MediaScannerConnectionUtils.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/media/MediaScannerConnectionUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.utils.media;
+package com.chwl.library.easyphoto.utils.media;
 
 import android.content.Context;
 import android.media.MediaScannerConnection;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/permission/PermissionUtil.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/permission/PermissionUtil.java
similarity index 95%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/permission/PermissionUtil.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/permission/PermissionUtil.java
index 1fbf7eff5..dfe47cf32 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/permission/PermissionUtil.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/permission/PermissionUtil.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.utils.permission;
+package com.chwl.library.easyphoto.utils.permission;
 
 import android.app.Activity;
 import android.content.pm.PackageManager;
@@ -7,7 +7,7 @@ import androidx.annotation.NonNull;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.PermissionChecker;
 
-import com.yizhuan.xchat_android_library.easyphoto.constant.Code;
+import com.chwl.library.easyphoto.constant.Code;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/result/EasyResult.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/result/EasyResult.java
similarity index 95%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/result/EasyResult.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/result/EasyResult.java
index d314c73ef..dc910370f 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/result/EasyResult.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/result/EasyResult.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.utils.result;
+package com.chwl.library.easyphoto.utils.result;
 
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/result/HolderFragment.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/result/HolderFragment.java
similarity index 83%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/result/HolderFragment.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/result/HolderFragment.java
index dac78921e..296d26dd6 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/result/HolderFragment.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/result/HolderFragment.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.utils.result;
+package com.chwl.library.easyphoto.utils.result;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -7,13 +7,13 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.yizhuan.xchat_android_library.easyphoto.EasyPhotos;
-import com.yizhuan.xchat_android_library.easyphoto.callback.PuzzleCallback;
-import com.yizhuan.xchat_android_library.easyphoto.callback.SelectCallback;
-import com.yizhuan.xchat_android_library.easyphoto.ui.EasyPhotosActivity;
-import com.yizhuan.xchat_android_library.easyphoto.ui.PuzzleActivity;
-import com.yizhuan.xchat_android_library.easyphoto.engine.ImageEngine;
-import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo;
+import com.chwl.library.easyphoto.EasyPhotos;
+import com.chwl.library.easyphoto.callback.PuzzleCallback;
+import com.chwl.library.easyphoto.callback.SelectCallback;
+import com.chwl.library.easyphoto.ui.EasyPhotosActivity;
+import com.chwl.library.easyphoto.ui.PuzzleActivity;
+import com.chwl.library.easyphoto.engine.ImageEngine;
+import com.chwl.library.easyphoto.models.album.entity.Photo;
 
 import java.util.ArrayList;
 
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/settings/SettingsUtils.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/settings/SettingsUtils.java
similarity index 83%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/settings/SettingsUtils.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/settings/SettingsUtils.java
index 8f0a4bed4..1cd5b403d 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/settings/SettingsUtils.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/settings/SettingsUtils.java
@@ -1,11 +1,11 @@
-package com.yizhuan.xchat_android_library.easyphoto.utils.settings;
+package com.chwl.library.easyphoto.utils.settings;
 
 import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
 import android.provider.Settings;
 
-import com.yizhuan.xchat_android_library.easyphoto.constant.Code;
+import com.chwl.library.easyphoto.constant.Code;
 
 /**
  * 系统设置界面启动器
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/string/StringUtils.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/string/StringUtils.java
similarity index 86%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/string/StringUtils.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/string/StringUtils.java
index 4efad9c46..ec085adcf 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/string/StringUtils.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/string/StringUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.utils.string;
+package com.chwl.library.easyphoto.utils.string;
 
 /**
  * 字符串工具类
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/system/MeiZuStatusUtils.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/system/MeiZuStatusUtils.java
similarity index 99%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/system/MeiZuStatusUtils.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/system/MeiZuStatusUtils.java
index 4e92afd4e..3fc418187 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/system/MeiZuStatusUtils.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/system/MeiZuStatusUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.utils.system;
+package com.chwl.library.easyphoto.utils.system;
 
 import android.app.Activity;
 import android.os.Build;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/system/SystemUtils.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/system/SystemUtils.java
similarity index 99%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/system/SystemUtils.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/system/SystemUtils.java
index e5b673220..dbef7760e 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/system/SystemUtils.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/system/SystemUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.utils.system;
+package com.chwl.library.easyphoto.utils.system;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/uri/UriUtils.java b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/uri/UriUtils.java
similarity index 98%
rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/uri/UriUtils.java
rename to library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/uri/UriUtils.java
index 9e21d9b60..e9117e189 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/uri/UriUtils.java
+++ b/library/src/module_easyphoto/java/com/chwl/library/easyphoto/utils/uri/UriUtils.java
@@ -1,4 +1,4 @@
-package com.yizhuan.xchat_android_library.easyphoto.utils.uri;
+package com.chwl.library.easyphoto.utils.uri;
 
 import android.content.ContentResolver;
 import android.content.ContentUris;
@@ -14,7 +14,7 @@ import android.util.Log;
 
 import androidx.core.content.FileProvider;
 
-import com.yizhuan.xchat_android_library.easyphoto.setting.Setting;
+import com.chwl.library.easyphoto.setting.Setting;
 
 import java.io.File;
 import java.util.Locale;
diff --git a/library/src/module_easyphoto/res/layout/activity_easy_photos.xml b/library/src/module_easyphoto/res/layout/activity_easy_photos.xml
index 0c6d0b475..2d25e28ac 100644
--- a/library/src/module_easyphoto/res/layout/activity_easy_photos.xml
+++ b/library/src/module_easyphoto/res/layout/activity_easy_photos.xml
@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/easy_photos_bg_primary"
-        tools:context="com.yizhuan.xchat_android_library.easyphoto.ui.EasyPhotosActivity">
+        tools:context="com.chwl.library.easyphoto.ui.EasyPhotosActivity">
 
         
 
-        
 
-        
 
-        
 
-        
 
-    
@@ -52,7 +52,7 @@
                     android:layout_gravity="center_vertical"
                     android:background="@color/easy_photos_bar_preview_primary_dark" />
 
-                
 
-                
             
 
-            
 
-        
 
-            
 
-        
+    tools:context="com.chwl.library.easyphoto.ui.PuzzleSelectorActivity">
 
     
 
-        
 
 
-    
 
-    
+    tools:context="com.chwl.library.easyphoto.ui.PreviewFragment">
 
     
 
-    
 
-    
diff --git a/library/src/module_easyphoto/res/layout/item_rv_photos_easy_photos.xml b/library/src/module_easyphoto/res/layout/item_rv_photos_easy_photos.xml
index e0157ba76..a5f73bde7 100644
--- a/library/src/module_easyphoto/res/layout/item_rv_photos_easy_photos.xml
+++ b/library/src/module_easyphoto/res/layout/item_rv_photos_easy_photos.xml
@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     xmlns:tools="http://schemas.android.com/tools">
 
-