diff --git a/.gitignore b/.gitignore
index 699fe998c..99d0852cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,7 @@
.externalNativeBuild
.idea
.settings
-app/peko/debug/app-accompany-debug.apk
-app/peko/debug/output.json
+app/peki/debug/app-accompany-debug.apk
+app/peki/debug/output.json
*.apk
-app/peko/release/output.json
+app/peki/release/output.json
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index a5fd097cc..b38ff907c 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -120,19 +120,19 @@
-keep class com.netease.** {*;}
# Presenter 相关
--keep class com.pikolive.app.base.** { *; }
--keep public class * extends com.pikolive.app.base.BaseMvpPresenter
+-keep class com.bingchuang.app.base.** { *; }
+-keep public class * extends com.bingchuang.app.base.BaseMvpPresenter
-keep public class * extends com.bingchuang.library.base.factory.AbstractMvpPresenter
# 云信自定义 ViewHolder 配置
--dontwarn com.pikolive.app.ui.im.recent.holder.**
--keep class com.pikolive.app.ui.im.recent.holder.** {*;}
--keep class com.pikolive.app.ui.im.chat.** {*;}
--keep class com.pikolive.app.luckymoney.viewholder.** {*;}
--keep class com.pikolive.app.share.viewholder.** {*;}
--keep class com.pikolive.app.public_chat_hall.msg.viewholder.** {*;}
--keep class com.pikolive.app.module_hall.im.msgholder.** {*;}
--keep class com.pikolive.core.mentoring_relationship.viewholder.** {*;}
+-dontwarn com.bingchuang.app.ui.im.recent.holder.**
+-keep class com.bingchuang.app.ui.im.recent.holder.** {*;}
+-keep class com.bingchuang.app.ui.im.chat.** {*;}
+-keep class com.bingchuang.app.luckymoney.viewholder.** {*;}
+-keep class com.bingchuang.app.share.viewholder.** {*;}
+-keep class com.bingchuang.app.public_chat_hall.msg.viewholder.** {*;}
+-keep class com.bingchuang.app.module_hall.im.msgholder.** {*;}
+-keep class com.bingchuang.core.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 {*;}
@@ -204,8 +204,8 @@
事件日期 账单item 首页热门adapter 文字消息holder
main tab 控件
diff --git a/app/src/main/java/com/pikolive/app/ui/widget/MainTabLayout.java b/app/src/main/java/com/bingchuang/app/ui/widget/MainTabLayout.java similarity index 97% rename from app/src/main/java/com/pikolive/app/ui/widget/MainTabLayout.java rename to app/src/main/java/com/bingchuang/app/ui/widget/MainTabLayout.java index c0ac2dc02..b02db6aa8 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/MainTabLayout.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/MainTabLayout.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget; +package com.bingchuang.app.ui.widget; import android.content.Context; import android.util.AttributeSet; @@ -9,9 +9,9 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.Size; -import com.pikolive.app.R; -import com.pikolive.core2.home.bean.MainTabInfo; -import com.pikolive.core2.home.bean.MainTabType; +import com.bingchuang.app.R; +import com.bingchuang.core2.home.bean.MainTabInfo; +import com.bingchuang.core2.home.bean.MainTabType; import com.bingchuang.library.utils.ListUtils; import java.util.ArrayList; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/MarqueeLayout.java b/app/src/main/java/com/bingchuang/app/ui/widget/MarqueeLayout.java similarity index 98% rename from app/src/main/java/com/pikolive/app/ui/widget/MarqueeLayout.java rename to app/src/main/java/com/bingchuang/app/ui/widget/MarqueeLayout.java index 144175edc..2500da818 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/MarqueeLayout.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/MarqueeLayout.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget; +package com.bingchuang.app.ui.widget; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -14,7 +14,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.pikolive.app.R; +import com.bingchuang.app.R; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.ScreenUtils; import com.bingchuang.library.utils.log.MLog; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/MarqueeTextView.kt b/app/src/main/java/com/bingchuang/app/ui/widget/MarqueeTextView.kt similarity index 99% rename from app/src/main/java/com/pikolive/app/ui/widget/MarqueeTextView.kt rename to app/src/main/java/com/bingchuang/app/ui/widget/MarqueeTextView.kt index 8fe428778..ad95d55a9 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/MarqueeTextView.kt +++ b/app/src/main/java/com/bingchuang/app/ui/widget/MarqueeTextView.kt @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget +package com.bingchuang.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.pikolive.app.R +import com.bingchuang.app.R import java.lang.ref.WeakReference import kotlin.math.abs import kotlin.math.ceil diff --git a/app/src/main/java/com/pikolive/app/ui/widget/MultipleGraduallyTextView.kt b/app/src/main/java/com/bingchuang/app/ui/widget/MultipleGraduallyTextView.kt similarity index 97% rename from app/src/main/java/com/pikolive/app/ui/widget/MultipleGraduallyTextView.kt rename to app/src/main/java/com/bingchuang/app/ui/widget/MultipleGraduallyTextView.kt index 9d1744b5f..78a8bb9f4 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/MultipleGraduallyTextView.kt +++ b/app/src/main/java/com/bingchuang/app/ui/widget/MultipleGraduallyTextView.kt @@ -1,10 +1,10 @@ -package com.pikolive.app.ui.widget +package com.bingchuang.app.ui.widget import android.content.Context import android.graphics.* import android.util.AttributeSet import androidx.appcompat.widget.AppCompatTextView -import com.pikolive.app.R +import com.bingchuang.app.R class MultipleGraduallyTextView(context: Context, attr: AttributeSet?, def: Int) : AppCompatTextView(context, attr, def) { diff --git a/app/src/main/java/com/pikolive/app/ui/widget/MyItemAnimator.java b/app/src/main/java/com/bingchuang/app/ui/widget/MyItemAnimator.java similarity index 99% rename from app/src/main/java/com/pikolive/app/ui/widget/MyItemAnimator.java rename to app/src/main/java/com/bingchuang/app/ui/widget/MyItemAnimator.java index ee2d36b53..1a457b07b 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/MyItemAnimator.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/MyItemAnimator.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget; +package com.bingchuang.app.ui.widget; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/NobleAvatarView.java b/app/src/main/java/com/bingchuang/app/ui/widget/NobleAvatarView.java similarity index 93% rename from app/src/main/java/com/pikolive/app/ui/widget/NobleAvatarView.java rename to app/src/main/java/com/bingchuang/app/ui/widget/NobleAvatarView.java index ffe6f6010..f38f7fd4e 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/NobleAvatarView.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/NobleAvatarView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget; +package com.bingchuang.app.ui.widget; import android.content.Context; import android.text.TextUtils; @@ -9,12 +9,12 @@ import android.widget.RelativeLayout; import androidx.annotation.Nullable; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; -import com.pikolive.app.R; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.core.noble.NobleInfo; -import com.pikolive.core.noble.NobleResourceType; -import com.pikolive.core.noble.NobleUtil; -import com.pikolive.core.user.bean.UserInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.core.noble.NobleInfo; +import com.bingchuang.core.noble.NobleResourceType; +import com.bingchuang.core.noble.NobleUtil; +import com.bingchuang.core.user.bean.UserInfo; import com.bingchuang.library.utils.SizeUtils; /** diff --git a/app/src/main/java/com/pikolive/app/ui/widget/NobleOpenNoticeView.java b/app/src/main/java/com/bingchuang/app/ui/widget/NobleOpenNoticeView.java similarity index 97% rename from app/src/main/java/com/pikolive/app/ui/widget/NobleOpenNoticeView.java rename to app/src/main/java/com/bingchuang/app/ui/widget/NobleOpenNoticeView.java index 8dff90228..d9d3b7b26 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/NobleOpenNoticeView.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/NobleOpenNoticeView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget; +package com.bingchuang.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.pikolive.app.R; -import com.pikolive.core.noble.NobleInfo; -import com.pikolive.core.noble.NobleUtil; +import com.bingchuang.app.R; +import com.bingchuang.core.noble.NobleInfo; +import com.bingchuang.core.noble.NobleUtil; import java.net.MalformedURLException; import java.net.URL; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/NumView.java b/app/src/main/java/com/bingchuang/app/ui/widget/NumView.java similarity index 93% rename from app/src/main/java/com/pikolive/app/ui/widget/NumView.java rename to app/src/main/java/com/bingchuang/app/ui/widget/NumView.java index ca7b0484b..59602b405 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/NumView.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/NumView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget; +package com.bingchuang.app.ui.widget; import android.content.Context; import android.util.AttributeSet; @@ -7,7 +7,7 @@ import android.widget.LinearLayout; import androidx.annotation.Nullable; -import com.pikolive.app.R; +import com.bingchuang.app.R; import com.bingchuang.library.utils.JavaUtil; public class NumView extends LinearLayout { diff --git a/app/src/main/java/com/pikolive/app/ui/widget/ObservableScrollView.java b/app/src/main/java/com/bingchuang/app/ui/widget/ObservableScrollView.java similarity index 97% rename from app/src/main/java/com/pikolive/app/ui/widget/ObservableScrollView.java rename to app/src/main/java/com/bingchuang/app/ui/widget/ObservableScrollView.java index 36aab6304..b5fbf1b85 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/ObservableScrollView.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/ObservableScrollView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget; +package com.bingchuang.app.ui.widget; /** * Created by chenran on 2017/10/17. diff --git a/app/src/main/java/com/pikolive/app/ui/widget/OnPageSelectedListener.java b/app/src/main/java/com/bingchuang/app/ui/widget/OnPageSelectedListener.java similarity index 90% rename from app/src/main/java/com/pikolive/app/ui/widget/OnPageSelectedListener.java rename to app/src/main/java/com/bingchuang/app/ui/widget/OnPageSelectedListener.java index 180866ee2..6bf236b2f 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/OnPageSelectedListener.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/OnPageSelectedListener.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget; +package com.bingchuang.app.ui.widget; import androidx.viewpager.widget.ViewPager; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/ParentClickHorizontalScrollView.java b/app/src/main/java/com/bingchuang/app/ui/widget/ParentClickHorizontalScrollView.java similarity index 98% rename from app/src/main/java/com/pikolive/app/ui/widget/ParentClickHorizontalScrollView.java rename to app/src/main/java/com/bingchuang/app/ui/widget/ParentClickHorizontalScrollView.java index ed0a72bd0..32486b89f 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/ParentClickHorizontalScrollView.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/ParentClickHorizontalScrollView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget; +package com.bingchuang.app.ui.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/PinEntryEditText.java b/app/src/main/java/com/bingchuang/app/ui/widget/PinEntryEditText.java similarity index 99% rename from app/src/main/java/com/pikolive/app/ui/widget/PinEntryEditText.java rename to app/src/main/java/com/bingchuang/app/ui/widget/PinEntryEditText.java index 26b90da6f..784ba755d 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/PinEntryEditText.java +++ b/app/src/main/java/com/bingchuang/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.pikolive.app.ui.widget; +package com.bingchuang.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.pikolive.app.R; +import com.bingchuang.app.R; public class PinEntryEditText extends AppCompatEditText { diff --git a/app/src/main/java/com/pikolive/app/ui/widget/RecallDialog.java b/app/src/main/java/com/bingchuang/app/ui/widget/RecallDialog.java similarity index 88% rename from app/src/main/java/com/pikolive/app/ui/widget/RecallDialog.java rename to app/src/main/java/com/bingchuang/app/ui/widget/RecallDialog.java index bc84bbbbc..6447c121e 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/RecallDialog.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/RecallDialog.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget; +package com.bingchuang.app.ui.widget; import android.content.Context; import android.content.Intent; @@ -10,15 +10,15 @@ import android.widget.EditText; import android.widget.TextView; import com.netease.nim.uikit.common.util.string.StringUtil; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseActivity; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.recall.RecallModel; -import com.pikolive.core.recall.bean.GoBackInfo; -import com.pikolive.core.recall.event.GoBackEvent; -import com.pikolive.core.user.UserModel; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.utils.SharedPreferenceUtils; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseActivity; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.recall.RecallModel; +import com.bingchuang.core.recall.bean.GoBackInfo; +import com.bingchuang.core.recall.event.GoBackEvent; +import com.bingchuang.core.user.UserModel; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.utils.SharedPreferenceUtils; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.SingleToastUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/RectLayout.java b/app/src/main/java/com/bingchuang/app/ui/widget/RectLayout.java similarity index 94% rename from app/src/main/java/com/pikolive/app/ui/widget/RectLayout.java rename to app/src/main/java/com/bingchuang/app/ui/widget/RectLayout.java index c2a797fc5..8853c2c69 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/RectLayout.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/RectLayout.java @@ -1,11 +1,11 @@ -package com.pikolive.app.ui.widget; +package com.bingchuang.app.ui.widget; import android.content.Context; import android.content.res.TypedArray; import android.util.AttributeSet; import android.widget.RelativeLayout; -import com.pikolive.app.R; +import com.bingchuang.app.R; /** * Created by jack diff --git a/app/src/main/java/com/pikolive/app/ui/widget/RecyclerRefreshLayout.java b/app/src/main/java/com/bingchuang/app/ui/widget/RecyclerRefreshLayout.java similarity index 98% rename from app/src/main/java/com/pikolive/app/ui/widget/RecyclerRefreshLayout.java rename to app/src/main/java/com/bingchuang/app/ui/widget/RecyclerRefreshLayout.java index a9bebea21..797b5be36 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/RecyclerRefreshLayout.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/RecyclerRefreshLayout.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget; +package com.bingchuang.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.pikolive.app.R; +import com.bingchuang.app.R; /** diff --git a/app/src/main/java/com/pikolive/app/ui/widget/RecyclerViewNoBugLinearLayoutManager.java b/app/src/main/java/com/bingchuang/app/ui/widget/RecyclerViewNoBugLinearLayoutManager.java similarity index 97% rename from app/src/main/java/com/pikolive/app/ui/widget/RecyclerViewNoBugLinearLayoutManager.java rename to app/src/main/java/com/bingchuang/app/ui/widget/RecyclerViewNoBugLinearLayoutManager.java index c9cd631a9..f0bae4f02 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/RecyclerViewNoBugLinearLayoutManager.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/RecyclerViewNoBugLinearLayoutManager.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget; +package com.bingchuang.app.ui.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/RecyclerViewNoViewpagerScroll.java b/app/src/main/java/com/bingchuang/app/ui/widget/RecyclerViewNoViewpagerScroll.java similarity index 95% rename from app/src/main/java/com/pikolive/app/ui/widget/RecyclerViewNoViewpagerScroll.java rename to app/src/main/java/com/bingchuang/app/ui/widget/RecyclerViewNoViewpagerScroll.java index be818e18b..322a870f2 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/RecyclerViewNoViewpagerScroll.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/RecyclerViewNoViewpagerScroll.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget; +package com.bingchuang.app.ui.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/RedPointView.java b/app/src/main/java/com/bingchuang/app/ui/widget/RedPointView.java similarity index 93% rename from app/src/main/java/com/pikolive/app/ui/widget/RedPointView.java rename to app/src/main/java/com/bingchuang/app/ui/widget/RedPointView.java index ac524fc06..029c8a3ba 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/RedPointView.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/RedPointView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget; +package com.bingchuang.app.ui.widget; import android.content.Context; import android.content.res.TypedArray; @@ -12,9 +12,9 @@ import android.util.AttributeSet; import androidx.annotation.Nullable; import androidx.appcompat.widget.AppCompatTextView; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.pikolive.app.R; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; /** * 本来是继承View,但是发现new出来的paint和textview不一样,(暂时没找到原因) diff --git a/app/src/main/java/com/pikolive/app/ui/widget/ScollLinearLayoutManager.java b/app/src/main/java/com/bingchuang/app/ui/widget/ScollLinearLayoutManager.java similarity index 98% rename from app/src/main/java/com/pikolive/app/ui/widget/ScollLinearLayoutManager.java rename to app/src/main/java/com/bingchuang/app/ui/widget/ScollLinearLayoutManager.java index 1c57ff741..c706f8254 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/ScollLinearLayoutManager.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/ScollLinearLayoutManager.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget; +package com.bingchuang.app.ui.widget; import android.content.Context; import android.graphics.PointF; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/ShareDialog.java b/app/src/main/java/com/bingchuang/app/ui/widget/ShareDialog.java similarity index 98% rename from app/src/main/java/com/pikolive/app/ui/widget/ShareDialog.java rename to app/src/main/java/com/bingchuang/app/ui/widget/ShareDialog.java index 4dfef921a..9ffdd44e5 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/ShareDialog.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/ShareDialog.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget; +package com.bingchuang.app.ui.widget; import static com.bingchuang.library.utils.ResUtil.getString; @@ -11,7 +11,7 @@ import android.view.WindowManager; import android.widget.TextView; import com.google.android.material.bottomsheet.BottomSheetDialog; -import com.pikolive.app.R; +import com.bingchuang.app.R; import com.bingchuang.library.utils.SingleToastUtil; import cn.sharesdk.facebook.Facebook; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/ShareRedBagDialog.java b/app/src/main/java/com/bingchuang/app/ui/widget/ShareRedBagDialog.java similarity index 94% rename from app/src/main/java/com/pikolive/app/ui/widget/ShareRedBagDialog.java rename to app/src/main/java/com/bingchuang/app/ui/widget/ShareRedBagDialog.java index c1de38247..85395203f 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/ShareRedBagDialog.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/ShareRedBagDialog.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget; +package com.bingchuang.app.ui.widget; import android.app.Dialog; import android.content.Context; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/SimpleAnimListener.java b/app/src/main/java/com/bingchuang/app/ui/widget/SimpleAnimListener.java similarity index 94% rename from app/src/main/java/com/pikolive/app/ui/widget/SimpleAnimListener.java rename to app/src/main/java/com/bingchuang/app/ui/widget/SimpleAnimListener.java index 7dc7fd944..ba3c31ae1 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/SimpleAnimListener.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/SimpleAnimListener.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget; +package com.bingchuang.app.ui.widget; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/SquareImageView.java b/app/src/main/java/com/bingchuang/app/ui/widget/SquareImageView.java similarity index 96% rename from app/src/main/java/com/pikolive/app/ui/widget/SquareImageView.java rename to app/src/main/java/com/bingchuang/app/ui/widget/SquareImageView.java index 3f4181181..44c8a7c6b 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/SquareImageView.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/SquareImageView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget; +package com.bingchuang.app.ui.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/SquareLayout.java b/app/src/main/java/com/bingchuang/app/ui/widget/SquareLayout.java similarity index 96% rename from app/src/main/java/com/pikolive/app/ui/widget/SquareLayout.java rename to app/src/main/java/com/bingchuang/app/ui/widget/SquareLayout.java index 0081ecc50..c0be866dd 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/SquareLayout.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/SquareLayout.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget; +package com.bingchuang.app.ui.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/SuperEditText.java b/app/src/main/java/com/bingchuang/app/ui/widget/SuperEditText.java similarity index 98% rename from app/src/main/java/com/pikolive/app/ui/widget/SuperEditText.java rename to app/src/main/java/com/bingchuang/app/ui/widget/SuperEditText.java index eb0ed8750..40aaa5103 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/SuperEditText.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/SuperEditText.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget; +package com.bingchuang.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.pikolive.app.R; +import com.bingchuang.app.R; /** * Created by huangmeng1 on 2018/6/27. diff --git a/app/src/main/java/com/pikolive/app/ui/widget/TextWatcherSimple.java b/app/src/main/java/com/bingchuang/app/ui/widget/TextWatcherSimple.java similarity index 90% rename from app/src/main/java/com/pikolive/app/ui/widget/TextWatcherSimple.java rename to app/src/main/java/com/bingchuang/app/ui/widget/TextWatcherSimple.java index 2ddd0efa9..b1d43af57 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/TextWatcherSimple.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/TextWatcherSimple.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget; +package com.bingchuang.app.ui.widget; import android.text.TextWatcher; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/TopRoundLinearLayout.java b/app/src/main/java/com/bingchuang/app/ui/widget/TopRoundLinearLayout.java similarity index 97% rename from app/src/main/java/com/pikolive/app/ui/widget/TopRoundLinearLayout.java rename to app/src/main/java/com/bingchuang/app/ui/widget/TopRoundLinearLayout.java index 4ef26faee..39d00d4f9 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/TopRoundLinearLayout.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/TopRoundLinearLayout.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget; +package com.bingchuang.app.ui.widget; import android.content.Context; import android.graphics.Canvas; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/UserInfoDialog.java b/app/src/main/java/com/bingchuang/app/ui/widget/UserInfoDialog.java similarity index 94% rename from app/src/main/java/com/pikolive/app/ui/widget/UserInfoDialog.java rename to app/src/main/java/com/bingchuang/app/ui/widget/UserInfoDialog.java index f10a6bcdc..40b7b482c 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/UserInfoDialog.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/UserInfoDialog.java @@ -1,8 +1,8 @@ -package com.pikolive.app.ui.widget; +package com.bingchuang.app.ui.widget; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAGON_BAR; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAGON_BAR_CANCEL; -import static com.pikolive.core.manager.RoomEvent.DRAGON_BAR_CANCEL; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAGON_BAR; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAGON_BAR_CANCEL; +import static com.bingchuang.core.manager.RoomEvent.DRAGON_BAR_CANCEL; import static com.bingchuang.library.utils.ResUtil.getString; import android.annotation.SuppressLint; @@ -32,60 +32,60 @@ 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.pikolive.app.R; -import com.pikolive.app.UIHelper; -import com.pikolive.app.avroom.ButtonItemFactory; -import com.pikolive.app.avroom.activity.AVRoomActivity; -import com.pikolive.app.avroom.adapter.UpMicAdapter; -import com.pikolive.app.avroom.giftvalue.GiftValueDialogUiHelper; -import com.pikolive.app.avroom.widget.ViewItem; -import com.pikolive.app.common.widget.dialog.DialogManager; -import com.pikolive.app.ui.user.activity.UserInfoActivity; -import com.pikolive.app.ui.user.adapter.SkillPicsAdapter; -import com.pikolive.app.ui.user.decorationsend.UserInfoSkillDecoration; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.app.utils.RegexUtil; -import com.pikolive.app.view.GenderAgeTextView; -import com.pikolive.app.vip.util.VipHelper; -import com.pikolive.core2.XChatConstants; -import com.pikolive.core.Constants; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.bean.RoomMicInfo; -import com.pikolive.core.bean.RoomQueueInfo; -import com.pikolive.core.decoration.headwear.bean.HeadWearInfo; -import com.pikolive.core.family.bean.FamilyInfo; -import com.pikolive.core.family.model.FamilyModel; -import com.pikolive.core.im.custom.bean.FaceAttachment; -import com.pikolive.core.kick.KickModel; -import com.pikolive.core.level.UserLevelVo; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.manager.RoomEvent; -import com.pikolive.core2.market_verify.MarketVerifyModel; -import com.pikolive.core.noble.NobleInfo; -import com.pikolive.core.noble.NobleUtil; -import com.pikolive.core.praise.PraiseModel; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.room.bean.RoomResult; -import com.pikolive.core.room.dragonball.DragonBallModel; -import com.pikolive.core.room.event.DatingSelectUserEvent; -import com.pikolive.core.room.event.RoomAtEvent; -import com.pikolive.core.room.face.FaceReceiveInfo; -import com.pikolive.core.room.giftvalue.GiftValueModel; -import com.pikolive.core.room.giftvalue.bean.RoomGiftValue; -import com.pikolive.core.room.giftvalue.helper.GiftValueMrg; -import com.pikolive.core.room.model.AvRoomModel; -import com.pikolive.core.room.model.HomePartyModel; -import com.pikolive.core.admin.model.SuperAdminModel; -import com.pikolive.core.admin.util.SuperAdminUtil; -import com.pikolive.core.user.UserModel; -import com.pikolive.core.user.bean.BaseInfo; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.utils.Logger; -import com.pikolive.core.utils.StringUtils; -import com.pikolive.core.utils.net.BeanObserver; -import com.pikolive.core.utils.net.DontWarnObserver; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.app.R; +import com.bingchuang.app.UIHelper; +import com.bingchuang.app.avroom.ButtonItemFactory; +import com.bingchuang.app.avroom.activity.AVRoomActivity; +import com.bingchuang.app.avroom.adapter.UpMicAdapter; +import com.bingchuang.app.avroom.giftvalue.GiftValueDialogUiHelper; +import com.bingchuang.app.avroom.widget.ViewItem; +import com.bingchuang.app.common.widget.dialog.DialogManager; +import com.bingchuang.app.ui.user.activity.UserInfoActivity; +import com.bingchuang.app.ui.user.adapter.SkillPicsAdapter; +import com.bingchuang.app.ui.user.decorationsend.UserInfoSkillDecoration; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.app.utils.RegexUtil; +import com.bingchuang.app.view.GenderAgeTextView; +import com.bingchuang.app.vip.util.VipHelper; +import com.bingchuang.core2.XChatConstants; +import com.bingchuang.core.Constants; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.bean.RoomMicInfo; +import com.bingchuang.core.bean.RoomQueueInfo; +import com.bingchuang.core.decoration.headwear.bean.HeadWearInfo; +import com.bingchuang.core.family.bean.FamilyInfo; +import com.bingchuang.core.family.model.FamilyModel; +import com.bingchuang.core.im.custom.bean.FaceAttachment; +import com.bingchuang.core.kick.KickModel; +import com.bingchuang.core.level.UserLevelVo; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.manager.RoomEvent; +import com.bingchuang.core2.market_verify.MarketVerifyModel; +import com.bingchuang.core.noble.NobleInfo; +import com.bingchuang.core.noble.NobleUtil; +import com.bingchuang.core.praise.PraiseModel; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.room.bean.RoomResult; +import com.bingchuang.core.room.dragonball.DragonBallModel; +import com.bingchuang.core.room.event.DatingSelectUserEvent; +import com.bingchuang.core.room.event.RoomAtEvent; +import com.bingchuang.core.room.face.FaceReceiveInfo; +import com.bingchuang.core.room.giftvalue.GiftValueModel; +import com.bingchuang.core.room.giftvalue.bean.RoomGiftValue; +import com.bingchuang.core.room.giftvalue.helper.GiftValueMrg; +import com.bingchuang.core.room.model.AvRoomModel; +import com.bingchuang.core.room.model.HomePartyModel; +import com.bingchuang.core.admin.model.SuperAdminModel; +import com.bingchuang.core.admin.util.SuperAdminUtil; +import com.bingchuang.core.user.UserModel; +import com.bingchuang.core.user.bean.BaseInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.utils.Logger; +import com.bingchuang.core.utils.StringUtils; +import com.bingchuang.core.utils.net.BeanObserver; +import com.bingchuang.core.utils.net.DontWarnObserver; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.callback.CallBack; import com.bingchuang.library.utils.ListUtils; import com.bingchuang.library.utils.SingleToastUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/UserInfoView.java b/app/src/main/java/com/bingchuang/app/ui/widget/UserInfoView.java similarity index 91% rename from app/src/main/java/com/pikolive/app/ui/widget/UserInfoView.java rename to app/src/main/java/com/bingchuang/app/ui/widget/UserInfoView.java index 4f239db53..43e48d34d 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/UserInfoView.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/UserInfoView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget; +package com.bingchuang.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.pikolive.app.R; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.app.utils.RegexUtil; -import com.pikolive.core.user.bean.SimpleUserInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.app.utils.RegexUtil; +import com.bingchuang.core.user.bean.SimpleUserInfo; /** * 用户信息展示 一个通用的展示,用户昵称,性别,经验等级,魅力等级 diff --git a/app/src/main/java/com/pikolive/app/ui/widget/UserInfoWrapContentPager.java b/app/src/main/java/com/bingchuang/app/ui/widget/UserInfoWrapContentPager.java similarity index 97% rename from app/src/main/java/com/pikolive/app/ui/widget/UserInfoWrapContentPager.java rename to app/src/main/java/com/bingchuang/app/ui/widget/UserInfoWrapContentPager.java index b952b76f7..cb527f073 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/UserInfoWrapContentPager.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/UserInfoWrapContentPager.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget; +package com.bingchuang.app.ui.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/UserMagicIndicator.java b/app/src/main/java/com/bingchuang/app/ui/widget/UserMagicIndicator.java similarity index 80% rename from app/src/main/java/com/pikolive/app/ui/widget/UserMagicIndicator.java rename to app/src/main/java/com/bingchuang/app/ui/widget/UserMagicIndicator.java index 810f11e02..bfe2c2e5c 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/UserMagicIndicator.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/UserMagicIndicator.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget; +package com.bingchuang.app.ui.widget; import android.content.Context; import android.view.ViewGroup; @@ -6,14 +6,14 @@ import android.widget.FrameLayout; import androidx.core.content.ContextCompat; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; -import com.pikolive.app.R; -import com.pikolive.app.decoration.view.widgets.BadgeScaleTransitionPagerTitleView; -import com.pikolive.core2.home.bean.TabInfo; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; +import com.bingchuang.app.R; +import com.bingchuang.app.decoration.view.widgets.BadgeScaleTransitionPagerTitleView; +import com.bingchuang.core2.home.bean.TabInfo; import com.bingchuang.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/WrapContentViewPager.java b/app/src/main/java/com/bingchuang/app/ui/widget/WrapContentViewPager.java similarity index 97% rename from app/src/main/java/com/pikolive/app/ui/widget/WrapContentViewPager.java rename to app/src/main/java/com/bingchuang/app/ui/widget/WrapContentViewPager.java index c64a59a2e..88517bf41 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/WrapContentViewPager.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/WrapContentViewPager.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget; +package com.bingchuang.app.ui.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/XRecyclerView/ScaleTransitionPagerTitleView.java b/app/src/main/java/com/bingchuang/app/ui/widget/XRecyclerView/ScaleTransitionPagerTitleView.java similarity index 88% rename from app/src/main/java/com/pikolive/app/ui/widget/XRecyclerView/ScaleTransitionPagerTitleView.java rename to app/src/main/java/com/bingchuang/app/ui/widget/XRecyclerView/ScaleTransitionPagerTitleView.java index c62de40ba..977c05714 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/XRecyclerView/ScaleTransitionPagerTitleView.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/XRecyclerView/ScaleTransitionPagerTitleView.java @@ -1,10 +1,10 @@ -package com.pikolive.app.ui.widget.XRecyclerView; +package com.bingchuang.app.ui.widget.XRecyclerView; import android.content.Context; import android.text.TextPaint; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.titles.ColorTransitionPagerTitleView; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.titles.ColorTransitionPagerTitleView; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.titles.ColorTransitionPagerTitleView; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.titles.ColorTransitionPagerTitleView; /** diff --git a/app/src/main/java/com/pikolive/app/ui/widget/bubble/LeBubbleTextView.java b/app/src/main/java/com/bingchuang/app/ui/widget/bubble/LeBubbleTextView.java similarity index 98% rename from app/src/main/java/com/pikolive/app/ui/widget/bubble/LeBubbleTextView.java rename to app/src/main/java/com/bingchuang/app/ui/widget/bubble/LeBubbleTextView.java index ae9e833bb..e73e08ba1 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/bubble/LeBubbleTextView.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/bubble/LeBubbleTextView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.bubble; +package com.bingchuang.app.ui.widget.bubble; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/bubble/LeBubbleTextViewHelper.java b/app/src/main/java/com/bingchuang/app/ui/widget/bubble/LeBubbleTextViewHelper.java similarity index 98% rename from app/src/main/java/com/pikolive/app/ui/widget/bubble/LeBubbleTextViewHelper.java rename to app/src/main/java/com/bingchuang/app/ui/widget/bubble/LeBubbleTextViewHelper.java index 3f70d8646..db83be1b2 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/bubble/LeBubbleTextViewHelper.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/bubble/LeBubbleTextViewHelper.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.bubble; +package com.bingchuang.app.ui.widget.bubble; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/bubble/LeBubbleTextViews.java b/app/src/main/java/com/bingchuang/app/ui/widget/bubble/LeBubbleTextViews.java similarity index 98% rename from app/src/main/java/com/pikolive/app/ui/widget/bubble/LeBubbleTextViews.java rename to app/src/main/java/com/bingchuang/app/ui/widget/bubble/LeBubbleTextViews.java index 603693b51..3dc525f75 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/bubble/LeBubbleTextViews.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/bubble/LeBubbleTextViews.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.bubble; +package com.bingchuang.app.ui.widget.bubble; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/bubble/LeBubbleTitleTextView.java b/app/src/main/java/com/bingchuang/app/ui/widget/bubble/LeBubbleTitleTextView.java similarity index 98% rename from app/src/main/java/com/pikolive/app/ui/widget/bubble/LeBubbleTitleTextView.java rename to app/src/main/java/com/bingchuang/app/ui/widget/bubble/LeBubbleTitleTextView.java index 8465df327..5bc43ad68 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/bubble/LeBubbleTitleTextView.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/bubble/LeBubbleTitleTextView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.bubble; +package com.bingchuang.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.pikolive.app.R; +import com.bingchuang.app.R; /** diff --git a/app/src/main/java/com/pikolive/app/ui/widget/bubble/LeBubbleView.java b/app/src/main/java/com/bingchuang/app/ui/widget/bubble/LeBubbleView.java similarity index 99% rename from app/src/main/java/com/pikolive/app/ui/widget/bubble/LeBubbleView.java rename to app/src/main/java/com/bingchuang/app/ui/widget/bubble/LeBubbleView.java index 1bf101a36..c024ff3c1 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/bubble/LeBubbleView.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/bubble/LeBubbleView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.bubble; +package com.bingchuang.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.pikolive.app.R; +import com.bingchuang.app.R; /** diff --git a/app/src/main/java/com/pikolive/app/ui/widget/bubble/LeRoundRectDrawable2.java b/app/src/main/java/com/bingchuang/app/ui/widget/bubble/LeRoundRectDrawable2.java similarity index 98% rename from app/src/main/java/com/pikolive/app/ui/widget/bubble/LeRoundRectDrawable2.java rename to app/src/main/java/com/bingchuang/app/ui/widget/bubble/LeRoundRectDrawable2.java index 749ff2e41..1dc2d5326 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/bubble/LeRoundRectDrawable2.java +++ b/app/src/main/java/com/bingchuang/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.pikolive.app.ui.widget.bubble; +package com.bingchuang.app.ui.widget.bubble; import android.graphics.Canvas; import android.graphics.ColorFilter; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/bubble/LeStateColorDrawable.java b/app/src/main/java/com/bingchuang/app/ui/widget/bubble/LeStateColorDrawable.java similarity index 96% rename from app/src/main/java/com/pikolive/app/ui/widget/bubble/LeStateColorDrawable.java rename to app/src/main/java/com/bingchuang/app/ui/widget/bubble/LeStateColorDrawable.java index 45c19f620..3982572d8 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/bubble/LeStateColorDrawable.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/bubble/LeStateColorDrawable.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.bubble; +package com.bingchuang.app.ui.widget.bubble; import android.graphics.drawable.ColorDrawable; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/bubble/TintedBitmapDrawable.java b/app/src/main/java/com/bingchuang/app/ui/widget/bubble/TintedBitmapDrawable.java similarity index 96% rename from app/src/main/java/com/pikolive/app/ui/widget/bubble/TintedBitmapDrawable.java rename to app/src/main/java/com/bingchuang/app/ui/widget/bubble/TintedBitmapDrawable.java index e15152e3f..793c25a76 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/bubble/TintedBitmapDrawable.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/bubble/TintedBitmapDrawable.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.bubble; +package com.bingchuang.app.ui.widget.bubble; import android.content.res.Resources; import android.graphics.Bitmap; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/dialog/AllPlayEffectDialog.java b/app/src/main/java/com/bingchuang/app/ui/widget/dialog/AllPlayEffectDialog.java similarity index 94% rename from app/src/main/java/com/pikolive/app/ui/widget/dialog/AllPlayEffectDialog.java rename to app/src/main/java/com/bingchuang/app/ui/widget/dialog/AllPlayEffectDialog.java index cb8555036..1b9bd2c2b 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/dialog/AllPlayEffectDialog.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/dialog/AllPlayEffectDialog.java @@ -1,9 +1,9 @@ -package com.pikolive.app.ui.widget.dialog; +package com.bingchuang.app.ui.widget.dialog; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_ALL; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_SERVER_ALL; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ALL_ROOM_NOTIFY_BY_SVGA; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L5; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_ALL; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_SERVER_ALL; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ALL_ROOM_NOTIFY_BY_SVGA; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L5; import android.content.Context; import android.graphics.Color; @@ -31,21 +31,21 @@ import com.opensource.svgaplayer.SVGADynamicEntity; import com.opensource.svgaplayer.SVGAImageView; import com.opensource.svgaplayer.SVGAParser; import com.opensource.svgaplayer.SVGAVideoEntity; -import com.pikolive.app.ui.webview.CommonWebViewActivity; -import com.pikolive.app.R; -import com.pikolive.app.avroom.activity.AVRoomActivity; -import com.pikolive.app.common.svga.SimpleSvgaCallback; -import com.pikolive.app.databinding.DialogAllPlayEffectBinding; -import com.pikolive.app.utils.RegexUtil; -import com.pikolive.app.utils.SpannableBuilder; -import com.pikolive.core.gift.bean.LuckyBagNoticeInfo; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.im.custom.bean.NotifyH5Info; -import com.pikolive.core.im.custom.bean.PlayEffectInfo; -import com.pikolive.core.im.custom.bean.RoomBoxPrizeInfo; -import com.pikolive.core.im.custom.bean.RoomLuckySeaMsgBean; -import com.pikolive.core.im.custom.bean.TarotMsgBean; -import com.pikolive.core2.treasurefairy.FairyMsgInfoBean; +import com.bingchuang.app.ui.webview.CommonWebViewActivity; +import com.bingchuang.app.R; +import com.bingchuang.app.avroom.activity.AVRoomActivity; +import com.bingchuang.app.common.svga.SimpleSvgaCallback; +import com.bingchuang.app.databinding.DialogAllPlayEffectBinding; +import com.bingchuang.app.utils.RegexUtil; +import com.bingchuang.app.utils.SpannableBuilder; +import com.bingchuang.core.gift.bean.LuckyBagNoticeInfo; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.im.custom.bean.NotifyH5Info; +import com.bingchuang.core.im.custom.bean.PlayEffectInfo; +import com.bingchuang.core.im.custom.bean.RoomBoxPrizeInfo; +import com.bingchuang.core.im.custom.bean.RoomLuckySeaMsgBean; +import com.bingchuang.core.im.custom.bean.TarotMsgBean; +import com.bingchuang.core2.treasurefairy.FairyMsgInfoBean; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.StringUtils; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/dialog/AllServiceGiftGoRoomTipsDialog.kt b/app/src/main/java/com/bingchuang/app/ui/widget/dialog/AllServiceGiftGoRoomTipsDialog.kt similarity index 88% rename from app/src/main/java/com/pikolive/app/ui/widget/dialog/AllServiceGiftGoRoomTipsDialog.kt rename to app/src/main/java/com/bingchuang/app/ui/widget/dialog/AllServiceGiftGoRoomTipsDialog.kt index c38d58643..2d31ddc68 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/dialog/AllServiceGiftGoRoomTipsDialog.kt +++ b/app/src/main/java/com/bingchuang/app/ui/widget/dialog/AllServiceGiftGoRoomTipsDialog.kt @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.dialog +package com.bingchuang.app.ui.widget.dialog import android.content.Context import android.os.Bundle @@ -8,10 +8,10 @@ import android.view.Window import android.view.WindowManager import androidx.databinding.DataBindingUtil import com.bingchuang.library.utils.ktx.singleClick -import com.pikolive.app.R -import com.pikolive.app.databinding.AllServiceGiftGoRoomTipsDialogBinding -import com.pikolive.app.public_chat_hall.activity.PublicChatHallHomeActivity -import com.pikolive.core.initial.InitialModel +import com.bingchuang.app.R +import com.bingchuang.app.databinding.AllServiceGiftGoRoomTipsDialogBinding +import com.bingchuang.app.public_chat_hall.activity.PublicChatHallHomeActivity +import com.bingchuang.core.initial.InitialModel import com.bingchuang.library.common.util.SPUtils import com.bingchuang.library.utils.JavaUtil @@ -70,7 +70,7 @@ class AllServiceGiftGoRoomTipsDialog( if (roomId == JavaUtil.str2long(InitialModel.get().publicChatHallUid)) { PublicChatHallHomeActivity.openPublicChatHallPage(context) } else { - com.pikolive.app.avroom.activity.AVRoomActivity.start(context, roomId) + com.bingchuang.app.avroom.activity.AVRoomActivity.start(context, roomId) } dismiss() } diff --git a/app/src/main/java/com/pikolive/app/ui/widget/dialog/AllServiceGiftLevelDialog.kt b/app/src/main/java/com/bingchuang/app/ui/widget/dialog/AllServiceGiftLevelDialog.kt similarity index 93% rename from app/src/main/java/com/pikolive/app/ui/widget/dialog/AllServiceGiftLevelDialog.kt rename to app/src/main/java/com/bingchuang/app/ui/widget/dialog/AllServiceGiftLevelDialog.kt index d3c595838..cbb155e83 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/dialog/AllServiceGiftLevelDialog.kt +++ b/app/src/main/java/com/bingchuang/app/ui/widget/dialog/AllServiceGiftLevelDialog.kt @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.dialog +package com.bingchuang.app.ui.widget.dialog import android.content.Context import android.graphics.Color @@ -16,11 +16,11 @@ import com.bingchuang.library.utils.ktx.getColorById import com.bingchuang.library.utils.ktx.singleClick import com.bingchuang.library.utils.ktx.toStringRes import com.bingchuang.library.utils.spannable.SpannableTextBuilder -import com.pikolive.app.R -import com.pikolive.app.databinding.DialogGiftAllServiceLevelBinding -import com.pikolive.app.public_chat_hall.activity.PublicChatHallHomeActivity -import com.pikolive.core.initial.InitialModel -import com.pikolive.core.noble.AllServiceGiftProtocol +import com.bingchuang.app.R +import com.bingchuang.app.databinding.DialogGiftAllServiceLevelBinding +import com.bingchuang.app.public_chat_hall.activity.PublicChatHallHomeActivity +import com.bingchuang.core.initial.InitialModel +import com.bingchuang.core.noble.AllServiceGiftProtocol import com.bingchuang.library.utils.JavaUtil import io.reactivex.Observable import io.reactivex.disposables.Disposable @@ -176,7 +176,7 @@ class AllServiceGiftLevelDialog : BaseDialog { if (data.roomUid == JavaUtil.str2long(InitialModel.get().publicChatHallUid)) { PublicChatHallHomeActivity.openPublicChatHallPage(context) } else { - com.pikolive.app.avroom.activity.AVRoomActivity.start(context, data.roomUid) + com.bingchuang.app.avroom.activity.AVRoomActivity.start(context, data.roomUid) } } } diff --git a/app/src/main/java/com/pikolive/app/ui/widget/dialog/AllServiceVipLevelUPDialog.java b/app/src/main/java/com/bingchuang/app/ui/widget/dialog/AllServiceVipLevelUPDialog.java similarity index 92% rename from app/src/main/java/com/pikolive/app/ui/widget/dialog/AllServiceVipLevelUPDialog.java rename to app/src/main/java/com/bingchuang/app/ui/widget/dialog/AllServiceVipLevelUPDialog.java index a4ebf360b..39506f166 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/dialog/AllServiceVipLevelUPDialog.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/dialog/AllServiceVipLevelUPDialog.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.dialog; +package com.bingchuang.app.ui.widget.dialog; import android.content.Context; import android.graphics.Color; @@ -21,13 +21,13 @@ import com.opensource.svgaplayer.SVGADynamicEntity; import com.opensource.svgaplayer.SVGAImageView; import com.opensource.svgaplayer.SVGAParser; import com.opensource.svgaplayer.SVGAVideoEntity; -import com.pikolive.app.R; -import com.pikolive.app.common.svga.SimpleSvgaCallback; -import com.pikolive.app.common.widget.CircleImageSpan; -import com.pikolive.app.databinding.DialogVipAllServiceLevelUpBinding; -import com.pikolive.app.utils.SpannableBuilder; -import com.pikolive.core.utils.StringExtensionKt; -import com.pikolive.core.vip.VipMessageInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.common.svga.SimpleSvgaCallback; +import com.bingchuang.app.common.widget.CircleImageSpan; +import com.bingchuang.app.databinding.DialogVipAllServiceLevelUpBinding; +import com.bingchuang.app.utils.SpannableBuilder; +import com.bingchuang.core.utils.StringExtensionKt; +import com.bingchuang.core.vip.VipMessageInfo; import com.bingchuang.library.utils.ResUtil; import java.net.URL; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/dialog/BaseDialog.java b/app/src/main/java/com/bingchuang/app/ui/widget/dialog/BaseDialog.java similarity index 92% rename from app/src/main/java/com/pikolive/app/ui/widget/dialog/BaseDialog.java rename to app/src/main/java/com/bingchuang/app/ui/widget/dialog/BaseDialog.java index fa58b552c..d09bbe8d1 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/dialog/BaseDialog.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/dialog/BaseDialog.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.dialog; +package com.bingchuang.app.ui.widget.dialog; import android.content.Context; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/dialog/CommonDialog.java b/app/src/main/java/com/bingchuang/app/ui/widget/dialog/CommonDialog.java similarity index 96% rename from app/src/main/java/com/pikolive/app/ui/widget/dialog/CommonDialog.java rename to app/src/main/java/com/bingchuang/app/ui/widget/dialog/CommonDialog.java index 64d399d8a..131fd99e9 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/dialog/CommonDialog.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/dialog/CommonDialog.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.dialog; +package com.bingchuang.app.ui.widget.dialog; import android.content.Context; import android.os.Bundle; @@ -10,8 +10,8 @@ import android.widget.TextView; import androidx.annotation.ColorRes; -import com.pikolive.app.R; -import com.pikolive.core.utils.TextUtils; +import com.bingchuang.app.R; +import com.bingchuang.core.utils.TextUtils; import com.bingchuang.library.utils.ResUtil; import static android.graphics.Typeface.BOLD; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/dialog/CommonLoadingDialog.java b/app/src/main/java/com/bingchuang/app/ui/widget/dialog/CommonLoadingDialog.java similarity index 95% rename from app/src/main/java/com/pikolive/app/ui/widget/dialog/CommonLoadingDialog.java rename to app/src/main/java/com/bingchuang/app/ui/widget/dialog/CommonLoadingDialog.java index e576b805e..349a361d3 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/dialog/CommonLoadingDialog.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/dialog/CommonLoadingDialog.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.dialog; +package com.bingchuang.app.ui.widget.dialog; import android.content.Context; import android.os.Bundle; @@ -6,7 +6,7 @@ import android.view.Window; import android.widget.TextView; import com.opensource.svgaplayer.SVGAImageView; -import com.pikolive.app.R; +import com.bingchuang.app.R; import com.bingchuang.library.utils.ResUtil; /** diff --git a/app/src/main/java/com/pikolive/app/ui/widget/dialog/CommonMessageDialog.kt b/app/src/main/java/com/bingchuang/app/ui/widget/dialog/CommonMessageDialog.kt similarity index 65% rename from app/src/main/java/com/pikolive/app/ui/widget/dialog/CommonMessageDialog.kt rename to app/src/main/java/com/bingchuang/app/ui/widget/dialog/CommonMessageDialog.kt index 82d5a8c10..e2d0a5696 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/dialog/CommonMessageDialog.kt +++ b/app/src/main/java/com/bingchuang/app/ui/widget/dialog/CommonMessageDialog.kt @@ -1,9 +1,9 @@ -package com.pikolive.app.ui.widget.dialog +package com.bingchuang.app.ui.widget.dialog import android.content.Context -import com.pikolive.app.R -import com.pikolive.app.databinding.DialogCommonMessageBinding -import com.pikolive.app.treasure_box.widget.dialog.BaseBindingDialog +import com.bingchuang.app.R +import com.bingchuang.app.databinding.DialogCommonMessageBinding +import com.bingchuang.app.treasure_box.widget.dialog.BaseBindingDialog import com.bingchuang.library.annatation.ActLayoutRes @ActLayoutRes(R.layout.dialog_common_message) diff --git a/app/src/main/java/com/pikolive/app/ui/widget/dialog/CommonTipDialog.java b/app/src/main/java/com/bingchuang/app/ui/widget/dialog/CommonTipDialog.java similarity index 96% rename from app/src/main/java/com/pikolive/app/ui/widget/dialog/CommonTipDialog.java rename to app/src/main/java/com/bingchuang/app/ui/widget/dialog/CommonTipDialog.java index 8c159711c..8d455550e 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/dialog/CommonTipDialog.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/dialog/CommonTipDialog.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.dialog; +package com.bingchuang.app.ui.widget.dialog; import static android.graphics.Typeface.BOLD; @@ -12,8 +12,8 @@ import android.widget.TextView; import androidx.annotation.ColorRes; -import com.pikolive.app.R; -import com.pikolive.core.utils.TextUtils; +import com.bingchuang.app.R; +import com.bingchuang.core.utils.TextUtils; import com.bingchuang.library.utils.ResUtil; /** diff --git a/app/src/main/java/com/pikolive/app/ui/widget/dialog/ExchangeDiamondTipDialog.java b/app/src/main/java/com/bingchuang/app/ui/widget/dialog/ExchangeDiamondTipDialog.java similarity index 96% rename from app/src/main/java/com/pikolive/app/ui/widget/dialog/ExchangeDiamondTipDialog.java rename to app/src/main/java/com/bingchuang/app/ui/widget/dialog/ExchangeDiamondTipDialog.java index 9a5486b2f..223c0ef2c 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/dialog/ExchangeDiamondTipDialog.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/dialog/ExchangeDiamondTipDialog.java @@ -1,11 +1,11 @@ -package com.pikolive.app.ui.widget.dialog; +package com.bingchuang.app.ui.widget.dialog; import android.content.Context; import android.os.Bundle; import android.widget.ImageView; import android.widget.TextView; -import com.pikolive.app.R; +import com.bingchuang.app.R; /** * @author jack diff --git a/app/src/main/java/com/pikolive/app/ui/widget/dialog/GiftManualQuantityDialog.java b/app/src/main/java/com/bingchuang/app/ui/widget/dialog/GiftManualQuantityDialog.java similarity index 95% rename from app/src/main/java/com/pikolive/app/ui/widget/dialog/GiftManualQuantityDialog.java rename to app/src/main/java/com/bingchuang/app/ui/widget/dialog/GiftManualQuantityDialog.java index 895e0fe80..ff564a6ff 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/dialog/GiftManualQuantityDialog.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/dialog/GiftManualQuantityDialog.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.dialog; +package com.bingchuang.app.ui.widget.dialog; import android.app.Dialog; import android.content.Context; @@ -12,8 +12,8 @@ import android.view.WindowManager; import android.widget.EditText; import android.widget.TextView; -import com.pikolive.app.R; -import com.pikolive.app.utils.KeyBoardUtils; +import com.bingchuang.app.R; +import com.bingchuang.app.utils.KeyBoardUtils; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.SingleToastUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/dialog/GiveDiamondTipDialog.java b/app/src/main/java/com/bingchuang/app/ui/widget/dialog/GiveDiamondTipDialog.java similarity index 97% rename from app/src/main/java/com/pikolive/app/ui/widget/dialog/GiveDiamondTipDialog.java rename to app/src/main/java/com/bingchuang/app/ui/widget/dialog/GiveDiamondTipDialog.java index 0e10594ca..ce1f111c4 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/dialog/GiveDiamondTipDialog.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/dialog/GiveDiamondTipDialog.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.dialog; +package com.bingchuang.app.ui.widget.dialog; import static android.graphics.Typeface.BOLD; @@ -15,8 +15,8 @@ import android.widget.TextView; import androidx.annotation.ColorRes; import androidx.constraintlayout.widget.ConstraintLayout; -import com.pikolive.app.R; -import com.pikolive.core.utils.TextUtils; +import com.bingchuang.app.R; +import com.bingchuang.core.utils.TextUtils; import com.bingchuang.library.utils.ResUtil; /** diff --git a/app/src/main/java/com/pikolive/app/ui/widget/dialog/MonsterDialog.java b/app/src/main/java/com/bingchuang/app/ui/widget/dialog/MonsterDialog.java similarity index 93% rename from app/src/main/java/com/pikolive/app/ui/widget/dialog/MonsterDialog.java rename to app/src/main/java/com/bingchuang/app/ui/widget/dialog/MonsterDialog.java index ec9ac781e..29dcd2554 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/dialog/MonsterDialog.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/dialog/MonsterDialog.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.dialog; +package com.bingchuang.app.ui.widget.dialog; import android.content.Context; import android.graphics.Color; @@ -14,13 +14,13 @@ import android.view.WindowManager; import androidx.databinding.DataBindingUtil; -import com.pikolive.app.ui.webview.CommonWebViewActivity; -import com.pikolive.app.R; -import com.pikolive.app.avroom.activity.AVRoomActivity; -import com.pikolive.app.databinding.DialogMonsterBinding; -import com.pikolive.core2.UriProvider; -import com.pikolive.core.monsterhunting.bean.MonsterInfo; -import com.pikolive.core.monsterhunting.bean.MonsterProtocol; +import com.bingchuang.app.ui.webview.CommonWebViewActivity; +import com.bingchuang.app.R; +import com.bingchuang.app.avroom.activity.AVRoomActivity; +import com.bingchuang.app.databinding.DialogMonsterBinding; +import com.bingchuang.core2.UriProvider; +import com.bingchuang.core.monsterhunting.bean.MonsterInfo; +import com.bingchuang.core.monsterhunting.bean.MonsterProtocol; import com.bingchuang.library.utils.SizeUtils; import java.text.SimpleDateFormat; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/dialog/OpenNobleDialog.java b/app/src/main/java/com/bingchuang/app/ui/widget/dialog/OpenNobleDialog.java similarity index 93% rename from app/src/main/java/com/pikolive/app/ui/widget/dialog/OpenNobleDialog.java rename to app/src/main/java/com/bingchuang/app/ui/widget/dialog/OpenNobleDialog.java index faa71a93a..ff856e83f 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/dialog/OpenNobleDialog.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/dialog/OpenNobleDialog.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.dialog; +package com.bingchuang.app.ui.widget.dialog; import android.content.Context; import android.os.Bundle; @@ -8,10 +8,10 @@ import android.widget.TextView; import androidx.appcompat.app.AppCompatDialog; -import com.pikolive.app.ui.webview.CommonWebViewActivity; -import com.pikolive.app.R; -import com.pikolive.core2.UriProvider; -import com.pikolive.core.noble.NobleUtil; +import com.bingchuang.app.ui.webview.CommonWebViewActivity; +import com.bingchuang.app.R; +import com.bingchuang.core2.UriProvider; +import com.bingchuang.core.noble.NobleUtil; import com.bingchuang.library.utils.ResUtil; /** diff --git a/app/src/main/java/com/pikolive/app/ui/widget/dialog/OpenNobleGlobalNoticeDialog.java b/app/src/main/java/com/bingchuang/app/ui/widget/dialog/OpenNobleGlobalNoticeDialog.java similarity index 94% rename from app/src/main/java/com/pikolive/app/ui/widget/dialog/OpenNobleGlobalNoticeDialog.java rename to app/src/main/java/com/bingchuang/app/ui/widget/dialog/OpenNobleGlobalNoticeDialog.java index 947f9366c..9a492f134 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/dialog/OpenNobleGlobalNoticeDialog.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/dialog/OpenNobleGlobalNoticeDialog.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.dialog; +package com.bingchuang.app.ui.widget.dialog; import android.animation.Animator; import android.content.Context; @@ -12,8 +12,8 @@ import android.view.WindowManager; import androidx.appcompat.app.AppCompatDialog; -import com.pikolive.app.R; -import com.pikolive.app.ui.widget.MarqueeLayout; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.widget.MarqueeLayout; import com.bingchuang.library.utils.SizeUtils; /** diff --git a/app/src/main/java/com/pikolive/app/ui/widget/drawgift/DrawGiftHelper.java b/app/src/main/java/com/bingchuang/app/ui/widget/drawgift/DrawGiftHelper.java similarity index 98% rename from app/src/main/java/com/pikolive/app/ui/widget/drawgift/DrawGiftHelper.java rename to app/src/main/java/com/bingchuang/app/ui/widget/drawgift/DrawGiftHelper.java index 57e5af0c8..8380c6294 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/drawgift/DrawGiftHelper.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/drawgift/DrawGiftHelper.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.drawgift; +package com.bingchuang.app.ui.widget.drawgift; import android.app.Activity; import android.graphics.Bitmap; @@ -13,7 +13,7 @@ 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.pikolive.app.R; +import com.bingchuang.app.R; import com.bingchuang.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/drawgift/DrawGiftModel.java b/app/src/main/java/com/bingchuang/app/ui/widget/drawgift/DrawGiftModel.java similarity index 96% rename from app/src/main/java/com/pikolive/app/ui/widget/drawgift/DrawGiftModel.java rename to app/src/main/java/com/bingchuang/app/ui/widget/drawgift/DrawGiftModel.java index 459001bda..f50c8e689 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/drawgift/DrawGiftModel.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/drawgift/DrawGiftModel.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.drawgift; +package com.bingchuang.app.ui.widget.drawgift; import android.graphics.Bitmap; import android.graphics.Matrix; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/drawgift/DrawGiftPlayHelper.java b/app/src/main/java/com/bingchuang/app/ui/widget/drawgift/DrawGiftPlayHelper.java similarity index 97% rename from app/src/main/java/com/pikolive/app/ui/widget/drawgift/DrawGiftPlayHelper.java rename to app/src/main/java/com/bingchuang/app/ui/widget/drawgift/DrawGiftPlayHelper.java index 655faf51a..95d9b8bb3 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/drawgift/DrawGiftPlayHelper.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/drawgift/DrawGiftPlayHelper.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.drawgift; +package com.bingchuang.app.ui.widget.drawgift; import android.app.Activity; import android.content.Context; @@ -16,9 +16,9 @@ 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.pikolive.app.R; -import com.pikolive.core.gift.GiftModel; -import com.pikolive.core.gift.bean.GiftInfo; +import com.bingchuang.app.R; +import com.bingchuang.core.gift.GiftModel; +import com.bingchuang.core.gift.bean.GiftInfo; import com.bingchuang.library.utils.ListUtils; import java.lang.ref.WeakReference; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/drawgift/DrawGiftPlayView.java b/app/src/main/java/com/bingchuang/app/ui/widget/drawgift/DrawGiftPlayView.java similarity index 99% rename from app/src/main/java/com/pikolive/app/ui/widget/drawgift/DrawGiftPlayView.java rename to app/src/main/java/com/bingchuang/app/ui/widget/drawgift/DrawGiftPlayView.java index 3df0f4231..900c28be4 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/drawgift/DrawGiftPlayView.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/drawgift/DrawGiftPlayView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.drawgift; +package com.bingchuang.app.ui.widget.drawgift; import android.animation.Animator; import android.animation.ValueAnimator; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/drawgift/DrawGiftView.java b/app/src/main/java/com/bingchuang/app/ui/widget/drawgift/DrawGiftView.java similarity index 99% rename from app/src/main/java/com/pikolive/app/ui/widget/drawgift/DrawGiftView.java rename to app/src/main/java/com/bingchuang/app/ui/widget/drawgift/DrawGiftView.java index 4663d1c6d..08d48ee5c 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/drawgift/DrawGiftView.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/drawgift/DrawGiftView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.drawgift; +package com.bingchuang.app.ui.widget.drawgift; import android.app.Activity; import android.content.Context; @@ -17,7 +17,7 @@ import android.view.View; import android.view.WindowManager; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.pikolive.app.R; +import com.bingchuang.app.R; import com.bingchuang.library.utils.ResUtil; import java.util.ArrayList; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/dynamicface/DynamicFaceAdapter.java b/app/src/main/java/com/bingchuang/app/ui/widget/dynamicface/DynamicFaceAdapter.java similarity index 92% rename from app/src/main/java/com/pikolive/app/ui/widget/dynamicface/DynamicFaceAdapter.java rename to app/src/main/java/com/bingchuang/app/ui/widget/dynamicface/DynamicFaceAdapter.java index b26e00a81..f734b4fe2 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/dynamicface/DynamicFaceAdapter.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/dynamicface/DynamicFaceAdapter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.dynamicface; +package com.bingchuang.app.ui.widget.dynamicface; import android.content.Context; import android.view.LayoutInflater; @@ -8,12 +8,12 @@ import android.widget.BaseAdapter; import android.widget.ImageView; import android.widget.TextView; -import com.pikolive.app.R; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.app.vip.util.VipHelper; -import com.pikolive.core.gift.bean.SimpleVipInfo; -import com.pikolive.core.room.face.FaceInfo; -import com.pikolive.core.utils.TextUtils; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.app.vip.util.VipHelper; +import com.bingchuang.core.gift.bean.SimpleVipInfo; +import com.bingchuang.core.room.face.FaceInfo; +import com.bingchuang.core.utils.TextUtils; import com.bingchuang.library.utils.config.BasicConfig; import java.io.File; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/dynamicface/DynamicFaceBuilder.java b/app/src/main/java/com/bingchuang/app/ui/widget/dynamicface/DynamicFaceBuilder.java similarity index 99% rename from app/src/main/java/com/pikolive/app/ui/widget/dynamicface/DynamicFaceBuilder.java rename to app/src/main/java/com/bingchuang/app/ui/widget/dynamicface/DynamicFaceBuilder.java index e6608eaa2..078d578c2 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/dynamicface/DynamicFaceBuilder.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/dynamicface/DynamicFaceBuilder.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.dynamicface; +package com.bingchuang.app.ui.widget.dynamicface; /** * Created by chenran on 2017/9/9. diff --git a/app/src/main/java/com/pikolive/app/ui/widget/dynamicface/DynamicFaceDialog.java b/app/src/main/java/com/bingchuang/app/ui/widget/dynamicface/DynamicFaceDialog.java similarity index 96% rename from app/src/main/java/com/pikolive/app/ui/widget/dynamicface/DynamicFaceDialog.java rename to app/src/main/java/com/bingchuang/app/ui/widget/dynamicface/DynamicFaceDialog.java index 5c556bc2d..adaa5386e 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/dynamicface/DynamicFaceDialog.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/dynamicface/DynamicFaceDialog.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.dynamicface; +package com.bingchuang.app.ui.widget.dynamicface; import android.content.Context; import android.os.Bundle; @@ -18,15 +18,15 @@ import androidx.viewpager.widget.ViewPager; import com.google.android.material.bottomsheet.BottomSheetBehavior; import com.google.android.material.bottomsheet.BottomSheetDialog; -import com.pikolive.app.R; -import com.pikolive.app.common.util.Utils; -import com.pikolive.app.common.widget.dialog.DialogManager; -import com.pikolive.app.vip.VipMainActivity; -import com.pikolive.core2.market_verify.MarketVerifyModel; -import com.pikolive.core.room.event.FaceIsReadyEvent; -import com.pikolive.core.room.face.DynamicFaceModel; -import com.pikolive.core.room.face.FaceInfo; -import com.pikolive.core.utils.LogUtils; +import com.bingchuang.app.R; +import com.bingchuang.app.common.util.Utils; +import com.bingchuang.app.common.widget.dialog.DialogManager; +import com.bingchuang.app.vip.VipMainActivity; +import com.bingchuang.core2.market_verify.MarketVerifyModel; +import com.bingchuang.core.room.event.FaceIsReadyEvent; +import com.bingchuang.core.room.face.DynamicFaceModel; +import com.bingchuang.core.room.face.FaceInfo; +import com.bingchuang.core.utils.LogUtils; import com.bingchuang.library.utils.ListUtils; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.SingleToastUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/dynamicface/FaceItem.java b/app/src/main/java/com/bingchuang/app/ui/widget/dynamicface/FaceItem.java similarity index 92% rename from app/src/main/java/com/pikolive/app/ui/widget/dynamicface/FaceItem.java rename to app/src/main/java/com/bingchuang/app/ui/widget/dynamicface/FaceItem.java index 4d9ae0244..fb01ae7ec 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/dynamicface/FaceItem.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/dynamicface/FaceItem.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.dynamicface; +package com.bingchuang.app.ui.widget.dynamicface; /** * Created by chenran on 2017/9/9. diff --git a/app/src/main/java/com/pikolive/app/ui/widget/dynamicface/FaceResultItem.java b/app/src/main/java/com/bingchuang/app/ui/widget/dynamicface/FaceResultItem.java similarity index 97% rename from app/src/main/java/com/pikolive/app/ui/widget/dynamicface/FaceResultItem.java rename to app/src/main/java/com/bingchuang/app/ui/widget/dynamicface/FaceResultItem.java index a6c8f4da9..d49b66e68 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/dynamicface/FaceResultItem.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/dynamicface/FaceResultItem.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.dynamicface; +package com.bingchuang.app.ui.widget.dynamicface; /** * Created by chenran on 2017/9/9. diff --git a/app/src/main/java/com/pikolive/app/ui/widget/higuide/GuideUtils.java b/app/src/main/java/com/bingchuang/app/ui/widget/higuide/GuideUtils.java similarity index 98% rename from app/src/main/java/com/pikolive/app/ui/widget/higuide/GuideUtils.java rename to app/src/main/java/com/bingchuang/app/ui/widget/higuide/GuideUtils.java index 7405165c2..7ec29cef6 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/higuide/GuideUtils.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/higuide/GuideUtils.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.higuide; +package com.bingchuang.app.ui.widget.higuide; import android.content.Context; import android.graphics.Point; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/higuide/GuideView.java b/app/src/main/java/com/bingchuang/app/ui/widget/higuide/GuideView.java similarity index 96% rename from app/src/main/java/com/pikolive/app/ui/widget/higuide/GuideView.java rename to app/src/main/java/com/bingchuang/app/ui/widget/higuide/GuideView.java index f93e1e58c..ed12c187d 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/higuide/GuideView.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/higuide/GuideView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.higuide; +package com.bingchuang.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.pikolive.app.ui.widget.higuide.Overlay.HightLight; -import com.pikolive.app.ui.widget.higuide.Overlay.Tips; -import com.pikolive.app.ui.widget.higuide.Overlay.Tips.Margin; +import com.bingchuang.app.ui.widget.higuide.Overlay.HightLight; +import com.bingchuang.app.ui.widget.higuide.Overlay.Tips; +import com.bingchuang.app.ui.widget.higuide.Overlay.Tips.Margin; /** * Create By Zii at 2018/5/3. diff --git a/app/src/main/java/com/pikolive/app/ui/widget/higuide/HiGuide.java b/app/src/main/java/com/bingchuang/app/ui/widget/higuide/HiGuide.java similarity index 94% rename from app/src/main/java/com/pikolive/app/ui/widget/higuide/HiGuide.java rename to app/src/main/java/com/bingchuang/app/ui/widget/higuide/HiGuide.java index 2f4dd1dbb..7f63cfec7 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/higuide/HiGuide.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/higuide/HiGuide.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.higuide; +package com.bingchuang.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.pikolive.app.R; -import com.pikolive.app.ui.widget.higuide.GuideView.RemoveCallback; -import com.pikolive.app.ui.widget.higuide.Overlay.Tips; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.widget.higuide.GuideView.RemoveCallback; +import com.bingchuang.app.ui.widget.higuide.Overlay.Tips; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/higuide/HiLightInfo.java b/app/src/main/java/com/bingchuang/app/ui/widget/higuide/HiLightInfo.java similarity index 94% rename from app/src/main/java/com/pikolive/app/ui/widget/higuide/HiLightInfo.java rename to app/src/main/java/com/bingchuang/app/ui/widget/higuide/HiLightInfo.java index bb28e26a2..97f5acd27 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/higuide/HiLightInfo.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/higuide/HiLightInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.higuide; +package com.bingchuang.app.ui.widget.higuide; import android.graphics.RectF; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/higuide/LightConfig.java b/app/src/main/java/com/bingchuang/app/ui/widget/higuide/LightConfig.java similarity index 95% rename from app/src/main/java/com/pikolive/app/ui/widget/higuide/LightConfig.java rename to app/src/main/java/com/bingchuang/app/ui/widget/higuide/LightConfig.java index 12304b3c9..736c0089d 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/higuide/LightConfig.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/higuide/LightConfig.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.higuide; +package com.bingchuang.app.ui.widget.higuide; import android.view.View; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/higuide/OverLayer.java b/app/src/main/java/com/bingchuang/app/ui/widget/higuide/OverLayer.java similarity index 96% rename from app/src/main/java/com/pikolive/app/ui/widget/higuide/OverLayer.java rename to app/src/main/java/com/bingchuang/app/ui/widget/higuide/OverLayer.java index ca24e9b6e..5cc4143ee 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/higuide/OverLayer.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/higuide/OverLayer.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.higuide; +package com.bingchuang.app.ui.widget.higuide; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/higuide/Overlay.java b/app/src/main/java/com/bingchuang/app/ui/widget/higuide/Overlay.java similarity index 99% rename from app/src/main/java/com/pikolive/app/ui/widget/higuide/Overlay.java rename to app/src/main/java/com/bingchuang/app/ui/widget/higuide/Overlay.java index e48e306f1..ea12f9e4a 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/higuide/Overlay.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/higuide/Overlay.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.higuide; +package com.bingchuang.app.ui.widget.higuide; import android.graphics.Color; import android.graphics.RectF; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/higuide/TuTuGuideHelper.java b/app/src/main/java/com/bingchuang/app/ui/widget/higuide/TuTuGuideHelper.java similarity index 99% rename from app/src/main/java/com/pikolive/app/ui/widget/higuide/TuTuGuideHelper.java rename to app/src/main/java/com/bingchuang/app/ui/widget/higuide/TuTuGuideHelper.java index 74d558551..b93c61260 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/higuide/TuTuGuideHelper.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/higuide/TuTuGuideHelper.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.higuide; +package com.bingchuang.app.ui.widget.higuide; import android.app.Activity; import android.app.Dialog; @@ -11,10 +11,10 @@ import android.view.ViewGroup; import android.widget.FrameLayout; import android.widget.ImageView; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.pikolive.app.R; -import com.pikolive.core.utils.ActivityUtil; -import com.pikolive.core.utils.SharedPreferenceUtils; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.app.R; +import com.bingchuang.core.utils.ActivityUtil; +import com.bingchuang.core.utils.SharedPreferenceUtils; import com.bingchuang.library.utils.ListUtils; import java.util.ArrayList; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/higuide/TuTuGuideView.java b/app/src/main/java/com/bingchuang/app/ui/widget/higuide/TuTuGuideView.java similarity index 96% rename from app/src/main/java/com/pikolive/app/ui/widget/higuide/TuTuGuideView.java rename to app/src/main/java/com/bingchuang/app/ui/widget/higuide/TuTuGuideView.java index 2b688bf76..1577b29dd 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/higuide/TuTuGuideView.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/higuide/TuTuGuideView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.higuide; +package com.bingchuang.app.ui.widget.higuide; import android.content.Context; import android.graphics.Canvas; @@ -14,9 +14,9 @@ import android.widget.TextView; import androidx.annotation.NonNull; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.pikolive.app.R; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/interfacex/MicListItem.java b/app/src/main/java/com/bingchuang/app/ui/widget/interfacex/MicListItem.java similarity index 77% rename from app/src/main/java/com/pikolive/app/ui/widget/interfacex/MicListItem.java rename to app/src/main/java/com/bingchuang/app/ui/widget/interfacex/MicListItem.java index a20279ff0..92e13027d 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/interfacex/MicListItem.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/interfacex/MicListItem.java @@ -1,6 +1,6 @@ -package com.pikolive.app.ui.widget.interfacex; +package com.bingchuang.app.ui.widget.interfacex; -import com.pikolive.core.user.bean.UserInfo; +import com.bingchuang.core.user.bean.UserInfo; /** * Created by zhouxiangfeng on 2017/6/15. diff --git a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/FragmentContainerHelper.java b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/FragmentContainerHelper.java similarity index 96% rename from app/src/main/java/com/pikolive/app/ui/widget/magicindicator/FragmentContainerHelper.java rename to app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/FragmentContainerHelper.java index 4c7b0554c..6b36d8501 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/FragmentContainerHelper.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/FragmentContainerHelper.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.magicindicator; +package com.bingchuang.app.ui.widget.magicindicator; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -8,8 +8,8 @@ import android.os.Build; import android.view.animation.AccelerateDecelerateInterpolator; import android.view.animation.Interpolator; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/GiftIndicator.java b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/GiftIndicator.java similarity index 92% rename from app/src/main/java/com/pikolive/app/ui/widget/magicindicator/GiftIndicator.java rename to app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/GiftIndicator.java index 035516e96..bf7a6d492 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/GiftIndicator.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/GiftIndicator.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.magicindicator; +package com.bingchuang.app.ui.widget.magicindicator; import android.content.Context; import android.util.AttributeSet; @@ -9,10 +9,10 @@ import android.widget.TextView; import androidx.annotation.Nullable; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.pikolive.app.R; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.pikolive.core.gift.bean.GiftTab; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.core.gift.bean.GiftTab; import java.util.ArrayList; import java.util.HashMap; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/MagicIndicator.java b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/MagicIndicator.java similarity index 89% rename from app/src/main/java/com/pikolive/app/ui/widget/magicindicator/MagicIndicator.java rename to app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/MagicIndicator.java index c2ce8fe85..d2b47587a 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/MagicIndicator.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/MagicIndicator.java @@ -1,12 +1,12 @@ -package com.pikolive.app.ui.widget.magicindicator; +package com.bingchuang.app.ui.widget.magicindicator; import android.content.Context; import android.util.AttributeSet; import android.view.View; import android.widget.FrameLayout; -import com.pikolive.app.ui.widget.magicindicator.abs.IPagerNavigator; -import com.pikolive.app.ui.widget.magicindicator.abs.IPagerNavigator; +import com.bingchuang.app.ui.widget.magicindicator.abs.IPagerNavigator; +import com.bingchuang.app.ui.widget.magicindicator.abs.IPagerNavigator; /** * 整个框架的入口,核心 diff --git a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/NavigatorHelper.java b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/NavigatorHelper.java similarity index 99% rename from app/src/main/java/com/pikolive/app/ui/widget/magicindicator/NavigatorHelper.java rename to app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/NavigatorHelper.java index 283641254..9190948be 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/NavigatorHelper.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/NavigatorHelper.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.magicindicator; +package com.bingchuang.app.ui.widget.magicindicator; import android.util.SparseArray; import android.util.SparseBooleanArray; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/ScrollState.java b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/ScrollState.java similarity index 81% rename from app/src/main/java/com/pikolive/app/ui/widget/magicindicator/ScrollState.java rename to app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/ScrollState.java index 0abe6c73d..87b0385c4 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/ScrollState.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/ScrollState.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.magicindicator; +package com.bingchuang.app.ui.widget.magicindicator; /** * 自定义滚动状态,消除对ViewPager的依赖 diff --git a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/ViewPagerHelper.java b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/ViewPagerHelper.java similarity index 97% rename from app/src/main/java/com/pikolive/app/ui/widget/magicindicator/ViewPagerHelper.java rename to app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/ViewPagerHelper.java index f308647a0..db45e8b16 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/ViewPagerHelper.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/ViewPagerHelper.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.magicindicator; +package com.bingchuang.app.ui.widget.magicindicator; import androidx.viewpager.widget.ViewPager; import androidx.viewpager2.widget.ViewPager2; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/abs/IPagerNavigator.java b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/abs/IPagerNavigator.java similarity index 93% rename from app/src/main/java/com/pikolive/app/ui/widget/magicindicator/abs/IPagerNavigator.java rename to app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/abs/IPagerNavigator.java index ff6831c93..6faf18846 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/abs/IPagerNavigator.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/abs/IPagerNavigator.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.magicindicator.abs; +package com.bingchuang.app.ui.widget.magicindicator.abs; /** * 抽象的ViewPager导航器 diff --git a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/ArgbEvaluatorHolder.java b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/ArgbEvaluatorHolder.java similarity index 94% rename from app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/ArgbEvaluatorHolder.java rename to app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/ArgbEvaluatorHolder.java index 0f63e2f6e..9543615dd 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/ArgbEvaluatorHolder.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/ArgbEvaluatorHolder.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.magicindicator.buildins; +package com.bingchuang.app.ui.widget.magicindicator.buildins; /** diff --git a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/UIUtil.java b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/UIUtil.java similarity index 90% rename from app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/UIUtil.java rename to app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/UIUtil.java index d9b2d4027..798d9bec0 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/UIUtil.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/UIUtil.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.magicindicator.buildins; +package com.bingchuang.app.ui.widget.magicindicator.buildins; import android.content.Context; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/circlenavigator/CircleNavigator.java b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/circlenavigator/CircleNavigator.java similarity index 97% rename from app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/circlenavigator/CircleNavigator.java rename to app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/circlenavigator/CircleNavigator.java index 229bdd6b8..f4f6f13bd 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/circlenavigator/CircleNavigator.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/circlenavigator/CircleNavigator.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.magicindicator.buildins.circlenavigator; +package com.bingchuang.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.pikolive.app.ui.widget.magicindicator.abs.IPagerNavigator; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.app.ui.widget.magicindicator.abs.IPagerNavigator; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/CommonNavigator.java b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/CommonNavigator.java similarity index 92% rename from app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/CommonNavigator.java rename to app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/CommonNavigator.java index 011a3bcfe..0ca99d141 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/CommonNavigator.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/CommonNavigator.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator; +package com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator; import android.content.Context; import android.database.DataSetObserver; @@ -9,20 +9,20 @@ import android.widget.FrameLayout; import android.widget.HorizontalScrollView; import android.widget.LinearLayout; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; -import com.pikolive.app.R; -import com.pikolive.app.ui.widget.magicindicator.NavigatorHelper; -import com.pikolive.app.ui.widget.magicindicator.ScrollState; -import com.pikolive.app.ui.widget.magicindicator.abs.IPagerNavigator; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.widget.magicindicator.NavigatorHelper; +import com.bingchuang.app.ui.widget.magicindicator.ScrollState; +import com.bingchuang.app.ui.widget.magicindicator.abs.IPagerNavigator; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/abs/CommonNavigatorAdapter.java b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/abs/CommonNavigatorAdapter.java similarity index 93% rename from app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/abs/CommonNavigatorAdapter.java rename to app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/abs/CommonNavigatorAdapter.java index 7686773d8..a485a0125 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/abs/CommonNavigatorAdapter.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/abs/CommonNavigatorAdapter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs; +package com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs; import android.content.Context; import android.database.DataSetObservable; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/abs/IMeasurablePagerTitleView.java b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/abs/IMeasurablePagerTitleView.java similarity index 78% rename from app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/abs/IMeasurablePagerTitleView.java rename to app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/abs/IMeasurablePagerTitleView.java index 30f4f5ba7..3c2b45f41 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/abs/IMeasurablePagerTitleView.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/abs/IMeasurablePagerTitleView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs; +package com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs; /** diff --git a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/abs/IPagerIndicator.java b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/abs/IPagerIndicator.java similarity index 61% rename from app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/abs/IPagerIndicator.java rename to app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/abs/IPagerIndicator.java index aaef83874..e4337ea6e 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/abs/IPagerIndicator.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/abs/IPagerIndicator.java @@ -1,8 +1,8 @@ -package com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs; +package com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/abs/IPagerTitleView.java b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/abs/IPagerTitleView.java similarity index 90% rename from app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/abs/IPagerTitleView.java rename to app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/abs/IPagerTitleView.java index 9ed83f498..58ad80c6f 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/abs/IPagerTitleView.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/abs/IPagerTitleView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs; +package com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs; /** * 抽象的指示器标题,适用于CommonNavigator diff --git a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/BezierPagerIndicator.java b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/BezierPagerIndicator.java similarity index 91% rename from app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/BezierPagerIndicator.java rename to app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/BezierPagerIndicator.java index 3636d3e0f..50b61daa1 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/BezierPagerIndicator.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/BezierPagerIndicator.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.indicators; +package com.bingchuang.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.pikolive.app.ui.widget.magicindicator.FragmentContainerHelper; -import com.pikolive.app.ui.widget.magicindicator.buildins.ArgbEvaluatorHolder; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; +import com.bingchuang.app.ui.widget.magicindicator.FragmentContainerHelper; +import com.bingchuang.app.ui.widget.magicindicator.buildins.ArgbEvaluatorHolder; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; import java.util.Arrays; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/GradientLinePagerIndicator.java b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/GradientLinePagerIndicator.java similarity index 88% rename from app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/GradientLinePagerIndicator.java rename to app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/GradientLinePagerIndicator.java index d651c3326..e38867b19 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/GradientLinePagerIndicator.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/GradientLinePagerIndicator.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.indicators; +package com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.indicators; import android.content.Context; import android.graphics.Canvas; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/GradientLineRoundPagerIndicator.java b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/GradientLineRoundPagerIndicator.java similarity index 83% rename from app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/GradientLineRoundPagerIndicator.java rename to app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/GradientLineRoundPagerIndicator.java index ad3e18427..2398ffa8f 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/GradientLineRoundPagerIndicator.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/GradientLineRoundPagerIndicator.java @@ -1,10 +1,10 @@ -package com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.indicators; +package com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.indicators; import android.content.Context; import android.graphics.Canvas; import android.graphics.LinearGradient; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; /** * 实现渐变指示器帮助类 diff --git a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/LinePagerIndicator.java b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/LinePagerIndicator.java similarity index 92% rename from app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/LinePagerIndicator.java rename to app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/LinePagerIndicator.java index 61c585123..1ce83ba9d 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/LinePagerIndicator.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/LinePagerIndicator.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.indicators; +package com.bingchuang.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.pikolive.app.ui.widget.magicindicator.FragmentContainerHelper; -import com.pikolive.app.ui.widget.magicindicator.buildins.ArgbEvaluatorHolder; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; +import com.bingchuang.app.ui.widget.magicindicator.FragmentContainerHelper; +import com.bingchuang.app.ui.widget.magicindicator.buildins.ArgbEvaluatorHolder; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; import java.util.Arrays; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/TestPagerIndicator.java b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/TestPagerIndicator.java similarity index 89% rename from app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/TestPagerIndicator.java rename to app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/TestPagerIndicator.java index 3208e2241..319be71c0 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/TestPagerIndicator.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/TestPagerIndicator.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.indicators; +package com.bingchuang.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.pikolive.app.ui.widget.magicindicator.FragmentContainerHelper; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; +import com.bingchuang.app.ui.widget.magicindicator.FragmentContainerHelper; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/ThemePagerIndicator.java b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/ThemePagerIndicator.java similarity index 77% rename from app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/ThemePagerIndicator.java rename to app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/ThemePagerIndicator.java index e6d4a128c..692b18067 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/ThemePagerIndicator.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/ThemePagerIndicator.java @@ -1,9 +1,9 @@ -package com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.indicators; +package com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.indicators; import android.content.Context; import android.graphics.Canvas; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; /** * 实现指示器帮助类 diff --git a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/TriangularPagerIndicator.java b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/TriangularPagerIndicator.java similarity index 91% rename from app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/TriangularPagerIndicator.java rename to app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/TriangularPagerIndicator.java index 62d6e8aa9..ad009e717 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/TriangularPagerIndicator.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/TriangularPagerIndicator.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.indicators; +package com.bingchuang.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.pikolive.app.ui.widget.magicindicator.FragmentContainerHelper; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; +import com.bingchuang.app.ui.widget.magicindicator.FragmentContainerHelper; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/WrapPagerIndicator.kt b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/WrapPagerIndicator.kt similarity index 89% rename from app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/WrapPagerIndicator.kt rename to app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/WrapPagerIndicator.kt index f49fb0f72..629737339 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/WrapPagerIndicator.kt +++ b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/WrapPagerIndicator.kt @@ -1,15 +1,15 @@ -package com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.indicators +package com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.indicators import android.content.Context import android.graphics.* -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator import android.view.animation.LinearInterpolator -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData import android.view.View import android.view.animation.Interpolator -import com.pikolive.app.R -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil -import com.pikolive.app.ui.widget.magicindicator.FragmentContainerHelper +import com.bingchuang.app.R +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil +import com.bingchuang.app.ui.widget.magicindicator.FragmentContainerHelper /** * 包裹住内容区域的指示器,类似天天快报的切换效果,需要和IMeasurablePagerTitleView配合使用 diff --git a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/model/PositionData.java b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/model/PositionData.java similarity index 90% rename from app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/model/PositionData.java rename to app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/model/PositionData.java index 623e63852..5751640c9 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/model/PositionData.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/model/PositionData.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.model; +package com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.model; /** * 保存指示器标题的坐标 diff --git a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/titles/ClipPagerTitleView.java b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/titles/ClipPagerTitleView.java similarity index 95% rename from app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/titles/ClipPagerTitleView.java rename to app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/titles/ClipPagerTitleView.java index f3a2f30db..2810e0de5 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/titles/ClipPagerTitleView.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/titles/ClipPagerTitleView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.titles; +package com.bingchuang.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.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; /** diff --git a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/titles/ColorTransitionPagerTitleView.java b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/titles/ColorTransitionPagerTitleView.java similarity index 86% rename from app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/titles/ColorTransitionPagerTitleView.java rename to app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/titles/ColorTransitionPagerTitleView.java index a663d6ab4..66b8cf1c6 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/titles/ColorTransitionPagerTitleView.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/titles/ColorTransitionPagerTitleView.java @@ -1,8 +1,8 @@ -package com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.titles; +package com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.titles; import android.content.Context; -import com.pikolive.app.ui.widget.magicindicator.buildins.ArgbEvaluatorHolder; +import com.bingchuang.app.ui.widget.magicindicator.buildins.ArgbEvaluatorHolder; /** diff --git a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/titles/CommonPagerTitleView.java b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/titles/CommonPagerTitleView.java similarity index 95% rename from app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/titles/CommonPagerTitleView.java rename to app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/titles/CommonPagerTitleView.java index 5dfd13c58..5550be638 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/titles/CommonPagerTitleView.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/titles/CommonPagerTitleView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.titles; +package com.bingchuang.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.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; /** diff --git a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/titles/DummyPagerTitleView.java b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/titles/DummyPagerTitleView.java similarity index 80% rename from app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/titles/DummyPagerTitleView.java rename to app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/titles/DummyPagerTitleView.java index 5db82a203..803b74466 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/titles/DummyPagerTitleView.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/titles/DummyPagerTitleView.java @@ -1,9 +1,9 @@ -package com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.titles; +package com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.titles; import android.content.Context; import android.view.View; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; /** * 空指示器标题,用于只需要指示器而不需要title的需求 diff --git a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/titles/SimplePagerTitleView.java b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/titles/SimplePagerTitleView.java similarity index 91% rename from app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/titles/SimplePagerTitleView.java rename to app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/titles/SimplePagerTitleView.java index dfa463a18..48d0bc5ad 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/titles/SimplePagerTitleView.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/titles/SimplePagerTitleView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.titles; +package com.bingchuang.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.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; /** diff --git a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgeAnchor.java b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgeAnchor.java similarity index 78% rename from app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgeAnchor.java rename to app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgeAnchor.java index ecd5682f2..9d264c0a6 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgeAnchor.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgeAnchor.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.titles.badge; +package com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.titles.badge; /** * 角标的锚点 diff --git a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgePagerTitleView.java b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgePagerTitleView.java similarity index 96% rename from app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgePagerTitleView.java rename to app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgePagerTitleView.java index 1606b11c4..888e276d2 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgePagerTitleView.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgePagerTitleView.java @@ -1,11 +1,11 @@ -package com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.titles.badge; +package com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.titles.badge; import android.content.Context; import android.view.View; import android.widget.FrameLayout; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; /** diff --git a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgeRule.java b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgeRule.java similarity index 85% rename from app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgeRule.java rename to app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgeRule.java index fe1ac2e40..59e3d226f 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgeRule.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgeRule.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.titles.badge; +package com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.titles.badge; /** diff --git a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/ext/FontChangePagerTitleView.java b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/ext/FontChangePagerTitleView.java similarity index 92% rename from app/src/main/java/com/pikolive/app/ui/widget/magicindicator/ext/FontChangePagerTitleView.java rename to app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/ext/FontChangePagerTitleView.java index 016fe24f9..cd8c102f5 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/ext/FontChangePagerTitleView.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/ext/FontChangePagerTitleView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.magicindicator.ext; +package com.bingchuang.app.ui.widget.magicindicator.ext; import android.content.Context; import android.graphics.Paint; @@ -8,10 +8,10 @@ import android.view.Gravity; import android.widget.LinearLayout; import android.widget.TextView; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; /** * create by lvzebiao @2019/5/5 diff --git a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/ext/MainCommonNavigatorAdapter.java b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/ext/MainCommonNavigatorAdapter.java similarity index 72% rename from app/src/main/java/com/pikolive/app/ui/widget/magicindicator/ext/MainCommonNavigatorAdapter.java rename to app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/ext/MainCommonNavigatorAdapter.java index 14ebfb8d9..5cf1d9ac8 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/ext/MainCommonNavigatorAdapter.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/ext/MainCommonNavigatorAdapter.java @@ -1,16 +1,16 @@ -package com.pikolive.app.ui.widget.magicindicator.ext; +package com.bingchuang.app.ui.widget.magicindicator.ext; import android.content.Context; import androidx.core.content.ContextCompat; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; -import com.pikolive.app.R; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/marqueeview/AvRoomNobleWelcomeView.java b/app/src/main/java/com/bingchuang/app/ui/widget/marqueeview/AvRoomNobleWelcomeView.java similarity index 96% rename from app/src/main/java/com/pikolive/app/ui/widget/marqueeview/AvRoomNobleWelcomeView.java rename to app/src/main/java/com/bingchuang/app/ui/widget/marqueeview/AvRoomNobleWelcomeView.java index 411c4250d..662540544 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/marqueeview/AvRoomNobleWelcomeView.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/marqueeview/AvRoomNobleWelcomeView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.marqueeview; +package com.bingchuang.app.ui.widget.marqueeview; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -15,9 +15,9 @@ import android.widget.TextView; import androidx.appcompat.widget.AppCompatImageView; -import com.pikolive.app.R; -import com.pikolive.core.noble.NobleInfo; -import com.pikolive.core.noble.NobleUtil; +import com.bingchuang.app.R; +import com.bingchuang.core.noble.NobleInfo; +import com.bingchuang.core.noble.NobleUtil; import com.bingchuang.library.utils.ScreenUtils; import com.bingchuang.library.utils.SizeUtils; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/marqueeview/BetterMarqueeView.java b/app/src/main/java/com/bingchuang/app/ui/widget/marqueeview/BetterMarqueeView.java similarity index 98% rename from app/src/main/java/com/pikolive/app/ui/widget/marqueeview/BetterMarqueeView.java rename to app/src/main/java/com/bingchuang/app/ui/widget/marqueeview/BetterMarqueeView.java index a7a3dee5c..3609545ad 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/marqueeview/BetterMarqueeView.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/marqueeview/BetterMarqueeView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.marqueeview; +package com.bingchuang.app.ui.widget.marqueeview; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/marqueeview/MarqueeView.java b/app/src/main/java/com/bingchuang/app/ui/widget/marqueeview/MarqueeView.java similarity index 98% rename from app/src/main/java/com/pikolive/app/ui/widget/marqueeview/MarqueeView.java rename to app/src/main/java/com/bingchuang/app/ui/widget/marqueeview/MarqueeView.java index 70678ae28..537248718 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/marqueeview/MarqueeView.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/marqueeview/MarqueeView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.marqueeview; +package com.bingchuang.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.pikolive.app.R; -import com.pikolive.app.common.util.Utils; +import com.bingchuang.app.R; +import com.bingchuang.app.common.util.Utils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/password/PassWordFragment.java b/app/src/main/java/com/bingchuang/app/ui/widget/password/PassWordFragment.java similarity index 95% rename from app/src/main/java/com/pikolive/app/ui/widget/password/PassWordFragment.java rename to app/src/main/java/com/bingchuang/app/ui/widget/password/PassWordFragment.java index 116c3d12c..e9ead6d52 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/password/PassWordFragment.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/password/PassWordFragment.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.password; +package com.bingchuang.app.ui.widget.password; import android.app.Activity; @@ -18,11 +18,11 @@ import androidx.fragment.app.FragmentManager; import com.jungly.gridpasswordview.GridPasswordView; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.pikolive.app.ui.setting.VerifyPhoneActivity; -import com.pikolive.app.R; -import com.pikolive.app.common.widget.dialog.DialogManager; -import com.pikolive.app.ui.wallet.ExchangeGoldActivity; -import com.pikolive.app.ui.withdraw.WithdrawActivity; +import com.bingchuang.app.ui.setting.VerifyPhoneActivity; +import com.bingchuang.app.R; +import com.bingchuang.app.common.widget.dialog.DialogManager; +import com.bingchuang.app.ui.wallet.ExchangeGoldActivity; +import com.bingchuang.app.ui.withdraw.WithdrawActivity; import com.bingchuang.library.utils.codec.DESUtils; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/password/PasswordEvent.java b/app/src/main/java/com/bingchuang/app/ui/widget/password/PasswordEvent.java similarity index 88% rename from app/src/main/java/com/pikolive/app/ui/widget/password/PasswordEvent.java rename to app/src/main/java/com/bingchuang/app/ui/widget/password/PasswordEvent.java index 0997eed4e..dd11284c0 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/password/PasswordEvent.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/password/PasswordEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.password; +package com.bingchuang.app.ui.widget.password; import lombok.Data; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/password/PasswordKeyboardView.java b/app/src/main/java/com/bingchuang/app/ui/widget/password/PasswordKeyboardView.java similarity index 98% rename from app/src/main/java/com/pikolive/app/ui/widget/password/PasswordKeyboardView.java rename to app/src/main/java/com/bingchuang/app/ui/widget/password/PasswordKeyboardView.java index a8a5f2f37..abdc39694 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/password/PasswordKeyboardView.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/password/PasswordKeyboardView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.password; +package com.bingchuang.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.pikolive.app.R; +import com.bingchuang.app.R; import java.util.Arrays; import java.util.Collections; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/password/PasswordView.java b/app/src/main/java/com/bingchuang/app/ui/widget/password/PasswordView.java similarity index 97% rename from app/src/main/java/com/pikolive/app/ui/widget/password/PasswordView.java rename to app/src/main/java/com/bingchuang/app/ui/widget/password/PasswordView.java index 6af1387ff..3cb66ed2b 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/password/PasswordView.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/password/PasswordView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.password; +package com.bingchuang.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.pikolive.app.R; +import com.bingchuang.app.R; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/recyclerview/decoration/ColorDecoration.java b/app/src/main/java/com/bingchuang/app/ui/widget/recyclerview/decoration/ColorDecoration.java similarity index 99% rename from app/src/main/java/com/pikolive/app/ui/widget/recyclerview/decoration/ColorDecoration.java rename to app/src/main/java/com/bingchuang/app/ui/widget/recyclerview/decoration/ColorDecoration.java index f038d3b3b..f5fbeaf94 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/recyclerview/decoration/ColorDecoration.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/recyclerview/decoration/ColorDecoration.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.recyclerview.decoration; +package com.bingchuang.app.ui.widget.recyclerview.decoration; import android.graphics.Canvas; import android.graphics.Rect; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/recyclerview/decoration/DatingItemDecoration.java b/app/src/main/java/com/bingchuang/app/ui/widget/recyclerview/decoration/DatingItemDecoration.java similarity index 95% rename from app/src/main/java/com/pikolive/app/ui/widget/recyclerview/decoration/DatingItemDecoration.java rename to app/src/main/java/com/bingchuang/app/ui/widget/recyclerview/decoration/DatingItemDecoration.java index e7d472a5e..6418e7f37 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/recyclerview/decoration/DatingItemDecoration.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/recyclerview/decoration/DatingItemDecoration.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.recyclerview.decoration; +package com.bingchuang.app.ui.widget.recyclerview.decoration; import android.graphics.Rect; import android.view.View; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/recyclerview/decoration/DividerItemDecoration.java b/app/src/main/java/com/bingchuang/app/ui/widget/recyclerview/decoration/DividerItemDecoration.java similarity index 98% rename from app/src/main/java/com/pikolive/app/ui/widget/recyclerview/decoration/DividerItemDecoration.java rename to app/src/main/java/com/bingchuang/app/ui/widget/recyclerview/decoration/DividerItemDecoration.java index d372cd582..810babc9f 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/recyclerview/decoration/DividerItemDecoration.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/recyclerview/decoration/DividerItemDecoration.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.recyclerview.decoration; +package com.bingchuang.app.ui.widget.recyclerview.decoration; import android.content.Context; import android.content.res.TypedArray; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/recyclerview/decoration/GridSpacingItemDecoration.java b/app/src/main/java/com/bingchuang/app/ui/widget/recyclerview/decoration/GridSpacingItemDecoration.java similarity index 96% rename from app/src/main/java/com/pikolive/app/ui/widget/recyclerview/decoration/GridSpacingItemDecoration.java rename to app/src/main/java/com/bingchuang/app/ui/widget/recyclerview/decoration/GridSpacingItemDecoration.java index 16c8426e8..ce94daa8c 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/recyclerview/decoration/GridSpacingItemDecoration.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/recyclerview/decoration/GridSpacingItemDecoration.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.recyclerview.decoration; +package com.bingchuang.app.ui.widget.recyclerview.decoration; import android.content.Context; import android.graphics.Rect; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/recyclerview/decoration/GridSpacingItemNewDecoration.java b/app/src/main/java/com/bingchuang/app/ui/widget/recyclerview/decoration/GridSpacingItemNewDecoration.java similarity index 98% rename from app/src/main/java/com/pikolive/app/ui/widget/recyclerview/decoration/GridSpacingItemNewDecoration.java rename to app/src/main/java/com/bingchuang/app/ui/widget/recyclerview/decoration/GridSpacingItemNewDecoration.java index a06ff8906..62a0312f9 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/recyclerview/decoration/GridSpacingItemNewDecoration.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/recyclerview/decoration/GridSpacingItemNewDecoration.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.recyclerview.decoration; +package com.bingchuang.app.ui.widget.recyclerview.decoration; import android.graphics.Rect; import android.view.View; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/recyclerview/decoration/GridVItemDecoration.java b/app/src/main/java/com/bingchuang/app/ui/widget/recyclerview/decoration/GridVItemDecoration.java similarity index 95% rename from app/src/main/java/com/pikolive/app/ui/widget/recyclerview/decoration/GridVItemDecoration.java rename to app/src/main/java/com/bingchuang/app/ui/widget/recyclerview/decoration/GridVItemDecoration.java index 11fd7385f..d68439b89 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/recyclerview/decoration/GridVItemDecoration.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/recyclerview/decoration/GridVItemDecoration.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.recyclerview.decoration; +package com.bingchuang.app.ui.widget.recyclerview.decoration; import android.content.Context; import android.graphics.Rect; @@ -7,8 +7,8 @@ import android.view.View; import androidx.recyclerview.widget.RecyclerView; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; import lombok.Setter; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/recyclerview/decoration/HorizontalDecoration.java b/app/src/main/java/com/bingchuang/app/ui/widget/recyclerview/decoration/HorizontalDecoration.java similarity index 95% rename from app/src/main/java/com/pikolive/app/ui/widget/recyclerview/decoration/HorizontalDecoration.java rename to app/src/main/java/com/bingchuang/app/ui/widget/recyclerview/decoration/HorizontalDecoration.java index 0a69f833a..f64c05f48 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/recyclerview/decoration/HorizontalDecoration.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/recyclerview/decoration/HorizontalDecoration.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.recyclerview.decoration; +package com.bingchuang.app.ui.widget.recyclerview.decoration; import android.graphics.Rect; import android.view.View; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/recyclerview/decoration/SpacingDecoration.java b/app/src/main/java/com/bingchuang/app/ui/widget/recyclerview/decoration/SpacingDecoration.java similarity index 98% rename from app/src/main/java/com/pikolive/app/ui/widget/recyclerview/decoration/SpacingDecoration.java rename to app/src/main/java/com/bingchuang/app/ui/widget/recyclerview/decoration/SpacingDecoration.java index 36aa8d2ac..014762bc5 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/recyclerview/decoration/SpacingDecoration.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/recyclerview/decoration/SpacingDecoration.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.recyclerview.decoration; +package com.bingchuang.app.ui.widget.recyclerview.decoration; import android.graphics.Rect; import android.view.View; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/recyclerview/decoration/TagItemDecoration.kt b/app/src/main/java/com/bingchuang/app/ui/widget/recyclerview/decoration/TagItemDecoration.kt similarity index 96% rename from app/src/main/java/com/pikolive/app/ui/widget/recyclerview/decoration/TagItemDecoration.kt rename to app/src/main/java/com/bingchuang/app/ui/widget/recyclerview/decoration/TagItemDecoration.kt index 8279c0cc7..32566a7b1 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/recyclerview/decoration/TagItemDecoration.kt +++ b/app/src/main/java/com/bingchuang/app/ui/widget/recyclerview/decoration/TagItemDecoration.kt @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.recyclerview.decoration +package com.bingchuang.app.ui.widget.recyclerview.decoration import android.graphics.Rect import android.view.View diff --git a/app/src/main/java/com/pikolive/app/ui/widget/recyclerview/decoration/VerticalDecoration.java b/app/src/main/java/com/bingchuang/app/ui/widget/recyclerview/decoration/VerticalDecoration.java similarity index 94% rename from app/src/main/java/com/pikolive/app/ui/widget/recyclerview/decoration/VerticalDecoration.java rename to app/src/main/java/com/bingchuang/app/ui/widget/recyclerview/decoration/VerticalDecoration.java index 7436facc2..3e675c1cd 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/recyclerview/decoration/VerticalDecoration.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/recyclerview/decoration/VerticalDecoration.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.recyclerview.decoration; +package com.bingchuang.app.ui.widget.recyclerview.decoration; import android.graphics.Rect; import android.view.View; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/recyclerview/layoutmanager/FullyGridLayoutManager.java b/app/src/main/java/com/bingchuang/app/ui/widget/recyclerview/layoutmanager/FullyGridLayoutManager.java similarity index 98% rename from app/src/main/java/com/pikolive/app/ui/widget/recyclerview/layoutmanager/FullyGridLayoutManager.java rename to app/src/main/java/com/bingchuang/app/ui/widget/recyclerview/layoutmanager/FullyGridLayoutManager.java index b3f49ca2e..4c5aa897e 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/recyclerview/layoutmanager/FullyGridLayoutManager.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/recyclerview/layoutmanager/FullyGridLayoutManager.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.recyclerview.layoutmanager; +package com.bingchuang.app.ui.widget.recyclerview.layoutmanager; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/recyclerview/layoutmanager/FullyLinearLayoutManager.java b/app/src/main/java/com/bingchuang/app/ui/widget/recyclerview/layoutmanager/FullyLinearLayoutManager.java similarity index 98% rename from app/src/main/java/com/pikolive/app/ui/widget/recyclerview/layoutmanager/FullyLinearLayoutManager.java rename to app/src/main/java/com/bingchuang/app/ui/widget/recyclerview/layoutmanager/FullyLinearLayoutManager.java index 2b246a7e3..6d75cb09a 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/recyclerview/layoutmanager/FullyLinearLayoutManager.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/recyclerview/layoutmanager/FullyLinearLayoutManager.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.recyclerview.layoutmanager; +package com.bingchuang.app.ui.widget.recyclerview.layoutmanager; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/rollviewpager/HintView.java b/app/src/main/java/com/bingchuang/app/ui/widget/rollviewpager/HintView.java similarity index 67% rename from app/src/main/java/com/pikolive/app/ui/widget/rollviewpager/HintView.java rename to app/src/main/java/com/bingchuang/app/ui/widget/rollviewpager/HintView.java index b1e1df6ae..2476ed973 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/rollviewpager/HintView.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/rollviewpager/HintView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.rollviewpager; +package com.bingchuang.app.ui.widget.rollviewpager; public interface HintView { diff --git a/app/src/main/java/com/pikolive/app/ui/widget/rollviewpager/OnItemClickListener.java b/app/src/main/java/com/bingchuang/app/ui/widget/rollviewpager/OnItemClickListener.java similarity index 69% rename from app/src/main/java/com/pikolive/app/ui/widget/rollviewpager/OnItemClickListener.java rename to app/src/main/java/com/bingchuang/app/ui/widget/rollviewpager/OnItemClickListener.java index 3b981316c..42a3455a8 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/rollviewpager/OnItemClickListener.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/rollviewpager/OnItemClickListener.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.rollviewpager; +package com.bingchuang.app.ui.widget.rollviewpager; /** * Created by zhuchenxi on 16/8/4. diff --git a/app/src/main/java/com/pikolive/app/ui/widget/rollviewpager/RollPagerView.java b/app/src/main/java/com/bingchuang/app/ui/widget/rollviewpager/RollPagerView.java similarity index 97% rename from app/src/main/java/com/pikolive/app/ui/widget/rollviewpager/RollPagerView.java rename to app/src/main/java/com/bingchuang/app/ui/widget/rollviewpager/RollPagerView.java index a7192e30c..1fa72ec87 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/rollviewpager/RollPagerView.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/rollviewpager/RollPagerView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.rollviewpager; +package com.bingchuang.app.ui.widget.rollviewpager; import android.content.Context; import android.content.res.TypedArray; @@ -21,11 +21,11 @@ import androidx.viewpager.widget.PagerAdapter; import androidx.viewpager.widget.ViewPager; import androidx.viewpager.widget.ViewPager.OnPageChangeListener; -import com.pikolive.app.ui.widget.rollviewpager.adapter.LoopPagerAdapter; -import com.pikolive.app.ui.widget.rollviewpager.hintview.ColorPointHintView; -import com.pikolive.app.R; -import com.pikolive.app.ui.widget.rollviewpager.adapter.LoopPagerAdapter; -import com.pikolive.app.ui.widget.rollviewpager.hintview.ColorPointHintView; +import com.bingchuang.app.ui.widget.rollviewpager.adapter.LoopPagerAdapter; +import com.bingchuang.app.ui.widget.rollviewpager.hintview.ColorPointHintView; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.widget.rollviewpager.adapter.LoopPagerAdapter; +import com.bingchuang.app.ui.widget.rollviewpager.hintview.ColorPointHintView; import java.lang.ref.WeakReference; import java.lang.reflect.Field; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/rollviewpager/Util.java b/app/src/main/java/com/bingchuang/app/ui/widget/rollviewpager/Util.java similarity index 90% rename from app/src/main/java/com/pikolive/app/ui/widget/rollviewpager/Util.java rename to app/src/main/java/com/bingchuang/app/ui/widget/rollviewpager/Util.java index 537e43239..43edeacb1 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/rollviewpager/Util.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/rollviewpager/Util.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.rollviewpager; +package com.bingchuang.app.ui.widget.rollviewpager; import android.content.Context; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/rollviewpager/adapter/DynamicPagerAdapter.java b/app/src/main/java/com/bingchuang/app/ui/widget/rollviewpager/adapter/DynamicPagerAdapter.java similarity index 94% rename from app/src/main/java/com/pikolive/app/ui/widget/rollviewpager/adapter/DynamicPagerAdapter.java rename to app/src/main/java/com/bingchuang/app/ui/widget/rollviewpager/adapter/DynamicPagerAdapter.java index e4e36667f..170f1e5e6 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/rollviewpager/adapter/DynamicPagerAdapter.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/rollviewpager/adapter/DynamicPagerAdapter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.rollviewpager.adapter; +package com.bingchuang.app.ui.widget.rollviewpager.adapter; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/rollviewpager/adapter/LoopPagerAdapter.java b/app/src/main/java/com/bingchuang/app/ui/widget/rollviewpager/adapter/LoopPagerAdapter.java similarity index 94% rename from app/src/main/java/com/pikolive/app/ui/widget/rollviewpager/adapter/LoopPagerAdapter.java rename to app/src/main/java/com/bingchuang/app/ui/widget/rollviewpager/adapter/LoopPagerAdapter.java index 6b6e398a9..33e86b432 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/rollviewpager/adapter/LoopPagerAdapter.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/rollviewpager/adapter/LoopPagerAdapter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.rollviewpager.adapter; +package com.bingchuang.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.pikolive.app.ui.widget.rollviewpager.HintView; -import com.pikolive.app.ui.widget.rollviewpager.RollPagerView; +import com.bingchuang.app.ui.widget.rollviewpager.HintView; +import com.bingchuang.app.ui.widget.rollviewpager.RollPagerView; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/rollviewpager/adapter/StaticPagerAdapter.java b/app/src/main/java/com/bingchuang/app/ui/widget/rollviewpager/adapter/StaticPagerAdapter.java similarity index 96% rename from app/src/main/java/com/pikolive/app/ui/widget/rollviewpager/adapter/StaticPagerAdapter.java rename to app/src/main/java/com/bingchuang/app/ui/widget/rollviewpager/adapter/StaticPagerAdapter.java index d78d0f3d4..b2809a715 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/rollviewpager/adapter/StaticPagerAdapter.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/rollviewpager/adapter/StaticPagerAdapter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.rollviewpager.adapter; +package com.bingchuang.app.ui.widget.rollviewpager.adapter; import android.view.View; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/rollviewpager/adapter/StaticPagerAdapterWrapper.java b/app/src/main/java/com/bingchuang/app/ui/widget/rollviewpager/adapter/StaticPagerAdapterWrapper.java similarity index 90% rename from app/src/main/java/com/pikolive/app/ui/widget/rollviewpager/adapter/StaticPagerAdapterWrapper.java rename to app/src/main/java/com/bingchuang/app/ui/widget/rollviewpager/adapter/StaticPagerAdapterWrapper.java index 4607e0b1b..e32c440a6 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/rollviewpager/adapter/StaticPagerAdapterWrapper.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/rollviewpager/adapter/StaticPagerAdapterWrapper.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.rollviewpager.adapter; +package com.bingchuang.app.ui.widget.rollviewpager.adapter; import android.content.Context; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/rollviewpager/hintview/ColorPointHintView.java b/app/src/main/java/com/bingchuang/app/ui/widget/rollviewpager/hintview/ColorPointHintView.java similarity index 90% rename from app/src/main/java/com/pikolive/app/ui/widget/rollviewpager/hintview/ColorPointHintView.java rename to app/src/main/java/com/bingchuang/app/ui/widget/rollviewpager/hintview/ColorPointHintView.java index c2c4cea07..75e61f7ef 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/rollviewpager/hintview/ColorPointHintView.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/rollviewpager/hintview/ColorPointHintView.java @@ -1,10 +1,10 @@ -package com.pikolive.app.ui.widget.rollviewpager.hintview; +package com.bingchuang.app.ui.widget.rollviewpager.hintview; import android.content.Context; import android.graphics.drawable.Drawable; import android.graphics.drawable.GradientDrawable; -import com.pikolive.app.ui.widget.rollviewpager.Util; +import com.bingchuang.app.ui.widget.rollviewpager.Util; /** diff --git a/app/src/main/java/com/pikolive/app/ui/widget/rollviewpager/hintview/IconHintView.java b/app/src/main/java/com/bingchuang/app/ui/widget/rollviewpager/hintview/IconHintView.java similarity index 95% rename from app/src/main/java/com/pikolive/app/ui/widget/rollviewpager/hintview/IconHintView.java rename to app/src/main/java/com/bingchuang/app/ui/widget/rollviewpager/hintview/IconHintView.java index 2aefd670f..bfeff3df0 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/rollviewpager/hintview/IconHintView.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/rollviewpager/hintview/IconHintView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.rollviewpager.hintview; +package com.bingchuang.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.pikolive.app.ui.widget.rollviewpager.Util; +import com.bingchuang.app.ui.widget.rollviewpager.Util; /** diff --git a/app/src/main/java/com/pikolive/app/ui/widget/rollviewpager/hintview/ShapeHintView.java b/app/src/main/java/com/bingchuang/app/ui/widget/rollviewpager/hintview/ShapeHintView.java similarity index 94% rename from app/src/main/java/com/pikolive/app/ui/widget/rollviewpager/hintview/ShapeHintView.java rename to app/src/main/java/com/bingchuang/app/ui/widget/rollviewpager/hintview/ShapeHintView.java index 1fe80e083..8bc293a95 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/rollviewpager/hintview/ShapeHintView.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/rollviewpager/hintview/ShapeHintView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.rollviewpager.hintview; +package com.bingchuang.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.pikolive.app.ui.widget.rollviewpager.HintView; +import com.bingchuang.app.ui.widget.rollviewpager.HintView; public abstract class ShapeHintView extends LinearLayout implements HintView { diff --git a/app/src/main/java/com/pikolive/app/ui/widget/rollviewpager/hintview/TextHintView.java b/app/src/main/java/com/bingchuang/app/ui/widget/rollviewpager/hintview/TextHintView.java similarity index 87% rename from app/src/main/java/com/pikolive/app/ui/widget/rollviewpager/hintview/TextHintView.java rename to app/src/main/java/com/bingchuang/app/ui/widget/rollviewpager/hintview/TextHintView.java index 5ea28b4e1..5a50af9ea 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/rollviewpager/hintview/TextHintView.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/rollviewpager/hintview/TextHintView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.rollviewpager.hintview; +package com.bingchuang.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.pikolive.app.ui.widget.rollviewpager.HintView; +import com.bingchuang.app.ui.widget.rollviewpager.HintView; public class TextHintView extends AppCompatTextView implements HintView { diff --git a/app/src/main/java/com/pikolive/app/ui/widget/viewpager/NoScrollViewPager.java b/app/src/main/java/com/bingchuang/app/ui/widget/viewpager/NoScrollViewPager.java similarity index 96% rename from app/src/main/java/com/pikolive/app/ui/widget/viewpager/NoScrollViewPager.java rename to app/src/main/java/com/bingchuang/app/ui/widget/viewpager/NoScrollViewPager.java index 5224650e2..e0504542a 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/viewpager/NoScrollViewPager.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/viewpager/NoScrollViewPager.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.widget.viewpager; +package com.bingchuang.app.ui.widget.viewpager; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/viewpager/ScrollViewPager.java b/app/src/main/java/com/bingchuang/app/ui/widget/viewpager/ScrollViewPager.java similarity index 79% rename from app/src/main/java/com/pikolive/app/ui/widget/viewpager/ScrollViewPager.java rename to app/src/main/java/com/bingchuang/app/ui/widget/viewpager/ScrollViewPager.java index 4df9becf6..52be0022d 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/viewpager/ScrollViewPager.java +++ b/app/src/main/java/com/bingchuang/app/ui/widget/viewpager/ScrollViewPager.java @@ -1,11 +1,11 @@ -package com.pikolive.app.ui.widget.viewpager; +package com.bingchuang.app.ui.widget.viewpager; import android.content.Context; import android.util.AttributeSet; import android.view.MotionEvent; -import com.pikolive.app.ui.widget.rollviewpager.RollPagerView; -import com.pikolive.app.ui.widget.rollviewpager.RollPagerView; +import com.bingchuang.app.ui.widget.rollviewpager.RollPagerView; +import com.bingchuang.app.ui.widget.rollviewpager.RollPagerView; public class ScrollViewPager extends RollPagerView { public ScrollViewPager(Context context) { diff --git a/app/src/main/java/com/pikolive/app/ui/withdraw/BinderAlipayActivity.java b/app/src/main/java/com/bingchuang/app/ui/withdraw/BinderAlipayActivity.java similarity index 94% rename from app/src/main/java/com/pikolive/app/ui/withdraw/BinderAlipayActivity.java rename to app/src/main/java/com/bingchuang/app/ui/withdraw/BinderAlipayActivity.java index 537e06213..96ee07858 100644 --- a/app/src/main/java/com/pikolive/app/ui/withdraw/BinderAlipayActivity.java +++ b/app/src/main/java/com/bingchuang/app/ui/withdraw/BinderAlipayActivity.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.withdraw; +package com.bingchuang.app.ui.withdraw; import android.annotation.SuppressLint; import android.content.Context; @@ -14,16 +14,16 @@ import android.widget.ImageView; import android.widget.TextView; import com.netease.nim.uikit.StatusBarUtil; -import com.pikolive.app.ui.login.CodeDownTimer; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseActivity; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.code.CodeType; -import com.pikolive.core.user.UserModel; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.utils.net.BeanObserver; -import com.pikolive.core.withdraw.WithdrawModel; -import com.pikolive.core.withdraw.bean.WithdrawInfo; +import com.bingchuang.app.ui.login.CodeDownTimer; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseActivity; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.code.CodeType; +import com.bingchuang.core.user.UserModel; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.utils.net.BeanObserver; +import com.bingchuang.core.withdraw.WithdrawModel; +import com.bingchuang.core.withdraw.bean.WithdrawInfo; import com.bingchuang.library.utils.FormatUtils; import com.bingchuang.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/withdraw/WithdrawActivity.java b/app/src/main/java/com/bingchuang/app/ui/withdraw/WithdrawActivity.java similarity index 93% rename from app/src/main/java/com/pikolive/app/ui/withdraw/WithdrawActivity.java rename to app/src/main/java/com/bingchuang/app/ui/withdraw/WithdrawActivity.java index 3044893fd..36b5f9a45 100644 --- a/app/src/main/java/com/pikolive/app/ui/withdraw/WithdrawActivity.java +++ b/app/src/main/java/com/bingchuang/app/ui/withdraw/WithdrawActivity.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.withdraw; +package com.bingchuang.app.ui.withdraw; import android.annotation.SuppressLint; import android.content.Intent; @@ -9,30 +9,30 @@ import android.view.View; import androidx.recyclerview.widget.GridLayoutManager; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.pikolive.app.ui.setting.ModifyPwdActivity; -import com.pikolive.app.ui.wallet.adapter.WithdrawJewelAdapter; -import com.pikolive.app.ui.webview.CommonWebViewActivity; -import com.pikolive.app.ui.widget.password.PassWordFragment; -import com.pikolive.app.ui.withdraw.bankcard.BindWithdrawBankCardActivity; +import com.bingchuang.app.ui.setting.ModifyPwdActivity; +import com.bingchuang.app.ui.wallet.adapter.WithdrawJewelAdapter; +import com.bingchuang.app.ui.webview.CommonWebViewActivity; +import com.bingchuang.app.ui.widget.password.PassWordFragment; +import com.bingchuang.app.ui.withdraw.bankcard.BindWithdrawBankCardActivity; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseViewBindingActivity; -import com.pikolive.app.base.TitleBar; -import com.pikolive.app.bills.activities.WithdrawBillsActivity; -import com.pikolive.app.common.widget.dialog.DialogManager; -import com.pikolive.app.databinding.ActivityWithdrawBinding; -import com.pikolive.app.utils.SpannableBuilder; -import com.pikolive.core2.UriProvider; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.initial.bean.TaxInfo; -import com.pikolive.core.user.UserModel; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.utils.net.BeanObserver; -import com.pikolive.core.withdraw.WithdrawModel; -import com.pikolive.core.withdraw.bean.ExchangerInfo; -import com.pikolive.core.withdraw.bean.RefreshInfo; -import com.pikolive.core.withdraw.bean.WithdrawInfo; -import com.pikolive.core.withdraw.bean.WithdrwaListInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseViewBindingActivity; +import com.bingchuang.app.base.TitleBar; +import com.bingchuang.app.bills.activities.WithdrawBillsActivity; +import com.bingchuang.app.common.widget.dialog.DialogManager; +import com.bingchuang.app.databinding.ActivityWithdrawBinding; +import com.bingchuang.app.utils.SpannableBuilder; +import com.bingchuang.core2.UriProvider; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.initial.bean.TaxInfo; +import com.bingchuang.core.user.UserModel; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.utils.net.BeanObserver; +import com.bingchuang.core.withdraw.WithdrawModel; +import com.bingchuang.core.withdraw.bean.ExchangerInfo; +import com.bingchuang.core.withdraw.bean.RefreshInfo; +import com.bingchuang.core.withdraw.bean.WithdrawInfo; +import com.bingchuang.core.withdraw.bean.WithdrwaListInfo; import com.bingchuang.library.utils.FormatUtils; import com.bingchuang.library.utils.ListUtils; import com.bingchuang.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/withdraw/WithdrawRuleActivity.java b/app/src/main/java/com/bingchuang/app/ui/withdraw/WithdrawRuleActivity.java similarity index 79% rename from app/src/main/java/com/pikolive/app/ui/withdraw/WithdrawRuleActivity.java rename to app/src/main/java/com/bingchuang/app/ui/withdraw/WithdrawRuleActivity.java index ae694a6da..fa56e3b4b 100644 --- a/app/src/main/java/com/pikolive/app/ui/withdraw/WithdrawRuleActivity.java +++ b/app/src/main/java/com/bingchuang/app/ui/withdraw/WithdrawRuleActivity.java @@ -1,11 +1,11 @@ -package com.pikolive.app.ui.withdraw; +package com.bingchuang.app.ui.withdraw; import android.os.Bundle; import android.webkit.WebView; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseActivity; -import com.pikolive.core2.UriProvider; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseActivity; +import com.bingchuang.core2.UriProvider; import com.bingchuang.library.utils.ResUtil; public class WithdrawRuleActivity extends BaseActivity { diff --git a/app/src/main/java/com/pikolive/app/ui/withdraw/bankcard/BindWithdrawBankCardActivity.java b/app/src/main/java/com/bingchuang/app/ui/withdraw/bankcard/BindWithdrawBankCardActivity.java similarity index 90% rename from app/src/main/java/com/pikolive/app/ui/withdraw/bankcard/BindWithdrawBankCardActivity.java rename to app/src/main/java/com/bingchuang/app/ui/withdraw/bankcard/BindWithdrawBankCardActivity.java index f93082364..5ef456199 100644 --- a/app/src/main/java/com/pikolive/app/ui/withdraw/bankcard/BindWithdrawBankCardActivity.java +++ b/app/src/main/java/com/bingchuang/app/ui/withdraw/bankcard/BindWithdrawBankCardActivity.java @@ -1,21 +1,21 @@ -package com.pikolive.app.ui.withdraw.bankcard; +package com.bingchuang.app.ui.withdraw.bankcard; import android.text.Editable; import android.text.TextUtils; import android.view.View; -import com.pikolive.app.ui.login.CodeDownTimer; -import com.pikolive.app.ui.widget.TextWatcherSimple; +import com.bingchuang.app.ui.login.CodeDownTimer; +import com.bingchuang.app.ui.widget.TextWatcherSimple; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseViewBindingActivity; -import com.pikolive.app.databinding.ActivityBindWithdrawBankCardBinding; -import com.pikolive.core.code.CodeModel; -import com.pikolive.core.code.CodeType; -import com.pikolive.core.user.UserModel; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.utils.net.DontWarnObserver; -import com.pikolive.core.withdraw.WithdrawModel; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseViewBindingActivity; +import com.bingchuang.app.databinding.ActivityBindWithdrawBankCardBinding; +import com.bingchuang.core.code.CodeModel; +import com.bingchuang.core.code.CodeType; +import com.bingchuang.core.user.UserModel; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.utils.net.DontWarnObserver; +import com.bingchuang.core.withdraw.WithdrawModel; import com.bingchuang.library.utils.ResUtil; /** diff --git a/app/src/main/java/com/pikolive/app/utils/ActWhiteListMrg.java b/app/src/main/java/com/bingchuang/app/utils/ActWhiteListMrg.java similarity index 82% rename from app/src/main/java/com/pikolive/app/utils/ActWhiteListMrg.java rename to app/src/main/java/com/bingchuang/app/utils/ActWhiteListMrg.java index 25b2b4d43..55e4972e4 100644 --- a/app/src/main/java/com/pikolive/app/utils/ActWhiteListMrg.java +++ b/app/src/main/java/com/bingchuang/app/utils/ActWhiteListMrg.java @@ -1,12 +1,12 @@ -package com.pikolive.app.utils; +package com.bingchuang.app.utils; import android.content.Context; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.pikolive.app.NimMiddleActivity; -import com.pikolive.app.R; -import com.pikolive.app.other.activity.SplashActivity; -import com.pikolive.core.utils.ActivityUtil; +import com.bingchuang.app.NimMiddleActivity; +import com.bingchuang.app.R; +import com.bingchuang.app.other.activity.SplashActivity; +import com.bingchuang.core.utils.ActivityUtil; import com.bingchuang.library.utils.ResUtil; import java.util.ArrayList; diff --git a/app/src/main/java/com/pikolive/app/utils/AppBarStateChangeListener.java b/app/src/main/java/com/bingchuang/app/utils/AppBarStateChangeListener.java similarity index 97% rename from app/src/main/java/com/pikolive/app/utils/AppBarStateChangeListener.java rename to app/src/main/java/com/bingchuang/app/utils/AppBarStateChangeListener.java index 8e4b56e57..d40fcf542 100644 --- a/app/src/main/java/com/pikolive/app/utils/AppBarStateChangeListener.java +++ b/app/src/main/java/com/bingchuang/app/utils/AppBarStateChangeListener.java @@ -1,4 +1,4 @@ -package com.pikolive.app.utils; +package com.bingchuang.app.utils; import com.google.android.material.appbar.AppBarLayout; diff --git a/app/src/main/java/com/pikolive/app/utils/BlurTransformation.java b/app/src/main/java/com/bingchuang/app/utils/BlurTransformation.java similarity index 98% rename from app/src/main/java/com/pikolive/app/utils/BlurTransformation.java rename to app/src/main/java/com/bingchuang/app/utils/BlurTransformation.java index 662c6a82f..f9d40798c 100644 --- a/app/src/main/java/com/pikolive/app/utils/BlurTransformation.java +++ b/app/src/main/java/com/bingchuang/app/utils/BlurTransformation.java @@ -1,4 +1,4 @@ -package com.pikolive.app.utils; +package com.bingchuang.app.utils; import android.content.Context; import android.graphics.Bitmap; diff --git a/app/src/main/java/com/pikolive/app/utils/CertificateHelper.java b/app/src/main/java/com/bingchuang/app/utils/CertificateHelper.java similarity index 87% rename from app/src/main/java/com/pikolive/app/utils/CertificateHelper.java rename to app/src/main/java/com/bingchuang/app/utils/CertificateHelper.java index f9bd14089..828237900 100644 --- a/app/src/main/java/com/pikolive/app/utils/CertificateHelper.java +++ b/app/src/main/java/com/bingchuang/app/utils/CertificateHelper.java @@ -1,8 +1,8 @@ -package com.pikolive.app.utils; +package com.bingchuang.app.utils; -import static com.pikolive.core.certification.CertificationModel.CER_TYPE_FORCE; -import static com.pikolive.core.certification.CertificationModel.CER_TYPE_GUIDE; -import static com.pikolive.core.certification.CertificationModel.CER_TYPE_NONE; +import static com.bingchuang.core.certification.CertificationModel.CER_TYPE_FORCE; +import static com.bingchuang.core.certification.CertificationModel.CER_TYPE_GUIDE; +import static com.bingchuang.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.pikolive.app.R; -import com.pikolive.app.common.widget.dialog.DialogManager; -import com.pikolive.app.ui.webview.CommonWebViewActivity; -import com.pikolive.core2.UriProvider; -import com.pikolive.core.certification.CertificationModel; -import com.pikolive.core.user.UserModel; -import com.pikolive.core.user.bean.UserInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.common.widget.dialog.DialogManager; +import com.bingchuang.app.ui.webview.CommonWebViewActivity; +import com.bingchuang.core2.UriProvider; +import com.bingchuang.core.certification.CertificationModel; +import com.bingchuang.core.user.UserModel; +import com.bingchuang.core.user.bean.UserInfo; /** * 强制用户实名认证 diff --git a/app/src/main/java/com/pikolive/app/utils/CleanLeakUtils.java b/app/src/main/java/com/bingchuang/app/utils/CleanLeakUtils.java similarity index 98% rename from app/src/main/java/com/pikolive/app/utils/CleanLeakUtils.java rename to app/src/main/java/com/bingchuang/app/utils/CleanLeakUtils.java index 3cf4230c6..71447106f 100644 --- a/app/src/main/java/com/pikolive/app/utils/CleanLeakUtils.java +++ b/app/src/main/java/com/bingchuang/app/utils/CleanLeakUtils.java @@ -1,4 +1,4 @@ -package com.pikolive.app.utils; +package com.bingchuang.app.utils; import android.content.Context; import android.os.Build; diff --git a/app/src/main/java/com/pikolive/app/utils/ClipboardUtils.java b/app/src/main/java/com/bingchuang/app/utils/ClipboardUtils.java similarity index 97% rename from app/src/main/java/com/pikolive/app/utils/ClipboardUtils.java rename to app/src/main/java/com/bingchuang/app/utils/ClipboardUtils.java index c19eb4c14..eba03d32a 100644 --- a/app/src/main/java/com/pikolive/app/utils/ClipboardUtils.java +++ b/app/src/main/java/com/bingchuang/app/utils/ClipboardUtils.java @@ -1,4 +1,4 @@ -package com.pikolive.app.utils; +package com.bingchuang.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.pikolive.app.application.XChatApplication; +import com.bingchuang.app.application.XChatApplication; /** *diff --git a/app/src/main/java/com/pikolive/app/utils/CommonJumpHelper.java b/app/src/main/java/com/bingchuang/app/utils/CommonJumpHelper.java similarity index 74% rename from app/src/main/java/com/pikolive/app/utils/CommonJumpHelper.java rename to app/src/main/java/com/bingchuang/app/utils/CommonJumpHelper.java index ba0d6bcbe..f238e9783 100644 --- a/app/src/main/java/com/pikolive/app/utils/CommonJumpHelper.java +++ b/app/src/main/java/com/bingchuang/app/utils/CommonJumpHelper.java @@ -1,19 +1,19 @@ -package com.pikolive.app.utils; +package com.bingchuang.app.utils; -import static com.pikolive.core2.home.bean.BannerInfo.SKIP_TYPE_ROUTER; -import static com.pikolive.core2.home.bean.BannerInfo.SKIP_TYP_APP; -import static com.pikolive.core2.home.bean.BannerInfo.SKIP_TYP_CHAT_ROOM; -import static com.pikolive.core2.home.bean.BannerInfo.SKIP_TYP_H5; +import static com.bingchuang.core2.home.bean.BannerInfo.SKIP_TYPE_ROUTER; +import static com.bingchuang.core2.home.bean.BannerInfo.SKIP_TYP_APP; +import static com.bingchuang.core2.home.bean.BannerInfo.SKIP_TYP_CHAT_ROOM; +import static com.bingchuang.core2.home.bean.BannerInfo.SKIP_TYP_H5; import android.content.Context; import android.content.Intent; import android.text.TextUtils; -import com.pikolive.app.avroom.activity.AVRoomActivity; -import com.pikolive.app.ui.im.RouterHandler; -import com.pikolive.app.ui.webview.CommonWebViewActivity; -import com.pikolive.core2.home.bean.BannerInfo; +import com.bingchuang.app.avroom.activity.AVRoomActivity; +import com.bingchuang.app.ui.im.RouterHandler; +import com.bingchuang.app.ui.webview.CommonWebViewActivity; +import com.bingchuang.core2.home.bean.BannerInfo; import com.bingchuang.library.utils.JavaUtil; /** diff --git a/app/src/main/java/com/pikolive/app/utils/FastBlur.java b/app/src/main/java/com/bingchuang/app/utils/FastBlur.java similarity index 99% rename from app/src/main/java/com/pikolive/app/utils/FastBlur.java rename to app/src/main/java/com/bingchuang/app/utils/FastBlur.java index 1ca334659..61ec2b816 100644 --- a/app/src/main/java/com/pikolive/app/utils/FastBlur.java +++ b/app/src/main/java/com/bingchuang/app/utils/FastBlur.java @@ -1,4 +1,4 @@ -package com.pikolive.app.utils; +package com.bingchuang.app.utils; import android.graphics.Bitmap; diff --git a/app/src/main/java/com/pikolive/app/utils/FloatManager.java b/app/src/main/java/com/bingchuang/app/utils/FloatManager.java similarity index 94% rename from app/src/main/java/com/pikolive/app/utils/FloatManager.java rename to app/src/main/java/com/bingchuang/app/utils/FloatManager.java index 486a6c189..fe7fffb1e 100644 --- a/app/src/main/java/com/pikolive/app/utils/FloatManager.java +++ b/app/src/main/java/com/bingchuang/app/utils/FloatManager.java @@ -1,4 +1,4 @@ -package com.pikolive.app.utils; +package com.bingchuang.app.utils; import android.content.Context; import android.graphics.PixelFormat; @@ -7,8 +7,8 @@ import android.view.Gravity; import android.view.ViewGroup; import android.view.WindowManager; -import com.pikolive.app.application.XChatApplication; -import com.pikolive.app.ui.widget.MarqueeLayout; +import com.bingchuang.app.application.XChatApplication; +import com.bingchuang.app.ui.widget.MarqueeLayout; import com.bingchuang.library.utils.SizeUtils; /** diff --git a/app/src/main/java/com/pikolive/app/utils/FontTextView.java b/app/src/main/java/com/bingchuang/app/utils/FontTextView.java similarity index 96% rename from app/src/main/java/com/pikolive/app/utils/FontTextView.java rename to app/src/main/java/com/bingchuang/app/utils/FontTextView.java index 275e7ceb6..832331add 100644 --- a/app/src/main/java/com/pikolive/app/utils/FontTextView.java +++ b/app/src/main/java/com/bingchuang/app/utils/FontTextView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.utils; +package com.bingchuang.app.utils; import android.content.Context; import android.content.res.AssetManager; diff --git a/app/src/main/java/com/pikolive/app/utils/KeyBoardUtils.java b/app/src/main/java/com/bingchuang/app/utils/KeyBoardUtils.java similarity index 97% rename from app/src/main/java/com/pikolive/app/utils/KeyBoardUtils.java rename to app/src/main/java/com/bingchuang/app/utils/KeyBoardUtils.java index 9983af7a0..e0736984d 100644 --- a/app/src/main/java/com/pikolive/app/utils/KeyBoardUtils.java +++ b/app/src/main/java/com/bingchuang/app/utils/KeyBoardUtils.java @@ -1,4 +1,4 @@ -package com.pikolive.app.utils; +package com.bingchuang.app.utils; import android.app.Activity; import android.content.Context; diff --git a/app/src/main/java/com/pikolive/app/utils/LimitInputFliter.java b/app/src/main/java/com/bingchuang/app/utils/LimitInputFliter.java similarity index 92% rename from app/src/main/java/com/pikolive/app/utils/LimitInputFliter.java rename to app/src/main/java/com/bingchuang/app/utils/LimitInputFliter.java index ab246ea1a..a3192542e 100644 --- a/app/src/main/java/com/pikolive/app/utils/LimitInputFliter.java +++ b/app/src/main/java/com/bingchuang/app/utils/LimitInputFliter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.utils; +package com.bingchuang.app.utils; import android.text.InputFilter; import android.text.Spanned; diff --git a/app/src/main/java/com/pikolive/app/utils/MsgBuilder.kt b/app/src/main/java/com/bingchuang/app/utils/MsgBuilder.kt similarity index 94% rename from app/src/main/java/com/pikolive/app/utils/MsgBuilder.kt rename to app/src/main/java/com/bingchuang/app/utils/MsgBuilder.kt index c2023a796..ee3adc8f8 100644 --- a/app/src/main/java/com/pikolive/app/utils/MsgBuilder.kt +++ b/app/src/main/java/com/bingchuang/app/utils/MsgBuilder.kt @@ -1,12 +1,12 @@ -package com.pikolive.app.utils +package com.bingchuang.app.utils import android.text.style.ForegroundColorSpan import android.view.View import androidx.core.graphics.toColorInt -import com.pikolive.app.ui.webview.CommonWebViewActivity -import com.pikolive.core.im.custom.bean.FairyMsgAttachment -import com.pikolive.core.manager.RoomEvent -import com.pikolive.core.utils.sub +import com.bingchuang.app.ui.webview.CommonWebViewActivity +import com.bingchuang.core.im.custom.bean.FairyMsgAttachment +import com.bingchuang.core.manager.RoomEvent +import com.bingchuang.core.utils.sub class MsgBuilder { diff --git a/app/src/main/java/com/pikolive/app/utils/NotificationsUtils.java b/app/src/main/java/com/bingchuang/app/utils/NotificationsUtils.java similarity index 98% rename from app/src/main/java/com/pikolive/app/utils/NotificationsUtils.java rename to app/src/main/java/com/bingchuang/app/utils/NotificationsUtils.java index 5387d594d..b00435d93 100644 --- a/app/src/main/java/com/pikolive/app/utils/NotificationsUtils.java +++ b/app/src/main/java/com/bingchuang/app/utils/NotificationsUtils.java @@ -1,4 +1,4 @@ -package com.pikolive.app.utils; +package com.bingchuang.app.utils; import android.app.Activity; import android.content.ComponentName; @@ -12,7 +12,7 @@ import android.provider.Settings; import androidx.core.app.NotificationManagerCompat; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.pikolive.app.R; +import com.bingchuang.app.R; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.SingleToastUtil; diff --git a/app/src/main/java/com/pikolive/app/utils/NumberFormatUtil.java b/app/src/main/java/com/bingchuang/app/utils/NumberFormatUtil.java similarity index 96% rename from app/src/main/java/com/pikolive/app/utils/NumberFormatUtil.java rename to app/src/main/java/com/bingchuang/app/utils/NumberFormatUtil.java index 455b1acae..bf29aaab1 100644 --- a/app/src/main/java/com/pikolive/app/utils/NumberFormatUtil.java +++ b/app/src/main/java/com/bingchuang/app/utils/NumberFormatUtil.java @@ -1,4 +1,4 @@ -package com.pikolive.app.utils; +package com.bingchuang.app.utils; import android.text.TextUtils; diff --git a/app/src/main/java/com/pikolive/app/utils/OSUtils.java b/app/src/main/java/com/bingchuang/app/utils/OSUtils.java similarity index 98% rename from app/src/main/java/com/pikolive/app/utils/OSUtils.java rename to app/src/main/java/com/bingchuang/app/utils/OSUtils.java index 160e30137..4eeda68f7 100644 --- a/app/src/main/java/com/pikolive/app/utils/OSUtils.java +++ b/app/src/main/java/com/bingchuang/app/utils/OSUtils.java @@ -1,4 +1,4 @@ -package com.pikolive.app.utils; +package com.bingchuang.app.utils; import android.text.TextUtils; diff --git a/app/src/main/java/com/pikolive/app/utils/PermissionUtil.kt b/app/src/main/java/com/bingchuang/app/utils/PermissionUtil.kt similarity index 97% rename from app/src/main/java/com/pikolive/app/utils/PermissionUtil.kt rename to app/src/main/java/com/bingchuang/app/utils/PermissionUtil.kt index 33e224cc5..b041a0ce7 100644 --- a/app/src/main/java/com/pikolive/app/utils/PermissionUtil.kt +++ b/app/src/main/java/com/bingchuang/app/utils/PermissionUtil.kt @@ -1,4 +1,4 @@ -package com.pikolive.app.utils +package com.bingchuang.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.pikolive.app.BuildConfig -import com.pikolive.app.ui.setting.bean.PermissionEntity +import com.bingchuang.app.BuildConfig +import com.bingchuang.app.ui.setting.bean.PermissionEntity class PermissionUtil { companion object { diff --git a/app/src/main/java/com/pikolive/app/utils/PushMessageHandler.java b/app/src/main/java/com/bingchuang/app/utils/PushMessageHandler.java similarity index 97% rename from app/src/main/java/com/pikolive/app/utils/PushMessageHandler.java rename to app/src/main/java/com/bingchuang/app/utils/PushMessageHandler.java index e092281b3..295d27cc6 100644 --- a/app/src/main/java/com/pikolive/app/utils/PushMessageHandler.java +++ b/app/src/main/java/com/bingchuang/app/utils/PushMessageHandler.java @@ -1,4 +1,4 @@ -package com.pikolive.app.utils; +package com.bingchuang.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.pikolive.core.DemoCache; +import com.bingchuang.core.DemoCache; import java.io.Serializable; import java.util.Map; diff --git a/app/src/main/java/com/pikolive/app/utils/RSBlur.java b/app/src/main/java/com/bingchuang/app/utils/RSBlur.java similarity index 98% rename from app/src/main/java/com/pikolive/app/utils/RSBlur.java rename to app/src/main/java/com/bingchuang/app/utils/RSBlur.java index 2f0e12de8..180327948 100644 --- a/app/src/main/java/com/pikolive/app/utils/RSBlur.java +++ b/app/src/main/java/com/bingchuang/app/utils/RSBlur.java @@ -1,4 +1,4 @@ -package com.pikolive.app.utils; +package com.bingchuang.app.utils; import android.annotation.TargetApi; import android.content.Context; diff --git a/app/src/main/java/com/pikolive/app/utils/RegexUtil.java b/app/src/main/java/com/bingchuang/app/utils/RegexUtil.java similarity index 95% rename from app/src/main/java/com/pikolive/app/utils/RegexUtil.java rename to app/src/main/java/com/bingchuang/app/utils/RegexUtil.java index 32e3d6f73..411038b78 100644 --- a/app/src/main/java/com/pikolive/app/utils/RegexUtil.java +++ b/app/src/main/java/com/bingchuang/app/utils/RegexUtil.java @@ -1,4 +1,4 @@ -package com.pikolive.app.utils; +package com.bingchuang.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.erban/com.pikolive.app.MainActivity}: kotlin.KotlinNullPointerException + // bug-fixed java.lang.RuntimeException:Unable to resume activity {com.yizhuan.erban/com.bingchuang.app.MainActivity}: kotlin.KotlinNullPointerException return TextUtils.isEmpty(NOT_VISIBLE_CHARS) ? "" : NOT_VISIBLE_CHARS; } diff --git a/app/src/main/java/com/pikolive/app/utils/SpannableBuilder.java b/app/src/main/java/com/bingchuang/app/utils/SpannableBuilder.java similarity index 97% rename from app/src/main/java/com/pikolive/app/utils/SpannableBuilder.java rename to app/src/main/java/com/bingchuang/app/utils/SpannableBuilder.java index f1bde816c..c55b719e2 100644 --- a/app/src/main/java/com/pikolive/app/utils/SpannableBuilder.java +++ b/app/src/main/java/com/bingchuang/app/utils/SpannableBuilder.java @@ -1,4 +1,4 @@ -package com.pikolive.app.utils; +package com.bingchuang.app.utils; import android.content.Context; import android.text.SpannableStringBuilder; diff --git a/app/src/main/java/com/pikolive/app/utils/ThreadUtil.java b/app/src/main/java/com/bingchuang/app/utils/ThreadUtil.java similarity index 98% rename from app/src/main/java/com/pikolive/app/utils/ThreadUtil.java rename to app/src/main/java/com/bingchuang/app/utils/ThreadUtil.java index a84cc6e11..f339dba3d 100644 --- a/app/src/main/java/com/pikolive/app/utils/ThreadUtil.java +++ b/app/src/main/java/com/bingchuang/app/utils/ThreadUtil.java @@ -1,9 +1,9 @@ -package com.pikolive.app.utils; +package com.bingchuang.app.utils; import android.os.Handler; import android.os.Looper; -import com.pikolive.app.R; +import com.bingchuang.app.R; import com.bingchuang.library.utils.ResUtil; import java.util.concurrent.Executors; diff --git a/app/src/main/java/com/pikolive/app/utils/TimeUiUtils.java b/app/src/main/java/com/bingchuang/app/utils/TimeUiUtils.java similarity index 94% rename from app/src/main/java/com/pikolive/app/utils/TimeUiUtils.java rename to app/src/main/java/com/bingchuang/app/utils/TimeUiUtils.java index dc86efef0..17275ddc1 100644 --- a/app/src/main/java/com/pikolive/app/utils/TimeUiUtils.java +++ b/app/src/main/java/com/bingchuang/app/utils/TimeUiUtils.java @@ -1,6 +1,6 @@ -package com.pikolive.app.utils; +package com.bingchuang.app.utils; -import com.pikolive.app.R; +import com.bingchuang.app.R; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.TimeUtils; diff --git a/app/src/main/java/com/pikolive/app/utils/UserUtils.java b/app/src/main/java/com/bingchuang/app/utils/UserUtils.java similarity index 80% rename from app/src/main/java/com/pikolive/app/utils/UserUtils.java rename to app/src/main/java/com/bingchuang/app/utils/UserUtils.java index 42be40c3f..f29348e6c 100644 --- a/app/src/main/java/com/pikolive/app/utils/UserUtils.java +++ b/app/src/main/java/com/bingchuang/app/utils/UserUtils.java @@ -1,9 +1,9 @@ -package com.pikolive.app.utils; +package com.bingchuang.app.utils; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core.user.UserModel; -import com.pikolive.core.user.bean.UserInfo; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core.user.UserModel; +import com.bingchuang.core.user.bean.UserInfo; public class UserUtils { diff --git a/app/src/main/java/com/pikolive/app/utils/VpSwipeRefreshLayout.java b/app/src/main/java/com/bingchuang/app/utils/VpSwipeRefreshLayout.java similarity index 98% rename from app/src/main/java/com/pikolive/app/utils/VpSwipeRefreshLayout.java rename to app/src/main/java/com/bingchuang/app/utils/VpSwipeRefreshLayout.java index d46d57c30..801f21aef 100644 --- a/app/src/main/java/com/pikolive/app/utils/VpSwipeRefreshLayout.java +++ b/app/src/main/java/com/bingchuang/app/utils/VpSwipeRefreshLayout.java @@ -1,4 +1,4 @@ -package com.pikolive.app.utils; +package com.bingchuang.app.utils; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/pikolive/app/utils/WebViewUtils.java b/app/src/main/java/com/bingchuang/app/utils/WebViewUtils.java similarity index 94% rename from app/src/main/java/com/pikolive/app/utils/WebViewUtils.java rename to app/src/main/java/com/bingchuang/app/utils/WebViewUtils.java index 414fde4ce..9e6bc40a5 100644 --- a/app/src/main/java/com/pikolive/app/utils/WebViewUtils.java +++ b/app/src/main/java/com/bingchuang/app/utils/WebViewUtils.java @@ -1,4 +1,4 @@ -package com.pikolive.app.utils; +package com.bingchuang.app.utils; import android.view.ViewGroup; import android.webkit.WebView; diff --git a/app/src/main/java/com/pikolive/app/view/GenderAgeTextView.kt b/app/src/main/java/com/bingchuang/app/view/GenderAgeTextView.kt similarity index 97% rename from app/src/main/java/com/pikolive/app/view/GenderAgeTextView.kt rename to app/src/main/java/com/bingchuang/app/view/GenderAgeTextView.kt index c7710c625..537d2faf2 100644 --- a/app/src/main/java/com/pikolive/app/view/GenderAgeTextView.kt +++ b/app/src/main/java/com/bingchuang/app/view/GenderAgeTextView.kt @@ -1,4 +1,4 @@ -package com.pikolive.app.view +package com.bingchuang.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.pikolive.app.R +import com.bingchuang.app.R import java.util.Calendar import java.util.Date diff --git a/app/src/main/java/com/pikolive/app/view/NestedScrollableHost.kt b/app/src/main/java/com/bingchuang/app/view/NestedScrollableHost.kt similarity index 99% rename from app/src/main/java/com/pikolive/app/view/NestedScrollableHost.kt rename to app/src/main/java/com/bingchuang/app/view/NestedScrollableHost.kt index e9eb6a296..ab0df844b 100644 --- a/app/src/main/java/com/pikolive/app/view/NestedScrollableHost.kt +++ b/app/src/main/java/com/bingchuang/app/view/NestedScrollableHost.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.pikolive.app.view +package com.bingchuang.app.view import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/com/pikolive/app/view/ShadowFrameLayout.java b/app/src/main/java/com/bingchuang/app/view/ShadowFrameLayout.java similarity index 98% rename from app/src/main/java/com/pikolive/app/view/ShadowFrameLayout.java rename to app/src/main/java/com/bingchuang/app/view/ShadowFrameLayout.java index 1efda98c8..483445d5f 100644 --- a/app/src/main/java/com/pikolive/app/view/ShadowFrameLayout.java +++ b/app/src/main/java/com/bingchuang/app/view/ShadowFrameLayout.java @@ -1,4 +1,4 @@ -package com.pikolive.app.view; +package com.bingchuang.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.pikolive.app.R; +import com.bingchuang.app.R; /** * @author wzq diff --git a/app/src/main/java/com/pikolive/app/view/WrapHeightViewPager.kt b/app/src/main/java/com/bingchuang/app/view/WrapHeightViewPager.kt similarity index 97% rename from app/src/main/java/com/pikolive/app/view/WrapHeightViewPager.kt rename to app/src/main/java/com/bingchuang/app/view/WrapHeightViewPager.kt index cd5b48198..79c837e43 100644 --- a/app/src/main/java/com/pikolive/app/view/WrapHeightViewPager.kt +++ b/app/src/main/java/com/bingchuang/app/view/WrapHeightViewPager.kt @@ -1,4 +1,4 @@ -package com.pikolive.app.view +package com.bingchuang.app.view import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/com/pikolive/app/vip/VipBroadcastView.kt b/app/src/main/java/com/bingchuang/app/vip/VipBroadcastView.kt similarity index 90% rename from app/src/main/java/com/pikolive/app/vip/VipBroadcastView.kt rename to app/src/main/java/com/bingchuang/app/vip/VipBroadcastView.kt index 8903dbd36..2a52a5115 100644 --- a/app/src/main/java/com/pikolive/app/vip/VipBroadcastView.kt +++ b/app/src/main/java/com/bingchuang/app/vip/VipBroadcastView.kt @@ -1,4 +1,4 @@ -package com.pikolive.app.vip +package com.bingchuang.app.vip import android.animation.ObjectAnimator import android.annotation.SuppressLint @@ -10,12 +10,12 @@ 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.pikolive.app.databinding.LayoutVipBroadcastViewBinding -import com.pikolive.app.ui.utils.ImageLoadUtils -import com.pikolive.core.im.custom.bean.VipMessageAttachment -import com.pikolive.core.room.anotherroompk.ShowUserInfoDialogEvent -import com.pikolive.core.utils.subAndReplaceDot -import com.pikolive.core.vip.VipBroadcastMsgEvent +import com.bingchuang.app.databinding.LayoutVipBroadcastViewBinding +import com.bingchuang.app.ui.utils.ImageLoadUtils +import com.bingchuang.core.im.custom.bean.VipMessageAttachment +import com.bingchuang.core.room.anotherroompk.ShowUserInfoDialogEvent +import com.bingchuang.core.utils.subAndReplaceDot +import com.bingchuang.core.vip.VipBroadcastMsgEvent import com.bingchuang.library.rxbus.RxBus import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers diff --git a/app/src/main/java/com/pikolive/app/vip/VipMainActivity.kt b/app/src/main/java/com/bingchuang/app/vip/VipMainActivity.kt similarity index 93% rename from app/src/main/java/com/pikolive/app/vip/VipMainActivity.kt rename to app/src/main/java/com/bingchuang/app/vip/VipMainActivity.kt index 7c7dd21dd..eaf2c27fd 100644 --- a/app/src/main/java/com/pikolive/app/vip/VipMainActivity.kt +++ b/app/src/main/java/com/bingchuang/app/vip/VipMainActivity.kt @@ -1,4 +1,4 @@ -package com.pikolive.app.vip +package com.bingchuang.app.vip import android.annotation.SuppressLint import android.content.Context @@ -25,34 +25,34 @@ import com.opensource.svgaplayer.SVGADrawable import com.opensource.svgaplayer.SVGAImageView import com.opensource.svgaplayer.SVGAParser import com.opensource.svgaplayer.SVGAVideoEntity -import com.pikolive.app.R -import com.pikolive.app.base.BaseViewBindingActivity -import com.pikolive.app.base.TitleBar -import com.pikolive.app.common.EmptyViewHelper -import com.pikolive.app.databinding.ActivityVipMainBinding -import com.pikolive.app.ui.pay.BillingManager -import com.pikolive.app.ui.pay.BillingManager.BillingUpdatesListener -import com.pikolive.app.ui.pay.ChargeActivity -import com.pikolive.app.ui.setting.ModifyPwdActivity -import com.pikolive.app.ui.utils.RVDelegate -import com.pikolive.app.ui.webview.CommonWebViewActivity -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator -import com.pikolive.app.vip.adapter.VipAuthAdapter -import com.pikolive.app.vip.adapter.VipMagicIndicatorAdapter -import com.pikolive.app.vip.dialog.SelectPayTypeDialog -import com.pikolive.app.vip.dialog.VipAuthDetailsDialog -import com.pikolive.app.vip.dialog.VipRemainTimeDialog -import com.pikolive.core.Constants -import com.pikolive.core.auth.AuthModel -import com.pikolive.core.pay.PayModel -import com.pikolive.core.pay.bean.ChargeBean -import com.pikolive.core.pay.bean.PayRecordId -import com.pikolive.core.utils.net.IgnoreException -import com.pikolive.core.utils.toast -import com.pikolive.core.vip.VipAuthInfo -import com.pikolive.core.vip.VipInfo -import com.pikolive.core.vip.VipOpenEvent -import com.pikolive.core2.UriProvider +import com.bingchuang.app.R +import com.bingchuang.app.base.BaseViewBindingActivity +import com.bingchuang.app.base.TitleBar +import com.bingchuang.app.common.EmptyViewHelper +import com.bingchuang.app.databinding.ActivityVipMainBinding +import com.bingchuang.app.ui.pay.BillingManager +import com.bingchuang.app.ui.pay.BillingManager.BillingUpdatesListener +import com.bingchuang.app.ui.pay.ChargeActivity +import com.bingchuang.app.ui.setting.ModifyPwdActivity +import com.bingchuang.app.ui.utils.RVDelegate +import com.bingchuang.app.ui.webview.CommonWebViewActivity +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator +import com.bingchuang.app.vip.adapter.VipAuthAdapter +import com.bingchuang.app.vip.adapter.VipMagicIndicatorAdapter +import com.bingchuang.app.vip.dialog.SelectPayTypeDialog +import com.bingchuang.app.vip.dialog.VipAuthDetailsDialog +import com.bingchuang.app.vip.dialog.VipRemainTimeDialog +import com.bingchuang.core.Constants +import com.bingchuang.core.auth.AuthModel +import com.bingchuang.core.pay.PayModel +import com.bingchuang.core.pay.bean.ChargeBean +import com.bingchuang.core.pay.bean.PayRecordId +import com.bingchuang.core.utils.net.IgnoreException +import com.bingchuang.core.utils.toast +import com.bingchuang.core.vip.VipAuthInfo +import com.bingchuang.core.vip.VipInfo +import com.bingchuang.core.vip.VipOpenEvent +import com.bingchuang.core2.UriProvider import com.bingchuang.library.common.util.DeviceUtil import com.bingchuang.library.utils.AppMetaDataUtil import com.bingchuang.library.utils.SingleToastUtil @@ -302,7 +302,7 @@ class VipMainActivity : BaseViewBindingActivity(), chargeInfo = it.list.getOrNull(0) chargeInfo?.let { chargeBean -> binding.tvOpenVip.text = - "${chargeBean.getMoney()}${getString(R.string.me_immediately_become_a_Peko_nobleman)}" + "${chargeBean.getMoney()}${getString(R.string.me_immediately_become_a_Peki_nobleman)}" } }, { it.printStackTrace() @@ -419,7 +419,7 @@ class VipMainActivity : BaseViewBindingActivity (), googleChargeBean = showChargeList[0] binding.tvOpenVip.text = "${ googleChargeBean?.getMoney() - }${getString(R.string.me_immediately_become_a_Peko_nobleman)}" + }${getString(R.string.me_immediately_become_a_Peki_nobleman)}" } } } diff --git a/app/src/main/java/com/pikolive/app/vip/VipSettingActivity.kt b/app/src/main/java/com/bingchuang/app/vip/VipSettingActivity.kt similarity index 90% rename from app/src/main/java/com/pikolive/app/vip/VipSettingActivity.kt rename to app/src/main/java/com/bingchuang/app/vip/VipSettingActivity.kt index db97c6ab8..c3bace6ac 100644 --- a/app/src/main/java/com/pikolive/app/vip/VipSettingActivity.kt +++ b/app/src/main/java/com/bingchuang/app/vip/VipSettingActivity.kt @@ -1,14 +1,14 @@ -package com.pikolive.app.vip +package com.bingchuang.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.pikolive.app.R -import com.pikolive.app.base.BaseViewBindingActivity -import com.pikolive.app.databinding.ActivityVipSettingBinding -import com.pikolive.core.user.UserModel +import com.bingchuang.app.R +import com.bingchuang.app.base.BaseViewBindingActivity +import com.bingchuang.app.databinding.ActivityVipSettingBinding +import com.bingchuang.core.user.UserModel import com.bingchuang.library.utils.ResUtil class VipSettingActivity : BaseViewBindingActivity () { diff --git a/app/src/main/java/com/pikolive/app/vip/VipViewModel.kt b/app/src/main/java/com/bingchuang/app/vip/VipViewModel.kt similarity index 92% rename from app/src/main/java/com/pikolive/app/vip/VipViewModel.kt rename to app/src/main/java/com/bingchuang/app/vip/VipViewModel.kt index bf4258a1f..3aca4cad0 100644 --- a/app/src/main/java/com/pikolive/app/vip/VipViewModel.kt +++ b/app/src/main/java/com/bingchuang/app/vip/VipViewModel.kt @@ -1,17 +1,17 @@ -package com.pikolive.app.vip +package com.bingchuang.app.vip import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import com.pikolive.app.R -import com.pikolive.app.base.BaseViewModel -import com.pikolive.core.bean.response.BeanResult -import com.pikolive.core.user.UserInfoUiMgr -import com.pikolive.core.user.UserModel -import com.pikolive.core.utils.toast -import com.pikolive.core.vip.VipAuthInfo -import com.pikolive.core.vip.VipBroadcastInfo -import com.pikolive.core.vip.VipInfo -import com.pikolive.core.vip.VipModel +import com.bingchuang.app.R +import com.bingchuang.app.base.BaseViewModel +import com.bingchuang.core.bean.response.BeanResult +import com.bingchuang.core.user.UserInfoUiMgr +import com.bingchuang.core.user.UserModel +import com.bingchuang.core.utils.toast +import com.bingchuang.core.vip.VipAuthInfo +import com.bingchuang.core.vip.VipBroadcastInfo +import com.bingchuang.core.vip.VipInfo +import com.bingchuang.core.vip.VipModel import com.bingchuang.library.utils.ResUtil class VipViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/pikolive/app/vip/adapter/PayAdapter.kt b/app/src/main/java/com/bingchuang/app/vip/adapter/PayAdapter.kt similarity index 84% rename from app/src/main/java/com/pikolive/app/vip/adapter/PayAdapter.kt rename to app/src/main/java/com/bingchuang/app/vip/adapter/PayAdapter.kt index 2bb987379..4c55773f9 100644 --- a/app/src/main/java/com/pikolive/app/vip/adapter/PayAdapter.kt +++ b/app/src/main/java/com/bingchuang/app/vip/adapter/PayAdapter.kt @@ -1,12 +1,12 @@ -package com.pikolive.app.vip.adapter +package com.bingchuang.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.pikolive.app.R -import com.pikolive.app.vip.bean.PayInfo +import com.bingchuang.app.R +import com.bingchuang.app.vip.bean.PayInfo class PayAdapter : BaseQuickAdapter (R.layout.item_pay) { diff --git a/app/src/main/java/com/pikolive/app/vip/adapter/VipAuthAdapter.kt b/app/src/main/java/com/bingchuang/app/vip/adapter/VipAuthAdapter.kt similarity index 79% rename from app/src/main/java/com/pikolive/app/vip/adapter/VipAuthAdapter.kt rename to app/src/main/java/com/bingchuang/app/vip/adapter/VipAuthAdapter.kt index 02f799803..4b7655617 100644 --- a/app/src/main/java/com/pikolive/app/vip/adapter/VipAuthAdapter.kt +++ b/app/src/main/java/com/bingchuang/app/vip/adapter/VipAuthAdapter.kt @@ -1,12 +1,12 @@ -package com.pikolive.app.vip.adapter +package com.bingchuang.app.vip.adapter import android.widget.ImageView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.pikolive.app.R -import com.pikolive.app.ui.utils.load -import com.pikolive.core.vip.VipAuthInfo -import com.pikolive.core.vip.VipInfo +import com.bingchuang.app.R +import com.bingchuang.app.ui.utils.load +import com.bingchuang.core.vip.VipAuthInfo +import com.bingchuang.core.vip.VipInfo class VipAuthAdapter : BaseQuickAdapter (R.layout.item_vip_auth) { diff --git a/app/src/main/java/com/pikolive/app/vip/adapter/VipMagicIndicatorAdapter.java b/app/src/main/java/com/bingchuang/app/vip/adapter/VipMagicIndicatorAdapter.java similarity index 85% rename from app/src/main/java/com/pikolive/app/vip/adapter/VipMagicIndicatorAdapter.java rename to app/src/main/java/com/bingchuang/app/vip/adapter/VipMagicIndicatorAdapter.java index ca9033552..2a403a752 100644 --- a/app/src/main/java/com/pikolive/app/vip/adapter/VipMagicIndicatorAdapter.java +++ b/app/src/main/java/com/bingchuang/app/vip/adapter/VipMagicIndicatorAdapter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.vip.adapter; +package com.bingchuang.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.pikolive.app.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; +import com.bingchuang.app.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/vip/bean/PayInfo.kt b/app/src/main/java/com/bingchuang/app/vip/bean/PayInfo.kt similarity index 78% rename from app/src/main/java/com/pikolive/app/vip/bean/PayInfo.kt rename to app/src/main/java/com/bingchuang/app/vip/bean/PayInfo.kt index 6a9de619c..1ded8debf 100644 --- a/app/src/main/java/com/pikolive/app/vip/bean/PayInfo.kt +++ b/app/src/main/java/com/bingchuang/app/vip/bean/PayInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.app.vip.bean +package com.bingchuang.app.vip.bean data class PayInfo( val url: Int = 0, diff --git a/app/src/main/java/com/pikolive/app/vip/dialog/PaymentDialog.kt b/app/src/main/java/com/bingchuang/app/vip/dialog/PaymentDialog.kt similarity index 87% rename from app/src/main/java/com/pikolive/app/vip/dialog/PaymentDialog.kt rename to app/src/main/java/com/bingchuang/app/vip/dialog/PaymentDialog.kt index 37d7d0041..25e2c78ed 100644 --- a/app/src/main/java/com/pikolive/app/vip/dialog/PaymentDialog.kt +++ b/app/src/main/java/com/bingchuang/app/vip/dialog/PaymentDialog.kt @@ -1,15 +1,15 @@ -package com.pikolive.app.vip.dialog +package com.bingchuang.app.vip.dialog import android.annotation.SuppressLint import android.view.Gravity import android.view.WindowManager import androidx.recyclerview.widget.LinearLayoutManager -import com.pikolive.app.R -import com.pikolive.app.base.BaseDialog -import com.pikolive.app.databinding.DialogPaymentBinding -import com.pikolive.app.ui.utils.RVDelegate -import com.pikolive.app.vip.adapter.PayAdapter -import com.pikolive.app.vip.bean.PayInfo +import com.bingchuang.app.R +import com.bingchuang.app.base.BaseDialog +import com.bingchuang.app.databinding.DialogPaymentBinding +import com.bingchuang.app.ui.utils.RVDelegate +import com.bingchuang.app.vip.adapter.PayAdapter +import com.bingchuang.app.vip.bean.PayInfo import com.bingchuang.library.utils.ResUtil /** diff --git a/app/src/main/java/com/pikolive/app/vip/dialog/SelectPayTypeDialog.kt b/app/src/main/java/com/bingchuang/app/vip/dialog/SelectPayTypeDialog.kt similarity index 92% rename from app/src/main/java/com/pikolive/app/vip/dialog/SelectPayTypeDialog.kt rename to app/src/main/java/com/bingchuang/app/vip/dialog/SelectPayTypeDialog.kt index 5d95113bc..a3b5ba404 100644 --- a/app/src/main/java/com/pikolive/app/vip/dialog/SelectPayTypeDialog.kt +++ b/app/src/main/java/com/bingchuang/app/vip/dialog/SelectPayTypeDialog.kt @@ -1,4 +1,4 @@ -package com.pikolive.app.vip.dialog +package com.bingchuang.app.vip.dialog import android.annotation.SuppressLint import android.content.res.ColorStateList @@ -9,14 +9,14 @@ import android.view.View import android.view.WindowManager import androidx.core.graphics.toColorInt import com.netease.nim.uikit.common.util.sys.ScreenUtil -import com.pikolive.app.R -import com.pikolive.app.base.BaseDialog -import com.pikolive.app.databinding.DialogSelectPayTypeBinding -import com.pikolive.app.ui.widget.dialog.CommonTipDialog -import com.pikolive.app.utils.SpannableBuilder -import com.pikolive.core.pay.PayModel -import com.pikolive.core.pay.bean.WalletInfo -import com.pikolive.core.utils.Logger +import com.bingchuang.app.R +import com.bingchuang.app.base.BaseDialog +import com.bingchuang.app.databinding.DialogSelectPayTypeBinding +import com.bingchuang.app.ui.widget.dialog.CommonTipDialog +import com.bingchuang.app.utils.SpannableBuilder +import com.bingchuang.core.pay.PayModel +import com.bingchuang.core.pay.bean.WalletInfo +import com.bingchuang.core.utils.Logger import com.bingchuang.library.utils.FormatUtils import com.bingchuang.library.utils.ResUtil import com.bingchuang.library.utils.SingleToastUtil diff --git a/app/src/main/java/com/pikolive/app/vip/dialog/VipAuthDetailsDialog.kt b/app/src/main/java/com/bingchuang/app/vip/dialog/VipAuthDetailsDialog.kt similarity index 82% rename from app/src/main/java/com/pikolive/app/vip/dialog/VipAuthDetailsDialog.kt rename to app/src/main/java/com/bingchuang/app/vip/dialog/VipAuthDetailsDialog.kt index 8d90a3c6f..45e1afcc5 100644 --- a/app/src/main/java/com/pikolive/app/vip/dialog/VipAuthDetailsDialog.kt +++ b/app/src/main/java/com/bingchuang/app/vip/dialog/VipAuthDetailsDialog.kt @@ -1,9 +1,9 @@ -package com.pikolive.app.vip.dialog +package com.bingchuang.app.vip.dialog import android.os.Bundle -import com.pikolive.app.base.BaseDialog -import com.pikolive.app.databinding.DialogVipAuthDetailsBinding -import com.pikolive.app.ui.utils.load +import com.bingchuang.app.base.BaseDialog +import com.bingchuang.app.databinding.DialogVipAuthDetailsBinding +import com.bingchuang.app.ui.utils.load class VipAuthDetailsDialog : BaseDialog () { diff --git a/app/src/main/java/com/pikolive/app/vip/dialog/VipBroadcastDialog.kt b/app/src/main/java/com/bingchuang/app/vip/dialog/VipBroadcastDialog.kt similarity index 90% rename from app/src/main/java/com/pikolive/app/vip/dialog/VipBroadcastDialog.kt rename to app/src/main/java/com/bingchuang/app/vip/dialog/VipBroadcastDialog.kt index 12579207e..4799d86d5 100644 --- a/app/src/main/java/com/pikolive/app/vip/dialog/VipBroadcastDialog.kt +++ b/app/src/main/java/com/bingchuang/app/vip/dialog/VipBroadcastDialog.kt @@ -1,16 +1,16 @@ -package com.pikolive.app.vip.dialog +package com.bingchuang.app.vip.dialog import android.annotation.SuppressLint import android.os.Bundle import androidx.core.view.isVisible import androidx.fragment.app.viewModels -import com.pikolive.app.R -import com.pikolive.app.base.BaseActivity -import com.pikolive.app.base.BaseDialog -import com.pikolive.app.databinding.DialogVipBroadcastBinding -import com.pikolive.app.vip.VipViewModel -import com.pikolive.core.utils.CurrentTimeUtils -import com.pikolive.core.utils.toast +import com.bingchuang.app.R +import com.bingchuang.app.base.BaseActivity +import com.bingchuang.app.base.BaseDialog +import com.bingchuang.app.databinding.DialogVipBroadcastBinding +import com.bingchuang.app.vip.VipViewModel +import com.bingchuang.core.utils.CurrentTimeUtils +import com.bingchuang.core.utils.toast import com.bingchuang.library.utils.ResUtil import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers diff --git a/app/src/main/java/com/pikolive/app/vip/dialog/VipRemainTimeDialog.kt b/app/src/main/java/com/bingchuang/app/vip/dialog/VipRemainTimeDialog.kt similarity index 76% rename from app/src/main/java/com/pikolive/app/vip/dialog/VipRemainTimeDialog.kt rename to app/src/main/java/com/bingchuang/app/vip/dialog/VipRemainTimeDialog.kt index 8871e6d54..7efdefe5c 100644 --- a/app/src/main/java/com/pikolive/app/vip/dialog/VipRemainTimeDialog.kt +++ b/app/src/main/java/com/bingchuang/app/vip/dialog/VipRemainTimeDialog.kt @@ -1,8 +1,8 @@ -package com.pikolive.app.vip.dialog +package com.bingchuang.app.vip.dialog import android.os.Bundle -import com.pikolive.app.base.BaseDialog -import com.pikolive.app.databinding.DialogVipRemainTimeBinding +import com.bingchuang.app.base.BaseDialog +import com.bingchuang.app.databinding.DialogVipRemainTimeBinding class VipRemainTimeDialog : BaseDialog () { diff --git a/app/src/main/java/com/pikolive/app/vip/dialog/VipUpgradeDialog.kt b/app/src/main/java/com/bingchuang/app/vip/dialog/VipUpgradeDialog.kt similarity index 89% rename from app/src/main/java/com/pikolive/app/vip/dialog/VipUpgradeDialog.kt rename to app/src/main/java/com/bingchuang/app/vip/dialog/VipUpgradeDialog.kt index 36ca54e2b..f95e5eae9 100644 --- a/app/src/main/java/com/pikolive/app/vip/dialog/VipUpgradeDialog.kt +++ b/app/src/main/java/com/bingchuang/app/vip/dialog/VipUpgradeDialog.kt @@ -1,4 +1,4 @@ -package com.pikolive.app.vip.dialog +package com.bingchuang.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.pikolive.app.base.BaseActivity -import com.pikolive.app.base.BaseDialog -import com.pikolive.app.databinding.DialogVipUpgradeBinding -import com.pikolive.app.vip.VipViewModel -import com.pikolive.core.vip.VipInfo +import com.bingchuang.app.base.BaseActivity +import com.bingchuang.app.base.BaseDialog +import com.bingchuang.app.databinding.DialogVipUpgradeBinding +import com.bingchuang.app.vip.VipViewModel +import com.bingchuang.core.vip.VipInfo import java.net.MalformedURLException import java.net.URL diff --git a/app/src/main/java/com/pikolive/app/vip/util/VipHelper.java b/app/src/main/java/com/bingchuang/app/vip/util/VipHelper.java similarity index 86% rename from app/src/main/java/com/pikolive/app/vip/util/VipHelper.java rename to app/src/main/java/com/bingchuang/app/vip/util/VipHelper.java index 5d4eceb98..c1dc30a9c 100644 --- a/app/src/main/java/com/pikolive/app/vip/util/VipHelper.java +++ b/app/src/main/java/com/bingchuang/app/vip/util/VipHelper.java @@ -1,4 +1,4 @@ -package com.pikolive.app.vip.util; +package com.bingchuang.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.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.core.user.UserModel; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.utils.TextUtils; -import com.pikolive.core.vip.UserVipInfo; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.core.user.UserModel; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.utils.TextUtils; +import com.bingchuang.core.vip.UserVipInfo; public class VipHelper { diff --git a/app/src/main/java/com/pikolive/app/vip/view/VipBroadcastView.kt b/app/src/main/java/com/bingchuang/app/vip/view/VipBroadcastView.kt similarity index 90% rename from app/src/main/java/com/pikolive/app/vip/view/VipBroadcastView.kt rename to app/src/main/java/com/bingchuang/app/vip/view/VipBroadcastView.kt index 788c992c5..0c84da45e 100644 --- a/app/src/main/java/com/pikolive/app/vip/view/VipBroadcastView.kt +++ b/app/src/main/java/com/bingchuang/app/vip/view/VipBroadcastView.kt @@ -1,4 +1,4 @@ -package com.pikolive.app.vip.view +package com.bingchuang.app.vip.view import android.animation.ObjectAnimator import android.annotation.SuppressLint @@ -10,12 +10,12 @@ 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.pikolive.app.databinding.LayoutVipBroadcastViewBinding -import com.pikolive.app.ui.utils.ImageLoadUtils -import com.pikolive.core.im.custom.bean.VipMessageAttachment -import com.pikolive.core.room.anotherroompk.ShowUserInfoDialogEvent -import com.pikolive.core.utils.subAndReplaceDot -import com.pikolive.core.vip.VipBroadcastMsgEvent +import com.bingchuang.app.databinding.LayoutVipBroadcastViewBinding +import com.bingchuang.app.ui.utils.ImageLoadUtils +import com.bingchuang.core.im.custom.bean.VipMessageAttachment +import com.bingchuang.core.room.anotherroompk.ShowUserInfoDialogEvent +import com.bingchuang.core.utils.subAndReplaceDot +import com.bingchuang.core.vip.VipBroadcastMsgEvent import com.bingchuang.library.rxbus.RxBus import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers 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 317533f83..a4ae0418f 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.pikolive.app.R; -import com.pikolive.app.base.BaseActivity; +import com.bingchuang.app.R; +import com.bingchuang.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 95bb6e4ae..3d9d7596d 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.pikolive.app.R; +import com.bingchuang.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 6548ff612..34ebab3a6 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.pikolive.app.R; +import com.bingchuang.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 ef62eacee..bbc0e4dac 100644 --- a/app/src/main/java/com/jph/takephoto/app/TakePhotoImpl.java +++ b/app/src/main/java/com/jph/takephoto/app/TakePhotoImpl.java @@ -35,7 +35,7 @@ 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.pikolive.app.R; +import com.bingchuang.app.R; import com.bingchuang.library.utils.SingleToastUtil; import java.io.File; 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 68c6a7141..00b1e3e9c 100644 --- a/app/src/main/java/com/jph/takephoto/compress/CompressImageUtil.java +++ b/app/src/main/java/com/jph/takephoto/compress/CompressImageUtil.java @@ -7,7 +7,7 @@ import android.graphics.BitmapFactory; import android.os.Handler; import com.jph.takephoto.uitl.TFileUtils; -import com.pikolive.app.R; +import com.bingchuang.app.R; import com.bingchuang.library.utils.ResUtil; import java.io.ByteArrayOutputStream; 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 cfddafabf..291c709c9 100644 --- a/app/src/main/java/com/jph/takephoto/model/TExceptionType.java +++ b/app/src/main/java/com/jph/takephoto/model/TExceptionType.java @@ -1,5 +1,5 @@ package com.jph.takephoto.model; -import com.pikolive.app.R; +import com.bingchuang.app.R; import com.bingchuang.library.utils.ResUtil; /** 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 963124d28..23001acea 100644 --- a/app/src/main/java/com/jph/takephoto/permission/PermissionManager.java +++ b/app/src/main/java/com/jph/takephoto/permission/PermissionManager.java @@ -13,7 +13,7 @@ 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.pikolive.app.R; +import com.bingchuang.app.R; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.SingleToastUtil; 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 ce9b23b2a..ab0f403f8 100644 --- a/app/src/main/java/com/jph/takephoto/uitl/TImageFiles.java +++ b/app/src/main/java/com/jph/takephoto/uitl/TImageFiles.java @@ -12,7 +12,7 @@ import android.webkit.MimeTypeMap; import com.jph.takephoto.model.TException; import com.jph.takephoto.model.TExceptionType; -import com.pikolive.app.R; +import com.bingchuang.app.R; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.SingleToastUtil; 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 89d357a0a..40444f5ff 100644 --- a/app/src/main/java/com/jph/takephoto/uitl/TUtils.java +++ b/app/src/main/java/com/jph/takephoto/uitl/TUtils.java @@ -20,7 +20,7 @@ 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.pikolive.app.R; +import com.bingchuang.app.R; import com.bingchuang.library.utils.SingleToastUtil; import java.io.File; diff --git a/app/src/main/java/com/pikolive/app/avroom/redpackage/RedPackageEvent.java b/app/src/main/java/com/pikolive/app/avroom/redpackage/RedPackageEvent.java deleted file mode 100644 index 247be85cc..000000000 --- a/app/src/main/java/com/pikolive/app/avroom/redpackage/RedPackageEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pikolive.app.avroom.redpackage; - -public class RedPackageEvent { -} diff --git a/app/src/main/java/com/pikolive/app/bills/presenter/BillGiftIncomeGroupPresenter.java b/app/src/main/java/com/pikolive/app/bills/presenter/BillGiftIncomeGroupPresenter.java deleted file mode 100644 index 88a545840..000000000 --- a/app/src/main/java/com/pikolive/app/bills/presenter/BillGiftIncomeGroupPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.pikolive.app.bills.presenter; - -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.app.bills.view.IBillGiftIncomeGroupView; - -public class BillGiftIncomeGroupPresenter extends BaseMvpPresenter{ -} diff --git a/app/src/main/java/com/pikolive/app/family/presenter/FamilyManagePresenter.java b/app/src/main/java/com/pikolive/app/family/presenter/FamilyManagePresenter.java deleted file mode 100644 index b8da9e475..000000000 --- a/app/src/main/java/com/pikolive/app/family/presenter/FamilyManagePresenter.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.pikolive.app.family.presenter; - -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.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/pikolive/app/family/presenter/FamilySelectFriendPresenter.java b/app/src/main/java/com/pikolive/app/family/presenter/FamilySelectFriendPresenter.java deleted file mode 100644 index 09581d4e2..000000000 --- a/app/src/main/java/com/pikolive/app/family/presenter/FamilySelectFriendPresenter.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.pikolive.app.family.presenter; - - -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.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/pikolive/app/home/event/ContactTrashEvent.java b/app/src/main/java/com/pikolive/app/home/event/ContactTrashEvent.java deleted file mode 100644 index e8605c10c..000000000 --- a/app/src/main/java/com/pikolive/app/home/event/ContactTrashEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pikolive.app.home.event; - -public class ContactTrashEvent { -} diff --git a/app/src/main/java/com/pikolive/app/other/present/SplashPresenter.java b/app/src/main/java/com/pikolive/app/other/present/SplashPresenter.java deleted file mode 100644 index d32db4a99..000000000 --- a/app/src/main/java/com/pikolive/app/other/present/SplashPresenter.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.pikolive.app.other.present; - -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.app.other.view.ISplashView; - -/** - * - * - * @author jiahui - * @date 2017/12/8 - */ -public class SplashPresenter extends BaseMvpPresenter
{ - - -} diff --git a/app/src/main/java/com/pikolive/app/radish/task/presenter/TaskCenterFrgPresenter.java b/app/src/main/java/com/pikolive/app/radish/task/presenter/TaskCenterFrgPresenter.java deleted file mode 100644 index ee439cb74..000000000 --- a/app/src/main/java/com/pikolive/app/radish/task/presenter/TaskCenterFrgPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.pikolive.app.radish.task.presenter; - -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.app.radish.task.view.ITaskCenterViewFrg; - -public class TaskCenterFrgPresenter extends BaseMvpPresenter { -} diff --git a/app/src/main/java/com/pikolive/app/radish/task/presenter/TaskCenterPresenter.java b/app/src/main/java/com/pikolive/app/radish/task/presenter/TaskCenterPresenter.java deleted file mode 100644 index f88894fb3..000000000 --- a/app/src/main/java/com/pikolive/app/radish/task/presenter/TaskCenterPresenter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.pikolive.app.radish.task.presenter; - -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.app.radish.task.view.ITaskCenterView; - -/** - * create by lvzebiao @2019/3/27 - */ -public class TaskCenterPresenter extends BaseMvpPresenter { - - -} diff --git a/app/src/main/java/com/pikolive/app/ui/utils/sys/PermissionUtil.kt b/app/src/main/java/com/pikolive/app/ui/utils/sys/PermissionUtil.kt deleted file mode 100644 index 3cab7691a..000000000 --- a/app/src/main/java/com/pikolive/app/ui/utils/sys/PermissionUtil.kt +++ /dev/null @@ -1,4 +0,0 @@ -package com.pikolive.app.ui.utils.sys - -class PermissionUtil { -} \ No newline at end of file diff --git a/app/src/main/java/fun/piko/live/lineapi/LineAuthenticationCallbackActivity.java b/app/src/main/java/fun/peki/live/lineapi/LineAuthenticationCallbackActivity.java similarity index 80% rename from app/src/main/java/fun/piko/live/lineapi/LineAuthenticationCallbackActivity.java rename to app/src/main/java/fun/peki/live/lineapi/LineAuthenticationCallbackActivity.java index c93e60fcc..5743f0dbb 100644 --- a/app/src/main/java/fun/piko/live/lineapi/LineAuthenticationCallbackActivity.java +++ b/app/src/main/java/fun/peki/live/lineapi/LineAuthenticationCallbackActivity.java @@ -1,4 +1,4 @@ -package fun.piko.live.lineapi; +package fun.peki.live.lineapi; import cn.sharesdk.line.LineHandlerActivity; diff --git a/app/src/main/res/layout/act_community_notice.xml b/app/src/main/res/layout/act_community_notice.xml index b2311cffd..f104f6d30 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 c8a943a29..bfcf67dbf 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.bingchuang.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 3d1ca8cf2..c2fa1a686 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.pikolive.app.team.view.AddMemberSearchActivity"> + tools:context="com.bingchuang.app.team.view.AddMemberSearchActivity">- \ 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 3dd61041a..f137c2b46 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.pikolive.app.home.activity.AllGameActivity"> + tools:context="com.bingchuang.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 b8b294da0..d037c59f4 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"> -@@ -131,7 +131,7 @@ tools:ignore="SpUsage" /> - +- - - - - @@ -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 94714aa9c..15d7f2d26 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 0782e9496..d8744a1f6 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"> - - + tools:context="com.bingchuang.app.earn.activity.BindWithdrawMsgActivity"> - - - diff --git a/app/src/main/res/layout/activity_charge.xml b/app/src/main/res/layout/activity_charge.xml index 71c028155..dfddee464 100644 --- a/app/src/main/res/layout/activity_charge.xml +++ b/app/src/main/res/layout/activity_charge.xml @@ -15,7 +15,7 @@ android:scaleType="centerCrop" 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 c345a633a..066699db2 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.pikolive.app.ui.webview.CommonWebViewActivity"> + tools:context="com.bingchuang.app.ui.webview.CommonWebViewActivity">+ tools:context="com.bingchuang.app.earn.activity.ConvertDiamondActivity"> - -- - - - diff --git a/app/src/main/res/layout/activity_cp_task.xml b/app/src/main/res/layout/activity_cp_task.xml index 6828ca320..68fb7ae22 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"> - - - - - - - - - - - - - - - @@ -183,7 +183,7 @@ android:gravity="center_vertical" android:orientation="horizontal"> - - - - - - - - - - - + tools:context="com.bingchuang.app.earn.activity.EarnRecordActivity"> - + tools:context="com.bingchuang.app.earn.activity.EarnWithdrawActivity"> - - - + tools:context="com.bingchuang.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 80ca8ef01..80c1a8dd6 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 577f40fa7..164361bc9 100644 --- a/app/src/main/res/layout/activity_family_currency.xml +++ b/app/src/main/res/layout/activity_family_currency.xml @@ -5,9 +5,9 @@ android:layout_height="match_parent" android:orientation="vertical" android:background="@color/white" - tools:context="com.pikolive.app.family.view.activity.FamilyCurrencyActivity"> + tools:context="com.bingchuang.app.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 da7c4d298..73dc8e108 100644 --- a/app/src/main/res/layout/activity_family_game_list.xml +++ b/app/src/main/res/layout/activity_family_game_list.xml @@ -4,15 +4,15 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:context="com.pikolive.app.family.view.activity.FamilyGameListActivity"> + tools:context="com.bingchuang.app.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 6146d80b9..ee0ace56b 100644 --- a/app/src/main/res/layout/activity_family_home.xml +++ b/app/src/main/res/layout/activity_family_home.xml @@ -6,14 +6,14 @@ android:layout_height="match_parent" android:background="@color/color_F5F5F5" android:orientation="vertical" - tools:context="com.pikolive.app.family.view.activity.FamilyHomeActivity"> + tools:context="com.bingchuang.app.family.view.activity.FamilyHomeActivity"> - - - @@ -31,7 +31,7 @@ android:focusableInTouchMode="true" android:orientation="vertical"> - +@@ -112,7 +112,7 @@ android:textSize="11sp" android:textStyle="bold" /> - +- - + tools:context="com.bingchuang.app.family.view.activity.FamilyInfoActivity"> - diff --git a/app/src/main/res/layout/activity_family_list.xml b/app/src/main/res/layout/activity_family_list.xml index c13643731..1b13cc5f0 100644 --- a/app/src/main/res/layout/activity_family_list.xml +++ b/app/src/main/res/layout/activity_family_list.xml @@ -5,14 +5,14 @@ android:layout_height="match_parent" android:orientation="vertical" android:background="@color/color_F1F1F1" - tools:context="com.pikolive.app.family.view.activity.FamilyListActivity"> + tools:context="com.bingchuang.app.family.view.activity.FamilyListActivity"> - - @@ -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 7f2397721..a8bc70d72 100644 --- a/app/src/main/res/layout/activity_family_list_member.xml +++ b/app/src/main/res/layout/activity_family_list_member.xml @@ -4,9 +4,9 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:context="com.pikolive.app.family.view.activity.FamilyMemberListActivity"> + tools:context="com.bingchuang.app.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 335027509..a3bdf5ee5 100644 --- a/app/src/main/res/layout/activity_family_manage_activty.xml +++ b/app/src/main/res/layout/activity_family_manage_activty.xml @@ -5,9 +5,9 @@ android:layout_height="match_parent" android:orientation="vertical" android:background="@color/color_F5F5F5" - tools:context="com.pikolive.app.family.view.activity.FamilyManageActivity"> + tools:context="com.bingchuang.app.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 58295ebac..a2f5d5ec8 100644 --- a/app/src/main/res/layout/activity_family_member_currency.xml +++ b/app/src/main/res/layout/activity_family_member_currency.xml @@ -5,9 +5,9 @@ android:layout_height="match_parent" android:orientation="vertical" android:background="@color/white" - tools:context="com.pikolive.app.family.view.activity.FamilyMemberCurrencyActivity"> + tools:context="com.bingchuang.app.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 35612489b..dc10d6c08 100644 --- a/app/src/main/res/layout/activity_family_member_search.xml +++ b/app/src/main/res/layout/activity_family_member_search.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical" android:background="@color/white" - tools:context="com.pikolive.app.family.view.activity.FamilyMemberSearchActivity"> + tools:context="com.bingchuang.app.family.view.activity.FamilyMemberSearchActivity"> - diff --git a/app/src/main/res/layout/activity_family_plaza.xml b/app/src/main/res/layout/activity_family_plaza.xml index 0ac17e251..ff5423264 100644 --- a/app/src/main/res/layout/activity_family_plaza.xml +++ b/app/src/main/res/layout/activity_family_plaza.xml @@ -6,9 +6,9 @@ android:layout_height="match_parent" android:background="@color/color_F5F5F5" android:orientation="vertical" - tools:context="com.pikolive.app.family.view.activity.FamilyPlazaActivity"> + tools:context="com.bingchuang.app.family.view.activity.FamilyPlazaActivity"> -@@ -91,5 +91,5 @@ tools:listItem="@layout/item_family_list"> - +@@ -32,7 +32,7 @@ android:focusableInTouchMode="true" android:orientation="vertical"> - @@ -43,7 +43,7 @@ android:scaleType="centerCrop" android:src="@drawable/banner_family_plaza" /> - ++ tools:context="com.bingchuang.app.family.view.activity.FamilySearchActivity"> \ 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 100190844..fac001887 100644 --- a/app/src/main/res/layout/activity_give_gold_success.xml +++ b/app/src/main/res/layout/activity_give_gold_success.xml @@ -6,9 +6,9 @@ android:background="@color/white" android:gravity="center_horizontal" android:orientation="vertical" - tools:context="com.pikolive.app.pay.activity.GiveGoldSuccessActivity"> + tools:context="com.bingchuang.app.pay.activity.GiveGoldSuccessActivity"> -- 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 799be7aab..7d44a5484 100644 --- a/app/src/main/res/layout/activity_family_select_friend.xml +++ b/app/src/main/res/layout/activity_family_select_friend.xml @@ -5,14 +5,14 @@ android:layout_height="match_parent" android:orientation="vertical" android:background="@color/white" - tools:context="com.pikolive.app.family.view.activity.FamilySelectFriendActivity" > + tools:context="com.bingchuang.app.family.view.activity.FamilySelectFriendActivity" > -@@ -93,5 +93,5 @@ tools:listItem="@layout/item_family_list"> - +- + tools:context="com.bingchuang.app.family.view.activity.FamilyTextInputActivity"> - diff --git a/app/src/main/res/layout/activity_fans.xml b/app/src/main/res/layout/activity_fans.xml index d42edd46b..6071e813a 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.bingchuang.app.ui.setting.FeedbackActivity"> - - - @@ -19,6 +19,6 @@ android:id="@+id/recycler_view" android:layout_width="match_parent" android:layout_height="match_parent" /> - +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 d61678838..3d139c22d 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 @@ -5,16 +5,16 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/white" - tools:context="com.pikolive.app.pay.activity.GiveGoldToUserActivity"> + tools:context="com.bingchuang.app.pay.activity.GiveGoldToUserActivity"> - - - + tools:context="com.bingchuang.app.earn.activity.GoldDetailActivity"> - - + tools:context="com.bingchuang.app.guide.GuideActivity"> - + app:layout_behavior="com.bingchuang.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 58d8de5c1..df61328aa 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 e5f866ceb..ec6d60157 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 2e37e2c56..f82852e29 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.pikolive.app.MainActivity"> + tools:context="com.bingchuang.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.bingchuang.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 d07c2258e..b811984fd 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.bingchuang.app.ui.patriarch.PatriarchModeActivity"> - + tools:context="com.bingchuang.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 fa3aa33ac..a24a7a0f5 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 a6d7a4e2f..67dfee2bd 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.bingchuang.app.base.BaseListViewModel" /> - \ 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 3362f6196..9902a1476 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"> -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 9b20a9f6e..c80374124 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" /> - +- - @@ -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 1340bac3b..729864ef5 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 d5190f22b..e2bf733be 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.bingchuang.app.avroom.activity.RoomOnlineUserActivity"> \ 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 488175e3a..6626dce01 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.pikolive.app.team.view.TeamWeeklyBillActivity"> + tools:context="com.bingchuang.app.team.view.TeamWeeklyBillActivity"> -- - + tools:context="com.bingchuang.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 9920819fb..2f50046ab 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 1fa7e1f29..6b00d3d56 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.bingchuang.app.ui.login.ShowBindPhoneActivity"> - + tools:context="com.bingchuang.app.ui.user.activity.ShowPhotoActivity"> - - +- - + tools:context="com.bingchuang.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 28013711d..5373e86c3 100644 --- a/app/src/main/res/layout/activity_sound_signature.xml +++ b/app/src/main/res/layout/activity_sound_signature.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/white" - tools:context="com.pikolive.app.audio.SoundSignatureActivity"> + tools:context="com.bingchuang.app.audio.SoundSignatureActivity">- - - - + -+ type="com.bingchuang.core.team.bean.TeamInfo" /> - - + + @@ -23,7 +23,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - diff --git a/app/src/main/res/layout/activity_team_member_list.xml b/app/src/main/res/layout/activity_team_member_list.xml index a2bfee06b..35a70d0a3 100644 --- a/app/src/main/res/layout/activity_team_member_list.xml +++ b/app/src/main/res/layout/activity_team_member_list.xml @@ -12,9 +12,9 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:context="com.pikolive.app.family.view.activity.FamilyMemberListActivity"> + tools:context="com.bingchuang.app.family.view.activity.FamilyMemberListActivity"> - @@ -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 2c72a3d24..757dde7dc 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 @@ -13,7 +13,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:context="com.pikolive.app.family.view.activity.FamilyMemberSearchActivity"> + tools:context="com.bingchuang.app.family.view.activity.FamilyMemberSearchActivity">- diff --git a/app/src/main/res/layout/activity_team_message.xml b/app/src/main/res/layout/activity_team_message.xml index 12876ab25..dec54ad94 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 @@@@ -105,6 +105,6 @@ tools:listItem="@layout/item_family_list"> - +- +- - @@ -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 d215bc51e..55023063f 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 @@ -13,7 +13,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:context="com.pikolive.app.family.view.activity.FamilyMemberSearchActivity"> + tools:context="com.bingchuang.app.family.view.activity.FamilyMemberSearchActivity">- \ 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 dd511f798..b20bc57e2 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"> -@@ -109,6 +109,6 @@ android:layout_height="match_parent" /> - +- - - - - - - - diff --git a/app/src/main/res/layout/activity_user_gift.xml b/app/src/main/res/layout/activity_user_gift.xml index 071fe3627..bb76265eb 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.bingchuang.app.ui.widget.AppBarLayoutBehavior"> - - - - - + app:layout_behavior="com.bingchuang.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 5a01d8d0e..8a9bf6468 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 4e7333ee9..5dd2eaa09 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 9abb28d75..a24d385e5 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 d408744bf..62db88f6a 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 3389979bb..46f2e7624 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 5410653d3..b98a86183 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 938015e87..0bc228268 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 62883d3f5..809425f9e 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 7e8565e6e..584aec6d3 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.bingchuang.core.noble.AllServiceGiftProtocol.DataBean" /> @@ -42,7 +42,7 @@ android:orientation="vertical" app:layout_constraintGuide_percent="0.0586" /> - - - - - + type="com.bingchuang.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 3b3e37dfa..ace66a96c 100644 --- a/app/src/main/res/layout/dialog_request_upmic.xml +++ b/app/src/main/res/layout/dialog_request_upmic.xml @@ -4,13 +4,13 @@ - + + type="com.bingchuang.core.user.bean.UserInfo" /> - -- - - - - - - - - - - - - - - - - - - - - - + + type="com.bingchuang.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 87e4e4303..3306e161b 100644 --- a/app/src/main/res/layout/fragment_contact_list.xml +++ b/app/src/main/res/layout/fragment_contact_list.xml @@ -24,7 +24,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 61a01a7cf..5f47310c4 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 dda16d1c4..eafa843d0 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 8d52f58b8..d3113cfa1 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 @@ - \ 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 bdb35ff20..fbba51a24 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"> -@@ -20,5 +20,5 @@ /> - +@@ -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 26d8bc22c..9fa497bb5 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 48f877e08..414d01c4e 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 b060652e7..7540e9f25 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_tab_map.xml b/app/src/main/res/layout/fragment_home_tab_map.xml index 46eaa4a37..9eda05b5b 100644 --- a/app/src/main/res/layout/fragment_home_tab_map.xml +++ b/app/src/main/res/layout/fragment_home_tab_map.xml @@ -1,4 +1,4 @@ -@@ -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 cc029b9f5..854f54e21 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.bingchuang.core.user.bean.UserInfo" /> - -- - - + type="com.bingchuang.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 26db7b077..20e756c36 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.bingchuang.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 a7465e6d8..f252f6c4c 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 b427619a5..2baff6152 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 896b38f32..4780b8f67 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.bingchuang.app.ui.webview.CommonWebViewActivity"> - \ 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 985dc50e5..ba0042b95 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" /> -diff --git a/app/src/main/res/layout/fragment_recent_list.xml b/app/src/main/res/layout/fragment_recent_list.xml index 882b762eb..f0539176f 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 f0d06b3b2..5bc89feba 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.bingchuang.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 fa1fd5a79..7a77a4f3e 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.bingchuang.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 f473435c7..a578d3e07 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.bingchuang.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 4dc5ae25c..d403c5d3a 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.bingchuang.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 7fb7cf2c2..5c9bd1c37 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" /> - +@@ -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 7bff7719c..4e48b63fa 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 8208caab2..f776bc486 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 44660ffc5..3830d3cfd 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.bingchuang.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 c17aa5bd0..fcd7515d8 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.bingchuang.core.family.bean.FamilyMemberInfo" /> - - - - + - - + - - + type="com.bingchuang.core.decoration.car.bean.CarInfo" /> + type="com.bingchuang.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.bingchuang.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 c1a3d66ee..fcaf3b437 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 04b7f496d..005aba588 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.bingchuang.core.user.bean.AttentionInfo" /> @@ -20,7 +20,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"> - - - - + tools:text="PekiPeki" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_dynamic.xml b/app/src/main/res/layout/item_home_dynamic.xml index e7be04b0a..0ec544a00 100644 --- a/app/src/main/res/layout/item_home_dynamic.xml +++ b/app/src/main/res/layout/item_home_dynamic.xml @@ -18,7 +18,7 @@ android:layout_marginTop="@dimen/dp_8" app:layout_constraintTop_toTopOf="parent"> - - - - + - - + 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 074b54031..2efc2e6e9 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 5b6122363..e3daff753 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.bingchuang.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 709e713c7..ca35e171e 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.bingchuang.core.decoration.headwear.bean.ChatBubbleInfo" /> + type="com.bingchuang.core.decoration.headwear.bean.HeadWearInfo" /> + type="com.bingchuang.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_room_banner.xml b/app/src/main/res/layout/item_room_banner.xml index 50a68a0c7..009866f0f 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"> -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + type="com.bingchuang.core.team.bean.TeamInfo" /> \ 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 7f43b0240..7fb49ea2d 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"> - + type="com.bingchuang.core.team.bean.TeamMemberInfo" /> + type="com.bingchuang.core.team.bean.TeamTransactionRecordInfo" /> - \ 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 0164de4b4..ec9c835bc 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.bingchuang.core.user.bean.UserGameInfo" /> - -+ type="com.bingchuang.core2.home.bean.BannerInfo" /> - - - + type="com.bingchuang.core.relation.cp.CpRelation" /> + type="com.bingchuang.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 c9295f833..7732116ad 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.bingchuang.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 00149ed0b..d4ba7637c 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.bingchuang.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 a61deea67..e96b44177 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 @@ - - - - - - - ++ type="com.bingchuang.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 + \ 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 8088750ae..11be2b35c 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 ae779c44d..ad8bde6fa 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 @@ - - - - - - - + @@ -495,7 +495,7 @@ @color/color_FE4C62 #9af5ef - +#FFA936 #39EBDF @@ -556,7 +556,7 @@#2D93FF - +#FFFFBC52 @@ -599,7 +599,7 @@#B3B3C3 - +#99FFFFFF diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6408a2b51..438c76e8f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -883,7 +883,7 @@隱私設置 通知提醒設置 -com.pikolive.app.ui.behavior.FixAppBarBehavior +com.bingchuang.app.ui.behavior.FixAppBarBehavior 搜索記錄 進房記錄 @@ -1048,7 +1048,7 @@Line 開通貴族點擊事件 -立即開通貴族特權 +立即開通貴族特權 恭喜開通貴族成功! 獲取貴族數據失敗,請重試 尚未開通貴族 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 2bde950a3..8985805fb 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.pikolive.app.R; +import com.bingchuang.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 d6d22a263..0ffe2b6ed 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,7 +16,7 @@ package com.zhihu.matisse.internal.entity; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.pikolive.app.R; +import com.bingchuang.app.R; import com.bingchuang.library.utils.ResUtil; public class CaptureStrategy { 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 4ef6af51f..ba563c6af 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.pikolive.app.R; +import com.bingchuang.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 cf1f64dde..b6db5c9ad 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.pikolive.app.R; +import com.bingchuang.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 937a30cec..cafdce4fe 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,8 +33,8 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.interpolator.view.animation.FastOutSlowInInterpolator; import androidx.viewpager.widget.ViewPager; -import com.pikolive.app.R; -import com.pikolive.app.base.TitleBar; +import com.bingchuang.app.R; +import com.bingchuang.app.base.TitleBar; import com.bingchuang.library.utils.ResUtil; 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/MediaSelectionFragment.java b/app/src/module_album/java/com/zhihu/matisse/internal/ui/MediaSelectionFragment.java index 76dab8a46..4ab4f2b2b 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.pikolive.app.R; +import com.bingchuang.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 c97354b16..61777a0ed 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,7 +27,7 @@ import android.view.ViewGroup; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; -import com.pikolive.app.R; +import com.bingchuang.app.R; import com.bingchuang.library.utils.SingleToastUtil; import com.zhihu.matisse.internal.entity.Item; import com.zhihu.matisse.internal.entity.SelectionSpec; diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/AlbumMediaAdapter.java b/app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/AlbumMediaAdapter.java index 2189535b1..cbbaa5707 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.pikolive.app.R; +import com.bingchuang.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 277e82293..b42a23582 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.pikolive.app.R; +import com.bingchuang.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 f8df75ef6..d7b99e6a4 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.pikolive.app.R; +import com.bingchuang.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 5f067927a..3d3736115 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.pikolive.app.R; +import com.bingchuang.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 cf759f4bf..47ccd5a4c 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.pikolive.app.R; +import com.bingchuang.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 4f7feaba4..af84e6631 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.pikolive.app.R; -import com.pikolive.app.common.widget.dialog.BaseAlertDialogBuilder; +import com.bingchuang.app.R; +import com.bingchuang.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 58412d0db..ac3520ce8 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.pikolive.app.R; +import com.bingchuang.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/PhotoMetadataUtils.java b/app/src/module_album/java/com/zhihu/matisse/internal/utils/PhotoMetadataUtils.java index c43a68bdc..d21019b57 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.pikolive.app.R; +import com.bingchuang.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 bbc0e757f..8993278a4 100644 --- a/app/src/module_album/java/com/zhihu/matisse/ui/MatisseActivity.java +++ b/app/src/module_album/java/com/zhihu/matisse/ui/MatisseActivity.java @@ -46,7 +46,7 @@ import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.pikolive.app.R; +import com.bingchuang.app.R; import com.bingchuang.library.utils.ResUtil; import com.zhihu.matisse.internal.entity.Album; import com.zhihu.matisse.internal.entity.CustomItem; 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 1e0287baa..83c298283 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.pikolive.app.R; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.app.R; +import com.bingchuang.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 85af17ee9..a2ce95409 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 7c7683b9d..283911694 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 @@ -- - 解除綁定銀行卡成功 用戶服務協議及隱私政策 - 尊敬的Piko用戶:\n\u3000\u3000為了更好地保障你的合法權益, + 尊敬的Peki用戶:\n\u3000\u3000為了更好地保障你的合法權益, 讓你正常使用%s服務,%s公司依照國家法律法規,對支付賬戶進行實名製管理、 履行反洗錢職責並采取風險防控措施。你需要向%s公司以及合作公司(匯聚支付)提交身份信息、 聯系方式、交易信息。\n\u3000\u3000%s公司將嚴格依據國家法律法規收集、存儲、使用你的個人信息,確保信息安全。 diff --git a/app/src/module_community/java/com/pikolive/app/community/ConstantValue.java b/app/src/module_community/java/com/bingchuang/app/community/ConstantValue.java similarity index 77% rename from app/src/module_community/java/com/pikolive/app/community/ConstantValue.java rename to app/src/module_community/java/com/bingchuang/app/community/ConstantValue.java index 53a94e708..b1ef6905b 100644 --- a/app/src/module_community/java/com/pikolive/app/community/ConstantValue.java +++ b/app/src/module_community/java/com/bingchuang/app/community/ConstantValue.java @@ -1,4 +1,4 @@ -package com.pikolive.app.community; +package com.bingchuang.app.community; /** * create by lvzebiao @2019/11/12 diff --git a/app/src/module_community/java/com/pikolive/app/community/dynamic/adapter/CommentAdapter.java b/app/src/module_community/java/com/bingchuang/app/community/dynamic/adapter/CommentAdapter.java similarity index 94% rename from app/src/module_community/java/com/pikolive/app/community/dynamic/adapter/CommentAdapter.java rename to app/src/module_community/java/com/bingchuang/app/community/dynamic/adapter/CommentAdapter.java index 630d8adb3..76d3923a5 100644 --- a/app/src/module_community/java/com/pikolive/app/community/dynamic/adapter/CommentAdapter.java +++ b/app/src/module_community/java/com/bingchuang/app/community/dynamic/adapter/CommentAdapter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.community.dynamic.adapter; +package com.bingchuang.app.community.dynamic.adapter; import android.view.LayoutInflater; import android.view.View; @@ -9,13 +9,13 @@ import androidx.recyclerview.widget.RecyclerView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.pikolive.app.R; -import com.pikolive.app.UIHelper; -import com.pikolive.app.ui.utils.ImageLoadUtilsV2; -import com.pikolive.app.utils.RegexUtil; -import com.pikolive.app.utils.TimeUiUtils; -import com.pikolive.app.vip.util.VipHelper; -import com.pikolive.core.community.bean.Comment; +import com.bingchuang.app.R; +import com.bingchuang.app.UIHelper; +import com.bingchuang.app.ui.utils.ImageLoadUtilsV2; +import com.bingchuang.app.utils.RegexUtil; +import com.bingchuang.app.utils.TimeUiUtils; +import com.bingchuang.app.vip.util.VipHelper; +import com.bingchuang.core.community.bean.Comment; import com.bingchuang.library.utils.ListUtils; import java.util.List; diff --git a/app/src/module_community/java/com/pikolive/app/community/dynamic/adapter/CommentReplyAdapter.java b/app/src/module_community/java/com/bingchuang/app/community/dynamic/adapter/CommentReplyAdapter.java similarity index 85% rename from app/src/module_community/java/com/pikolive/app/community/dynamic/adapter/CommentReplyAdapter.java rename to app/src/module_community/java/com/bingchuang/app/community/dynamic/adapter/CommentReplyAdapter.java index 8a36f4537..020798e03 100644 --- a/app/src/module_community/java/com/pikolive/app/community/dynamic/adapter/CommentReplyAdapter.java +++ b/app/src/module_community/java/com/bingchuang/app/community/dynamic/adapter/CommentReplyAdapter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.community.dynamic.adapter; +package com.bingchuang.app.community.dynamic.adapter; import android.text.style.ForegroundColorSpan; import android.view.View; @@ -6,14 +6,14 @@ import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.pikolive.app.R; -import com.pikolive.app.UIHelper; -import com.pikolive.app.ui.utils.ImageLoadUtilsV2; -import com.pikolive.app.utils.RegexUtil; -import com.pikolive.app.utils.SpannableBuilder; -import com.pikolive.app.utils.TimeUiUtils; -import com.pikolive.app.vip.util.VipHelper; -import com.pikolive.core.community.bean.comment.Reply; +import com.bingchuang.app.R; +import com.bingchuang.app.UIHelper; +import com.bingchuang.app.ui.utils.ImageLoadUtilsV2; +import com.bingchuang.app.utils.RegexUtil; +import com.bingchuang.app.utils.SpannableBuilder; +import com.bingchuang.app.utils.TimeUiUtils; +import com.bingchuang.app.vip.util.VipHelper; +import com.bingchuang.core.community.bean.comment.Reply; /** * create by lvzebiao @2019/11/27 diff --git a/app/src/module_community/java/com/pikolive/app/community/dynamic/adapter/WorldDynamicAdapter.java b/app/src/module_community/java/com/bingchuang/app/community/dynamic/adapter/WorldDynamicAdapter.java similarity index 89% rename from app/src/module_community/java/com/pikolive/app/community/dynamic/adapter/WorldDynamicAdapter.java rename to app/src/module_community/java/com/bingchuang/app/community/dynamic/adapter/WorldDynamicAdapter.java index f98aed016..580ff8637 100644 --- a/app/src/module_community/java/com/pikolive/app/community/dynamic/adapter/WorldDynamicAdapter.java +++ b/app/src/module_community/java/com/bingchuang/app/community/dynamic/adapter/WorldDynamicAdapter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.community.dynamic.adapter; +package com.bingchuang.app.community.dynamic.adapter; import android.app.Activity; import android.content.Context; @@ -18,29 +18,29 @@ 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.pikolive.app.R; -import com.pikolive.app.UIHelper; -import com.pikolive.app.community.dynamic.view.DynamicDetailActivity; -import com.pikolive.app.community.helper.CalcSize; -import com.pikolive.app.community.helper.DynamicUiHelper; -import com.pikolive.app.community.helper.ImageUiHelper; -import com.pikolive.app.community.photo.BigPhotoActivity; -import com.pikolive.app.community.photo.DynamicImageAdapter; -import com.pikolive.app.community.photo.PagerOption; -import com.pikolive.app.community.utils.ObjectTypeHelper; -import com.pikolive.app.community.utils.TopicUpTextWrapper; -import com.pikolive.app.community.widget.DynamicNickDetailWidget; -import com.pikolive.app.community.widget.ExpandableTextView; -import com.pikolive.app.community.widget.TopicLabelWidget; -import com.pikolive.app.ui.utils.ImageLoadUtilsV2; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.pikolive.app.utils.TimeUiUtils; -import com.pikolive.core.community.bean.DynamicMedia; -import com.pikolive.core.community.bean.WorldDynamicBean; -import com.pikolive.core.community.dynamic.DynamicModel; -import com.pikolive.core.noble.NobleUtil; -import com.pikolive.core.utils.net.DontWarnObserver; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.app.R; +import com.bingchuang.app.UIHelper; +import com.bingchuang.app.community.dynamic.view.DynamicDetailActivity; +import com.bingchuang.app.community.helper.CalcSize; +import com.bingchuang.app.community.helper.DynamicUiHelper; +import com.bingchuang.app.community.helper.ImageUiHelper; +import com.bingchuang.app.community.photo.BigPhotoActivity; +import com.bingchuang.app.community.photo.DynamicImageAdapter; +import com.bingchuang.app.community.photo.PagerOption; +import com.bingchuang.app.community.utils.ObjectTypeHelper; +import com.bingchuang.app.community.utils.TopicUpTextWrapper; +import com.bingchuang.app.community.widget.DynamicNickDetailWidget; +import com.bingchuang.app.community.widget.ExpandableTextView; +import com.bingchuang.app.community.widget.TopicLabelWidget; +import com.bingchuang.app.ui.utils.ImageLoadUtilsV2; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.app.utils.TimeUiUtils; +import com.bingchuang.core.community.bean.DynamicMedia; +import com.bingchuang.core.community.bean.WorldDynamicBean; +import com.bingchuang.core.community.dynamic.DynamicModel; +import com.bingchuang.core.noble.NobleUtil; +import com.bingchuang.core.utils.net.DontWarnObserver; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.SingleToastUtil; diff --git a/app/src/module_community/java/com/bingchuang/app/community/dynamic/presenter/WorldDynamicPresenter.java b/app/src/module_community/java/com/bingchuang/app/community/dynamic/presenter/WorldDynamicPresenter.java new file mode 100644 index 000000000..566b95af7 --- /dev/null +++ b/app/src/module_community/java/com/bingchuang/app/community/dynamic/presenter/WorldDynamicPresenter.java @@ -0,0 +1,13 @@ +package com.bingchuang.app.community.dynamic.presenter; + +import com.bingchuang.app.base.BaseMvpPresenter; +import com.bingchuang.app.community.dynamic.view.IWorldDynamicView; + +/** + * create by lvzebiao @2019/11/21 + */ +public class WorldDynamicPresenter extends BaseMvpPresenter { + + + +} diff --git a/app/src/module_community/java/com/pikolive/app/community/dynamic/view/DynamicDetailActivity.java b/app/src/module_community/java/com/bingchuang/app/community/dynamic/view/DynamicDetailActivity.java similarity index 94% rename from app/src/module_community/java/com/pikolive/app/community/dynamic/view/DynamicDetailActivity.java rename to app/src/module_community/java/com/bingchuang/app/community/dynamic/view/DynamicDetailActivity.java index 4fe35c7be..c9feb854e 100644 --- a/app/src/module_community/java/com/pikolive/app/community/dynamic/view/DynamicDetailActivity.java +++ b/app/src/module_community/java/com/bingchuang/app/community/dynamic/view/DynamicDetailActivity.java @@ -1,4 +1,4 @@ -package com.pikolive.app.community.dynamic.view; +package com.bingchuang.app.community.dynamic.view; import android.content.ClipboardManager; import android.content.Context; @@ -25,56 +25,56 @@ import com.coorchice.library.utils.LogUtils; 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.pikolive.app.community.dynamic.adapter.CommentAdapter; +import com.bingchuang.app.community.dynamic.adapter.CommentAdapter; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.pikolive.app.R; -import com.pikolive.app.UIHelper; -import com.pikolive.app.avroom.ButtonItemFactory; -import com.pikolive.app.base.BaseViewBindingActivity; -import com.pikolive.app.common.widget.CircleImageView; -import com.pikolive.app.common.widget.dialog.DialogManager; -import com.pikolive.app.community.helper.CalcSize; -import com.pikolive.app.community.helper.DynamicUiHelper; -import com.pikolive.app.community.helper.ImageUiHelper; -import com.pikolive.app.community.helper.ShareDynamicHelper; -import com.pikolive.app.community.photo.BigPhotoActivity; -import com.pikolive.app.community.photo.DynamicImageAdapter; -import com.pikolive.app.community.photo.PagerOption; -import com.pikolive.app.community.utils.ObjectTypeHelper; -import com.pikolive.app.community.widget.DynamicNickDetailWidget; -import com.pikolive.app.community.widget.ExpandableTextView; -import com.pikolive.app.miniworld.activity.TopicMainActivity; -import com.pikolive.app.ui.utils.ImageLoadUtilsV2; -import com.pikolive.app.ui.widget.ButtonItem; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.pikolive.app.utils.RegexUtil; -import com.pikolive.app.utils.SpannableBuilder; -import com.pikolive.app.utils.TimeUiUtils; -import com.pikolive.core2.XChatConstants; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.community.bean.Comment; -import com.pikolive.core.community.bean.CommentResult; -import com.pikolive.core.community.bean.DynamicMedia; -import com.pikolive.core.community.bean.WorldDynamicBean; -import com.pikolive.core.community.bean.comment.PopupParams; -import com.pikolive.core.community.bean.comment.Reply; -import com.pikolive.core.community.bean.comment.ReplyResult; -import com.pikolive.core.community.dynamic.DynamicDetailModel; -import com.pikolive.core.community.dynamic.DynamicModel; -import com.pikolive.core.community.event.DynamicDetailFinishEvent; -import com.pikolive.core.community.event.DynamicRefreshEvent; -import com.pikolive.core.noble.NobleUtil; -import com.pikolive.core.user.UserModel; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.utils.net.BeanObserver; -import com.pikolive.core.utils.net.DontWarnObserver; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.app.R; +import com.bingchuang.app.UIHelper; +import com.bingchuang.app.avroom.ButtonItemFactory; +import com.bingchuang.app.base.BaseViewBindingActivity; +import com.bingchuang.app.common.widget.CircleImageView; +import com.bingchuang.app.common.widget.dialog.DialogManager; +import com.bingchuang.app.community.helper.CalcSize; +import com.bingchuang.app.community.helper.DynamicUiHelper; +import com.bingchuang.app.community.helper.ImageUiHelper; +import com.bingchuang.app.community.helper.ShareDynamicHelper; +import com.bingchuang.app.community.photo.BigPhotoActivity; +import com.bingchuang.app.community.photo.DynamicImageAdapter; +import com.bingchuang.app.community.photo.PagerOption; +import com.bingchuang.app.community.utils.ObjectTypeHelper; +import com.bingchuang.app.community.widget.DynamicNickDetailWidget; +import com.bingchuang.app.community.widget.ExpandableTextView; +import com.bingchuang.app.miniworld.activity.TopicMainActivity; +import com.bingchuang.app.ui.utils.ImageLoadUtilsV2; +import com.bingchuang.app.ui.widget.ButtonItem; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.app.utils.RegexUtil; +import com.bingchuang.app.utils.SpannableBuilder; +import com.bingchuang.app.utils.TimeUiUtils; +import com.bingchuang.core2.XChatConstants; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.community.bean.Comment; +import com.bingchuang.core.community.bean.CommentResult; +import com.bingchuang.core.community.bean.DynamicMedia; +import com.bingchuang.core.community.bean.WorldDynamicBean; +import com.bingchuang.core.community.bean.comment.PopupParams; +import com.bingchuang.core.community.bean.comment.Reply; +import com.bingchuang.core.community.bean.comment.ReplyResult; +import com.bingchuang.core.community.dynamic.DynamicDetailModel; +import com.bingchuang.core.community.dynamic.DynamicModel; +import com.bingchuang.core.community.event.DynamicDetailFinishEvent; +import com.bingchuang.core.community.event.DynamicRefreshEvent; +import com.bingchuang.core.noble.NobleUtil; +import com.bingchuang.core.user.UserModel; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.utils.net.BeanObserver; +import com.bingchuang.core.utils.net.DontWarnObserver; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.utils.ListUtils; import com.bingchuang.library.utils.LogUtil; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.SingleToastUtil; import com.bingchuang.library.utils.keyboard.KeyboardVisibilityEvent; -import com.pikolive.app.databinding.ActivityDynamicDetailBinding; +import com.bingchuang.app.databinding.ActivityDynamicDetailBinding; import org.greenrobot.eventbus.EventBus; @@ -248,7 +248,7 @@ public class DynamicDetailActivity extends BaseViewBindingActivity { diff --git a/app/src/module_community/java/com/pikolive/app/community/publish/view/WorldsChooseFrg.java b/app/src/module_community/java/com/bingchuang/app/community/publish/view/WorldsChooseFrg.java similarity index 91% rename from app/src/module_community/java/com/pikolive/app/community/publish/view/WorldsChooseFrg.java rename to app/src/module_community/java/com/bingchuang/app/community/publish/view/WorldsChooseFrg.java index d70330508..8433010a1 100644 --- a/app/src/module_community/java/com/pikolive/app/community/publish/view/WorldsChooseFrg.java +++ b/app/src/module_community/java/com/bingchuang/app/community/publish/view/WorldsChooseFrg.java @@ -1,4 +1,4 @@ -package com.pikolive.app.community.publish.view; +package com.bingchuang.app.community.publish.view; import android.os.Bundle; import android.view.View; @@ -8,12 +8,12 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.pikolive.app.community.publish.presenter.WorldChoosePresenter; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseMvpFragment; -import com.pikolive.app.ui.widget.recyclerview.decoration.HorizontalDecoration; -import com.pikolive.core.Constants; -import com.pikolive.core.community.bean.MiniWorldChooseInfo; +import com.bingchuang.app.community.publish.presenter.WorldChoosePresenter; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseMvpFragment; +import com.bingchuang.app.ui.widget.recyclerview.decoration.HorizontalDecoration; +import com.bingchuang.core.Constants; +import com.bingchuang.core.community.bean.MiniWorldChooseInfo; import com.bingchuang.library.base.factory.CreatePresenter; import com.bingchuang.library.utils.SizeUtils; diff --git a/app/src/module_community/java/com/pikolive/app/community/square/SquareDynamicFragment.java b/app/src/module_community/java/com/bingchuang/app/community/square/SquareDynamicFragment.java similarity index 90% rename from app/src/module_community/java/com/pikolive/app/community/square/SquareDynamicFragment.java rename to app/src/module_community/java/com/bingchuang/app/community/square/SquareDynamicFragment.java index d4e181606..691a38035 100644 --- a/app/src/module_community/java/com/pikolive/app/community/square/SquareDynamicFragment.java +++ b/app/src/module_community/java/com/bingchuang/app/community/square/SquareDynamicFragment.java @@ -1,4 +1,4 @@ -package com.pikolive.app.community.square; +package com.bingchuang.app.community.square; import android.os.Bundle; import android.util.SparseArray; @@ -17,36 +17,36 @@ import androidx.viewpager.widget.PagerAdapter; import androidx.viewpager.widget.ViewPager; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.pikolive.app.community.square.adapter.SquareDynamicAdapter; -import com.pikolive.app.community.square.adapter.SquareTopicAdapter; +import com.bingchuang.app.community.square.adapter.SquareDynamicAdapter; +import com.bingchuang.app.community.square.adapter.SquareTopicAdapter; import com.trello.rxlifecycle3.android.FragmentEvent; -import com.pikolive.app.R; -import com.pikolive.app.UIHelper; -import com.pikolive.app.avroom.ButtonItemFactory; -import com.pikolive.app.avroom.activity.AVRoomActivity; -import com.pikolive.app.base.BaseMvpFragment; -import com.pikolive.app.common.EmptyViewHelper; -import com.pikolive.app.common.widget.dialog.DialogManager; -import com.pikolive.app.community.helper.ShareDynamicHelper; -import com.pikolive.app.miniworld.activity.TopicMainActivity; -import com.pikolive.app.miniworld.listener.DoubleClickCheckListener; -import com.pikolive.app.miniworld.presenter.MiniWorldCategoryPresenter; -import com.pikolive.app.miniworld.view.IMiniWorldCategoryView; -import com.pikolive.app.ui.widget.ButtonItem; -import com.pikolive.core2.XChatConstants; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.community.CommunityConstant; -import com.pikolive.core.community.bean.WorldDynamicBean; -import com.pikolive.core.community.bean.WorldDynamicListResult; -import com.pikolive.core.community.dynamic.DynamicModel; -import com.pikolive.core.community.event.DynamicPublishEvent; -import com.pikolive.core.community.event.DynamicRefreshEvent; -import com.pikolive.core.community.square.SquareModel; -import com.pikolive.core.miniworld.bean.MiniWorldInfo; -import com.pikolive.core.user.UserModel; -import com.pikolive.core.user.event.LoadLoginUserInfoEvent; -import com.pikolive.core.utils.net.BeanObserver; -import com.pikolive.core.utils.net.DontWarnObserver; +import com.bingchuang.app.R; +import com.bingchuang.app.UIHelper; +import com.bingchuang.app.avroom.ButtonItemFactory; +import com.bingchuang.app.avroom.activity.AVRoomActivity; +import com.bingchuang.app.base.BaseMvpFragment; +import com.bingchuang.app.common.EmptyViewHelper; +import com.bingchuang.app.common.widget.dialog.DialogManager; +import com.bingchuang.app.community.helper.ShareDynamicHelper; +import com.bingchuang.app.miniworld.activity.TopicMainActivity; +import com.bingchuang.app.miniworld.listener.DoubleClickCheckListener; +import com.bingchuang.app.miniworld.presenter.MiniWorldCategoryPresenter; +import com.bingchuang.app.miniworld.view.IMiniWorldCategoryView; +import com.bingchuang.app.ui.widget.ButtonItem; +import com.bingchuang.core2.XChatConstants; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.community.CommunityConstant; +import com.bingchuang.core.community.bean.WorldDynamicBean; +import com.bingchuang.core.community.bean.WorldDynamicListResult; +import com.bingchuang.core.community.dynamic.DynamicModel; +import com.bingchuang.core.community.event.DynamicPublishEvent; +import com.bingchuang.core.community.event.DynamicRefreshEvent; +import com.bingchuang.core.community.square.SquareModel; +import com.bingchuang.core.miniworld.bean.MiniWorldInfo; +import com.bingchuang.core.user.UserModel; +import com.bingchuang.core.user.event.LoadLoginUserInfoEvent; +import com.bingchuang.core.utils.net.BeanObserver; +import com.bingchuang.core.utils.net.DontWarnObserver; import com.bingchuang.library.base.factory.CreatePresenter; import com.bingchuang.library.utils.ResUtil; diff --git a/app/src/module_community/java/com/pikolive/app/community/square/SquareFragment.java b/app/src/module_community/java/com/bingchuang/app/community/square/SquareFragment.java similarity index 86% rename from app/src/module_community/java/com/pikolive/app/community/square/SquareFragment.java rename to app/src/module_community/java/com/bingchuang/app/community/square/SquareFragment.java index 2870e5c5d..714b2f73d 100644 --- a/app/src/module_community/java/com/pikolive/app/community/square/SquareFragment.java +++ b/app/src/module_community/java/com/bingchuang/app/community/square/SquareFragment.java @@ -1,4 +1,4 @@ -package com.pikolive.app.community.square; +package com.bingchuang.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.pikolive.app.R; -import com.pikolive.app.base.BaseFragment; -import com.pikolive.app.common.widget.DragLayout; -import com.pikolive.app.community.publish.view.PublishActivity; -import com.pikolive.app.home.activity.CommunityNoticeAct; -import com.pikolive.app.home.adapter.TopMagicIndicatorAdapter; -import com.pikolive.app.ui.user.adapter.UserInfoPagerAdapter; -import com.pikolive.app.ui.widget.magicindicator.MagicIndicator; -import com.pikolive.app.ui.widget.magicindicator.ViewPagerHelper; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.community.event.UnReadCountEvent; -import com.pikolive.core2.home.model.HomeModel; -import com.pikolive.core.user.event.LoadLoginUserInfoEvent; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseFragment; +import com.bingchuang.app.common.widget.DragLayout; +import com.bingchuang.app.community.publish.view.PublishActivity; +import com.bingchuang.app.home.activity.CommunityNoticeAct; +import com.bingchuang.app.home.adapter.TopMagicIndicatorAdapter; +import com.bingchuang.app.ui.user.adapter.UserInfoPagerAdapter; +import com.bingchuang.app.ui.widget.magicindicator.MagicIndicator; +import com.bingchuang.app.ui.widget.magicindicator.ViewPagerHelper; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.community.event.UnReadCountEvent; +import com.bingchuang.core2.home.model.HomeModel; +import com.bingchuang.core.user.event.LoadLoginUserInfoEvent; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/module_community/java/com/pikolive/app/community/square/adapter/SquareDynamicAdapter.java b/app/src/module_community/java/com/bingchuang/app/community/square/adapter/SquareDynamicAdapter.java similarity index 89% rename from app/src/module_community/java/com/pikolive/app/community/square/adapter/SquareDynamicAdapter.java rename to app/src/module_community/java/com/bingchuang/app/community/square/adapter/SquareDynamicAdapter.java index 0ef5a63d7..a1a646320 100644 --- a/app/src/module_community/java/com/pikolive/app/community/square/adapter/SquareDynamicAdapter.java +++ b/app/src/module_community/java/com/bingchuang/app/community/square/adapter/SquareDynamicAdapter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.community.square.adapter; +package com.bingchuang.app.community.square.adapter; import android.content.Context; import android.text.TextUtils; @@ -13,25 +13,25 @@ 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.pikolive.app.community.dynamic.view.DynamicDetailActivity; -import com.pikolive.app.community.widget.DynamicNickDetailWidget; -import com.pikolive.app.community.widget.ExpandableTextView; -import com.pikolive.app.community.widget.GridImageWidget; -import com.pikolive.app.community.widget.TopicLabelWidget; -import com.pikolive.app.R; -import com.pikolive.app.UIHelper; -import com.pikolive.app.community.helper.DynamicUiHelper; -import com.pikolive.app.community.utils.TopicUpTextWrapper; -import com.pikolive.app.miniworld.activity.TopicMainActivity; -import com.pikolive.app.miniworld.presenter.MiniWorldCategoryPresenter; -import com.pikolive.app.ui.utils.ImageLoadUtilsV2; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.pikolive.app.utils.TimeUiUtils; -import com.pikolive.core.community.bean.WorldDynamicBean; -import com.pikolive.core.community.dynamic.DynamicModel; -import com.pikolive.core.noble.NobleUtil; -import com.pikolive.core.utils.net.DontWarnObserver; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.app.community.dynamic.view.DynamicDetailActivity; +import com.bingchuang.app.community.widget.DynamicNickDetailWidget; +import com.bingchuang.app.community.widget.ExpandableTextView; +import com.bingchuang.app.community.widget.GridImageWidget; +import com.bingchuang.app.community.widget.TopicLabelWidget; +import com.bingchuang.app.R; +import com.bingchuang.app.UIHelper; +import com.bingchuang.app.community.helper.DynamicUiHelper; +import com.bingchuang.app.community.utils.TopicUpTextWrapper; +import com.bingchuang.app.miniworld.activity.TopicMainActivity; +import com.bingchuang.app.miniworld.presenter.MiniWorldCategoryPresenter; +import com.bingchuang.app.ui.utils.ImageLoadUtilsV2; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.app.utils.TimeUiUtils; +import com.bingchuang.core.community.bean.WorldDynamicBean; +import com.bingchuang.core.community.dynamic.DynamicModel; +import com.bingchuang.core.noble.NobleUtil; +import com.bingchuang.core.utils.net.DontWarnObserver; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.base.factory.CreatePresenter; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.SingleToastUtil; diff --git a/app/src/module_community/java/com/pikolive/app/community/square/adapter/SquareTopicAdapter.java b/app/src/module_community/java/com/bingchuang/app/community/square/adapter/SquareTopicAdapter.java similarity index 79% rename from app/src/module_community/java/com/pikolive/app/community/square/adapter/SquareTopicAdapter.java rename to app/src/module_community/java/com/bingchuang/app/community/square/adapter/SquareTopicAdapter.java index b51d35350..bbe2c6e46 100644 --- a/app/src/module_community/java/com/pikolive/app/community/square/adapter/SquareTopicAdapter.java +++ b/app/src/module_community/java/com/bingchuang/app/community/square/adapter/SquareTopicAdapter.java @@ -1,10 +1,10 @@ -package com.pikolive.app.community.square.adapter; +package com.bingchuang.app.community.square.adapter; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.pikolive.app.R; -import com.pikolive.core.miniworld.bean.MiniWorldInfo; +import com.bingchuang.app.R; +import com.bingchuang.core.miniworld.bean.MiniWorldInfo; /** * create by lvzebiao @2019/11/13 diff --git a/app/src/module_community/java/com/pikolive/app/community/user_dynamic/IUserDynamicView.java b/app/src/module_community/java/com/bingchuang/app/community/user_dynamic/IUserDynamicView.java similarity index 77% rename from app/src/module_community/java/com/pikolive/app/community/user_dynamic/IUserDynamicView.java rename to app/src/module_community/java/com/bingchuang/app/community/user_dynamic/IUserDynamicView.java index 2ce972dee..2f5c3fd5c 100644 --- a/app/src/module_community/java/com/pikolive/app/community/user_dynamic/IUserDynamicView.java +++ b/app/src/module_community/java/com/bingchuang/app/community/user_dynamic/IUserDynamicView.java @@ -1,6 +1,6 @@ -package com.pikolive.app.community.user_dynamic; +package com.bingchuang.app.community.user_dynamic; -import com.pikolive.core.community.bean.WorldDynamicBean; +import com.bingchuang.core.community.bean.WorldDynamicBean; import com.bingchuang.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_community/java/com/pikolive/app/community/user_dynamic/UserDynamicAdapter.java b/app/src/module_community/java/com/bingchuang/app/community/user_dynamic/UserDynamicAdapter.java similarity index 91% rename from app/src/module_community/java/com/pikolive/app/community/user_dynamic/UserDynamicAdapter.java rename to app/src/module_community/java/com/bingchuang/app/community/user_dynamic/UserDynamicAdapter.java index 71a70dff3..425de6da6 100644 --- a/app/src/module_community/java/com/pikolive/app/community/user_dynamic/UserDynamicAdapter.java +++ b/app/src/module_community/java/com/bingchuang/app/community/user_dynamic/UserDynamicAdapter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.community.user_dynamic; +package com.bingchuang.app.community.user_dynamic; import android.app.Activity; import android.content.Context; @@ -18,22 +18,22 @@ 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.pikolive.app.ui.widget.recyclerview.decoration.GridSpacingItemDecoration; -import com.pikolive.app.community.helper.CalcSize; -import com.pikolive.app.community.helper.ImageUiHelper; -import com.pikolive.app.community.photo.BigPhotoActivity; -import com.pikolive.app.community.photo.DynamicImageAdapter; -import com.pikolive.app.community.photo.PagerOption; -import com.pikolive.app.community.utils.ObjectTypeHelper; -import com.pikolive.app.community.widget.ExpandableTextView; -import com.pikolive.app.R; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.pikolive.core.community.bean.DynamicMedia; -import com.pikolive.core.community.bean.UserDynamicItem; -import com.pikolive.core.community.bean.WorldDynamicBean; -import com.pikolive.core.community.dynamic.DynamicModel; -import com.pikolive.core.utils.net.DontWarnObserver; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.app.ui.widget.recyclerview.decoration.GridSpacingItemDecoration; +import com.bingchuang.app.community.helper.CalcSize; +import com.bingchuang.app.community.helper.ImageUiHelper; +import com.bingchuang.app.community.photo.BigPhotoActivity; +import com.bingchuang.app.community.photo.DynamicImageAdapter; +import com.bingchuang.app.community.photo.PagerOption; +import com.bingchuang.app.community.utils.ObjectTypeHelper; +import com.bingchuang.app.community.widget.ExpandableTextView; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.core.community.bean.DynamicMedia; +import com.bingchuang.core.community.bean.UserDynamicItem; +import com.bingchuang.core.community.bean.WorldDynamicBean; +import com.bingchuang.core.community.dynamic.DynamicModel; +import com.bingchuang.core.utils.net.DontWarnObserver; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.ScreenUtils; import com.bingchuang.library.utils.SingleToastUtil; diff --git a/app/src/module_community/java/com/pikolive/app/community/user_dynamic/UserDynamicFrg.java b/app/src/module_community/java/com/bingchuang/app/community/user_dynamic/UserDynamicFrg.java similarity index 93% rename from app/src/module_community/java/com/pikolive/app/community/user_dynamic/UserDynamicFrg.java rename to app/src/module_community/java/com/bingchuang/app/community/user_dynamic/UserDynamicFrg.java index 78d483b48..8d66e5cb3 100644 --- a/app/src/module_community/java/com/pikolive/app/community/user_dynamic/UserDynamicFrg.java +++ b/app/src/module_community/java/com/bingchuang/app/community/user_dynamic/UserDynamicFrg.java @@ -1,4 +1,4 @@ -package com.pikolive.app.community.user_dynamic; +package com.bingchuang.app.community.user_dynamic; import android.os.Bundle; import android.view.View; @@ -8,18 +8,18 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.pikolive.app.community.dynamic.view.DynamicDetailActivity; -import com.pikolive.app.community.helper.ShareDynamicHelper; -import com.pikolive.app.R; -import com.pikolive.app.UIHelper; -import com.pikolive.app.base.BaseMvpFragment; -import com.pikolive.app.common.widget.dialog.DialogManager; -import com.pikolive.app.miniworld.activity.TopicMainActivity; -import com.pikolive.app.ui.widget.ButtonItem; -import com.pikolive.core2.XChatConstants; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.community.bean.UserDynamicItem; -import com.pikolive.core.community.bean.WorldDynamicBean; +import com.bingchuang.app.community.dynamic.view.DynamicDetailActivity; +import com.bingchuang.app.community.helper.ShareDynamicHelper; +import com.bingchuang.app.R; +import com.bingchuang.app.UIHelper; +import com.bingchuang.app.base.BaseMvpFragment; +import com.bingchuang.app.common.widget.dialog.DialogManager; +import com.bingchuang.app.miniworld.activity.TopicMainActivity; +import com.bingchuang.app.ui.widget.ButtonItem; +import com.bingchuang.core2.XChatConstants; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.community.bean.UserDynamicItem; +import com.bingchuang.core.community.bean.WorldDynamicBean; import com.bingchuang.library.base.factory.CreatePresenter; import com.bingchuang.library.utils.ResUtil; diff --git a/app/src/module_community/java/com/pikolive/app/community/user_dynamic/UserDynamicPresenter.java b/app/src/module_community/java/com/bingchuang/app/community/user_dynamic/UserDynamicPresenter.java similarity index 92% rename from app/src/module_community/java/com/pikolive/app/community/user_dynamic/UserDynamicPresenter.java rename to app/src/module_community/java/com/bingchuang/app/community/user_dynamic/UserDynamicPresenter.java index 54b581fc4..0201719ab 100644 --- a/app/src/module_community/java/com/pikolive/app/community/user_dynamic/UserDynamicPresenter.java +++ b/app/src/module_community/java/com/bingchuang/app/community/user_dynamic/UserDynamicPresenter.java @@ -1,14 +1,14 @@ -package com.pikolive.app.community.user_dynamic; +package com.bingchuang.app.community.user_dynamic; import android.annotation.SuppressLint; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.core.Constants; -import com.pikolive.core.community.bean.UserDynamicItem; -import com.pikolive.core.community.bean.WorldDynamicBean; -import com.pikolive.core.community.dynamic.DynamicModel; -import com.pikolive.core.user.UserDynamicModel; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseMvpPresenter; +import com.bingchuang.core.Constants; +import com.bingchuang.core.community.bean.UserDynamicItem; +import com.bingchuang.core.community.bean.WorldDynamicBean; +import com.bingchuang.core.community.dynamic.DynamicModel; +import com.bingchuang.core.user.UserDynamicModel; import com.bingchuang.library.utils.ResUtil; import java.util.ArrayList; diff --git a/app/src/module_community/java/com/pikolive/app/community/utils/Glide4Engine.java b/app/src/module_community/java/com/bingchuang/app/community/utils/Glide4Engine.java similarity index 98% rename from app/src/module_community/java/com/pikolive/app/community/utils/Glide4Engine.java rename to app/src/module_community/java/com/bingchuang/app/community/utils/Glide4Engine.java index 99b02355a..18cdf8935 100644 --- a/app/src/module_community/java/com/pikolive/app/community/utils/Glide4Engine.java +++ b/app/src/module_community/java/com/bingchuang/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.pikolive.app.community.utils; +package com.bingchuang.app.community.utils; import android.content.Context; import android.graphics.drawable.Drawable; diff --git a/app/src/module_community/java/com/pikolive/app/community/utils/ObjectTypeHelper.java b/app/src/module_community/java/com/bingchuang/app/community/utils/ObjectTypeHelper.java similarity index 95% rename from app/src/module_community/java/com/pikolive/app/community/utils/ObjectTypeHelper.java rename to app/src/module_community/java/com/bingchuang/app/community/utils/ObjectTypeHelper.java index 75421fef9..af4e16a10 100644 --- a/app/src/module_community/java/com/pikolive/app/community/utils/ObjectTypeHelper.java +++ b/app/src/module_community/java/com/bingchuang/app/community/utils/ObjectTypeHelper.java @@ -1,6 +1,6 @@ -package com.pikolive.app.community.utils; +package com.bingchuang.app.community.utils; -import com.pikolive.core.community.bean.DynamicMedia; +import com.bingchuang.core.community.bean.DynamicMedia; import com.zhihu.matisse.internal.entity.CustomItem; import java.util.ArrayList; diff --git a/app/src/module_community/java/com/pikolive/app/community/utils/TopicUpTextWrapper.kt b/app/src/module_community/java/com/bingchuang/app/community/utils/TopicUpTextWrapper.kt similarity index 85% rename from app/src/module_community/java/com/pikolive/app/community/utils/TopicUpTextWrapper.kt rename to app/src/module_community/java/com/bingchuang/app/community/utils/TopicUpTextWrapper.kt index 1fdb0f056..e893d136a 100644 --- a/app/src/module_community/java/com/pikolive/app/community/utils/TopicUpTextWrapper.kt +++ b/app/src/module_community/java/com/bingchuang/app/community/utils/TopicUpTextWrapper.kt @@ -1,4 +1,4 @@ -package com.pikolive.app.community.utils +package com.bingchuang.app.community.utils import android.content.Context import android.graphics.Color @@ -6,9 +6,9 @@ import android.graphics.drawable.Drawable import android.text.SpannableStringBuilder import android.text.Spanned import android.text.style.ForegroundColorSpan -import com.pikolive.app.R -import com.pikolive.app.common.widget.CustomImageSpan -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil +import com.bingchuang.app.R +import com.bingchuang.app.common.widget.CustomImageSpan +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil import com.bingchuang.library.utils.ResUtil object TopicUpTextWrapper { diff --git a/app/src/module_community/java/com/pikolive/app/community/widget/DynamicNickDetailWidget.java b/app/src/module_community/java/com/bingchuang/app/community/widget/DynamicNickDetailWidget.java similarity index 90% rename from app/src/module_community/java/com/pikolive/app/community/widget/DynamicNickDetailWidget.java rename to app/src/module_community/java/com/bingchuang/app/community/widget/DynamicNickDetailWidget.java index 0979b3286..d2bd803a2 100644 --- a/app/src/module_community/java/com/pikolive/app/community/widget/DynamicNickDetailWidget.java +++ b/app/src/module_community/java/com/bingchuang/app/community/widget/DynamicNickDetailWidget.java @@ -1,4 +1,4 @@ -package com.pikolive.app.community.widget; +package com.bingchuang.app.community.widget; import android.content.Context; import android.text.TextUtils; @@ -11,13 +11,13 @@ import androidx.annotation.ColorInt; import androidx.constraintlayout.widget.ConstraintLayout; import com.netease.nim.uikit.support.glide.GlideApp; -import com.pikolive.app.R; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.app.utils.RegexUtil; -import com.pikolive.app.utils.TimeUiUtils; -import com.pikolive.app.view.GenderAgeTextView; -import com.pikolive.app.vip.util.VipHelper; -import com.pikolive.core.user.bean.BaseUserInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.app.utils.RegexUtil; +import com.bingchuang.app.utils.TimeUiUtils; +import com.bingchuang.app.view.GenderAgeTextView; +import com.bingchuang.app.vip.util.VipHelper; +import com.bingchuang.core.user.bean.BaseUserInfo; import com.bingchuang.library.widget.ShapeConstrainLayout; /** diff --git a/app/src/module_community/java/com/pikolive/app/community/widget/ExpandableTextView.java b/app/src/module_community/java/com/bingchuang/app/community/widget/ExpandableTextView.java similarity index 99% rename from app/src/module_community/java/com/pikolive/app/community/widget/ExpandableTextView.java rename to app/src/module_community/java/com/bingchuang/app/community/widget/ExpandableTextView.java index 2c530a1c8..6e8815758 100644 --- a/app/src/module_community/java/com/pikolive/app/community/widget/ExpandableTextView.java +++ b/app/src/module_community/java/com/bingchuang/app/community/widget/ExpandableTextView.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.pikolive.app.community.widget; +package com.bingchuang.app.community.widget; import android.annotation.TargetApi; import android.content.Context; @@ -43,7 +43,7 @@ import androidx.annotation.IdRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.pikolive.app.R; +import com.bingchuang.app.R; import com.bingchuang.library.utils.ResUtil; import lombok.Setter; diff --git a/app/src/module_community/java/com/pikolive/app/community/widget/GridImageWidget.java b/app/src/module_community/java/com/bingchuang/app/community/widget/GridImageWidget.java similarity index 86% rename from app/src/module_community/java/com/pikolive/app/community/widget/GridImageWidget.java rename to app/src/module_community/java/com/bingchuang/app/community/widget/GridImageWidget.java index 440ac6604..e73d372d6 100644 --- a/app/src/module_community/java/com/pikolive/app/community/widget/GridImageWidget.java +++ b/app/src/module_community/java/com/bingchuang/app/community/widget/GridImageWidget.java @@ -1,4 +1,4 @@ -package com.pikolive.app.community.widget; +package com.bingchuang.app.community.widget; import android.app.Activity; import android.content.Context; @@ -12,17 +12,17 @@ import androidx.annotation.Nullable; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.pikolive.app.ui.widget.recyclerview.decoration.GridVItemDecoration; -import com.pikolive.app.R; -import com.pikolive.app.community.helper.CalcSize; -import com.pikolive.app.community.helper.ImageUiHelper; -import com.pikolive.app.community.photo.BigPhotoActivity; -import com.pikolive.app.community.photo.DynamicImageAdapter; -import com.pikolive.app.community.photo.PagerOption; -import com.pikolive.app.community.utils.ObjectTypeHelper; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.pikolive.core.community.bean.DynamicMedia; -import com.pikolive.core.community.bean.WorldDynamicBean; +import com.bingchuang.app.ui.widget.recyclerview.decoration.GridVItemDecoration; +import com.bingchuang.app.R; +import com.bingchuang.app.community.helper.CalcSize; +import com.bingchuang.app.community.helper.ImageUiHelper; +import com.bingchuang.app.community.photo.BigPhotoActivity; +import com.bingchuang.app.community.photo.DynamicImageAdapter; +import com.bingchuang.app.community.photo.PagerOption; +import com.bingchuang.app.community.utils.ObjectTypeHelper; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.core.community.bean.DynamicMedia; +import com.bingchuang.core.community.bean.WorldDynamicBean; import com.bingchuang.library.utils.ListUtils; import java.util.List; diff --git a/app/src/module_community/java/com/pikolive/app/community/widget/TopicLabelWidget.kt b/app/src/module_community/java/com/bingchuang/app/community/widget/TopicLabelWidget.kt similarity index 90% rename from app/src/module_community/java/com/pikolive/app/community/widget/TopicLabelWidget.kt rename to app/src/module_community/java/com/bingchuang/app/community/widget/TopicLabelWidget.kt index c69003362..74ae72747 100644 --- a/app/src/module_community/java/com/pikolive/app/community/widget/TopicLabelWidget.kt +++ b/app/src/module_community/java/com/bingchuang/app/community/widget/TopicLabelWidget.kt @@ -1,4 +1,4 @@ -package com.pikolive.app.community.widget +package com.bingchuang.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.pikolive.app.ui.utils.ImageLoadUtilsV2 -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil +import com.bingchuang.app.ui.utils.ImageLoadUtilsV2 +import com.bingchuang.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/pikolive/app/community/widget/TouchHideKeyboardView.java b/app/src/module_community/java/com/bingchuang/app/community/widget/TouchHideKeyboardView.java similarity index 95% rename from app/src/module_community/java/com/pikolive/app/community/widget/TouchHideKeyboardView.java rename to app/src/module_community/java/com/bingchuang/app/community/widget/TouchHideKeyboardView.java index bd2cd27e0..ef22de800 100644 --- a/app/src/module_community/java/com/pikolive/app/community/widget/TouchHideKeyboardView.java +++ b/app/src/module_community/java/com/bingchuang/app/community/widget/TouchHideKeyboardView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.community.widget; +package com.bingchuang.app.community.widget; import android.app.Activity; import android.content.Context; diff --git a/app/src/module_community/java/com/pikolive/app/community/widget/ZoomImageView.java b/app/src/module_community/java/com/bingchuang/app/community/widget/ZoomImageView.java similarity index 99% rename from app/src/module_community/java/com/pikolive/app/community/widget/ZoomImageView.java rename to app/src/module_community/java/com/bingchuang/app/community/widget/ZoomImageView.java index 0e06166bc..f840ef14f 100644 --- a/app/src/module_community/java/com/pikolive/app/community/widget/ZoomImageView.java +++ b/app/src/module_community/java/com/bingchuang/app/community/widget/ZoomImageView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.community.widget; +package com.bingchuang.app.community.widget; import android.annotation.SuppressLint; import android.content.Context; diff --git a/app/src/module_community/java/com/pikolive/app/community/dynamic/presenter/WorldDynamicPresenter.java b/app/src/module_community/java/com/pikolive/app/community/dynamic/presenter/WorldDynamicPresenter.java deleted file mode 100644 index f6699c3be..000000000 --- a/app/src/module_community/java/com/pikolive/app/community/dynamic/presenter/WorldDynamicPresenter.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.pikolive.app.community.dynamic.presenter; - -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.app.community.dynamic.view.IWorldDynamicView; - -/** - * create by lvzebiao @2019/11/21 - */ -public class WorldDynamicPresenter extends BaseMvpPresenter { - - - -} 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 e5dc5fe62..3807889e9 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 1aff4903e..d8021be8a 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 df8d95993..3e640c9b7 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 c5dbaa710..a00fb47d6 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 f85831a48..ff96dc13c 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 8774edb3f..6968d4dea 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"> - - - - +- - - +- - +- \ 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 d50bb298e..744027ea5 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_labour_union/java/com/pikolive/app/module_hall/hall/activity/HallNameSettingActivity.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/activity/HallNameSettingActivity.java similarity index 90% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/activity/HallNameSettingActivity.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/activity/HallNameSettingActivity.java index 75c88f707..929457e39 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/activity/HallNameSettingActivity.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/activity/HallNameSettingActivity.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.hall.activity; +package com.bingchuang.app.module_hall.hall.activity; import android.content.Context; import android.content.Intent; @@ -9,12 +9,12 @@ import android.view.View; import androidx.core.content.ContextCompat; import com.netease.nim.uikit.StatusBarUtil; -import com.pikolive.app.module_hall.hall.presenter.HallNamePresenter; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseMvpActivity; -import com.pikolive.app.base.TitleBar; -import com.pikolive.app.common.widget.LimitEditText; -import com.pikolive.app.module_hall.hall.view.IHallNameView; +import com.bingchuang.app.module_hall.hall.presenter.HallNamePresenter; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseMvpActivity; +import com.bingchuang.app.base.TitleBar; +import com.bingchuang.app.common.widget.LimitEditText; +import com.bingchuang.app.module_hall.hall.view.IHallNameView; import com.bingchuang.library.base.factory.CreatePresenter; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.SingleToastUtil; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/activity/HallSearchActivity.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/activity/HallSearchActivity.java similarity index 78% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/activity/HallSearchActivity.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/activity/HallSearchActivity.java index 9d529c5be..6f8c0729f 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/activity/HallSearchActivity.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/activity/HallSearchActivity.java @@ -1,12 +1,12 @@ -package com.pikolive.app.module_hall.hall.activity; +package com.bingchuang.app.module_hall.hall.activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import com.pikolive.app.R; -import com.pikolive.app.friend.action.AbstractSelectFriendAction; -import com.pikolive.app.ui.search.SearchHallActivity; +import com.bingchuang.app.R; +import com.bingchuang.app.friend.action.AbstractSelectFriendAction; +import com.bingchuang.app.ui.search.SearchHallActivity; import com.bingchuang.library.utils.ResUtil; /** diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/activity/IncomeStatisticsActivity.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/activity/IncomeStatisticsActivity.java similarity index 95% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/activity/IncomeStatisticsActivity.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/activity/IncomeStatisticsActivity.java index bbde9bc40..4ee5d3e45 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/activity/IncomeStatisticsActivity.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/activity/IncomeStatisticsActivity.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.hall.activity; +package com.bingchuang.app.module_hall.hall.activity; import android.content.Context; import android.content.Intent; @@ -15,17 +15,17 @@ import androidx.viewpager.widget.ViewPager; import com.jzxiang.pickerview.data.Type; import com.netease.nim.uikit.StatusBarUtil; -import com.pikolive.app.module_hall.income.DayIncomeFragment; -import com.pikolive.app.module_hall.income.GoldRecordFragment; -import com.pikolive.app.module_hall.income.presenter.IncomeStatisticsPresenter; -import com.pikolive.app.module_hall.income.view.IIncomeStatisticsView; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseMvpActivity; -import com.pikolive.app.module_hall.hall.view.dialog.TimePickerDialog; -import com.pikolive.app.module_hall.hall.view.indicator.StatisticsIndicatorAdapter; -import com.pikolive.app.ui.widget.magicindicator.MagicIndicator; -import com.pikolive.app.ui.widget.magicindicator.ViewPagerHelper; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.bingchuang.app.module_hall.income.DayIncomeFragment; +import com.bingchuang.app.module_hall.income.GoldRecordFragment; +import com.bingchuang.app.module_hall.income.presenter.IncomeStatisticsPresenter; +import com.bingchuang.app.module_hall.income.view.IIncomeStatisticsView; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseMvpActivity; +import com.bingchuang.app.module_hall.hall.view.dialog.TimePickerDialog; +import com.bingchuang.app.module_hall.hall.view.indicator.StatisticsIndicatorAdapter; +import com.bingchuang.app.ui.widget.magicindicator.MagicIndicator; +import com.bingchuang.app.ui.widget.magicindicator.ViewPagerHelper; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; import com.bingchuang.library.base.factory.CreatePresenter; import com.bingchuang.library.utils.CommonUtils; import com.bingchuang.library.utils.ResUtil; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/activity/MemberSearchActivity.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/activity/MemberSearchActivity.java similarity index 86% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/activity/MemberSearchActivity.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/activity/MemberSearchActivity.java index abb57cf9c..cafc351bf 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/activity/MemberSearchActivity.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/activity/MemberSearchActivity.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.hall.activity; +package com.bingchuang.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.pikolive.app.R; -import com.pikolive.app.UIHelper; -import com.pikolive.app.base.BaseViewBindingActivity; -import com.pikolive.app.common.EmptyViewHelper; -import com.pikolive.app.module_hall.hall.adapter.GroupMemberListAdapter; -import com.pikolive.app.ui.utils.RVDelegate; -import com.pikolive.core.module_hall.hall.HallModel; -import com.pikolive.core.module_hall.hall.bean.MemberInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.UIHelper; +import com.bingchuang.app.base.BaseViewBindingActivity; +import com.bingchuang.app.common.EmptyViewHelper; +import com.bingchuang.app.module_hall.hall.adapter.GroupMemberListAdapter; +import com.bingchuang.app.ui.utils.RVDelegate; +import com.bingchuang.core.module_hall.hall.HallModel; +import com.bingchuang.core.module_hall.hall.bean.MemberInfo; import com.bingchuang.library.utils.ResUtil; -import com.pikolive.app.databinding.ActivityAddMemberBinding; +import com.bingchuang.app.databinding.ActivityAddMemberBinding; import java.util.ArrayList; import java.util.List; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/activity/ModuleClanActivity.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/activity/ModuleClanActivity.java similarity index 92% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/activity/ModuleClanActivity.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/activity/ModuleClanActivity.java index 8893dfd71..7be74fc8a 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/activity/ModuleClanActivity.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/activity/ModuleClanActivity.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.hall.activity; +package com.bingchuang.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.pikolive.app.module_hall.HallDataManager; -import com.pikolive.app.R; -import com.pikolive.app.UIHelper; -import com.pikolive.app.base.BaseActivity; -import com.pikolive.app.module_hall.hall.adapter.GroupMemberListAdapter; -import com.pikolive.app.module_hall.hall.adapter.HallListAdapter; -import com.pikolive.app.ui.user.activity.UserInfoActivity; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.app.ui.utils.RVDelegate; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.module_hall.hall.HallModel; -import com.pikolive.core.module_hall.hall.bean.ClanInfo; -import com.pikolive.core.module_hall.hall.bean.HallInfo; -import com.pikolive.core.module_hall.hall.bean.MemberInfo; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.app.module_hall.HallDataManager; +import com.bingchuang.app.R; +import com.bingchuang.app.UIHelper; +import com.bingchuang.app.base.BaseActivity; +import com.bingchuang.app.module_hall.hall.adapter.GroupMemberListAdapter; +import com.bingchuang.app.module_hall.hall.adapter.HallListAdapter; +import com.bingchuang.app.ui.user.activity.UserInfoActivity; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.app.ui.utils.RVDelegate; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.module_hall.hall.HallModel; +import com.bingchuang.core.module_hall.hall.bean.ClanInfo; +import com.bingchuang.core.module_hall.hall.bean.HallInfo; +import com.bingchuang.core.module_hall.hall.bean.MemberInfo; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.utils.ListUtils; import com.bingchuang.library.utils.ResUtil; -import com.pikolive.app.databinding.ActivityModuleClanBinding; +import com.bingchuang.app.databinding.ActivityModuleClanBinding; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/activity/ModuleHallActivity.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/activity/ModuleHallActivity.java similarity index 93% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/activity/ModuleHallActivity.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/activity/ModuleHallActivity.java index 24fe7c87e..e9594c758 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/activity/ModuleHallActivity.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/activity/ModuleHallActivity.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.hall.activity; +package com.bingchuang.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.pikolive.app.module_hall.HallDataManager; -import com.pikolive.app.module_hall.hall.presenter.ModuleHallPresenter; -import com.pikolive.app.R; -import com.pikolive.app.UIHelper; -import com.pikolive.app.base.BaseMvpActivity; -import com.pikolive.app.common.widget.dialog.DialogManager; -import com.pikolive.app.friend.action.AbstractSelectFriendAction; -import com.pikolive.app.home.activity.AssociationActivity; -import com.pikolive.app.module_hall.hall.adapter.GroupMemberListAdapter; -import com.pikolive.app.module_hall.hall.view.IModuleHallView; -import com.pikolive.app.ui.im.avtivity.NimP2PMessageActivity; -import com.pikolive.app.ui.user.activity.UserInfoActivity; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.app.ui.widget.ButtonItem; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.module_hall.hall.HallModel; -import com.pikolive.core.module_hall.hall.bean.AuthInfo; -import com.pikolive.core.module_hall.hall.bean.ClanInfo; -import com.pikolive.core.module_hall.hall.bean.HallInfo; -import com.pikolive.core.module_hall.hall.bean.JoinRoomInfo; -import com.pikolive.core.module_hall.hall.bean.MemberInfo; -import com.pikolive.core.module_hall.hall.bean.RoleType; -import com.pikolive.core.utils.net.BeanObserver; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.app.module_hall.HallDataManager; +import com.bingchuang.app.module_hall.hall.presenter.ModuleHallPresenter; +import com.bingchuang.app.R; +import com.bingchuang.app.UIHelper; +import com.bingchuang.app.base.BaseMvpActivity; +import com.bingchuang.app.common.widget.dialog.DialogManager; +import com.bingchuang.app.friend.action.AbstractSelectFriendAction; +import com.bingchuang.app.home.activity.AssociationActivity; +import com.bingchuang.app.module_hall.hall.adapter.GroupMemberListAdapter; +import com.bingchuang.app.module_hall.hall.view.IModuleHallView; +import com.bingchuang.app.ui.im.avtivity.NimP2PMessageActivity; +import com.bingchuang.app.ui.user.activity.UserInfoActivity; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.app.ui.widget.ButtonItem; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.module_hall.hall.HallModel; +import com.bingchuang.core.module_hall.hall.bean.AuthInfo; +import com.bingchuang.core.module_hall.hall.bean.ClanInfo; +import com.bingchuang.core.module_hall.hall.bean.HallInfo; +import com.bingchuang.core.module_hall.hall.bean.JoinRoomInfo; +import com.bingchuang.core.module_hall.hall.bean.MemberInfo; +import com.bingchuang.core.module_hall.hall.bean.RoleType; +import com.bingchuang.core.utils.net.BeanObserver; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.base.factory.CreatePresenter; import com.bingchuang.library.utils.ResUtil; -import com.pikolive.app.databinding.ActivityModuleHallBinding; +import com.bingchuang.app.databinding.ActivityModuleHallBinding; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/activity/RemoveMemberListActivity.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/activity/RemoveMemberListActivity.java similarity index 90% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/activity/RemoveMemberListActivity.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/activity/RemoveMemberListActivity.java index 11a0ea5df..6c7a0fcc6 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/activity/RemoveMemberListActivity.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/activity/RemoveMemberListActivity.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.hall.activity; +package com.bingchuang.app.module_hall.hall.activity; import android.annotation.SuppressLint; import android.content.Context; @@ -17,21 +17,21 @@ import androidx.recyclerview.widget.RecyclerView; import com.netease.nim.uikit.StatusBarUtil; import com.orhanobut.logger.Logger; -import com.pikolive.app.module_hall.hall.presenter.RemoveMemberPresenter; -import com.pikolive.app.R; -import com.pikolive.app.UIHelper; -import com.pikolive.app.base.BaseMvpActivity; -import com.pikolive.app.common.EmptyViewHelper; -import com.pikolive.app.common.widget.dialog.DialogManager; -import com.pikolive.app.module_hall.hall.adapter.GroupMemberListAdapter; -import com.pikolive.app.module_hall.hall.view.IRemoveMemberView; -import com.pikolive.app.ui.utils.RVDelegate; -import com.pikolive.app.ui.widget.TextWatcherSimple; -import com.pikolive.core.module_hall.hall.HallModel; -import com.pikolive.core.module_hall.hall.bean.MemberInfo; -import com.pikolive.core.module_hall.hall.bean.RoleType; -import com.pikolive.core.module_hall.income.event.UpdateMemberListEvent; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.app.module_hall.hall.presenter.RemoveMemberPresenter; +import com.bingchuang.app.R; +import com.bingchuang.app.UIHelper; +import com.bingchuang.app.base.BaseMvpActivity; +import com.bingchuang.app.common.EmptyViewHelper; +import com.bingchuang.app.common.widget.dialog.DialogManager; +import com.bingchuang.app.module_hall.hall.adapter.GroupMemberListAdapter; +import com.bingchuang.app.module_hall.hall.view.IRemoveMemberView; +import com.bingchuang.app.ui.utils.RVDelegate; +import com.bingchuang.app.ui.widget.TextWatcherSimple; +import com.bingchuang.core.module_hall.hall.HallModel; +import com.bingchuang.core.module_hall.hall.bean.MemberInfo; +import com.bingchuang.core.module_hall.hall.bean.RoleType; +import com.bingchuang.core.module_hall.income.event.UpdateMemberListEvent; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.base.factory.CreatePresenter; import com.bingchuang.library.utils.ListUtils; import com.bingchuang.library.utils.ResUtil; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/activity/RoomIncomeActivity.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/activity/RoomIncomeActivity.java similarity index 93% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/activity/RoomIncomeActivity.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/activity/RoomIncomeActivity.java index f6e15e1ee..ff8afed8e 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/activity/RoomIncomeActivity.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/activity/RoomIncomeActivity.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.hall.activity; +package com.bingchuang.app.module_hall.hall.activity; import android.content.Context; import android.content.Intent; @@ -15,16 +15,16 @@ import androidx.viewpager.widget.ViewPager; import com.jzxiang.pickerview.data.Type; import com.netease.nim.uikit.StatusBarUtil; -import com.pikolive.app.module_hall.income.HallIncomeFragment; -import com.pikolive.app.module_hall.income.presenter.RoomIncomePresenter; -import com.pikolive.app.module_hall.income.view.IIncomeStatisticsView; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseMvpActivity; -import com.pikolive.app.module_hall.hall.view.dialog.TimePickerDialog; -import com.pikolive.app.module_hall.hall.view.indicator.StatisticsIndicatorAdapter; -import com.pikolive.app.ui.widget.magicindicator.MagicIndicator; -import com.pikolive.app.ui.widget.magicindicator.ViewPagerHelper; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.bingchuang.app.module_hall.income.HallIncomeFragment; +import com.bingchuang.app.module_hall.income.presenter.RoomIncomePresenter; +import com.bingchuang.app.module_hall.income.view.IIncomeStatisticsView; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseMvpActivity; +import com.bingchuang.app.module_hall.hall.view.dialog.TimePickerDialog; +import com.bingchuang.app.module_hall.hall.view.indicator.StatisticsIndicatorAdapter; +import com.bingchuang.app.ui.widget.magicindicator.MagicIndicator; +import com.bingchuang.app.ui.widget.magicindicator.ViewPagerHelper; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; import com.bingchuang.library.base.factory.CreatePresenter; import com.bingchuang.library.utils.CommonUtils; import com.bingchuang.library.utils.TimeUtils; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/activity/SingleRoomIncomeActivity.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/activity/SingleRoomIncomeActivity.java similarity index 93% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/activity/SingleRoomIncomeActivity.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/activity/SingleRoomIncomeActivity.java index 36c4b864e..ad4cf3264 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/activity/SingleRoomIncomeActivity.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/activity/SingleRoomIncomeActivity.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.hall.activity; +package com.bingchuang.app.module_hall.hall.activity; import android.content.Context; import android.content.Intent; @@ -14,16 +14,16 @@ import androidx.viewpager.widget.ViewPager; import com.jzxiang.pickerview.data.Type; import com.netease.nim.uikit.StatusBarUtil; -import com.pikolive.app.module_hall.income.SingleRoomIncomeFragment; -import com.pikolive.app.module_hall.income.presenter.SingleRoomIncomePresenter; -import com.pikolive.app.module_hall.income.view.IIncomeStatisticsView; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseMvpActivity; -import com.pikolive.app.module_hall.hall.view.dialog.TimePickerDialog; -import com.pikolive.app.module_hall.hall.view.indicator.StatisticsIndicatorAdapter; -import com.pikolive.app.ui.widget.magicindicator.MagicIndicator; -import com.pikolive.app.ui.widget.magicindicator.ViewPagerHelper; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.bingchuang.app.module_hall.income.SingleRoomIncomeFragment; +import com.bingchuang.app.module_hall.income.presenter.SingleRoomIncomePresenter; +import com.bingchuang.app.module_hall.income.view.IIncomeStatisticsView; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseMvpActivity; +import com.bingchuang.app.module_hall.hall.view.dialog.TimePickerDialog; +import com.bingchuang.app.module_hall.hall.view.indicator.StatisticsIndicatorAdapter; +import com.bingchuang.app.ui.widget.magicindicator.MagicIndicator; +import com.bingchuang.app.ui.widget.magicindicator.ViewPagerHelper; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; import com.bingchuang.library.base.factory.CreatePresenter; import com.bingchuang.library.utils.CommonUtils; import com.bingchuang.library.utils.ResUtil; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/activity/SuperAdminAddActivity.kt b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/activity/SuperAdminAddActivity.kt similarity index 82% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/activity/SuperAdminAddActivity.kt rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/activity/SuperAdminAddActivity.kt index 34c48fee2..21758fa6f 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/activity/SuperAdminAddActivity.kt +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/activity/SuperAdminAddActivity.kt @@ -1,19 +1,19 @@ -package com.pikolive.app.module_hall.hall.activity +package com.bingchuang.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.pikolive.app.R -import com.pikolive.app.base.BaseViewBindingActivity -import com.pikolive.app.common.EmptyViewHelper -import com.pikolive.app.databinding.ActivitySuperAdminAddBinding -import com.pikolive.app.module_hall.hall.adapter.SearchAdminAdapter -import com.pikolive.app.ui.utils.RVDelegate -import com.pikolive.core.module_hall.hall.HallModel -import com.pikolive.core.module_hall.hall.bean.SuperAdminInfo -import com.pikolive.core.utils.toast +import com.bingchuang.app.R +import com.bingchuang.app.base.BaseViewBindingActivity +import com.bingchuang.app.common.EmptyViewHelper +import com.bingchuang.app.databinding.ActivitySuperAdminAddBinding +import com.bingchuang.app.module_hall.hall.adapter.SearchAdminAdapter +import com.bingchuang.app.ui.utils.RVDelegate +import com.bingchuang.core.module_hall.hall.HallModel +import com.bingchuang.core.module_hall.hall.bean.SuperAdminInfo +import com.bingchuang.core.utils.toast import com.bingchuang.library.utils.ResUtil class SuperAdminAddActivity : BaseViewBindingActivity () { @@ -45,7 +45,7 @@ class SuperAdminAddActivity : BaseViewBindingActivity () { diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/activity/SuperAdminRoomSetActivity.kt b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/activity/SuperAdminRoomSetActivity.kt similarity index 87% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/activity/SuperAdminRoomSetActivity.kt rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/activity/SuperAdminRoomSetActivity.kt index abf750165..7107582c0 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/activity/SuperAdminRoomSetActivity.kt +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/activity/SuperAdminRoomSetActivity.kt @@ -1,19 +1,19 @@ -package com.pikolive.app.module_hall.hall.activity +package com.bingchuang.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.pikolive.app.R -import com.pikolive.app.base.BaseViewBindingActivity -import com.pikolive.app.common.EmptyViewHelper -import com.pikolive.app.databinding.ActivitySuperAdminRoomSetBinding -import com.pikolive.app.module_hall.hall.adapter.ManageRoomSetAdapter -import com.pikolive.app.ui.utils.RVDelegate -import com.pikolive.core.module_hall.hall.HallModel -import com.pikolive.core.module_hall.hall.bean.SuperAdminHall -import com.pikolive.core.utils.toast +import com.bingchuang.app.R +import com.bingchuang.app.base.BaseViewBindingActivity +import com.bingchuang.app.common.EmptyViewHelper +import com.bingchuang.app.databinding.ActivitySuperAdminRoomSetBinding +import com.bingchuang.app.module_hall.hall.adapter.ManageRoomSetAdapter +import com.bingchuang.app.ui.utils.RVDelegate +import com.bingchuang.core.module_hall.hall.HallModel +import com.bingchuang.core.module_hall.hall.bean.SuperAdminHall +import com.bingchuang.core.utils.toast import com.bingchuang.library.utils.ResUtil class SuperAdminRoomSetActivity : BaseViewBindingActivity () { diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/AssociationAdapter.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/AssociationAdapter.java similarity index 92% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/AssociationAdapter.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/AssociationAdapter.java index 2e33b652e..0e2404204 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/AssociationAdapter.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/AssociationAdapter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.hall.adapter; +package com.bingchuang.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.pikolive.app.R; -import com.pikolive.app.ui.utils.ImageLoadUtilsV2; -import com.pikolive.core2.association.bean.ClanListInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.utils.ImageLoadUtilsV2; +import com.bingchuang.core2.association.bean.ClanListInfo; /** * Created by yudi diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/AssociationRoomAdapter.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/AssociationRoomAdapter.java similarity index 94% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/AssociationRoomAdapter.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/AssociationRoomAdapter.java index b4eb19dda..4c631868e 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/AssociationRoomAdapter.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/AssociationRoomAdapter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.hall.adapter; +package com.bingchuang.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.pikolive.app.R; -import com.pikolive.app.ui.utils.ImageLoadUtilsV2; -import com.pikolive.core2.association.bean.HallListInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.utils.ImageLoadUtilsV2; +import com.bingchuang.core2.association.bean.HallListInfo; /** * Created by yudi diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/AuthSettingAdapter.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/AuthSettingAdapter.java similarity index 92% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/AuthSettingAdapter.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/AuthSettingAdapter.java index 497c34751..872aecd3a 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/AuthSettingAdapter.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/AuthSettingAdapter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.hall.adapter; +package com.bingchuang.app.module_hall.hall.adapter; import android.content.Context; import android.text.TextUtils; @@ -7,8 +7,8 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import com.pikolive.app.R; -import com.pikolive.core.module_hall.hall.bean.AuthInfo; +import com.bingchuang.app.R; +import com.bingchuang.core.module_hall.hall.bean.AuthInfo; import com.bingchuang.library.widget.IOSSwitchView; public class AuthSettingAdapter { diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/EnableExchangeAdapter.kt b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/EnableExchangeAdapter.kt similarity index 90% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/EnableExchangeAdapter.kt rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/EnableExchangeAdapter.kt index f480b8e12..98d6e7efc 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/EnableExchangeAdapter.kt +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/EnableExchangeAdapter.kt @@ -1,12 +1,12 @@ -package com.pikolive.app.module_hall.hall.adapter +package com.bingchuang.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.pikolive.app.R -import com.pikolive.app.ui.utils.ImageLoadUtils -import com.pikolive.core2.association.bean.MemberExchangeInfo +import com.bingchuang.app.R +import com.bingchuang.app.ui.utils.ImageLoadUtils +import com.bingchuang.core2.association.bean.MemberExchangeInfo /** * 可兑换 diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/GroupListAdapter.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/GroupListAdapter.java similarity index 76% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/GroupListAdapter.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/GroupListAdapter.java index ea49e05ed..bd81574cb 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/GroupListAdapter.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/GroupListAdapter.java @@ -1,10 +1,10 @@ -package com.pikolive.app.module_hall.hall.adapter; +package com.bingchuang.app.module_hall.hall.adapter; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.pikolive.app.R; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.core.module_hall.hall.bean.HTeamInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.core.module_hall.hall.bean.HTeamInfo; public class GroupListAdapter extends BaseQuickAdapter { diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/GroupMemberListAdapter.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/GroupMemberListAdapter.java similarity index 94% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/GroupMemberListAdapter.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/GroupMemberListAdapter.java index 109204650..ff502e72c 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/GroupMemberListAdapter.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/GroupMemberListAdapter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.hall.adapter; +package com.bingchuang.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.pikolive.app.R; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.app.utils.RegexUtil; -import com.pikolive.core.level.UserLevelVo; -import com.pikolive.core.module_hall.hall.bean.MemberInfo; -import com.pikolive.core.module_hall.hall.bean.RoleType; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.app.utils.RegexUtil; +import com.bingchuang.core.level.UserLevelVo; +import com.bingchuang.core.module_hall.hall.bean.MemberInfo; +import com.bingchuang.core.module_hall.hall.bean.RoleType; import org.jetbrains.annotations.NotNull; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/HallListAdapter.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/HallListAdapter.java similarity index 76% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/HallListAdapter.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/HallListAdapter.java index 76e47f90e..9f10d46bb 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/HallListAdapter.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/HallListAdapter.java @@ -1,11 +1,11 @@ -package com.pikolive.app.module_hall.hall.adapter; +package com.bingchuang.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.pikolive.app.R; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.core.module_hall.hall.bean.HallInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.core.module_hall.hall.bean.HallInfo; public class HallListAdapter extends BaseQuickAdapter { public HallListAdapter() { diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/ManageRoomAdapter.kt b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/ManageRoomAdapter.kt similarity index 76% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/ManageRoomAdapter.kt rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/ManageRoomAdapter.kt index 9dd62ad05..d600c7377 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/ManageRoomAdapter.kt +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/ManageRoomAdapter.kt @@ -1,11 +1,11 @@ -package com.pikolive.app.module_hall.hall.adapter +package com.bingchuang.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.pikolive.app.R -import com.pikolive.app.ui.utils.ImageLoadUtils -import com.pikolive.core.module_hall.hall.bean.SuperAdminHall +import com.bingchuang.app.R +import com.bingchuang.app.ui.utils.ImageLoadUtils +import com.bingchuang.core.module_hall.hall.bean.SuperAdminHall class ManageRoomAdapter : BaseQuickAdapter (R.layout.item_manage_room) { diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/ManageRoomSetAdapter.kt b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/ManageRoomSetAdapter.kt similarity index 78% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/ManageRoomSetAdapter.kt rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/ManageRoomSetAdapter.kt index ad7c87681..05b6750cc 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/ManageRoomSetAdapter.kt +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/ManageRoomSetAdapter.kt @@ -1,10 +1,10 @@ -package com.pikolive.app.module_hall.hall.adapter +package com.bingchuang.app.module_hall.hall.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.pikolive.app.R -import com.pikolive.app.ui.utils.ImageLoadUtils -import com.pikolive.core.module_hall.hall.bean.SuperAdminHall +import com.bingchuang.app.R +import com.bingchuang.app.ui.utils.ImageLoadUtils +import com.bingchuang.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/pikolive/app/module_hall/hall/adapter/ManageSuperAdminAdapter.kt b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/ManageSuperAdminAdapter.kt similarity index 79% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/ManageSuperAdminAdapter.kt rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/ManageSuperAdminAdapter.kt index b2b2a529c..54d30b75e 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/ManageSuperAdminAdapter.kt +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/ManageSuperAdminAdapter.kt @@ -1,15 +1,15 @@ -package com.pikolive.app.module_hall.hall.adapter +package com.bingchuang.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.pikolive.app.R -import com.pikolive.app.common.EmptyViewHelper -import com.pikolive.app.ui.utils.ImageLoadUtils -import com.pikolive.app.ui.utils.RVDelegate -import com.pikolive.core.module_hall.hall.bean.SuperAdminHall -import com.pikolive.core.module_hall.hall.bean.SuperAdminInfo +import com.bingchuang.app.R +import com.bingchuang.app.common.EmptyViewHelper +import com.bingchuang.app.ui.utils.ImageLoadUtils +import com.bingchuang.app.ui.utils.RVDelegate +import com.bingchuang.core.module_hall.hall.bean.SuperAdminHall +import com.bingchuang.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/pikolive/app/module_hall/hall/adapter/MemberViewHolder.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/MemberViewHolder.java similarity index 95% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/MemberViewHolder.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/MemberViewHolder.java index 940f58c5a..36246c4bc 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/MemberViewHolder.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/MemberViewHolder.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.hall.adapter; +package com.bingchuang.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.pikolive.app.R; +import com.bingchuang.app.R; public class MemberViewHolder extends BaseViewHolder { TextView userName; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/NoExchangeAdapter.kt b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/NoExchangeAdapter.kt similarity index 86% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/NoExchangeAdapter.kt rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/NoExchangeAdapter.kt index 146482bf7..21464bac4 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/NoExchangeAdapter.kt +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/NoExchangeAdapter.kt @@ -1,10 +1,10 @@ -package com.pikolive.app.module_hall.hall.adapter +package com.bingchuang.app.module_hall.hall.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.pikolive.app.R -import com.pikolive.app.ui.utils.ImageLoadUtils -import com.pikolive.core2.association.bean.MemberExchangeInfo +import com.bingchuang.app.R +import com.bingchuang.app.ui.utils.ImageLoadUtils +import com.bingchuang.core2.association.bean.MemberExchangeInfo /** * 不可兑换 diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/OptionAdapter.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/OptionAdapter.java similarity index 88% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/OptionAdapter.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/OptionAdapter.java index 3224b573d..caac17954 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/OptionAdapter.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/OptionAdapter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.hall.adapter; +package com.bingchuang.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.pikolive.app.R; -import com.pikolive.core.module_hall.hall.bean.OptionInfo; +import com.bingchuang.app.R; +import com.bingchuang.core.module_hall.hall.bean.OptionInfo; import java.util.List; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/SearchAdminAdapter.kt b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/SearchAdminAdapter.kt similarity index 83% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/SearchAdminAdapter.kt rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/SearchAdminAdapter.kt index 35805713f..aa12ef502 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/adapter/SearchAdminAdapter.kt +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/adapter/SearchAdminAdapter.kt @@ -1,10 +1,10 @@ -package com.pikolive.app.module_hall.hall.adapter +package com.bingchuang.app.module_hall.hall.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.pikolive.app.R -import com.pikolive.app.ui.utils.ImageLoadUtils -import com.pikolive.core.module_hall.hall.bean.SuperAdminInfo +import com.bingchuang.app.R +import com.bingchuang.app.ui.utils.ImageLoadUtils +import com.bingchuang.core.module_hall.hall.bean.SuperAdminInfo import com.bingchuang.library.utils.ResUtil class SearchAdminAdapter : diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/fragment/AssociationFragment.kt b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/fragment/AssociationFragment.kt similarity index 80% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/fragment/AssociationFragment.kt rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/fragment/AssociationFragment.kt index 76098bce6..ca54498e5 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/fragment/AssociationFragment.kt +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/fragment/AssociationFragment.kt @@ -1,22 +1,22 @@ -package com.pikolive.app.module_hall.hall.fragment +package com.bingchuang.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.pikolive.app.R -import com.pikolive.app.module_hall.viewmodel.AssociationViewModel -import com.pikolive.app.module_hall.hall.adapter.AssociationAdapter -import com.pikolive.app.base.BaseViewBindingFragment -import com.pikolive.app.common.EmptyViewHelper -import com.pikolive.app.databinding.FragmentAssociationBinding -import com.pikolive.app.module_hall.hall.activity.ModuleClanActivity -import com.pikolive.app.ui.utils.RVDelegate -import com.pikolive.core2.association.bean.ClanListInfo -import com.pikolive.core.module_hall.hall.HallModel -import com.pikolive.core.utils.net.BeanObserver -import com.pikolive.core.utils.net.RxHelper +import com.bingchuang.app.R +import com.bingchuang.app.module_hall.viewmodel.AssociationViewModel +import com.bingchuang.app.module_hall.hall.adapter.AssociationAdapter +import com.bingchuang.app.base.BaseViewBindingFragment +import com.bingchuang.app.common.EmptyViewHelper +import com.bingchuang.app.databinding.FragmentAssociationBinding +import com.bingchuang.app.module_hall.hall.activity.ModuleClanActivity +import com.bingchuang.app.ui.utils.RVDelegate +import com.bingchuang.core2.association.bean.ClanListInfo +import com.bingchuang.core.module_hall.hall.HallModel +import com.bingchuang.core.utils.net.BeanObserver +import com.bingchuang.core.utils.net.RxHelper import com.bingchuang.library.utils.ResUtil /** diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/fragment/AssociationRoomFragment.kt b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/fragment/AssociationRoomFragment.kt similarity index 90% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/fragment/AssociationRoomFragment.kt rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/fragment/AssociationRoomFragment.kt index 7c42c8f40..f2232ec4d 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/fragment/AssociationRoomFragment.kt +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/fragment/AssociationRoomFragment.kt @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.hall.fragment +package com.bingchuang.app.module_hall.hall.fragment import android.content.Context import android.os.Bundle @@ -13,19 +13,19 @@ import android.widget.TextView import androidx.fragment.app.viewModels import androidx.recyclerview.widget.LinearLayoutManager import com.chad.library.adapter.base.BaseQuickAdapter -import com.pikolive.app.R -import com.pikolive.app.base.BaseViewBindingFragment -import com.pikolive.app.common.EmptyViewHelper -import com.pikolive.app.databinding.FragmentAssociationRoomBinding -import com.pikolive.app.module_hall.hall.activity.ModuleHallActivity -import com.pikolive.app.module_hall.hall.adapter.AssociationRoomAdapter -import com.pikolive.app.module_hall.viewmodel.AssociationViewModel -import com.pikolive.app.ui.im.avtivity.NimP2PMessageActivity -import com.pikolive.app.ui.utils.RVDelegate -import com.pikolive.core.module_hall.hall.HallModel -import com.pikolive.core.utils.net.BeanObserver -import com.pikolive.core.utils.net.RxHelper -import com.pikolive.core2.association.bean.HallListInfo +import com.bingchuang.app.R +import com.bingchuang.app.base.BaseViewBindingFragment +import com.bingchuang.app.common.EmptyViewHelper +import com.bingchuang.app.databinding.FragmentAssociationRoomBinding +import com.bingchuang.app.module_hall.hall.activity.ModuleHallActivity +import com.bingchuang.app.module_hall.hall.adapter.AssociationRoomAdapter +import com.bingchuang.app.module_hall.viewmodel.AssociationViewModel +import com.bingchuang.app.ui.im.avtivity.NimP2PMessageActivity +import com.bingchuang.app.ui.utils.RVDelegate +import com.bingchuang.core.module_hall.hall.HallModel +import com.bingchuang.core.utils.net.BeanObserver +import com.bingchuang.core.utils.net.RxHelper +import com.bingchuang.core2.association.bean.HallListInfo import com.bingchuang.library.utils.ResUtil class AssociationRoomFragment : BaseViewBindingFragment () { diff --git a/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/presenter/AddMemberPresenter.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/presenter/AddMemberPresenter.java new file mode 100644 index 000000000..cce9d359e --- /dev/null +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/presenter/AddMemberPresenter.java @@ -0,0 +1,7 @@ +package com.bingchuang.app.module_hall.hall.presenter; + +import com.bingchuang.app.base.BaseMvpPresenter; +import com.bingchuang.app.module_hall.hall.view.IAddMemberView; + +public class AddMemberPresenter extends BaseMvpPresenter { +} diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/presenter/AdminAddPresenter.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/presenter/AdminAddPresenter.java similarity index 88% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/presenter/AdminAddPresenter.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/presenter/AdminAddPresenter.java index 518378cb6..4498cf6b8 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/presenter/AdminAddPresenter.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/presenter/AdminAddPresenter.java @@ -1,8 +1,8 @@ -package com.pikolive.app.module_hall.hall.presenter; +package com.bingchuang.app.module_hall.hall.presenter; -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.app.module_hall.hall.view.IAdminAddView; -import com.pikolive.core.module_hall.hall.HallModel; +import com.bingchuang.app.base.BaseMvpPresenter; +import com.bingchuang.app.module_hall.hall.view.IAdminAddView; +import com.bingchuang.core.module_hall.hall.HallModel; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/presenter/AdminListPresenter.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/presenter/AdminListPresenter.java similarity index 75% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/presenter/AdminListPresenter.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/presenter/AdminListPresenter.java index 904d4fa49..471354f59 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/presenter/AdminListPresenter.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/presenter/AdminListPresenter.java @@ -1,10 +1,10 @@ -package com.pikolive.app.module_hall.hall.presenter; +package com.bingchuang.app.module_hall.hall.presenter; -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.app.module_hall.hall.view.IAdminListView; -import com.pikolive.core.module_hall.hall.HallModel; -import com.pikolive.core.module_hall.hall.bean.ListMemberInfo; -import com.pikolive.core.utils.net.BeanObserver; +import com.bingchuang.app.base.BaseMvpPresenter; +import com.bingchuang.app.module_hall.hall.view.IAdminListView; +import com.bingchuang.core.module_hall.hall.HallModel; +import com.bingchuang.core.module_hall.hall.bean.ListMemberInfo; +import com.bingchuang.core.utils.net.BeanObserver; import com.bingchuang.library.utils.ListUtils; public class AdminListPresenter extends BaseMvpPresenter { diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/presenter/AuthSettingPresenter.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/presenter/AuthSettingPresenter.java similarity index 86% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/presenter/AuthSettingPresenter.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/presenter/AuthSettingPresenter.java index 2cc232095..a8368925e 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/presenter/AuthSettingPresenter.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/presenter/AuthSettingPresenter.java @@ -1,9 +1,9 @@ -package com.pikolive.app.module_hall.hall.presenter; +package com.bingchuang.app.module_hall.hall.presenter; -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.app.module_hall.hall.view.IAuthSettingView; -import com.pikolive.core.module_hall.hall.HallModel; -import com.pikolive.core.module_hall.hall.bean.AuthInfo; +import com.bingchuang.app.base.BaseMvpPresenter; +import com.bingchuang.app.module_hall.hall.view.IAuthSettingView; +import com.bingchuang.core.module_hall.hall.HallModel; +import com.bingchuang.core.module_hall.hall.bean.AuthInfo; import java.util.List; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/presenter/HallNamePresenter.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/presenter/HallNamePresenter.java similarity index 80% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/presenter/HallNamePresenter.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/presenter/HallNamePresenter.java index 202a7f319..ace012dfa 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/presenter/HallNamePresenter.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/presenter/HallNamePresenter.java @@ -1,8 +1,8 @@ -package com.pikolive.app.module_hall.hall.presenter; +package com.bingchuang.app.module_hall.hall.presenter; -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.app.module_hall.hall.view.IHallNameView; -import com.pikolive.core.module_hall.hall.HallNameModel; +import com.bingchuang.app.base.BaseMvpPresenter; +import com.bingchuang.app.module_hall.hall.view.IHallNameView; +import com.bingchuang.core.module_hall.hall.HallNameModel; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/presenter/ModuleHallPresenter.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/presenter/ModuleHallPresenter.java similarity index 92% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/presenter/ModuleHallPresenter.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/presenter/ModuleHallPresenter.java index a7f113fff..82e55733a 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/presenter/ModuleHallPresenter.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/presenter/ModuleHallPresenter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.hall.presenter; +package com.bingchuang.app.module_hall.hall.presenter; import android.content.Context; import android.text.SpannableString; @@ -7,14 +7,14 @@ import android.text.style.ForegroundColorSpan; import androidx.core.content.ContextCompat; -import com.pikolive.app.module_hall.HallDataManager; -import com.pikolive.app.R; -import com.pikolive.app.avroom.widget.MessageView; -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.app.module_hall.hall.view.IModuleHallView; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.module_hall.hall.HallModel; -import com.pikolive.core.module_hall.hall.bean.AuthInfo; +import com.bingchuang.app.module_hall.HallDataManager; +import com.bingchuang.app.R; +import com.bingchuang.app.avroom.widget.MessageView; +import com.bingchuang.app.base.BaseMvpPresenter; +import com.bingchuang.app.module_hall.hall.view.IModuleHallView; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.module_hall.hall.HallModel; +import com.bingchuang.core.module_hall.hall.bean.AuthInfo; import com.bingchuang.library.utils.ResUtil; import java.util.ArrayList; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/presenter/RemoveMemberPresenter.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/presenter/RemoveMemberPresenter.java similarity index 91% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/presenter/RemoveMemberPresenter.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/presenter/RemoveMemberPresenter.java index d65c63ffe..50832e73a 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/presenter/RemoveMemberPresenter.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/presenter/RemoveMemberPresenter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.hall.presenter; +package com.bingchuang.app.module_hall.hall.presenter; import android.content.Context; import android.text.SpannableString; @@ -7,10 +7,10 @@ import android.text.style.ForegroundColorSpan; import androidx.core.content.ContextCompat; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.app.module_hall.hall.view.IRemoveMemberView; -import com.pikolive.core.module_hall.hall.HallModel; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseMvpPresenter; +import com.bingchuang.app.module_hall.hall.view.IRemoveMemberView; +import com.bingchuang.core.module_hall.hall.HallModel; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.SingleToastUtil; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/IAddMemberView.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/IAddMemberView.java similarity index 68% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/IAddMemberView.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/IAddMemberView.java index b7481a011..bec172485 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/IAddMemberView.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/IAddMemberView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.hall.view; +package com.bingchuang.app.module_hall.hall.view; import com.bingchuang.library.base.IMvpBaseView; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/IAdminAddView.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/IAdminAddView.java similarity index 79% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/IAdminAddView.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/IAdminAddView.java index 841213bc0..ab7b726a8 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/IAdminAddView.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/IAdminAddView.java @@ -1,6 +1,6 @@ -package com.pikolive.app.module_hall.hall.view; +package com.bingchuang.app.module_hall.hall.view; -import com.pikolive.core.module_hall.hall.bean.MemberInfo; +import com.bingchuang.core.module_hall.hall.bean.MemberInfo; import com.bingchuang.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/IAdminListView.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/IAdminListView.java similarity index 68% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/IAdminListView.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/IAdminListView.java index 8a7ef624f..ccd9c3e55 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/IAdminListView.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/IAdminListView.java @@ -1,6 +1,6 @@ -package com.pikolive.app.module_hall.hall.view; +package com.bingchuang.app.module_hall.hall.view; -import com.pikolive.core.module_hall.hall.bean.MemberInfo; +import com.bingchuang.core.module_hall.hall.bean.MemberInfo; import com.bingchuang.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/IAuthSettingView.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/IAuthSettingView.java similarity index 74% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/IAuthSettingView.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/IAuthSettingView.java index 221dae63e..d5f6c2b73 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/IAuthSettingView.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/IAuthSettingView.java @@ -1,6 +1,6 @@ -package com.pikolive.app.module_hall.hall.view; +package com.bingchuang.app.module_hall.hall.view; -import com.pikolive.core.module_hall.hall.bean.AuthInfo; +import com.bingchuang.core.module_hall.hall.bean.AuthInfo; import com.bingchuang.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/IHallNameView.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/IHallNameView.java similarity index 80% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/IHallNameView.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/IHallNameView.java index 5227a485c..d5efc7d73 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/IHallNameView.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/IHallNameView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.hall.view; +package com.bingchuang.app.module_hall.hall.view; import com.bingchuang.library.base.IMvpBaseView; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/IMemberSearchView.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/IMemberSearchView.java similarity index 68% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/IMemberSearchView.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/IMemberSearchView.java index 22375e349..9251a46eb 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/IMemberSearchView.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/IMemberSearchView.java @@ -1,6 +1,6 @@ -package com.pikolive.app.module_hall.hall.view; +package com.bingchuang.app.module_hall.hall.view; -import com.pikolive.core.module_hall.hall.bean.MemberInfo; +import com.bingchuang.core.module_hall.hall.bean.MemberInfo; import com.bingchuang.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/IModuleHallView.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/IModuleHallView.java similarity index 76% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/IModuleHallView.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/IModuleHallView.java index f47100299..79b02e3b6 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/IModuleHallView.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/IModuleHallView.java @@ -1,7 +1,7 @@ -package com.pikolive.app.module_hall.hall.view; +package com.bingchuang.app.module_hall.hall.view; -import com.pikolive.core.module_hall.hall.bean.AuthInfo; -import com.pikolive.core.module_hall.hall.bean.MemberInfo; +import com.bingchuang.core.module_hall.hall.bean.AuthInfo; +import com.bingchuang.core.module_hall.hall.bean.MemberInfo; import com.bingchuang.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/IRemoveMemberView.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/IRemoveMemberView.java similarity index 78% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/IRemoveMemberView.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/IRemoveMemberView.java index bfc9c106d..04b4499dc 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/IRemoveMemberView.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/IRemoveMemberView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.hall.view; +package com.bingchuang.app.module_hall.hall.view; import com.bingchuang.library.base.IMvpBaseView; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/dialog/CloseExchangeTipDialog.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/dialog/CloseExchangeTipDialog.java similarity index 94% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/dialog/CloseExchangeTipDialog.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/dialog/CloseExchangeTipDialog.java index 6a201451d..3e1310e27 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/dialog/CloseExchangeTipDialog.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/dialog/CloseExchangeTipDialog.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.hall.view.dialog; +package com.bingchuang.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.pikolive.app.R; -import com.pikolive.app.ui.widget.dialog.BaseDialog; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.widget.dialog.BaseDialog; /** * @author wushaocheng diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/dialog/HallMenuDialog.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/dialog/HallMenuDialog.java similarity index 97% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/dialog/HallMenuDialog.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/dialog/HallMenuDialog.java index 8841588ae..d701af5c9 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/dialog/HallMenuDialog.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/dialog/HallMenuDialog.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.hall.view.dialog; +package com.bingchuang.app.module_hall.hall.view.dialog; import android.app.Dialog; import android.content.Context; @@ -14,8 +14,8 @@ import android.widget.TextView; import androidx.annotation.NonNull; -import com.pikolive.app.R; -import com.pikolive.core.module_hall.hall.bean.AuthInfo; +import com.bingchuang.app.R; +import com.bingchuang.core.module_hall.hall.bean.AuthInfo; import com.bingchuang.library.utils.SizeUtils; import java.util.List; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/dialog/TimePickerClanDialog.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/dialog/TimePickerClanDialog.java similarity index 99% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/dialog/TimePickerClanDialog.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/dialog/TimePickerClanDialog.java index 237ee6d5e..958574375 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/dialog/TimePickerClanDialog.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/dialog/TimePickerClanDialog.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.hall.view.dialog; +package com.bingchuang.app.module_hall.hall.view.dialog; import android.app.Activity; import android.app.Dialog; @@ -21,7 +21,7 @@ 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.pikolive.app.R; +import com.bingchuang.app.R; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.SingleToastUtil; import com.bingchuang.library.utils.TimeUtils; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/dialog/TimePickerDialog.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/dialog/TimePickerDialog.java similarity index 99% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/dialog/TimePickerDialog.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/dialog/TimePickerDialog.java index 5c67554a2..507a452ac 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/dialog/TimePickerDialog.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/dialog/TimePickerDialog.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.hall.view.dialog; +package com.bingchuang.app.module_hall.hall.view.dialog; import android.app.Activity; import android.app.Dialog; @@ -21,7 +21,7 @@ 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.pikolive.app.R; +import com.bingchuang.app.R; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.SingleToastUtil; import com.bingchuang.library.utils.TimeUtils; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/dialog/TimePickerGoldDialog.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/dialog/TimePickerGoldDialog.java similarity index 99% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/dialog/TimePickerGoldDialog.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/dialog/TimePickerGoldDialog.java index 6f474253f..1e9102947 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/dialog/TimePickerGoldDialog.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/dialog/TimePickerGoldDialog.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.hall.view.dialog; +package com.bingchuang.app.module_hall.hall.view.dialog; import android.app.Activity; import android.app.Dialog; @@ -21,7 +21,7 @@ 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.pikolive.app.R; +import com.bingchuang.app.R; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.SingleToastUtil; import com.bingchuang.library.utils.TimeUtils; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/dialog/TimeWheel.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/dialog/TimeWheel.java similarity index 99% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/dialog/TimeWheel.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/dialog/TimeWheel.java index cb51dca3e..b5337efa5 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/dialog/TimeWheel.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/dialog/TimeWheel.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.hall.view.dialog; +package com.bingchuang.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.pikolive.app.R; +import com.bingchuang.app.R; import java.util.Calendar; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/indicator/StatisticsIndicatorAdapter.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/indicator/StatisticsIndicatorAdapter.java similarity index 80% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/indicator/StatisticsIndicatorAdapter.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/indicator/StatisticsIndicatorAdapter.java index 9889540ff..2c26da199 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/view/indicator/StatisticsIndicatorAdapter.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/hall/view/indicator/StatisticsIndicatorAdapter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.hall.view.indicator; +package com.bingchuang.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.pikolive.app.R; -import com.pikolive.app.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.bingchuang.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/pikolive/app/module_hall/im/NimHelper.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/im/NimHelper.java similarity index 91% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/im/NimHelper.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/im/NimHelper.java index 5e064e7b0..e2c40cf0d 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/im/NimHelper.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/im/NimHelper.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.im; +package com.bingchuang.app.module_hall.im; import android.text.TextUtils; @@ -8,10 +8,10 @@ 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.pikolive.app.R; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.module_hall.im.ClanImMsgInfo; -import com.pikolive.core.module_hall.im.HallImMsgInfo; +import com.bingchuang.app.R; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.module_hall.im.ClanImMsgInfo; +import com.bingchuang.core.module_hall.im.HallImMsgInfo; import com.bingchuang.library.utils.ResUtil; import java.util.Map; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/im/dialog/AgreeApplyDialog.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/im/dialog/AgreeApplyDialog.java similarity index 94% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/im/dialog/AgreeApplyDialog.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/im/dialog/AgreeApplyDialog.java index a8258812d..ad12c6fe0 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/im/dialog/AgreeApplyDialog.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/im/dialog/AgreeApplyDialog.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.im.dialog; +package com.bingchuang.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.pikolive.app.R; -import com.pikolive.app.ui.widget.dialog.BaseDialog; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.widget.dialog.BaseDialog; /** * @author wushaocheng diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/im/dialog/RefuseApplyDialog.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/im/dialog/RefuseApplyDialog.java similarity index 96% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/im/dialog/RefuseApplyDialog.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/im/dialog/RefuseApplyDialog.java index 5ce908eaa..82b64b177 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/im/dialog/RefuseApplyDialog.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/im/dialog/RefuseApplyDialog.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.im.dialog; +package com.bingchuang.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.pikolive.app.R; -import com.pikolive.app.ui.widget.dialog.BaseDialog; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.widget.dialog.BaseDialog; /** * @author wushaocheng diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/im/msgholder/ClanMsgViewHolder.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/im/msgholder/ClanMsgViewHolder.java similarity index 93% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/im/msgholder/ClanMsgViewHolder.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/im/msgholder/ClanMsgViewHolder.java index 1bab27903..9809f08cf 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/im/msgholder/ClanMsgViewHolder.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/im/msgholder/ClanMsgViewHolder.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.im.msgholder; +package com.bingchuang.app.module_hall.im.msgholder; import android.graphics.Color; import android.text.SpannableStringBuilder; @@ -20,18 +20,18 @@ 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.pikolive.app.R; -import com.pikolive.app.module_hall.im.NimHelper; -import com.pikolive.app.ui.im.RouterHandler; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.module_hall.hall.HallModel; -import com.pikolive.core.module_hall.hall.bean.ApplyResult; -import com.pikolive.core.module_hall.im.ClanAttachment; -import com.pikolive.core.module_hall.im.ClanImMsgInfo; -import com.pikolive.core.module_hall.im.bean.HallMsgComponent; -import com.pikolive.core.module_hall.im.bean.HallMsgLayout; -import com.pikolive.core.utils.net.BeanObserver; +import com.bingchuang.app.R; +import com.bingchuang.app.module_hall.im.NimHelper; +import com.bingchuang.app.ui.im.RouterHandler; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.module_hall.hall.HallModel; +import com.bingchuang.core.module_hall.hall.bean.ApplyResult; +import com.bingchuang.core.module_hall.im.ClanAttachment; +import com.bingchuang.core.module_hall.im.ClanImMsgInfo; +import com.bingchuang.core.module_hall.im.bean.HallMsgComponent; +import com.bingchuang.core.module_hall.im.bean.HallMsgLayout; +import com.bingchuang.core.utils.net.BeanObserver; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.SingleToastUtil; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/im/msgholder/HallMsgViewHolder.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/im/msgholder/HallMsgViewHolder.java similarity index 93% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/im/msgholder/HallMsgViewHolder.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/im/msgholder/HallMsgViewHolder.java index 424ff346b..01a020d70 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/im/msgholder/HallMsgViewHolder.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/im/msgholder/HallMsgViewHolder.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.im.msgholder; +package com.bingchuang.app.module_hall.im.msgholder; import android.graphics.Color; import android.text.SpannableStringBuilder; @@ -21,21 +21,21 @@ 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.pikolive.app.R; -import com.pikolive.app.module_hall.im.NimHelper; -import com.pikolive.app.module_hall.im.dialog.AgreeApplyDialog; -import com.pikolive.app.module_hall.im.dialog.RefuseApplyDialog; -import com.pikolive.app.ui.im.RouterHandler; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.manager.event.HallInfoChangeEvent; -import com.pikolive.core.module_hall.hall.HallModel; -import com.pikolive.core.module_hall.hall.bean.ApplyResult; -import com.pikolive.core.module_hall.im.HallAttachment; -import com.pikolive.core.module_hall.im.HallImMsgInfo; -import com.pikolive.core.module_hall.im.bean.HallMsgComponent; -import com.pikolive.core.module_hall.im.bean.HallMsgLayout; -import com.pikolive.core.utils.net.BeanObserver; +import com.bingchuang.app.R; +import com.bingchuang.app.module_hall.im.NimHelper; +import com.bingchuang.app.module_hall.im.dialog.AgreeApplyDialog; +import com.bingchuang.app.module_hall.im.dialog.RefuseApplyDialog; +import com.bingchuang.app.ui.im.RouterHandler; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.manager.event.HallInfoChangeEvent; +import com.bingchuang.core.module_hall.hall.HallModel; +import com.bingchuang.core.module_hall.hall.bean.ApplyResult; +import com.bingchuang.core.module_hall.im.HallAttachment; +import com.bingchuang.core.module_hall.im.HallImMsgInfo; +import com.bingchuang.core.module_hall.im.bean.HallMsgComponent; +import com.bingchuang.core.module_hall.im.bean.HallMsgLayout; +import com.bingchuang.core.utils.net.BeanObserver; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.SingleToastUtil; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/ClanIncomeFragment.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/ClanIncomeFragment.java similarity index 87% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/income/ClanIncomeFragment.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/ClanIncomeFragment.java index 06af876d1..8cbc1be99 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/ClanIncomeFragment.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/ClanIncomeFragment.java @@ -1,16 +1,16 @@ -package com.pikolive.app.module_hall.income; +package com.bingchuang.app.module_hall.income; import android.os.Bundle; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.pikolive.app.module_hall.income.adapter.ClanIncomeAdapter; -import com.pikolive.app.module_hall.income.presenter.ClanIncomeFragmentPresenter; -import com.pikolive.app.module_hall.income.view.IClanIncomeView; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseMvpFragment; -import com.pikolive.core.module_hall.income.bean.ClanTotalIncomeInfo; +import com.bingchuang.app.module_hall.income.adapter.ClanIncomeAdapter; +import com.bingchuang.app.module_hall.income.presenter.ClanIncomeFragmentPresenter; +import com.bingchuang.app.module_hall.income.view.IClanIncomeView; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseMvpFragment; +import com.bingchuang.core.module_hall.income.bean.ClanTotalIncomeInfo; import com.bingchuang.library.base.factory.CreatePresenter; import com.bingchuang.library.utils.ListUtils; import com.bingchuang.library.utils.ResUtil; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/DayIncomeFragment.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/DayIncomeFragment.java similarity index 89% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/income/DayIncomeFragment.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/DayIncomeFragment.java index c1ac01539..e2a366bde 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/DayIncomeFragment.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/DayIncomeFragment.java @@ -1,17 +1,17 @@ -package com.pikolive.app.module_hall.income; +package com.bingchuang.app.module_hall.income; import android.os.Bundle; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.pikolive.app.module_hall.income.adapter.IncomeAdapter; -import com.pikolive.app.module_hall.income.presenter.IncomePresenter; -import com.pikolive.app.module_hall.income.view.IIncomeView; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseMvpFragment; -import com.pikolive.core.module_hall.income.bean.IncomeInfo; -import com.pikolive.core.module_hall.income.bean.IncomeTotalInfo; +import com.bingchuang.app.module_hall.income.adapter.IncomeAdapter; +import com.bingchuang.app.module_hall.income.presenter.IncomePresenter; +import com.bingchuang.app.module_hall.income.view.IIncomeView; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseMvpFragment; +import com.bingchuang.core.module_hall.income.bean.IncomeInfo; +import com.bingchuang.core.module_hall.income.bean.IncomeTotalInfo; import com.bingchuang.library.base.factory.CreatePresenter; import java.util.List; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/GoldRecordFragment.kt b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/GoldRecordFragment.kt similarity index 86% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/income/GoldRecordFragment.kt rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/GoldRecordFragment.kt index d70e470be..827358fa4 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/GoldRecordFragment.kt +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/GoldRecordFragment.kt @@ -1,16 +1,16 @@ -package com.pikolive.app.module_hall.income +package com.bingchuang.app.module_hall.income import android.os.Bundle import androidx.fragment.app.viewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.pikolive.app.R -import com.pikolive.app.base.BaseViewBindingFragment -import com.pikolive.app.common.EmptyViewHelper -import com.pikolive.app.databinding.FragmentAssociationBinding -import com.pikolive.app.earn.EarnRecordViewModel -import com.pikolive.app.earn.adapter.GoldRecordAdapter -import com.pikolive.app.ui.utils.RVDelegate -import com.pikolive.core2.earn.bean.HallMemberGoldFlowInfo +import com.bingchuang.app.R +import com.bingchuang.app.base.BaseViewBindingFragment +import com.bingchuang.app.common.EmptyViewHelper +import com.bingchuang.app.databinding.FragmentAssociationBinding +import com.bingchuang.app.earn.EarnRecordViewModel +import com.bingchuang.app.earn.adapter.GoldRecordAdapter +import com.bingchuang.app.ui.utils.RVDelegate +import com.bingchuang.core2.earn.bean.HallMemberGoldFlowInfo import com.bingchuang.library.utils.ResUtil /** diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/HallIncomeFragment.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/HallIncomeFragment.java similarity index 86% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/income/HallIncomeFragment.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/HallIncomeFragment.java index 231206b4a..b1c456866 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/HallIncomeFragment.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/HallIncomeFragment.java @@ -1,16 +1,16 @@ -package com.pikolive.app.module_hall.income; +package com.bingchuang.app.module_hall.income; import android.os.Bundle; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.pikolive.app.module_hall.income.adapter.HallIncomeAdapter; -import com.pikolive.app.module_hall.income.presenter.HallIncomeFragmentPresenter; -import com.pikolive.app.module_hall.income.view.IHallIncomeView; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseMvpFragment; -import com.pikolive.core.module_hall.income.bean.HallTotalIncomeInfo; +import com.bingchuang.app.module_hall.income.adapter.HallIncomeAdapter; +import com.bingchuang.app.module_hall.income.presenter.HallIncomeFragmentPresenter; +import com.bingchuang.app.module_hall.income.view.IHallIncomeView; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseMvpFragment; +import com.bingchuang.core.module_hall.income.bean.HallTotalIncomeInfo; import com.bingchuang.library.base.factory.CreatePresenter; import com.bingchuang.library.utils.ListUtils; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/IncomeDetailActivity.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/IncomeDetailActivity.java similarity index 86% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/income/IncomeDetailActivity.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/IncomeDetailActivity.java index 8ce755a15..3c75c53e5 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/IncomeDetailActivity.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/IncomeDetailActivity.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.income; +package com.bingchuang.app.module_hall.income; import android.content.Context; import android.content.Intent; @@ -10,16 +10,16 @@ import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.netease.nim.uikit.StatusBarUtil; -import com.pikolive.app.module_hall.income.adapter.IncomeDetailAdapter; -import com.pikolive.app.module_hall.income.presenter.IncomeDetailPresenter; -import com.pikolive.app.module_hall.income.view.IIncomeDetailView; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseMvpActivity; -import com.pikolive.app.common.util.Utils; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.app.ui.widget.recyclerview.decoration.SpacingDecoration; -import com.pikolive.core.module_hall.income.bean.IncomeGiftInfo; -import com.pikolive.core.module_hall.income.bean.IncomeInfo; +import com.bingchuang.app.module_hall.income.adapter.IncomeDetailAdapter; +import com.bingchuang.app.module_hall.income.presenter.IncomeDetailPresenter; +import com.bingchuang.app.module_hall.income.view.IIncomeDetailView; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseMvpActivity; +import com.bingchuang.app.common.util.Utils; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.app.ui.widget.recyclerview.decoration.SpacingDecoration; +import com.bingchuang.core.module_hall.income.bean.IncomeGiftInfo; +import com.bingchuang.core.module_hall.income.bean.IncomeInfo; import com.bingchuang.library.base.factory.CreatePresenter; import com.bingchuang.library.utils.ResUtil; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/SingleRoomIncomeFragment.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/SingleRoomIncomeFragment.java similarity index 88% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/income/SingleRoomIncomeFragment.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/SingleRoomIncomeFragment.java index 62eb415c6..49efa4683 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/SingleRoomIncomeFragment.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/SingleRoomIncomeFragment.java @@ -1,16 +1,16 @@ -package com.pikolive.app.module_hall.income; +package com.bingchuang.app.module_hall.income; import android.os.Bundle; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.pikolive.app.module_hall.income.adapter.SingleRoomIncomeAdapter; -import com.pikolive.app.module_hall.income.presenter.SingRoomIncomeFragmentPresenter; -import com.pikolive.app.module_hall.income.view.ISingRoomIncomeView; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseMvpFragment; -import com.pikolive.core.module_hall.income.bean.SingleRoomTotalIncomeInfo; +import com.bingchuang.app.module_hall.income.adapter.SingleRoomIncomeAdapter; +import com.bingchuang.app.module_hall.income.presenter.SingRoomIncomeFragmentPresenter; +import com.bingchuang.app.module_hall.income.view.ISingRoomIncomeView; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseMvpFragment; +import com.bingchuang.core.module_hall.income.bean.SingleRoomTotalIncomeInfo; import com.bingchuang.library.base.factory.CreatePresenter; import com.bingchuang.library.utils.ListUtils; import com.bingchuang.library.utils.ResUtil; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/adapter/ClanIncomeAdapter.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/adapter/ClanIncomeAdapter.java similarity index 89% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/income/adapter/ClanIncomeAdapter.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/adapter/ClanIncomeAdapter.java index b5a96a225..36f07b8ae 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/adapter/ClanIncomeAdapter.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/adapter/ClanIncomeAdapter.java @@ -1,10 +1,10 @@ -package com.pikolive.app.module_hall.income.adapter; +package com.bingchuang.app.module_hall.income.adapter; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.pikolive.app.R; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.core.module_hall.income.bean.ClanIncomeInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.core.module_hall.income.bean.ClanIncomeInfo; import com.bingchuang.library.utils.ResUtil; import org.jetbrains.annotations.NotNull; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/adapter/HallIncomeAdapter.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/adapter/HallIncomeAdapter.java similarity index 85% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/income/adapter/HallIncomeAdapter.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/adapter/HallIncomeAdapter.java index da853ce3f..50509fbfc 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/adapter/HallIncomeAdapter.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/adapter/HallIncomeAdapter.java @@ -1,10 +1,10 @@ -package com.pikolive.app.module_hall.income.adapter; +package com.bingchuang.app.module_hall.income.adapter; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.pikolive.app.R; -import com.pikolive.app.ui.utils.ImageLoadUtilsV2; -import com.pikolive.core.module_hall.income.bean.HallIncomeInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.utils.ImageLoadUtilsV2; +import com.bingchuang.core.module_hall.income.bean.HallIncomeInfo; import org.jetbrains.annotations.NotNull; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/adapter/IncomeAdapter.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/adapter/IncomeAdapter.java similarity index 86% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/income/adapter/IncomeAdapter.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/adapter/IncomeAdapter.java index 0beb3417e..9097cc79e 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/adapter/IncomeAdapter.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/adapter/IncomeAdapter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.income.adapter; +package com.bingchuang.app.module_hall.income.adapter; import android.content.Context; import android.text.TextUtils; @@ -7,9 +7,9 @@ import androidx.annotation.Nullable; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.pikolive.app.R; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.core.module_hall.income.bean.IncomeInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.core.module_hall.income.bean.IncomeInfo; import java.text.DecimalFormat; import java.util.List; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/adapter/IncomeDetailAdapter.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/adapter/IncomeDetailAdapter.java similarity index 92% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/income/adapter/IncomeDetailAdapter.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/adapter/IncomeDetailAdapter.java index 915f7ea26..272e493e1 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/adapter/IncomeDetailAdapter.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/adapter/IncomeDetailAdapter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.income.adapter; +package com.bingchuang.app.module_hall.income.adapter; import android.text.SpannableString; import android.text.style.ForegroundColorSpan; @@ -8,9 +8,9 @@ import androidx.core.content.ContextCompat; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.pikolive.app.R; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.core.module_hall.income.bean.IncomeGiftInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.core.module_hall.income.bean.IncomeGiftInfo; import com.bingchuang.library.utils.ResUtil; import java.math.BigDecimal; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/adapter/LiveIncomeAdapter.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/adapter/LiveIncomeAdapter.java similarity index 80% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/income/adapter/LiveIncomeAdapter.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/adapter/LiveIncomeAdapter.java index b4d3262c5..6e417584b 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/adapter/LiveIncomeAdapter.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/adapter/LiveIncomeAdapter.java @@ -1,11 +1,11 @@ -package com.pikolive.app.module_hall.income.adapter; +package com.bingchuang.app.module_hall.income.adapter; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.pikolive.app.R; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.app.ui.utils.ImageLoadUtilsV2; -import com.pikolive.core.module_hall.income.bean.LiveIncomeInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.app.ui.utils.ImageLoadUtilsV2; +import com.bingchuang.core.module_hall.income.bean.LiveIncomeInfo; import org.jetbrains.annotations.NotNull; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/adapter/SingleRoomIncomeAdapter.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/adapter/SingleRoomIncomeAdapter.java similarity index 87% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/income/adapter/SingleRoomIncomeAdapter.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/adapter/SingleRoomIncomeAdapter.java index 7d17fff10..57e2da925 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/adapter/SingleRoomIncomeAdapter.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/adapter/SingleRoomIncomeAdapter.java @@ -1,10 +1,10 @@ -package com.pikolive.app.module_hall.income.adapter; +package com.bingchuang.app.module_hall.income.adapter; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.pikolive.app.R; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.core.module_hall.income.bean.SingleRoomIncomeInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.core.module_hall.income.bean.SingleRoomIncomeInfo; import com.bingchuang.library.utils.ResUtil; import org.jetbrains.annotations.NotNull; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/presenter/ClanIncomeFragmentPresenter.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/presenter/ClanIncomeFragmentPresenter.java similarity index 79% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/income/presenter/ClanIncomeFragmentPresenter.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/presenter/ClanIncomeFragmentPresenter.java index e67730d9f..60a00cb22 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/presenter/ClanIncomeFragmentPresenter.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/presenter/ClanIncomeFragmentPresenter.java @@ -1,9 +1,9 @@ -package com.pikolive.app.module_hall.income.presenter; +package com.bingchuang.app.module_hall.income.presenter; -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.app.module_hall.income.view.IClanIncomeView; -import com.pikolive.core.module_hall.income.IncomeModel; -import com.pikolive.core.module_hall.income.bean.ClanTotalIncomeInfo; +import com.bingchuang.app.base.BaseMvpPresenter; +import com.bingchuang.app.module_hall.income.view.IClanIncomeView; +import com.bingchuang.core.module_hall.income.IncomeModel; +import com.bingchuang.core.module_hall.income.bean.ClanTotalIncomeInfo; import org.jetbrains.annotations.NotNull; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/presenter/ClanIncomePresenter.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/presenter/ClanIncomePresenter.java similarity index 94% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/income/presenter/ClanIncomePresenter.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/presenter/ClanIncomePresenter.java index 36de70920..10c9cc904 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/presenter/ClanIncomePresenter.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/presenter/ClanIncomePresenter.java @@ -1,7 +1,7 @@ -package com.pikolive.app.module_hall.income.presenter; +package com.bingchuang.app.module_hall.income.presenter; -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.app.module_hall.income.view.IIncomeStatisticsView; +import com.bingchuang.app.base.BaseMvpPresenter; +import com.bingchuang.app.module_hall.income.view.IIncomeStatisticsView; import com.bingchuang.library.utils.TimeUtils; import java.text.DecimalFormat; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/presenter/HallIncomeFragmentPresenter.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/presenter/HallIncomeFragmentPresenter.java similarity index 79% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/income/presenter/HallIncomeFragmentPresenter.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/presenter/HallIncomeFragmentPresenter.java index 835221423..42d699a30 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/presenter/HallIncomeFragmentPresenter.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/presenter/HallIncomeFragmentPresenter.java @@ -1,9 +1,9 @@ -package com.pikolive.app.module_hall.income.presenter; +package com.bingchuang.app.module_hall.income.presenter; -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.app.module_hall.income.view.IHallIncomeView; -import com.pikolive.core.module_hall.income.IncomeModel; -import com.pikolive.core.module_hall.income.bean.HallTotalIncomeInfo; +import com.bingchuang.app.base.BaseMvpPresenter; +import com.bingchuang.app.module_hall.income.view.IHallIncomeView; +import com.bingchuang.core.module_hall.income.IncomeModel; +import com.bingchuang.core.module_hall.income.bean.HallTotalIncomeInfo; import org.jetbrains.annotations.NotNull; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/presenter/IncomeDetailPresenter.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/presenter/IncomeDetailPresenter.java similarity index 79% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/income/presenter/IncomeDetailPresenter.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/presenter/IncomeDetailPresenter.java index 71dd2976b..1ca76a087 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/presenter/IncomeDetailPresenter.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/presenter/IncomeDetailPresenter.java @@ -1,9 +1,9 @@ -package com.pikolive.app.module_hall.income.presenter; +package com.bingchuang.app.module_hall.income.presenter; -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.app.module_hall.income.view.IIncomeDetailView; -import com.pikolive.core.module_hall.income.IncomeModel; -import com.pikolive.core.module_hall.income.bean.IncomeGiftInfo; +import com.bingchuang.app.base.BaseMvpPresenter; +import com.bingchuang.app.module_hall.income.view.IIncomeDetailView; +import com.bingchuang.core.module_hall.income.IncomeModel; +import com.bingchuang.core.module_hall.income.bean.IncomeGiftInfo; import java.util.List; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/presenter/IncomePresenter.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/presenter/IncomePresenter.java similarity index 79% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/income/presenter/IncomePresenter.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/presenter/IncomePresenter.java index a1fdf1d4d..267360443 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/presenter/IncomePresenter.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/presenter/IncomePresenter.java @@ -1,9 +1,9 @@ -package com.pikolive.app.module_hall.income.presenter; +package com.bingchuang.app.module_hall.income.presenter; -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.app.module_hall.income.view.IIncomeView; -import com.pikolive.core.module_hall.income.IncomeModel; -import com.pikolive.core.module_hall.income.bean.IncomeTotalInfo; +import com.bingchuang.app.base.BaseMvpPresenter; +import com.bingchuang.app.module_hall.income.view.IIncomeView; +import com.bingchuang.core.module_hall.income.IncomeModel; +import com.bingchuang.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/pikolive/app/module_hall/income/presenter/IncomeStatisticsPresenter.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/presenter/IncomeStatisticsPresenter.java similarity index 95% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/income/presenter/IncomeStatisticsPresenter.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/presenter/IncomeStatisticsPresenter.java index 41c6589b7..2b561df50 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/presenter/IncomeStatisticsPresenter.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/presenter/IncomeStatisticsPresenter.java @@ -1,10 +1,10 @@ -package com.pikolive.app.module_hall.income.presenter; +package com.bingchuang.app.module_hall.income.presenter; import android.text.SpannableString; import android.text.style.RelativeSizeSpan; -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.app.module_hall.income.view.IIncomeStatisticsView; +import com.bingchuang.app.base.BaseMvpPresenter; +import com.bingchuang.app.module_hall.income.view.IIncomeStatisticsView; import com.bingchuang.library.utils.TimeUtils; import java.text.DecimalFormat; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/presenter/LiveIncomeFragmentPresenter.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/presenter/LiveIncomeFragmentPresenter.java similarity index 79% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/income/presenter/LiveIncomeFragmentPresenter.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/presenter/LiveIncomeFragmentPresenter.java index e461f4ee2..a2938d1a8 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/presenter/LiveIncomeFragmentPresenter.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/presenter/LiveIncomeFragmentPresenter.java @@ -1,9 +1,9 @@ -package com.pikolive.app.module_hall.income.presenter; +package com.bingchuang.app.module_hall.income.presenter; -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.app.module_hall.income.view.ILiveIncomeView; -import com.pikolive.core.module_hall.income.IncomeModel; -import com.pikolive.core.module_hall.income.bean.LiveTotalIncomeInfo; +import com.bingchuang.app.base.BaseMvpPresenter; +import com.bingchuang.app.module_hall.income.view.ILiveIncomeView; +import com.bingchuang.core.module_hall.income.IncomeModel; +import com.bingchuang.core.module_hall.income.bean.LiveTotalIncomeInfo; import org.jetbrains.annotations.NotNull; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/presenter/RoomIncomePresenter.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/presenter/RoomIncomePresenter.java similarity index 95% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/income/presenter/RoomIncomePresenter.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/presenter/RoomIncomePresenter.java index c9fd3433b..64c294dd0 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/presenter/RoomIncomePresenter.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/presenter/RoomIncomePresenter.java @@ -1,10 +1,10 @@ -package com.pikolive.app.module_hall.income.presenter; +package com.bingchuang.app.module_hall.income.presenter; import android.text.SpannableString; import android.text.style.RelativeSizeSpan; -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.app.module_hall.income.view.IIncomeStatisticsView; +import com.bingchuang.app.base.BaseMvpPresenter; +import com.bingchuang.app.module_hall.income.view.IIncomeStatisticsView; import com.bingchuang.library.utils.TimeUtils; import java.text.DecimalFormat; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/presenter/SingRoomIncomeFragmentPresenter.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/presenter/SingRoomIncomeFragmentPresenter.java similarity index 79% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/income/presenter/SingRoomIncomeFragmentPresenter.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/presenter/SingRoomIncomeFragmentPresenter.java index 65ba4aaeb..45a3bea3f 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/presenter/SingRoomIncomeFragmentPresenter.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/presenter/SingRoomIncomeFragmentPresenter.java @@ -1,9 +1,9 @@ -package com.pikolive.app.module_hall.income.presenter; +package com.bingchuang.app.module_hall.income.presenter; -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.app.module_hall.income.view.ISingRoomIncomeView; -import com.pikolive.core.module_hall.income.IncomeModel; -import com.pikolive.core.module_hall.income.bean.SingleRoomTotalIncomeInfo; +import com.bingchuang.app.base.BaseMvpPresenter; +import com.bingchuang.app.module_hall.income.view.ISingRoomIncomeView; +import com.bingchuang.core.module_hall.income.IncomeModel; +import com.bingchuang.core.module_hall.income.bean.SingleRoomTotalIncomeInfo; import org.jetbrains.annotations.NotNull; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/presenter/SingleRoomIncomePresenter.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/presenter/SingleRoomIncomePresenter.java similarity index 95% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/income/presenter/SingleRoomIncomePresenter.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/presenter/SingleRoomIncomePresenter.java index 163a20c18..3810c3fbe 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/presenter/SingleRoomIncomePresenter.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/presenter/SingleRoomIncomePresenter.java @@ -1,11 +1,11 @@ -package com.pikolive.app.module_hall.income.presenter; +package com.bingchuang.app.module_hall.income.presenter; import android.text.SpannableString; import android.text.style.RelativeSizeSpan; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.app.module_hall.income.view.IIncomeStatisticsView; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseMvpPresenter; +import com.bingchuang.app.module_hall.income.view.IIncomeStatisticsView; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.TimeUtils; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/view/IClanIncomeView.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/view/IClanIncomeView.java similarity index 64% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/income/view/IClanIncomeView.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/view/IClanIncomeView.java index ef5bc7092..d5366b564 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/view/IClanIncomeView.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/view/IClanIncomeView.java @@ -1,6 +1,6 @@ -package com.pikolive.app.module_hall.income.view; +package com.bingchuang.app.module_hall.income.view; -import com.pikolive.core.module_hall.income.bean.ClanTotalIncomeInfo; +import com.bingchuang.core.module_hall.income.bean.ClanTotalIncomeInfo; import com.bingchuang.library.base.IMvpBaseView; public interface IClanIncomeView extends IMvpBaseView { diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/view/IHallIncomeView.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/view/IHallIncomeView.java similarity index 64% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/income/view/IHallIncomeView.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/view/IHallIncomeView.java index 2e67af9bb..70cfd4d34 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/view/IHallIncomeView.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/view/IHallIncomeView.java @@ -1,6 +1,6 @@ -package com.pikolive.app.module_hall.income.view; +package com.bingchuang.app.module_hall.income.view; -import com.pikolive.core.module_hall.income.bean.HallTotalIncomeInfo; +import com.bingchuang.core.module_hall.income.bean.HallTotalIncomeInfo; import com.bingchuang.library.base.IMvpBaseView; public interface IHallIncomeView extends IMvpBaseView { diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/view/IIncomeDetailView.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/view/IIncomeDetailView.java similarity index 67% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/income/view/IIncomeDetailView.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/view/IIncomeDetailView.java index 1f83201c2..64a4496aa 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/view/IIncomeDetailView.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/view/IIncomeDetailView.java @@ -1,6 +1,6 @@ -package com.pikolive.app.module_hall.income.view; +package com.bingchuang.app.module_hall.income.view; -import com.pikolive.core.module_hall.income.bean.IncomeGiftInfo; +import com.bingchuang.core.module_hall.income.bean.IncomeGiftInfo; import com.bingchuang.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/view/IIncomeStatisticsView.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/view/IIncomeStatisticsView.java similarity index 68% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/income/view/IIncomeStatisticsView.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/view/IIncomeStatisticsView.java index a4312bc0a..7db5dd3cc 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/view/IIncomeStatisticsView.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/view/IIncomeStatisticsView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.income.view; +package com.bingchuang.app.module_hall.income.view; import com.bingchuang.library.base.IMvpBaseView; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/view/IIncomeView.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/view/IIncomeView.java similarity index 63% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/income/view/IIncomeView.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/view/IIncomeView.java index 3728186c8..252b05e40 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/view/IIncomeView.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/view/IIncomeView.java @@ -1,6 +1,6 @@ -package com.pikolive.app.module_hall.income.view; +package com.bingchuang.app.module_hall.income.view; -import com.pikolive.core.module_hall.income.bean.IncomeTotalInfo; +import com.bingchuang.core.module_hall.income.bean.IncomeTotalInfo; import com.bingchuang.library.base.IMvpBaseView; public interface IIncomeView extends IMvpBaseView { diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/view/ILiveIncomeView.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/view/ILiveIncomeView.java similarity index 64% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/income/view/ILiveIncomeView.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/view/ILiveIncomeView.java index 296ff040e..65d43d7d4 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/view/ILiveIncomeView.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/view/ILiveIncomeView.java @@ -1,6 +1,6 @@ -package com.pikolive.app.module_hall.income.view; +package com.bingchuang.app.module_hall.income.view; -import com.pikolive.core.module_hall.income.bean.LiveTotalIncomeInfo; +import com.bingchuang.core.module_hall.income.bean.LiveTotalIncomeInfo; import com.bingchuang.library.base.IMvpBaseView; public interface ILiveIncomeView extends IMvpBaseView { diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/view/ISingRoomIncomeView.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/view/ISingRoomIncomeView.java similarity index 63% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/income/view/ISingRoomIncomeView.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/view/ISingRoomIncomeView.java index 02521bfb5..7e26e592e 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/view/ISingRoomIncomeView.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/view/ISingRoomIncomeView.java @@ -1,6 +1,6 @@ -package com.pikolive.app.module_hall.income.view; +package com.bingchuang.app.module_hall.income.view; -import com.pikolive.core.module_hall.income.bean.SingleRoomTotalIncomeInfo; +import com.bingchuang.core.module_hall.income.bean.SingleRoomTotalIncomeInfo; import com.bingchuang.library.base.IMvpBaseView; public interface ISingRoomIncomeView extends IMvpBaseView { diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/view/LiveIncomeFragment.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/view/LiveIncomeFragment.java similarity index 89% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/income/view/LiveIncomeFragment.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/view/LiveIncomeFragment.java index e06abe4f4..b9e7c755c 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/income/view/LiveIncomeFragment.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/income/view/LiveIncomeFragment.java @@ -1,15 +1,15 @@ -package com.pikolive.app.module_hall.income.view; +package com.bingchuang.app.module_hall.income.view; import android.os.Bundle; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.pikolive.app.module_hall.income.adapter.LiveIncomeAdapter; -import com.pikolive.app.module_hall.income.presenter.LiveIncomeFragmentPresenter; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseMvpFragment; -import com.pikolive.core.module_hall.income.bean.LiveTotalIncomeInfo; +import com.bingchuang.app.module_hall.income.adapter.LiveIncomeAdapter; +import com.bingchuang.app.module_hall.income.presenter.LiveIncomeFragmentPresenter; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseMvpFragment; +import com.bingchuang.core.module_hall.income.bean.LiveTotalIncomeInfo; import com.bingchuang.library.base.factory.CreatePresenter; import com.bingchuang.library.utils.ListUtils; import com.bingchuang.library.utils.ResUtil; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/secretcode/PwdCodeMgr.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/secretcode/PwdCodeMgr.java similarity index 87% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/secretcode/PwdCodeMgr.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/secretcode/PwdCodeMgr.java index fd03dec6f..cc02573c2 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/secretcode/PwdCodeMgr.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/secretcode/PwdCodeMgr.java @@ -1,10 +1,10 @@ -package com.pikolive.app.module_hall.secretcode; +package com.bingchuang.app.module_hall.secretcode; import android.text.TextUtils; import com.google.gson.Gson; -import com.pikolive.core.module_hall.secretcode.bean.SecretCodeInfo; -import com.pikolive.core.utils.SharedPreferenceUtils; +import com.bingchuang.core.module_hall.secretcode.bean.SecretCodeInfo; +import com.bingchuang.core.utils.SharedPreferenceUtils; /** * emoji 暗号的一个缓存处理,24小时刷新 diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/team/HTeamDataManager.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/HTeamDataManager.java similarity index 90% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/team/HTeamDataManager.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/HTeamDataManager.java index f85da8391..1dced8d42 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/team/HTeamDataManager.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/HTeamDataManager.java @@ -1,10 +1,10 @@ -package com.pikolive.app.module_hall.team; +package com.bingchuang.app.module_hall.team; import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.Observer; -import com.pikolive.core.module_hall.hall.bean.HTeamInfo; +import com.bingchuang.core.module_hall.hall.bean.HTeamInfo; /** * 厅群信息的管理,只针对单个群信息 diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/team/activity/CreateHallTeamActivity.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/activity/CreateHallTeamActivity.java similarity index 90% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/team/activity/CreateHallTeamActivity.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/activity/CreateHallTeamActivity.java index 6fda2a601..c4e75aa14 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/team/activity/CreateHallTeamActivity.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/activity/CreateHallTeamActivity.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.team.activity; +package com.bingchuang.app.module_hall.team.activity; import android.annotation.SuppressLint; import android.content.Context; @@ -17,19 +17,19 @@ import androidx.recyclerview.widget.RecyclerView; import com.coorchice.library.SuperTextView; import com.netease.nim.uikit.support.glide.GlideApp; -import com.pikolive.app.module_hall.team.presenter.CreateHallTeamPresenter; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseMvpTakePhotoActivity; -import com.pikolive.app.base.list.BaseViewHolder; -import com.pikolive.app.base.list.CommonAdapter; -import com.pikolive.app.common.widget.CircleImageView; -import com.pikolive.app.module_hall.team.view.ICreateHallTeamView; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.app.utils.KeyBoardUtils; -import com.pikolive.core.module_hall.hall.bean.HTeamInfo; -import com.pikolive.core.module_hall.hall.bean.MemberInfo; -import com.pikolive.core.module_hall.team.HTeamModel; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.app.module_hall.team.presenter.CreateHallTeamPresenter; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseMvpTakePhotoActivity; +import com.bingchuang.app.base.list.BaseViewHolder; +import com.bingchuang.app.base.list.CommonAdapter; +import com.bingchuang.app.common.widget.CircleImageView; +import com.bingchuang.app.module_hall.team.view.ICreateHallTeamView; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.app.utils.KeyBoardUtils; +import com.bingchuang.core.module_hall.hall.bean.HTeamInfo; +import com.bingchuang.core.module_hall.hall.bean.MemberInfo; +import com.bingchuang.core.module_hall.team.HTeamModel; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.base.factory.CreatePresenter; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.widget.decoration.RowColumnDifItemDecoration; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/team/activity/HTeamMemberListActivity.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/activity/HTeamMemberListActivity.java similarity index 93% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/team/activity/HTeamMemberListActivity.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/activity/HTeamMemberListActivity.java index 6be0a2c8c..b3aee4d90 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/team/activity/HTeamMemberListActivity.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/activity/HTeamMemberListActivity.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.team.activity; +package com.bingchuang.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.pikolive.app.R; -import com.pikolive.app.UIHelper; -import com.pikolive.app.avroom.widget.MessageView; -import com.pikolive.app.base.BaseViewBindingActivity; -import com.pikolive.app.base.TitleBar; -import com.pikolive.app.base.list.BaseViewHolder; -import com.pikolive.app.base.list.CommonAdapter; -import com.pikolive.app.base.list.IRecyclerListener; -import com.pikolive.app.base.list.LineColorDecoration; -import com.pikolive.app.common.widget.dialog.DialogManager; -import com.pikolive.app.module_hall.HallConstant; -import com.pikolive.app.module_hall.team.adapter.HTeamMemberListAdapter; -import com.pikolive.app.team.bean.NimTeamMember; -import com.pikolive.core.module_hall.hall.bean.HTeamInfo; -import com.pikolive.core.module_hall.hall.bean.HTeamMember; -import com.pikolive.core.module_hall.team.HTeamModel; -import com.pikolive.core.module_hall.team.event.HteamMemberNumChangeEvent; -import com.pikolive.core.utils.net.BeanObserver; +import com.bingchuang.app.R; +import com.bingchuang.app.UIHelper; +import com.bingchuang.app.avroom.widget.MessageView; +import com.bingchuang.app.base.BaseViewBindingActivity; +import com.bingchuang.app.base.TitleBar; +import com.bingchuang.app.base.list.BaseViewHolder; +import com.bingchuang.app.base.list.CommonAdapter; +import com.bingchuang.app.base.list.IRecyclerListener; +import com.bingchuang.app.base.list.LineColorDecoration; +import com.bingchuang.app.common.widget.dialog.DialogManager; +import com.bingchuang.app.module_hall.HallConstant; +import com.bingchuang.app.module_hall.team.adapter.HTeamMemberListAdapter; +import com.bingchuang.app.team.bean.NimTeamMember; +import com.bingchuang.core.module_hall.hall.bean.HTeamInfo; +import com.bingchuang.core.module_hall.hall.bean.HTeamMember; +import com.bingchuang.core.module_hall.team.HTeamModel; +import com.bingchuang.core.module_hall.team.event.HteamMemberNumChangeEvent; +import com.bingchuang.core.utils.net.BeanObserver; import com.bingchuang.library.utils.ResUtil; -import com.pikolive.app.databinding.ActivityHteamMemberListBinding; +import com.bingchuang.app.databinding.ActivityHteamMemberListBinding; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/team/activity/HallTeamMessageActivity.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/activity/HallTeamMessageActivity.java similarity index 93% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/team/activity/HallTeamMessageActivity.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/activity/HallTeamMessageActivity.java index b1dbfa553..465c80626 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/team/activity/HallTeamMessageActivity.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/activity/HallTeamMessageActivity.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.team.activity; +package com.bingchuang.app.module_hall.team.activity; import android.content.Context; import android.content.Intent; @@ -26,21 +26,21 @@ 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.pikolive.app.R; -import com.pikolive.app.module_hall.team.HTeamDataManager; -import com.pikolive.app.module_hall.team.adapter.HTeamMemberListAdapter; -import com.pikolive.app.team.view.NimTeamManagementActivity; -import com.pikolive.app.team.view.NimTeamMessageFragment; -import com.pikolive.app.team.viewmodel.TeamVM; -import com.pikolive.app.ui.im.avtivity.BaseMessageActivity; -import com.pikolive.core.initial.InitialModel; -import com.pikolive.core.initial.bean.InitInfo; -import com.pikolive.core.level.UserLevelVo; -import com.pikolive.core.module_hall.hall.bean.HTeamInfo; -import com.pikolive.core.module_hall.team.HTeamModel; -import com.pikolive.core.team.bean.TeamEvent; -import com.pikolive.core.user.UserModel; -import com.pikolive.core.user.bean.UserInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.module_hall.team.HTeamDataManager; +import com.bingchuang.app.module_hall.team.adapter.HTeamMemberListAdapter; +import com.bingchuang.app.team.view.NimTeamManagementActivity; +import com.bingchuang.app.team.view.NimTeamMessageFragment; +import com.bingchuang.app.team.viewmodel.TeamVM; +import com.bingchuang.app.ui.im.avtivity.BaseMessageActivity; +import com.bingchuang.core.initial.InitialModel; +import com.bingchuang.core.initial.bean.InitInfo; +import com.bingchuang.core.level.UserLevelVo; +import com.bingchuang.core.module_hall.hall.bean.HTeamInfo; +import com.bingchuang.core.module_hall.team.HTeamModel; +import com.bingchuang.core.team.bean.TeamEvent; +import com.bingchuang.core.user.UserModel; +import com.bingchuang.core.user.bean.UserInfo; import com.bingchuang.library.rxbus.RxBus; import com.bingchuang.library.utils.ResUtil; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/team/activity/SelectTeamMemberActivity.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/activity/SelectTeamMemberActivity.java similarity index 87% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/team/activity/SelectTeamMemberActivity.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/activity/SelectTeamMemberActivity.java index c294f91a3..2ffde193e 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/team/activity/SelectTeamMemberActivity.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/activity/SelectTeamMemberActivity.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.team.activity; +package com.bingchuang.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.pikolive.app.module_hall.HallDataManager; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseViewBindingActivity; -import com.pikolive.app.base.TitleBar; -import com.pikolive.app.base.list.BaseViewHolder; -import com.pikolive.app.base.list.CommonAdapter; -import com.pikolive.app.base.list.IRecyclerListener; -import com.pikolive.app.base.list.LineColorDecoration; -import com.pikolive.app.module_hall.HallConstant; -import com.pikolive.app.module_hall.team.adapter.SelectTeamMemberAdapter; -import com.pikolive.core.module_hall.hall.HallModel; -import com.pikolive.core.module_hall.hall.bean.ListMemberInfo; -import com.pikolive.core.module_hall.hall.bean.MemberInfo; -import com.pikolive.core.module_hall.team.HTeamModel; -import com.pikolive.core.utils.net.BeanObserver; +import com.bingchuang.app.module_hall.HallDataManager; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseViewBindingActivity; +import com.bingchuang.app.base.TitleBar; +import com.bingchuang.app.base.list.BaseViewHolder; +import com.bingchuang.app.base.list.CommonAdapter; +import com.bingchuang.app.base.list.IRecyclerListener; +import com.bingchuang.app.base.list.LineColorDecoration; +import com.bingchuang.app.module_hall.HallConstant; +import com.bingchuang.app.module_hall.team.adapter.SelectTeamMemberAdapter; +import com.bingchuang.core.module_hall.hall.HallModel; +import com.bingchuang.core.module_hall.hall.bean.ListMemberInfo; +import com.bingchuang.core.module_hall.hall.bean.MemberInfo; +import com.bingchuang.core.module_hall.team.HTeamModel; +import com.bingchuang.core.utils.net.BeanObserver; import com.bingchuang.library.utils.ResUtil; -import com.pikolive.app.databinding.ActivitySelectGroupMemberBinding; +import com.bingchuang.app.databinding.ActivitySelectGroupMemberBinding; import java.util.ArrayList; import java.util.List; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/team/activity/TeamEditActivity.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/activity/TeamEditActivity.java similarity index 88% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/team/activity/TeamEditActivity.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/activity/TeamEditActivity.java index dd829fa31..cf98f1899 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/team/activity/TeamEditActivity.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/activity/TeamEditActivity.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.team.activity; +package com.bingchuang.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.pikolive.app.R; -import com.pikolive.app.base.BaseViewBindingActivity; -import com.pikolive.app.base.TitleBar; -import com.pikolive.app.module_hall.HallConstant; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.pikolive.core.module_hall.hall.bean.HTeamInfo; -import com.pikolive.core.module_hall.team.HTeamModel; -import com.pikolive.core.utils.net.BeanObserver; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseViewBindingActivity; +import com.bingchuang.app.base.TitleBar; +import com.bingchuang.app.module_hall.HallConstant; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.core.module_hall.hall.bean.HTeamInfo; +import com.bingchuang.core.module_hall.team.HTeamModel; +import com.bingchuang.core.utils.net.BeanObserver; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.utils.ResUtil; -import com.pikolive.app.databinding.ActivityTeamEditBinding; +import com.bingchuang.app.databinding.ActivityTeamEditBinding; /** * 群公告,群名称编辑 diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/team/activity/TeamInfoShowActivity.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/activity/TeamInfoShowActivity.java similarity index 92% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/team/activity/TeamInfoShowActivity.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/activity/TeamInfoShowActivity.java index d6736c8b7..0bcbc6792 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/team/activity/TeamInfoShowActivity.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/activity/TeamInfoShowActivity.java @@ -1,4 +1,4 @@ -package com.pikolive.app.module_hall.team.activity; +package com.bingchuang.app.module_hall.team.activity; import android.content.Context; import android.content.Intent; @@ -13,24 +13,24 @@ 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.pikolive.app.module_hall.team.presenter.TeamInfoShowPresenter; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseMvpTakePhotoActivity; -import com.pikolive.app.common.widget.CircleImageView; -import com.pikolive.app.common.widget.TutuSwitchView; -import com.pikolive.app.common.widget.dialog.DialogManager; -import com.pikolive.app.module_hall.team.adapter.HTeamMemberListAdapter; -import com.pikolive.app.module_hall.team.view.ITeamInfoShowView; -import com.pikolive.app.module_hall.team.view.widget.GridMemberView; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.app.ui.widget.ButtonItem; -import com.pikolive.core.module_hall.hall.bean.HTeamInfo; -import com.pikolive.core.module_hall.hall.bean.HTeamMember; -import com.pikolive.core.module_hall.hall.bean.RoleType; -import com.pikolive.core.module_hall.team.HTeamModel; -import com.pikolive.core.module_hall.team.bean.HTeamType; -import com.pikolive.core.module_hall.team.event.HteamInfoUpdateInfoEvent; -import com.pikolive.core.utils.net.BeanObserver; +import com.bingchuang.app.module_hall.team.presenter.TeamInfoShowPresenter; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseMvpTakePhotoActivity; +import com.bingchuang.app.common.widget.CircleImageView; +import com.bingchuang.app.common.widget.TutuSwitchView; +import com.bingchuang.app.common.widget.dialog.DialogManager; +import com.bingchuang.app.module_hall.team.adapter.HTeamMemberListAdapter; +import com.bingchuang.app.module_hall.team.view.ITeamInfoShowView; +import com.bingchuang.app.module_hall.team.view.widget.GridMemberView; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.app.ui.widget.ButtonItem; +import com.bingchuang.core.module_hall.hall.bean.HTeamInfo; +import com.bingchuang.core.module_hall.hall.bean.HTeamMember; +import com.bingchuang.core.module_hall.hall.bean.RoleType; +import com.bingchuang.core.module_hall.team.HTeamModel; +import com.bingchuang.core.module_hall.team.bean.HTeamType; +import com.bingchuang.core.module_hall.team.event.HteamInfoUpdateInfoEvent; +import com.bingchuang.core.utils.net.BeanObserver; import com.bingchuang.library.base.factory.CreatePresenter; import com.bingchuang.library.utils.ResUtil; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/team/adapter/HTeamMemberListAdapter.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/adapter/HTeamMemberListAdapter.java similarity index 90% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/team/adapter/HTeamMemberListAdapter.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/adapter/HTeamMemberListAdapter.java index 498bfe4fc..f280704dd 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/team/adapter/HTeamMemberListAdapter.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/adapter/HTeamMemberListAdapter.java @@ -1,15 +1,15 @@ -package com.pikolive.app.module_hall.team.adapter; +package com.bingchuang.app.module_hall.team.adapter; import android.view.View; import android.widget.ImageView; -import com.pikolive.app.R; -import com.pikolive.app.base.list.BaseViewHolder; -import com.pikolive.app.base.list.CommonAdapter; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.app.ui.widget.UserInfoView; -import com.pikolive.core.module_hall.hall.bean.HTeamMember; -import com.pikolive.core.user.UserModel; +import com.bingchuang.app.R; +import com.bingchuang.app.base.list.BaseViewHolder; +import com.bingchuang.app.base.list.CommonAdapter; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.app.ui.widget.UserInfoView; +import com.bingchuang.core.module_hall.hall.bean.HTeamMember; +import com.bingchuang.core.user.UserModel; /** * 厅群成员列表 diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/team/adapter/SelectTeamMemberAdapter.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/adapter/SelectTeamMemberAdapter.java similarity index 75% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/team/adapter/SelectTeamMemberAdapter.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/adapter/SelectTeamMemberAdapter.java index 72cde28ba..1c225f3c4 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/team/adapter/SelectTeamMemberAdapter.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/adapter/SelectTeamMemberAdapter.java @@ -1,16 +1,16 @@ -package com.pikolive.app.module_hall.team.adapter; +package com.bingchuang.app.module_hall.team.adapter; import android.view.View; import android.widget.ImageView; -import com.pikolive.app.R; -import com.pikolive.app.base.list.BaseViewHolder; -import com.pikolive.app.base.list.CommonAdapter; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.app.ui.widget.UserInfoView; -import com.pikolive.core.module_hall.hall.bean.MemberInfo; -import com.pikolive.core.module_hall.hall.bean.RoleType; -import com.pikolive.core.user.UserModel; +import com.bingchuang.app.R; +import com.bingchuang.app.base.list.BaseViewHolder; +import com.bingchuang.app.base.list.CommonAdapter; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.app.ui.widget.UserInfoView; +import com.bingchuang.core.module_hall.hall.bean.MemberInfo; +import com.bingchuang.core.module_hall.hall.bean.RoleType; +import com.bingchuang.core.user.UserModel; /** * 选择厅成员 diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/team/presenter/CreateHallTeamPresenter.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/presenter/CreateHallTeamPresenter.java similarity index 74% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/team/presenter/CreateHallTeamPresenter.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/presenter/CreateHallTeamPresenter.java index 5ee8de37e..b83a4ebe1 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/team/presenter/CreateHallTeamPresenter.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/presenter/CreateHallTeamPresenter.java @@ -1,12 +1,12 @@ -package com.pikolive.app.module_hall.team.presenter; +package com.bingchuang.app.module_hall.team.presenter; -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.app.module_hall.HallDataManager; -import com.pikolive.app.module_hall.team.view.ICreateHallTeamView; -import com.pikolive.core.module_hall.hall.bean.HTeamInfo; -import com.pikolive.core.module_hall.hall.bean.MemberInfo; -import com.pikolive.core.module_hall.team.HTeamModel; -import com.pikolive.core.utils.net.BeanObserver; +import com.bingchuang.app.base.BaseMvpPresenter; +import com.bingchuang.app.module_hall.HallDataManager; +import com.bingchuang.app.module_hall.team.view.ICreateHallTeamView; +import com.bingchuang.core.module_hall.hall.bean.HTeamInfo; +import com.bingchuang.core.module_hall.hall.bean.MemberInfo; +import com.bingchuang.core.module_hall.team.HTeamModel; +import com.bingchuang.core.utils.net.BeanObserver; import com.bingchuang.library.base.PresenterEvent; import java.util.List; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/team/presenter/TeamInfoShowPresenter.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/presenter/TeamInfoShowPresenter.java similarity index 82% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/team/presenter/TeamInfoShowPresenter.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/presenter/TeamInfoShowPresenter.java index 706da4178..ab9654e0a 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/team/presenter/TeamInfoShowPresenter.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/presenter/TeamInfoShowPresenter.java @@ -1,10 +1,10 @@ -package com.pikolive.app.module_hall.team.presenter; +package com.bingchuang.app.module_hall.team.presenter; -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.app.module_hall.team.view.ITeamInfoShowView; -import com.pikolive.core.module_hall.hall.bean.HTeamInfo; -import com.pikolive.core.module_hall.team.HTeamModel; -import com.pikolive.core.utils.net.BeanObserver; +import com.bingchuang.app.base.BaseMvpPresenter; +import com.bingchuang.app.module_hall.team.view.ITeamInfoShowView; +import com.bingchuang.core.module_hall.hall.bean.HTeamInfo; +import com.bingchuang.core.module_hall.team.HTeamModel; +import com.bingchuang.core.utils.net.BeanObserver; import com.bingchuang.library.base.PresenterEvent; /** diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/team/view/ICreateHallTeamView.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/view/ICreateHallTeamView.java similarity index 69% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/team/view/ICreateHallTeamView.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/view/ICreateHallTeamView.java index ca986fe26..03151dae6 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/team/view/ICreateHallTeamView.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/view/ICreateHallTeamView.java @@ -1,6 +1,6 @@ -package com.pikolive.app.module_hall.team.view; +package com.bingchuang.app.module_hall.team.view; -import com.pikolive.core.module_hall.hall.bean.HTeamInfo; +import com.bingchuang.core.module_hall.hall.bean.HTeamInfo; import com.bingchuang.library.base.IMvpBaseView; /** diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/team/view/ITeamInfoShowView.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/view/ITeamInfoShowView.java similarity index 75% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/team/view/ITeamInfoShowView.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/view/ITeamInfoShowView.java index 8ed857396..e1fb26148 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/team/view/ITeamInfoShowView.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/view/ITeamInfoShowView.java @@ -1,6 +1,6 @@ -package com.pikolive.app.module_hall.team.view; +package com.bingchuang.app.module_hall.team.view; -import com.pikolive.core.module_hall.hall.bean.HTeamInfo; +import com.bingchuang.core.module_hall.hall.bean.HTeamInfo; import com.bingchuang.library.base.IMvpBaseView; /** diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/team/view/widget/GridMemberView.java b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/view/widget/GridMemberView.java similarity index 89% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/team/view/widget/GridMemberView.java rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/view/widget/GridMemberView.java index 69febc995..6922562b9 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/team/view/widget/GridMemberView.java +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/team/view/widget/GridMemberView.java @@ -1,12 +1,12 @@ -package com.pikolive.app.module_hall.team.view.widget; +package com.bingchuang.app.module_hall.team.view.widget; import android.content.Context; import android.util.AttributeSet; import com.google.android.flexbox.FlexboxLayout; -import com.pikolive.app.common.widget.CircleImageView; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.app.common.widget.CircleImageView; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; import com.bingchuang.library.utils.ListUtils; import java.util.List; diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/viewmodel/AssociationViewModel.kt b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/viewmodel/AssociationViewModel.kt similarity index 83% rename from app/src/module_labour_union/java/com/pikolive/app/module_hall/viewmodel/AssociationViewModel.kt rename to app/src/module_labour_union/java/com/bingchuang/app/module_hall/viewmodel/AssociationViewModel.kt index 39fb9dfb6..79991f146 100644 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/viewmodel/AssociationViewModel.kt +++ b/app/src/module_labour_union/java/com/bingchuang/app/module_hall/viewmodel/AssociationViewModel.kt @@ -1,11 +1,11 @@ -package com.pikolive.app.module_hall.viewmodel +package com.bingchuang.app.module_hall.viewmodel import androidx.lifecycle.MutableLiveData -import com.pikolive.app.base.BaseViewModel -import com.pikolive.core2.association.bean.ClanListInfo -import com.pikolive.core2.association.bean.HallListInfo -import com.pikolive.core2.association.bean.MemberExchangeInfo -import com.pikolive.core2.association.model.AssociationModel +import com.bingchuang.app.base.BaseViewModel +import com.bingchuang.core2.association.bean.ClanListInfo +import com.bingchuang.core2.association.bean.HallListInfo +import com.bingchuang.core2.association.bean.MemberExchangeInfo +import com.bingchuang.core2.association.model.AssociationModel class AssociationViewModel : BaseViewModel() { diff --git a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/presenter/AddMemberPresenter.java b/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/presenter/AddMemberPresenter.java deleted file mode 100644 index 9bee598c7..000000000 --- a/app/src/module_labour_union/java/com/pikolive/app/module_hall/hall/presenter/AddMemberPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.pikolive.app.module_hall.hall.presenter; - -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.app.module_hall.hall.view.IAddMemberView; - -public class AddMemberPresenter extends BaseMvpPresenter { -} 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 bd31e9ad0..cb60eb3b8 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 1ea7d683e..4be6e0c67 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 d276e8e37..14e923bda 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 a04c55346..59fa262af 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" /> - - + tools:context="com.bingchuang.app.module_hall.hall.activity.ExchangePermissionActivity"> - - - @@ -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 58f92f940..0a1153e21 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 53d8e6e2c..fec871095 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.bingchuang.app.module_hall.hall.activity.ModuleHallActivity"> - + android:background="@color/bg_normal_1c1b22"> + android:layout_height="match_parent"> - - +@@ -33,7 +31,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 2972962ec..c8248a39e 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 67a2565a4..4a664f4cf 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 f10a11f13..f65c7040d 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 81b1a5795..4b64549f8 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 239ce675b..db789b97c 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 3f47fbdf9..785b80eb8 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.bingchuang.core.user.bean.LiveTagInfo.LiveSkillVoListBean" /> - - - - - - { diff --git a/app/src/module_mentoring_relationship/java/com/pikolive/app/mentoring_relationship/adapter/ResultMarqueeAdapter.java b/app/src/module_mentoring_relationship/java/com/bingchuang/app/mentoring_relationship/adapter/ResultMarqueeAdapter.java similarity index 90% rename from app/src/module_mentoring_relationship/java/com/pikolive/app/mentoring_relationship/adapter/ResultMarqueeAdapter.java rename to app/src/module_mentoring_relationship/java/com/bingchuang/app/mentoring_relationship/adapter/ResultMarqueeAdapter.java index 6f41ff83a..166e612c1 100644 --- a/app/src/module_mentoring_relationship/java/com/pikolive/app/mentoring_relationship/adapter/ResultMarqueeAdapter.java +++ b/app/src/module_mentoring_relationship/java/com/bingchuang/app/mentoring_relationship/adapter/ResultMarqueeAdapter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.mentoring_relationship.adapter; +package com.bingchuang.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.pikolive.app.R; -import com.pikolive.app.ui.widget.marqueeview.BetterMarqueeView; -import com.pikolive.core.mentoring_relationship.bean.MentoringResultMarqueeInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.widget.marqueeview.BetterMarqueeView; +import com.bingchuang.core.mentoring_relationship.bean.MentoringResultMarqueeInfo; import java.util.ArrayList; import java.util.List; diff --git a/app/src/module_mentoring_relationship/java/com/pikolive/app/mentoring_relationship/dialog/BuildMentoringRelationshipSuccessDialog.java b/app/src/module_mentoring_relationship/java/com/bingchuang/app/mentoring_relationship/dialog/BuildMentoringRelationshipSuccessDialog.java similarity index 91% rename from app/src/module_mentoring_relationship/java/com/pikolive/app/mentoring_relationship/dialog/BuildMentoringRelationshipSuccessDialog.java rename to app/src/module_mentoring_relationship/java/com/bingchuang/app/mentoring_relationship/dialog/BuildMentoringRelationshipSuccessDialog.java index c4c29ccb9..d3f1804bd 100644 --- a/app/src/module_mentoring_relationship/java/com/pikolive/app/mentoring_relationship/dialog/BuildMentoringRelationshipSuccessDialog.java +++ b/app/src/module_mentoring_relationship/java/com/bingchuang/app/mentoring_relationship/dialog/BuildMentoringRelationshipSuccessDialog.java @@ -1,4 +1,4 @@ -package com.pikolive.app.mentoring_relationship.dialog; +package com.bingchuang.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.pikolive.app.R; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; public class BuildMentoringRelationshipSuccessDialog extends DialogFragment { diff --git a/app/src/module_mentoring_relationship/java/com/pikolive/app/mentoring_relationship/dialog/GrabApprenticesNoticeDialog.java b/app/src/module_mentoring_relationship/java/com/bingchuang/app/mentoring_relationship/dialog/GrabApprenticesNoticeDialog.java similarity index 93% rename from app/src/module_mentoring_relationship/java/com/pikolive/app/mentoring_relationship/dialog/GrabApprenticesNoticeDialog.java rename to app/src/module_mentoring_relationship/java/com/bingchuang/app/mentoring_relationship/dialog/GrabApprenticesNoticeDialog.java index 6c61b932c..2e9ecf52e 100644 --- a/app/src/module_mentoring_relationship/java/com/pikolive/app/mentoring_relationship/dialog/GrabApprenticesNoticeDialog.java +++ b/app/src/module_mentoring_relationship/java/com/bingchuang/app/mentoring_relationship/dialog/GrabApprenticesNoticeDialog.java @@ -1,4 +1,4 @@ -package com.pikolive.app.mentoring_relationship.dialog; +package com.bingchuang.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.pikolive.app.MainActivity; -import com.pikolive.app.R; -import com.pikolive.app.avroom.activity.AVRoomActivity; -import com.pikolive.app.common.permission.StatusBarCompat; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.app.MainActivity; +import com.bingchuang.app.R; +import com.bingchuang.app.avroom.activity.AVRoomActivity; +import com.bingchuang.app.common.permission.StatusBarCompat; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; import java.util.concurrent.TimeUnit; diff --git a/app/src/module_mentoring_relationship/java/com/pikolive/app/mentoring_relationship/dialog/ReleaseMentoringRelationshipSuccessDialog.java b/app/src/module_mentoring_relationship/java/com/bingchuang/app/mentoring_relationship/dialog/ReleaseMentoringRelationshipSuccessDialog.java similarity index 92% rename from app/src/module_mentoring_relationship/java/com/pikolive/app/mentoring_relationship/dialog/ReleaseMentoringRelationshipSuccessDialog.java rename to app/src/module_mentoring_relationship/java/com/bingchuang/app/mentoring_relationship/dialog/ReleaseMentoringRelationshipSuccessDialog.java index 522813caf..6bca5fd79 100644 --- a/app/src/module_mentoring_relationship/java/com/pikolive/app/mentoring_relationship/dialog/ReleaseMentoringRelationshipSuccessDialog.java +++ b/app/src/module_mentoring_relationship/java/com/bingchuang/app/mentoring_relationship/dialog/ReleaseMentoringRelationshipSuccessDialog.java @@ -1,4 +1,4 @@ -package com.pikolive.app.mentoring_relationship.dialog; +package com.bingchuang.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.pikolive.app.R; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; public class ReleaseMentoringRelationshipSuccessDialog extends DialogFragment implements View.OnClickListener { diff --git a/app/src/module_mentoring_relationship/java/com/pikolive/app/mentoring_relationship/presenter/MentoringRelationshipPresenter.java b/app/src/module_mentoring_relationship/java/com/bingchuang/app/mentoring_relationship/presenter/MentoringRelationshipPresenter.java similarity index 92% rename from app/src/module_mentoring_relationship/java/com/pikolive/app/mentoring_relationship/presenter/MentoringRelationshipPresenter.java rename to app/src/module_mentoring_relationship/java/com/bingchuang/app/mentoring_relationship/presenter/MentoringRelationshipPresenter.java index fc808475e..77252f356 100644 --- a/app/src/module_mentoring_relationship/java/com/pikolive/app/mentoring_relationship/presenter/MentoringRelationshipPresenter.java +++ b/app/src/module_mentoring_relationship/java/com/bingchuang/app/mentoring_relationship/presenter/MentoringRelationshipPresenter.java @@ -1,13 +1,13 @@ -package com.pikolive.app.mentoring_relationship.presenter; +package com.bingchuang.app.mentoring_relationship.presenter; import android.annotation.SuppressLint; -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.core.Constants; -import com.pikolive.core.exception.FailReasonException; -import com.pikolive.core.mentoring_relationship.bean.MentoringRankingDataInfo; -import com.pikolive.core.mentoring_relationship.model.MentoringRelationshipModel; -import com.pikolive.core.mentoring_relationship.view.IMentoringRelationshipView; +import com.bingchuang.app.base.BaseMvpPresenter; +import com.bingchuang.core.Constants; +import com.bingchuang.core.exception.FailReasonException; +import com.bingchuang.core.mentoring_relationship.bean.MentoringRankingDataInfo; +import com.bingchuang.core.mentoring_relationship.model.MentoringRelationshipModel; +import com.bingchuang.core.mentoring_relationship.view.IMentoringRelationshipView; import com.bingchuang.library.base.PresenterEvent; import com.bingchuang.library.utils.ListUtils; 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 794a78635..e18f52b41 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/pikolive/app/miniworld/activity/AllTopicActivity.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/activity/AllTopicActivity.java similarity index 83% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/activity/AllTopicActivity.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/activity/AllTopicActivity.java index ecd9342d1..afa86f745 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/activity/AllTopicActivity.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/activity/AllTopicActivity.java @@ -1,4 +1,4 @@ -package com.pikolive.app.miniworld.activity; +package com.bingchuang.app.miniworld.activity; import android.content.Context; import android.content.Intent; @@ -11,22 +11,22 @@ import androidx.fragment.app.Fragment; import androidx.viewpager.widget.ViewPager; import com.netease.nim.uikit.StatusBarUtil; -import com.pikolive.app.miniworld.fragment.MiniWorldCategoryFragment; -import com.pikolive.app.miniworld.presenter.MiniWorldPresenter; -import com.pikolive.app.miniworld.view.IMiniWorldView; -import com.pikolive.app.R; -import com.pikolive.app.avroom.adapter.RoomContributeListAdapter; -import com.pikolive.app.base.BaseMvpActivity; -import com.pikolive.app.ui.widget.magicindicator.MagicIndicator; -import com.pikolive.app.ui.widget.magicindicator.ViewPagerHelper; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.titles.SimplePagerTitleView; -import com.pikolive.core.miniworld.bean.MiniWorldCategoryInfo; +import com.bingchuang.app.miniworld.fragment.MiniWorldCategoryFragment; +import com.bingchuang.app.miniworld.presenter.MiniWorldPresenter; +import com.bingchuang.app.miniworld.view.IMiniWorldView; +import com.bingchuang.app.R; +import com.bingchuang.app.avroom.adapter.RoomContributeListAdapter; +import com.bingchuang.app.base.BaseMvpActivity; +import com.bingchuang.app.ui.widget.magicindicator.MagicIndicator; +import com.bingchuang.app.ui.widget.magicindicator.ViewPagerHelper; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.titles.SimplePagerTitleView; +import com.bingchuang.core.miniworld.bean.MiniWorldCategoryInfo; import com.bingchuang.library.base.factory.CreatePresenter; import com.bingchuang.library.utils.ListUtils; import com.bingchuang.library.utils.ResUtil; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/activity/AudioPartyDialog.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/activity/AudioPartyDialog.java similarity index 93% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/activity/AudioPartyDialog.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/activity/AudioPartyDialog.java index 21e1adb7e..193e78e05 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/activity/AudioPartyDialog.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/activity/AudioPartyDialog.java @@ -1,4 +1,4 @@ -package com.pikolive.app.miniworld.activity; +package com.bingchuang.app.miniworld.activity; import android.app.Activity; import android.app.Dialog; @@ -22,17 +22,17 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.pikolive.app.miniworld.adapter.AudioPartyAdapter; -import com.pikolive.app.miniworld.presenter.AudioPartyDialogPresenter; -import com.pikolive.app.miniworld.view.IAudioPartyDialogView; -import com.pikolive.app.R; -import com.pikolive.app.avroom.activity.AVRoomActivity; -import com.pikolive.core.Constants; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.miniworld.bean.AudioPartyInfo; -import com.pikolive.core.miniworld.bean.AudioPartyItem; -import com.pikolive.core.miniworld.model.MiniWorldHelper; -import com.pikolive.core.admin.util.SuperAdminUtil; +import com.bingchuang.app.miniworld.adapter.AudioPartyAdapter; +import com.bingchuang.app.miniworld.presenter.AudioPartyDialogPresenter; +import com.bingchuang.app.miniworld.view.IAudioPartyDialogView; +import com.bingchuang.app.R; +import com.bingchuang.app.avroom.activity.AVRoomActivity; +import com.bingchuang.core.Constants; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.miniworld.bean.AudioPartyInfo; +import com.bingchuang.core.miniworld.bean.AudioPartyItem; +import com.bingchuang.core.miniworld.model.MiniWorldHelper; +import com.bingchuang.core.admin.util.SuperAdminUtil; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.SingleToastUtil; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/activity/MWTeamRoomMessageAct.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/activity/MWTeamRoomMessageAct.java similarity index 92% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/activity/MWTeamRoomMessageAct.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/activity/MWTeamRoomMessageAct.java index 136be6c62..39f9fb419 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/activity/MWTeamRoomMessageAct.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/activity/MWTeamRoomMessageAct.java @@ -1,4 +1,4 @@ -package com.pikolive.app.miniworld.activity; +package com.bingchuang.app.miniworld.activity; import android.annotation.SuppressLint; import android.content.Context; @@ -28,45 +28,45 @@ import com.netease.nimlib.sdk.msg.model.IMMessage; 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.pikolive.app.miniworld.presenter.MWTeamMessagePresenter; -import com.pikolive.app.miniworld.view.IMWTeamMessageView; +import com.bingchuang.app.miniworld.presenter.MWTeamMessagePresenter; +import com.bingchuang.app.miniworld.view.IMWTeamMessageView; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.pikolive.app.R; -import com.pikolive.app.avroom.ButtonItemFactory; -import com.pikolive.app.avroom.activity.AVRoomActivity; -import com.pikolive.app.avroom.widget.EditRoomTitleDialog; -import com.pikolive.app.avroom.widget.ViewItem; -import com.pikolive.app.common.widget.dialog.DialogManager; -import com.pikolive.app.home.presenter.MainFragmentPresenter; -import com.pikolive.app.team.view.NimTeamMessageFragment; -import com.pikolive.app.ui.gift.callback.OnGiftDialogBtnClickListenerWrapper; -import com.pikolive.app.ui.im.avtivity.BaseMessageActivity; -import com.pikolive.app.ui.widget.GiftDialog; -import com.pikolive.app.ui.widget.UserInfoDialog; -import com.pikolive.app.ui.widget.dialog.OpenNobleDialog; -import com.pikolive.app.utils.CertificateHelper; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.gift.GiftModel; -import com.pikolive.core.gift.bean.GiftInfo; -import com.pikolive.core.gift.toolbox.GiftToolbox; -import com.pikolive.core.initial.InitialModel; -import com.pikolive.core.initial.bean.InitInfo; -import com.pikolive.core.level.UserLevelVo; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core.miniworld.bean.MWChatInfo; -import com.pikolive.core.miniworld.bean.OpenAudioPartyAttachment; -import com.pikolive.core.miniworld.event.MWChatTopicEvent; -import com.pikolive.core.miniworld.model.MiniWorldHelper; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.room.model.AvRoomModel; -import com.pikolive.core.room.model.RoomSettingModel; -import com.pikolive.core.room.queue.bean.MicMemberInfo; -import com.pikolive.core.team.bean.TeamEvent; -import com.pikolive.core.user.UserModel; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.utils.ActivityUtil; -import com.pikolive.core.utils.SharedPreferenceUtils; -import com.pikolive.core.utils.net.BeanObserver; +import com.bingchuang.app.R; +import com.bingchuang.app.avroom.ButtonItemFactory; +import com.bingchuang.app.avroom.activity.AVRoomActivity; +import com.bingchuang.app.avroom.widget.EditRoomTitleDialog; +import com.bingchuang.app.avroom.widget.ViewItem; +import com.bingchuang.app.common.widget.dialog.DialogManager; +import com.bingchuang.app.home.presenter.MainFragmentPresenter; +import com.bingchuang.app.team.view.NimTeamMessageFragment; +import com.bingchuang.app.ui.gift.callback.OnGiftDialogBtnClickListenerWrapper; +import com.bingchuang.app.ui.im.avtivity.BaseMessageActivity; +import com.bingchuang.app.ui.widget.GiftDialog; +import com.bingchuang.app.ui.widget.UserInfoDialog; +import com.bingchuang.app.ui.widget.dialog.OpenNobleDialog; +import com.bingchuang.app.utils.CertificateHelper; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.gift.GiftModel; +import com.bingchuang.core.gift.bean.GiftInfo; +import com.bingchuang.core.gift.toolbox.GiftToolbox; +import com.bingchuang.core.initial.InitialModel; +import com.bingchuang.core.initial.bean.InitInfo; +import com.bingchuang.core.level.UserLevelVo; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core.miniworld.bean.MWChatInfo; +import com.bingchuang.core.miniworld.bean.OpenAudioPartyAttachment; +import com.bingchuang.core.miniworld.event.MWChatTopicEvent; +import com.bingchuang.core.miniworld.model.MiniWorldHelper; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.room.model.AvRoomModel; +import com.bingchuang.core.room.model.RoomSettingModel; +import com.bingchuang.core.room.queue.bean.MicMemberInfo; +import com.bingchuang.core.team.bean.TeamEvent; +import com.bingchuang.core.user.UserModel; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.utils.ActivityUtil; +import com.bingchuang.core.utils.SharedPreferenceUtils; +import com.bingchuang.core.utils.net.BeanObserver; import com.bingchuang.library.net.rxnet.callback.CallBack; import com.bingchuang.library.rxbus.RxBus; import com.bingchuang.library.utils.ResUtil; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/activity/MiniWorldActivity.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/activity/MiniWorldActivity.java similarity index 85% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/activity/MiniWorldActivity.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/activity/MiniWorldActivity.java index 8d859a35e..a6a85861b 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/activity/MiniWorldActivity.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/activity/MiniWorldActivity.java @@ -1,4 +1,4 @@ -package com.pikolive.app.miniworld.activity; +package com.bingchuang.app.miniworld.activity; import android.content.Context; import android.content.Intent; @@ -10,22 +10,22 @@ import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import androidx.viewpager.widget.ViewPager; -import com.pikolive.app.miniworld.fragment.MiniWorldCategoryFragment; -import com.pikolive.app.miniworld.presenter.MiniWorldPresenter; -import com.pikolive.app.miniworld.view.IMiniWorldView; -import com.pikolive.app.R; -import com.pikolive.app.avroom.adapter.RoomContributeListAdapter; -import com.pikolive.app.base.BaseMvpActivity; -import com.pikolive.app.ui.widget.magicindicator.MagicIndicator; -import com.pikolive.app.ui.widget.magicindicator.ViewPagerHelper; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.titles.SimplePagerTitleView; -import com.pikolive.core.miniworld.bean.MiniWorldCategoryInfo; +import com.bingchuang.app.miniworld.fragment.MiniWorldCategoryFragment; +import com.bingchuang.app.miniworld.presenter.MiniWorldPresenter; +import com.bingchuang.app.miniworld.view.IMiniWorldView; +import com.bingchuang.app.R; +import com.bingchuang.app.avroom.adapter.RoomContributeListAdapter; +import com.bingchuang.app.base.BaseMvpActivity; +import com.bingchuang.app.ui.widget.magicindicator.MagicIndicator; +import com.bingchuang.app.ui.widget.magicindicator.ViewPagerHelper; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.titles.SimplePagerTitleView; +import com.bingchuang.core.miniworld.bean.MiniWorldCategoryInfo; import com.bingchuang.library.base.factory.CreatePresenter; import com.bingchuang.library.utils.ListUtils; import com.bingchuang.library.utils.ResUtil; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/activity/MiniWorldEditActivity.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/activity/MiniWorldEditActivity.java similarity index 95% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/activity/MiniWorldEditActivity.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/activity/MiniWorldEditActivity.java index 7273ea93e..0e239d50d 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/activity/MiniWorldEditActivity.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/activity/MiniWorldEditActivity.java @@ -1,4 +1,4 @@ -package com.pikolive.app.miniworld.activity; +package com.bingchuang.app.miniworld.activity; import android.Manifest; import android.app.Activity; @@ -18,17 +18,17 @@ import androidx.constraintlayout.widget.ConstraintLayout; import com.jph.takephoto.model.TResult; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.pikolive.app.ErbanTakePhotoActivity; -import com.pikolive.app.miniworld.presenter.MiniWorldEditPresenter; -import com.pikolive.app.miniworld.view.IMiniWorldEditView; -import com.pikolive.app.miniworld.viewmodel.MiniWorldEditableInfoVM; -import com.pikolive.app.miniworld.widget.MiniWorldEditChooseClassifyDialog; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseMvpActivity; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.app.ui.widget.ButtonItem; -import com.pikolive.core.file.FileModel; -import com.pikolive.core.utils.net.DontWarnObserver; +import com.bingchuang.app.ErbanTakePhotoActivity; +import com.bingchuang.app.miniworld.presenter.MiniWorldEditPresenter; +import com.bingchuang.app.miniworld.view.IMiniWorldEditView; +import com.bingchuang.app.miniworld.viewmodel.MiniWorldEditableInfoVM; +import com.bingchuang.app.miniworld.widget.MiniWorldEditChooseClassifyDialog; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseMvpActivity; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.app.ui.widget.ButtonItem; +import com.bingchuang.core.file.FileModel; +import com.bingchuang.core.utils.net.DontWarnObserver; import com.bingchuang.library.base.factory.CreatePresenter; import com.bingchuang.library.utils.ResUtil; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/activity/MiniWorldGroupThemeActivity.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/activity/MiniWorldGroupThemeActivity.java similarity index 93% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/activity/MiniWorldGroupThemeActivity.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/activity/MiniWorldGroupThemeActivity.java index 6e939b299..83b148759 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/activity/MiniWorldGroupThemeActivity.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/activity/MiniWorldGroupThemeActivity.java @@ -1,4 +1,4 @@ -package com.pikolive.app.miniworld.activity; +package com.bingchuang.app.miniworld.activity; import android.content.Context; import android.content.Intent; @@ -10,12 +10,12 @@ import android.view.View; import android.widget.EditText; import android.widget.TextView; -import com.pikolive.app.miniworld.presenter.MWThemePresenter; -import com.pikolive.app.miniworld.view.IMWThemeView; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseMvpActivity; -import com.pikolive.app.common.widget.dialog.DialogManager; -import com.pikolive.core.miniworld.bean.TopicInfo; +import com.bingchuang.app.miniworld.presenter.MWThemePresenter; +import com.bingchuang.app.miniworld.view.IMWThemeView; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseMvpActivity; +import com.bingchuang.app.common.widget.dialog.DialogManager; +import com.bingchuang.core.miniworld.bean.TopicInfo; import com.bingchuang.library.base.factory.CreatePresenter; import com.bingchuang.library.utils.ResUtil; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/activity/MiniWorldGuestPageActivity.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/activity/MiniWorldGuestPageActivity.java similarity index 93% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/activity/MiniWorldGuestPageActivity.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/activity/MiniWorldGuestPageActivity.java index b5fba7242..8987b641f 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/activity/MiniWorldGuestPageActivity.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/activity/MiniWorldGuestPageActivity.java @@ -1,4 +1,4 @@ -package com.pikolive.app.miniworld.activity; +package com.bingchuang.app.miniworld.activity; import android.content.Context; import android.content.Intent; @@ -33,50 +33,50 @@ import com.netease.nimlib.sdk.NIMClient; 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.pikolive.app.miniworld.adapter.GuestAudioPartyAdapter; -import com.pikolive.app.miniworld.fragment.MiniWorldNoticeFrg; -import com.pikolive.app.miniworld.presenter.MiniWorldGuestPagePresenter; -import com.pikolive.app.miniworld.view.IMiniWorldGuestPage; -import com.pikolive.app.miniworld.viewmodel.MiniWorldDetailInfoVM; -import com.pikolive.app.miniworld.viewmodel.MiniWorldEditableInfoVM; -import com.pikolive.app.miniworld.widget.MWMagicIndicator; +import com.bingchuang.app.miniworld.adapter.GuestAudioPartyAdapter; +import com.bingchuang.app.miniworld.fragment.MiniWorldNoticeFrg; +import com.bingchuang.app.miniworld.presenter.MiniWorldGuestPagePresenter; +import com.bingchuang.app.miniworld.view.IMiniWorldGuestPage; +import com.bingchuang.app.miniworld.viewmodel.MiniWorldDetailInfoVM; +import com.bingchuang.app.miniworld.viewmodel.MiniWorldEditableInfoVM; +import com.bingchuang.app.miniworld.widget.MWMagicIndicator; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.pikolive.app.R; -import com.pikolive.app.UIHelper; -import com.pikolive.app.avroom.activity.AVRoomActivity; -import com.pikolive.app.base.BaseMvpActivity; -import com.pikolive.app.base.TitleBar; -import com.pikolive.app.common.widget.CircleImageView; -import com.pikolive.app.community.dynamic.view.WorldDynamicFragment; -import com.pikolive.app.community.publish.view.PublishActivity; -import com.pikolive.app.friend.view.SelectFriendActivity; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.app.ui.webview.CommonWebViewActivity; -import com.pikolive.app.ui.widget.ShareDialog; -import com.pikolive.app.ui.widget.higuide.TuTuGuideHelper; -import com.pikolive.app.ui.widget.magicindicator.MagicIndicator; -import com.pikolive.app.ui.widget.magicindicator.ViewPagerHelper; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; -import com.pikolive.app.ui.widget.recyclerview.decoration.VerticalDecoration; -import com.pikolive.app.utils.AppBarStateChangeListener; -import com.pikolive.core2.XChatConstants; -import com.pikolive.core2.UriProvider; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core2.home.bean.TabInfo; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.miniworld.bean.AudioPartyInfo; -import com.pikolive.core.miniworld.bean.MiniWorldDetailInfo; -import com.pikolive.core.miniworld.event.MiniWorldJoinVerifiedEvent; -import com.pikolive.core.miniworld.event.MiniWorldStateChangedEvent; -import com.pikolive.core.miniworld.event.MiniWorldTeamExitEvent; -import com.pikolive.core.miniworld.event.OpenedMyMiniWorldEvent; -import com.pikolive.core.miniworld.model.MiniWorldModel; -import com.pikolive.core.share.ShareModel; -import com.pikolive.core.share.bean.SessionType; -import com.pikolive.core.utils.ActivityUtil; -import com.pikolive.core.utils.SharedPreferenceUtils; -import com.pikolive.core.utils.net.DontWarnObserver; +import com.bingchuang.app.R; +import com.bingchuang.app.UIHelper; +import com.bingchuang.app.avroom.activity.AVRoomActivity; +import com.bingchuang.app.base.BaseMvpActivity; +import com.bingchuang.app.base.TitleBar; +import com.bingchuang.app.common.widget.CircleImageView; +import com.bingchuang.app.community.dynamic.view.WorldDynamicFragment; +import com.bingchuang.app.community.publish.view.PublishActivity; +import com.bingchuang.app.friend.view.SelectFriendActivity; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.app.ui.webview.CommonWebViewActivity; +import com.bingchuang.app.ui.widget.ShareDialog; +import com.bingchuang.app.ui.widget.higuide.TuTuGuideHelper; +import com.bingchuang.app.ui.widget.magicindicator.MagicIndicator; +import com.bingchuang.app.ui.widget.magicindicator.ViewPagerHelper; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.bingchuang.app.ui.widget.recyclerview.decoration.VerticalDecoration; +import com.bingchuang.app.utils.AppBarStateChangeListener; +import com.bingchuang.core2.XChatConstants; +import com.bingchuang.core2.UriProvider; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core2.home.bean.TabInfo; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.miniworld.bean.AudioPartyInfo; +import com.bingchuang.core.miniworld.bean.MiniWorldDetailInfo; +import com.bingchuang.core.miniworld.event.MiniWorldJoinVerifiedEvent; +import com.bingchuang.core.miniworld.event.MiniWorldStateChangedEvent; +import com.bingchuang.core.miniworld.event.MiniWorldTeamExitEvent; +import com.bingchuang.core.miniworld.event.OpenedMyMiniWorldEvent; +import com.bingchuang.core.miniworld.model.MiniWorldModel; +import com.bingchuang.core.share.ShareModel; +import com.bingchuang.core.share.bean.SessionType; +import com.bingchuang.core.utils.ActivityUtil; +import com.bingchuang.core.utils.SharedPreferenceUtils; +import com.bingchuang.core.utils.net.DontWarnObserver; import com.bingchuang.library.base.factory.CreatePresenter; import com.bingchuang.library.utils.JavaUtil; import com.bingchuang.library.utils.ResUtil; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/activity/MiniWorldMainActivity.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/activity/MiniWorldMainActivity.java similarity index 90% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/activity/MiniWorldMainActivity.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/activity/MiniWorldMainActivity.java index 11de6d91e..a824273c6 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/activity/MiniWorldMainActivity.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/activity/MiniWorldMainActivity.java @@ -1,4 +1,4 @@ -package com.pikolive.app.miniworld.activity; +package com.bingchuang.app.miniworld.activity; import android.content.Context; import android.content.Intent; @@ -17,24 +17,24 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.chad.library.adapter.base.BaseQuickAdapter; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.pikolive.app.miniworld.adapter.MiniWorldMainAdapter; -import com.pikolive.app.miniworld.listener.DoubleClickCheckListener; -import com.pikolive.app.miniworld.presenter.MiniWorldMainPresenter; -import com.pikolive.app.miniworld.view.IMiniWorldMainView; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseMvpActivity; -import com.pikolive.app.home.adapter.BannerAdapter; -import com.pikolive.app.ui.widget.higuide.TuTuGuideHelper; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.pikolive.app.ui.widget.rollviewpager.RollPagerView; -import com.pikolive.app.ui.widget.rollviewpager.Util; -import com.pikolive.app.ui.widget.rollviewpager.hintview.ColorPointHintView; -import com.pikolive.core2.home.bean.BannerInfo; -import com.pikolive.core.miniworld.bean.MiniWorldCategoryInfo; -import com.pikolive.core.miniworld.bean.MiniWorldInfo; -import com.pikolive.core.miniworld.bean.MiniWorldMainItemInfo; -import com.pikolive.core.miniworld.event.MiniWorldStateChangedEvent; -import com.pikolive.core.miniworld.event.OpenedMyMiniWorldEvent; +import com.bingchuang.app.miniworld.adapter.MiniWorldMainAdapter; +import com.bingchuang.app.miniworld.listener.DoubleClickCheckListener; +import com.bingchuang.app.miniworld.presenter.MiniWorldMainPresenter; +import com.bingchuang.app.miniworld.view.IMiniWorldMainView; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseMvpActivity; +import com.bingchuang.app.home.adapter.BannerAdapter; +import com.bingchuang.app.ui.widget.higuide.TuTuGuideHelper; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.app.ui.widget.rollviewpager.RollPagerView; +import com.bingchuang.app.ui.widget.rollviewpager.Util; +import com.bingchuang.app.ui.widget.rollviewpager.hintview.ColorPointHintView; +import com.bingchuang.core2.home.bean.BannerInfo; +import com.bingchuang.core.miniworld.bean.MiniWorldCategoryInfo; +import com.bingchuang.core.miniworld.bean.MiniWorldInfo; +import com.bingchuang.core.miniworld.bean.MiniWorldMainItemInfo; +import com.bingchuang.core.miniworld.event.MiniWorldStateChangedEvent; +import com.bingchuang.core.miniworld.event.OpenedMyMiniWorldEvent; import com.bingchuang.library.base.factory.CreatePresenter; import com.bingchuang.library.utils.ListUtils; import com.bingchuang.library.utils.SizeUtils; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/activity/MiniWorldMemberListActivity.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/activity/MiniWorldMemberListActivity.java similarity index 93% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/activity/MiniWorldMemberListActivity.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/activity/MiniWorldMemberListActivity.java index a2fb38f4f..308840850 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/activity/MiniWorldMemberListActivity.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/activity/MiniWorldMemberListActivity.java @@ -1,4 +1,4 @@ -package com.pikolive.app.miniworld.activity; +package com.bingchuang.app.miniworld.activity; import android.content.Context; import android.content.Intent; @@ -14,16 +14,16 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import com.pikolive.app.miniworld.adapter.MiniWorldMemberListAdapter; -import com.pikolive.app.miniworld.presenter.MiniWorldMemberListPresenter; -import com.pikolive.app.miniworld.view.IMiniWorldMemberListView; -import com.pikolive.app.R; -import com.pikolive.app.UIHelper; -import com.pikolive.app.avroom.activity.AVRoomActivity; -import com.pikolive.app.base.BaseMvpActivity; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core.miniworld.bean.MiniWorldMemberListMemberInfo; -import com.pikolive.core.room.bean.RoomInfo; +import com.bingchuang.app.miniworld.adapter.MiniWorldMemberListAdapter; +import com.bingchuang.app.miniworld.presenter.MiniWorldMemberListPresenter; +import com.bingchuang.app.miniworld.view.IMiniWorldMemberListView; +import com.bingchuang.app.R; +import com.bingchuang.app.UIHelper; +import com.bingchuang.app.avroom.activity.AVRoomActivity; +import com.bingchuang.app.base.BaseMvpActivity; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core.miniworld.bean.MiniWorldMemberListMemberInfo; +import com.bingchuang.core.room.bean.RoomInfo; import com.bingchuang.library.base.factory.CreatePresenter; import com.bingchuang.library.utils.ListUtils; import com.bingchuang.library.utils.ResUtil; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/activity/MiniWorldSearchActivity.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/activity/MiniWorldSearchActivity.java similarity index 94% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/activity/MiniWorldSearchActivity.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/activity/MiniWorldSearchActivity.java index ab967e101..d6c75432a 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/activity/MiniWorldSearchActivity.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/activity/MiniWorldSearchActivity.java @@ -1,4 +1,4 @@ -package com.pikolive.app.miniworld.activity; +package com.bingchuang.app.miniworld.activity; import android.content.Context; import android.content.Intent; @@ -20,13 +20,13 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.pikolive.app.miniworld.adapter.MiniWorldListAdapter; -import com.pikolive.app.miniworld.listener.DoubleClickCheckListener; -import com.pikolive.app.miniworld.presenter.MiniWorldSearchPresenter; -import com.pikolive.app.miniworld.view.IMiniWorldSearchView; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseMvpActivity; -import com.pikolive.core.miniworld.bean.MiniWorldInfo; +import com.bingchuang.app.miniworld.adapter.MiniWorldListAdapter; +import com.bingchuang.app.miniworld.listener.DoubleClickCheckListener; +import com.bingchuang.app.miniworld.presenter.MiniWorldSearchPresenter; +import com.bingchuang.app.miniworld.view.IMiniWorldSearchView; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseMvpActivity; +import com.bingchuang.core.miniworld.bean.MiniWorldInfo; import com.bingchuang.library.base.factory.CreatePresenter; import com.bingchuang.library.utils.ImeUtil; import com.bingchuang.library.utils.ResUtil; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/activity/MiniWorldTeamMessageActivity.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/activity/MiniWorldTeamMessageActivity.java similarity index 93% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/activity/MiniWorldTeamMessageActivity.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/activity/MiniWorldTeamMessageActivity.java index 2f02e50bf..3ad686041 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/activity/MiniWorldTeamMessageActivity.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/activity/MiniWorldTeamMessageActivity.java @@ -1,4 +1,4 @@ -package com.pikolive.app.miniworld.activity; +package com.bingchuang.app.miniworld.activity; import android.annotation.SuppressLint; import android.content.Context; @@ -31,53 +31,53 @@ import com.netease.nimlib.sdk.team.constant.TeamMessageNotifyTypeEnum; 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.pikolive.app.miniworld.presenter.MWTeamMessagePresenter; -import com.pikolive.app.miniworld.view.IMWTeamMessageView; +import com.bingchuang.app.miniworld.presenter.MWTeamMessagePresenter; +import com.bingchuang.app.miniworld.view.IMWTeamMessageView; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.pikolive.app.R; -import com.pikolive.app.avroom.ButtonItemFactory; -import com.pikolive.app.avroom.activity.AVRoomActivity; -import com.pikolive.app.avroom.widget.EditRoomTitleDialog; -import com.pikolive.app.avroom.widget.ViewItem; -import com.pikolive.app.common.widget.dialog.DialogManager; -import com.pikolive.app.home.presenter.MainFragmentPresenter; -import com.pikolive.app.team.view.NimTeamMessageFragment; -import com.pikolive.app.ui.gift.callback.OnGiftDialogBtnClickListenerWrapper; -import com.pikolive.app.ui.im.avtivity.BaseMessageActivity; -import com.pikolive.app.ui.patriarch.help.LimitEnterRoomHelper; -import com.pikolive.app.ui.widget.ButtonItem; -import com.pikolive.app.ui.widget.GiftDialog; -import com.pikolive.app.ui.widget.UserInfoDialog; -import com.pikolive.app.ui.widget.dialog.OpenNobleDialog; -import com.pikolive.app.utils.CertificateHelper; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.gift.GiftModel; -import com.pikolive.core.gift.bean.GiftInfo; -import com.pikolive.core.gift.toolbox.GiftToolbox; -import com.pikolive.core.initial.InitialModel; -import com.pikolive.core.initial.bean.InitInfo; -import com.pikolive.core.level.UserLevelVo; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core.miniworld.bean.MWChatInfo; -import com.pikolive.core.miniworld.bean.OpenAudioPartyAttachment; -import com.pikolive.core.miniworld.event.AudioPartyOpenEvent; -import com.pikolive.core.miniworld.event.MWChatTopicEvent; -import com.pikolive.core.miniworld.event.MWGroupChatMemberEvent; -import com.pikolive.core.miniworld.event.MiniWorldTeamExitEvent; -import com.pikolive.core.miniworld.model.MiniWorldHelper; -import com.pikolive.core.miniworld.model.MiniWorldModel; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.room.model.AvRoomModel; -import com.pikolive.core.room.model.RoomSettingModel; -import com.pikolive.core.room.queue.bean.MicMemberInfo; -import com.pikolive.core.team.bean.TeamEvent; -import com.pikolive.core.user.UserModel; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.utils.ActivityUtil; -import com.pikolive.core.utils.SharedPreferenceUtils; -import com.pikolive.core.utils.net.BeanObserver; -import com.pikolive.core.utils.net.DontWarnObserver; +import com.bingchuang.app.R; +import com.bingchuang.app.avroom.ButtonItemFactory; +import com.bingchuang.app.avroom.activity.AVRoomActivity; +import com.bingchuang.app.avroom.widget.EditRoomTitleDialog; +import com.bingchuang.app.avroom.widget.ViewItem; +import com.bingchuang.app.common.widget.dialog.DialogManager; +import com.bingchuang.app.home.presenter.MainFragmentPresenter; +import com.bingchuang.app.team.view.NimTeamMessageFragment; +import com.bingchuang.app.ui.gift.callback.OnGiftDialogBtnClickListenerWrapper; +import com.bingchuang.app.ui.im.avtivity.BaseMessageActivity; +import com.bingchuang.app.ui.patriarch.help.LimitEnterRoomHelper; +import com.bingchuang.app.ui.widget.ButtonItem; +import com.bingchuang.app.ui.widget.GiftDialog; +import com.bingchuang.app.ui.widget.UserInfoDialog; +import com.bingchuang.app.ui.widget.dialog.OpenNobleDialog; +import com.bingchuang.app.utils.CertificateHelper; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.gift.GiftModel; +import com.bingchuang.core.gift.bean.GiftInfo; +import com.bingchuang.core.gift.toolbox.GiftToolbox; +import com.bingchuang.core.initial.InitialModel; +import com.bingchuang.core.initial.bean.InitInfo; +import com.bingchuang.core.level.UserLevelVo; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core.miniworld.bean.MWChatInfo; +import com.bingchuang.core.miniworld.bean.OpenAudioPartyAttachment; +import com.bingchuang.core.miniworld.event.AudioPartyOpenEvent; +import com.bingchuang.core.miniworld.event.MWChatTopicEvent; +import com.bingchuang.core.miniworld.event.MWGroupChatMemberEvent; +import com.bingchuang.core.miniworld.event.MiniWorldTeamExitEvent; +import com.bingchuang.core.miniworld.model.MiniWorldHelper; +import com.bingchuang.core.miniworld.model.MiniWorldModel; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.room.model.AvRoomModel; +import com.bingchuang.core.room.model.RoomSettingModel; +import com.bingchuang.core.room.queue.bean.MicMemberInfo; +import com.bingchuang.core.team.bean.TeamEvent; +import com.bingchuang.core.user.UserModel; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.utils.ActivityUtil; +import com.bingchuang.core.utils.SharedPreferenceUtils; +import com.bingchuang.core.utils.net.BeanObserver; +import com.bingchuang.core.utils.net.DontWarnObserver; import com.bingchuang.library.net.rxnet.callback.CallBack; import com.bingchuang.library.rxbus.RxBus; import com.bingchuang.library.utils.ResUtil; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/activity/TopicMainActivity.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/activity/TopicMainActivity.java similarity index 92% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/activity/TopicMainActivity.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/activity/TopicMainActivity.java index f4d228b4e..beeed6ef7 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/activity/TopicMainActivity.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/activity/TopicMainActivity.java @@ -1,4 +1,4 @@ -package com.pikolive.app.miniworld.activity; +package com.bingchuang.app.miniworld.activity; import android.content.Context; import android.content.Intent; @@ -25,38 +25,38 @@ import androidx.viewpager.widget.ViewPager; import com.google.android.material.appbar.AppBarLayout; import com.google.android.material.appbar.CollapsingToolbarLayout; import com.netease.nim.uikit.StatusBarUtil; -import com.pikolive.app.miniworld.presenter.MiniWorldGuestPagePresenter; -import com.pikolive.app.miniworld.view.IMiniWorldGuestPage; -import com.pikolive.app.miniworld.viewmodel.MiniWorldDetailInfoVM; -import com.pikolive.app.miniworld.viewmodel.MiniWorldEditableInfoVM; -import com.pikolive.app.miniworld.widget.MWMagicIndicator; +import com.bingchuang.app.miniworld.presenter.MiniWorldGuestPagePresenter; +import com.bingchuang.app.miniworld.view.IMiniWorldGuestPage; +import com.bingchuang.app.miniworld.viewmodel.MiniWorldDetailInfoVM; +import com.bingchuang.app.miniworld.viewmodel.MiniWorldEditableInfoVM; +import com.bingchuang.app.miniworld.widget.MWMagicIndicator; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.pikolive.app.R; -import com.pikolive.app.UIHelper; -import com.pikolive.app.base.BaseMvpActivity; -import com.pikolive.app.community.dynamic.view.WorldDynamicFragment; -import com.pikolive.app.community.publish.view.PublishActivity; -import com.pikolive.app.friend.view.SelectFriendActivity; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.app.ui.widget.ShareDialog; -import com.pikolive.app.ui.widget.magicindicator.MagicIndicator; -import com.pikolive.app.ui.widget.magicindicator.ViewPagerHelper; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; -import com.pikolive.core2.XChatConstants; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core2.home.bean.TabInfo; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.miniworld.bean.AudioPartyInfo; -import com.pikolive.core.miniworld.bean.MiniWorldDetailInfo; -import com.pikolive.core.miniworld.event.MiniWorldJoinVerifiedEvent; -import com.pikolive.core.miniworld.event.MiniWorldStateChangedEvent; -import com.pikolive.core.miniworld.event.MiniWorldTeamExitEvent; -import com.pikolive.core.miniworld.model.MiniWorldModel; -import com.pikolive.core.share.ShareModel; -import com.pikolive.core.share.bean.SessionType; -import com.pikolive.core.utils.SharedPreferenceUtils; -import com.pikolive.core.utils.net.DontWarnObserver; +import com.bingchuang.app.R; +import com.bingchuang.app.UIHelper; +import com.bingchuang.app.base.BaseMvpActivity; +import com.bingchuang.app.community.dynamic.view.WorldDynamicFragment; +import com.bingchuang.app.community.publish.view.PublishActivity; +import com.bingchuang.app.friend.view.SelectFriendActivity; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.app.ui.widget.ShareDialog; +import com.bingchuang.app.ui.widget.magicindicator.MagicIndicator; +import com.bingchuang.app.ui.widget.magicindicator.ViewPagerHelper; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.bingchuang.core2.XChatConstants; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core2.home.bean.TabInfo; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.miniworld.bean.AudioPartyInfo; +import com.bingchuang.core.miniworld.bean.MiniWorldDetailInfo; +import com.bingchuang.core.miniworld.event.MiniWorldJoinVerifiedEvent; +import com.bingchuang.core.miniworld.event.MiniWorldStateChangedEvent; +import com.bingchuang.core.miniworld.event.MiniWorldTeamExitEvent; +import com.bingchuang.core.miniworld.model.MiniWorldModel; +import com.bingchuang.core.share.ShareModel; +import com.bingchuang.core.share.bean.SessionType; +import com.bingchuang.core.utils.SharedPreferenceUtils; +import com.bingchuang.core.utils.net.DontWarnObserver; import com.bingchuang.library.base.factory.CreatePresenter; import com.bingchuang.library.utils.JavaUtil; import com.bingchuang.library.utils.ResUtil; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/adapter/AllTopicListAdapter.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/adapter/AllTopicListAdapter.java similarity index 83% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/adapter/AllTopicListAdapter.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/adapter/AllTopicListAdapter.java index cb0ae68fd..3a2bb54cb 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/adapter/AllTopicListAdapter.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/adapter/AllTopicListAdapter.java @@ -1,11 +1,11 @@ -package com.pikolive.app.miniworld.adapter; +package com.bingchuang.app.miniworld.adapter; import androidx.annotation.Nullable; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.pikolive.app.R; -import com.pikolive.core.miniworld.bean.MiniWorldInfo; +import com.bingchuang.app.R; +import com.bingchuang.core.miniworld.bean.MiniWorldInfo; import java.util.List; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/adapter/AudioPartyAdapter.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/adapter/AudioPartyAdapter.java similarity index 92% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/adapter/AudioPartyAdapter.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/adapter/AudioPartyAdapter.java index 2b577b61f..eaae32b57 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/adapter/AudioPartyAdapter.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/adapter/AudioPartyAdapter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.miniworld.adapter; +package com.bingchuang.app.miniworld.adapter; import android.content.Context; import android.widget.ImageView; @@ -7,10 +7,10 @@ import androidx.core.content.ContextCompat; import com.chad.library.adapter.base.BaseMultiItemQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.pikolive.app.R; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.core.miniworld.bean.AudioPartyInfo; -import com.pikolive.core.miniworld.bean.AudioPartyItem; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.core.miniworld.bean.AudioPartyInfo; +import com.bingchuang.core.miniworld.bean.AudioPartyItem; import com.bingchuang.library.utils.ResUtil; import java.util.List; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/adapter/GuestAudioPartyAdapter.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/adapter/GuestAudioPartyAdapter.java similarity index 73% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/adapter/GuestAudioPartyAdapter.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/adapter/GuestAudioPartyAdapter.java index ada356a89..dce96721a 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/adapter/GuestAudioPartyAdapter.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/adapter/GuestAudioPartyAdapter.java @@ -1,11 +1,11 @@ -package com.pikolive.app.miniworld.adapter; +package com.bingchuang.app.miniworld.adapter; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.pikolive.app.R; -import com.pikolive.app.common.widget.CircleImageView; -import com.pikolive.app.ui.utils.ImageLoadUtilsV2; -import com.pikolive.core.miniworld.bean.AudioPartyInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.common.widget.CircleImageView; +import com.bingchuang.app.ui.utils.ImageLoadUtilsV2; +import com.bingchuang.core.miniworld.bean.AudioPartyInfo; public class GuestAudioPartyAdapter extends BaseQuickAdapter- - - - +{ diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/adapter/MiniWorldEditClassifyAdapter.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/adapter/MiniWorldEditClassifyAdapter.java similarity index 89% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/adapter/MiniWorldEditClassifyAdapter.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/adapter/MiniWorldEditClassifyAdapter.java index 81db828e3..0a6308e0b 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/adapter/MiniWorldEditClassifyAdapter.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/adapter/MiniWorldEditClassifyAdapter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.miniworld.adapter; +package com.bingchuang.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.pikolive.app.R; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.core.miniworld.bean.MiniWorldEditClassifyInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.core.miniworld.bean.MiniWorldEditClassifyInfo; import java.util.List; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/adapter/MiniWorldListAdapter.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/adapter/MiniWorldListAdapter.java similarity index 91% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/adapter/MiniWorldListAdapter.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/adapter/MiniWorldListAdapter.java index 44f7e4cad..62e067d42 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/adapter/MiniWorldListAdapter.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/adapter/MiniWorldListAdapter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.miniworld.adapter; +package com.bingchuang.app.miniworld.adapter; import android.text.TextUtils; import android.widget.ImageView; @@ -9,10 +9,10 @@ import androidx.recyclerview.widget.RecyclerView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.pikolive.app.R; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.core.miniworld.bean.MiniWorldInfo; -import com.pikolive.core.user.bean.UserInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.core.miniworld.bean.MiniWorldInfo; +import com.bingchuang.core.user.bean.UserInfo; import com.bingchuang.library.utils.ResUtil; import java.util.List; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/adapter/MiniWorldMainAdapter.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/adapter/MiniWorldMainAdapter.java similarity index 79% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/adapter/MiniWorldMainAdapter.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/adapter/MiniWorldMainAdapter.java index 4a6afb422..8e84500b9 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/adapter/MiniWorldMainAdapter.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/adapter/MiniWorldMainAdapter.java @@ -1,12 +1,12 @@ -package com.pikolive.app.miniworld.adapter; +package com.bingchuang.app.miniworld.adapter; -import static com.pikolive.core.miniworld.bean.MiniWorldMainItemInfo.TYPE_BANNER; -import static com.pikolive.core.miniworld.bean.MiniWorldMainItemInfo.TYPE_BOTTOM_PADDING; -import static com.pikolive.core.miniworld.bean.MiniWorldMainItemInfo.TYPE_DIVIDER; -import static com.pikolive.core.miniworld.bean.MiniWorldMainItemInfo.TYPE_FIND; -import static com.pikolive.core.miniworld.bean.MiniWorldMainItemInfo.TYPE_ITEM; -import static com.pikolive.core.miniworld.bean.MiniWorldMainItemInfo.TYPE_PLACEHOLDER; -import static com.pikolive.core.miniworld.bean.MiniWorldMainItemInfo.TYPE_TITLE; +import static com.bingchuang.core.miniworld.bean.MiniWorldMainItemInfo.TYPE_BANNER; +import static com.bingchuang.core.miniworld.bean.MiniWorldMainItemInfo.TYPE_BOTTOM_PADDING; +import static com.bingchuang.core.miniworld.bean.MiniWorldMainItemInfo.TYPE_DIVIDER; +import static com.bingchuang.core.miniworld.bean.MiniWorldMainItemInfo.TYPE_FIND; +import static com.bingchuang.core.miniworld.bean.MiniWorldMainItemInfo.TYPE_ITEM; +import static com.bingchuang.core.miniworld.bean.MiniWorldMainItemInfo.TYPE_PLACEHOLDER; +import static com.bingchuang.core.miniworld.bean.MiniWorldMainItemInfo.TYPE_TITLE; import android.text.TextUtils; import android.widget.ImageView; @@ -16,12 +16,12 @@ import androidx.recyclerview.widget.GridLayoutManager; import com.chad.library.adapter.base.BaseMultiItemQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.pikolive.app.R; -import com.pikolive.app.avroom.widget.MessageView; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.core.miniworld.bean.MiniWorldCategoryInfo; -import com.pikolive.core.miniworld.bean.MiniWorldInfo; -import com.pikolive.core.miniworld.bean.MiniWorldMainItemInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.avroom.widget.MessageView; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.core.miniworld.bean.MiniWorldCategoryInfo; +import com.bingchuang.core.miniworld.bean.MiniWorldInfo; +import com.bingchuang.core.miniworld.bean.MiniWorldMainItemInfo; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.SizeUtils; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/adapter/MiniWorldMemberListAdapter.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/adapter/MiniWorldMemberListAdapter.java similarity index 94% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/adapter/MiniWorldMemberListAdapter.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/adapter/MiniWorldMemberListAdapter.java index 2562add39..ff72caaa2 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/adapter/MiniWorldMemberListAdapter.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/adapter/MiniWorldMemberListAdapter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.miniworld.adapter; +package com.bingchuang.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.pikolive.app.R; -import com.pikolive.app.common.widget.CircleImageView; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.core.level.UserLevelVo; -import com.pikolive.core.miniworld.bean.MiniWorldMemberListMemberInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.common.widget.CircleImageView; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.core.level.UserLevelVo; +import com.bingchuang.core.miniworld.bean.MiniWorldMemberListMemberInfo; import java.util.List; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/adapter/RecommendTopicListAdapter.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/adapter/RecommendTopicListAdapter.java similarity index 81% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/adapter/RecommendTopicListAdapter.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/adapter/RecommendTopicListAdapter.java index 2977149fd..27bc2b6c7 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/adapter/RecommendTopicListAdapter.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/adapter/RecommendTopicListAdapter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.miniworld.adapter; +package com.bingchuang.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.pikolive.app.R; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.core.miniworld.bean.MiniWorldInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.core.miniworld.bean.MiniWorldInfo; import java.util.List; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/fragment/MiniWorldCategoryFragment.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/fragment/MiniWorldCategoryFragment.java similarity index 90% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/fragment/MiniWorldCategoryFragment.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/fragment/MiniWorldCategoryFragment.java index e2ba15f97..e62c93f9c 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/fragment/MiniWorldCategoryFragment.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/fragment/MiniWorldCategoryFragment.java @@ -1,4 +1,4 @@ -package com.pikolive.app.miniworld.fragment; +package com.bingchuang.app.miniworld.fragment; import android.app.Activity; import android.graphics.Rect; @@ -11,19 +11,19 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.pikolive.app.miniworld.adapter.AllTopicListAdapter; -import com.pikolive.app.miniworld.listener.DoubleClickCheckListener; -import com.pikolive.app.miniworld.presenter.MiniWorldCategoryPresenter; -import com.pikolive.app.miniworld.view.IMiniWorldCategoryView; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseMvpFragment; -import com.pikolive.app.common.NoDataFragment; -import com.pikolive.app.miniworld.activity.MiniWorldActivity; -import com.pikolive.app.miniworld.activity.TopicMainActivity; -import com.pikolive.core.miniworld.bean.MiniWorldCategoryInfo; -import com.pikolive.core.miniworld.bean.MiniWorldInfo; -import com.pikolive.core.miniworld.event.MiniWorldStateChangedEvent; -import com.pikolive.core.miniworld.event.OpenedMyMiniWorldEvent; +import com.bingchuang.app.miniworld.adapter.AllTopicListAdapter; +import com.bingchuang.app.miniworld.listener.DoubleClickCheckListener; +import com.bingchuang.app.miniworld.presenter.MiniWorldCategoryPresenter; +import com.bingchuang.app.miniworld.view.IMiniWorldCategoryView; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseMvpFragment; +import com.bingchuang.app.common.NoDataFragment; +import com.bingchuang.app.miniworld.activity.MiniWorldActivity; +import com.bingchuang.app.miniworld.activity.TopicMainActivity; +import com.bingchuang.core.miniworld.bean.MiniWorldCategoryInfo; +import com.bingchuang.core.miniworld.bean.MiniWorldInfo; +import com.bingchuang.core.miniworld.event.MiniWorldStateChangedEvent; +import com.bingchuang.core.miniworld.event.OpenedMyMiniWorldEvent; import com.bingchuang.library.base.factory.CreatePresenter; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.SizeUtils; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/fragment/MiniWorldNoticeFrg.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/fragment/MiniWorldNoticeFrg.java similarity index 88% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/fragment/MiniWorldNoticeFrg.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/fragment/MiniWorldNoticeFrg.java index 5090effe8..62573a659 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/fragment/MiniWorldNoticeFrg.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/fragment/MiniWorldNoticeFrg.java @@ -1,4 +1,4 @@ -package com.pikolive.app.miniworld.fragment; +package com.bingchuang.app.miniworld.fragment; import android.graphics.drawable.Drawable; import android.text.TextUtils; @@ -8,14 +8,14 @@ import android.widget.TextView; import androidx.core.content.ContextCompat; -import com.pikolive.app.miniworld.presenter.MiniWorldNoticePresenter; -import com.pikolive.app.miniworld.view.IMiniWorldNoticeView; -import com.pikolive.app.miniworld.viewmodel.MiniWorldDetailInfoVM; -import com.pikolive.app.R; -import com.pikolive.app.UIHelper; -import com.pikolive.app.base.BaseMvpFragment; -import com.pikolive.app.common.widget.CircleImageView; -import com.pikolive.app.ui.utils.ImageLoadUtils; +import com.bingchuang.app.miniworld.presenter.MiniWorldNoticePresenter; +import com.bingchuang.app.miniworld.view.IMiniWorldNoticeView; +import com.bingchuang.app.miniworld.viewmodel.MiniWorldDetailInfoVM; +import com.bingchuang.app.R; +import com.bingchuang.app.UIHelper; +import com.bingchuang.app.base.BaseMvpFragment; +import com.bingchuang.app.common.widget.CircleImageView; +import com.bingchuang.app.ui.utils.ImageLoadUtils; import com.bingchuang.library.base.factory.CreatePresenter; @CreatePresenter(MiniWorldNoticePresenter.class) diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/listener/DoubleClickCheckListener.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/listener/DoubleClickCheckListener.java similarity index 95% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/listener/DoubleClickCheckListener.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/listener/DoubleClickCheckListener.java index afc81063d..103db7c38 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/listener/DoubleClickCheckListener.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/listener/DoubleClickCheckListener.java @@ -1,4 +1,4 @@ -package com.pikolive.app.miniworld.listener; +package com.bingchuang.app.miniworld.listener; import android.view.View; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/presenter/AudioPartyDialogPresenter.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/presenter/AudioPartyDialogPresenter.java similarity index 91% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/presenter/AudioPartyDialogPresenter.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/presenter/AudioPartyDialogPresenter.java index 71b132cc7..08b0f6bb0 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/presenter/AudioPartyDialogPresenter.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/presenter/AudioPartyDialogPresenter.java @@ -1,11 +1,11 @@ -package com.pikolive.app.miniworld.presenter; +package com.bingchuang.app.miniworld.presenter; -import com.pikolive.app.miniworld.view.IAudioPartyDialogView; -import com.pikolive.core.Constants; -import com.pikolive.core.miniworld.bean.AudioPartyInfo; -import com.pikolive.core.miniworld.bean.AudioPartyItem; -import com.pikolive.core.miniworld.bean.AudioPartyListInfo; -import com.pikolive.core.miniworld.model.MiniWorldModel; +import com.bingchuang.app.miniworld.view.IAudioPartyDialogView; +import com.bingchuang.core.Constants; +import com.bingchuang.core.miniworld.bean.AudioPartyInfo; +import com.bingchuang.core.miniworld.bean.AudioPartyItem; +import com.bingchuang.core.miniworld.bean.AudioPartyListInfo; +import com.bingchuang.core.miniworld.model.MiniWorldModel; import java.util.ArrayList; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/presenter/MWTeamMessagePresenter.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/presenter/MWTeamMessagePresenter.java similarity index 88% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/presenter/MWTeamMessagePresenter.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/presenter/MWTeamMessagePresenter.java index 170357ac6..4bfb091ac 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/presenter/MWTeamMessagePresenter.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/presenter/MWTeamMessagePresenter.java @@ -1,25 +1,25 @@ -package com.pikolive.app.miniworld.presenter; +package com.bingchuang.app.miniworld.presenter; -import static com.pikolive.app.home.presenter.MainFragmentPresenter.OPEN_ROOM_FAIL; -import static com.pikolive.app.home.presenter.MainFragmentPresenter.OPEN_ROOM_FAIL_ALREADY_OPENED_ROOM; -import static com.pikolive.app.home.presenter.MainFragmentPresenter.OPEN_ROOM_FAIL_PM_LIMIT_TIME; -import static com.pikolive.app.home.presenter.MainFragmentPresenter.OPEN_ROOM_SUCCESS; +import static com.bingchuang.app.home.presenter.MainFragmentPresenter.OPEN_ROOM_FAIL; +import static com.bingchuang.app.home.presenter.MainFragmentPresenter.OPEN_ROOM_FAIL_ALREADY_OPENED_ROOM; +import static com.bingchuang.app.home.presenter.MainFragmentPresenter.OPEN_ROOM_FAIL_PM_LIMIT_TIME; +import static com.bingchuang.app.home.presenter.MainFragmentPresenter.OPEN_ROOM_SUCCESS; import android.annotation.SuppressLint; import android.content.Context; -import com.pikolive.app.miniworld.view.IMWTeamMessageView; +import com.bingchuang.app.miniworld.view.IMWTeamMessageView; import com.trello.rxlifecycle3.LifecycleProvider; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.pikolive.app.R; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.miniworld.bean.MWChatInfo; -import com.pikolive.core.miniworld.model.MiniWorldModel; -import com.pikolive.core.patriarch.exception.PmRoomLimitException; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.room.model.AvRoomModel; -import com.pikolive.core.utils.net.BeanObserver; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.app.R; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.miniworld.bean.MWChatInfo; +import com.bingchuang.core.miniworld.model.MiniWorldModel; +import com.bingchuang.core.patriarch.exception.PmRoomLimitException; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.room.model.AvRoomModel; +import com.bingchuang.core.utils.net.BeanObserver; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.callback.CallBack; import com.bingchuang.library.utils.ResUtil; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/presenter/MWThemePresenter.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/presenter/MWThemePresenter.java similarity index 81% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/presenter/MWThemePresenter.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/presenter/MWThemePresenter.java index 6bc01d3bc..7898a0755 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/presenter/MWThemePresenter.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/presenter/MWThemePresenter.java @@ -1,10 +1,10 @@ -package com.pikolive.app.miniworld.presenter; +package com.bingchuang.app.miniworld.presenter; -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.app.miniworld.view.IMWThemeView; -import com.pikolive.core.miniworld.bean.TopicInfo; -import com.pikolive.core.miniworld.model.MiniWorldModel; -import com.pikolive.core.utils.net.BeanObserver; +import com.bingchuang.app.base.BaseMvpPresenter; +import com.bingchuang.app.miniworld.view.IMWThemeView; +import com.bingchuang.core.miniworld.bean.TopicInfo; +import com.bingchuang.core.miniworld.model.MiniWorldModel; +import com.bingchuang.core.utils.net.BeanObserver; import java.util.List; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/presenter/MiniWorldCategoryPresenter.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/presenter/MiniWorldCategoryPresenter.java similarity index 89% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/presenter/MiniWorldCategoryPresenter.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/presenter/MiniWorldCategoryPresenter.java index 01781457b..b20b23ea4 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/presenter/MiniWorldCategoryPresenter.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/presenter/MiniWorldCategoryPresenter.java @@ -1,12 +1,12 @@ -package com.pikolive.app.miniworld.presenter; +package com.bingchuang.app.miniworld.presenter; import android.annotation.SuppressLint; -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.app.miniworld.view.IMiniWorldCategoryView; -import com.pikolive.core.miniworld.bean.MiniWorldInfo; -import com.pikolive.core.miniworld.model.MiniWorldModel; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.app.base.BaseMvpPresenter; +import com.bingchuang.app.miniworld.view.IMiniWorldCategoryView; +import com.bingchuang.core.miniworld.bean.MiniWorldInfo; +import com.bingchuang.core.miniworld.model.MiniWorldModel; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.base.PresenterEvent; import com.bingchuang.library.utils.ListUtils; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/presenter/MiniWorldEditPresenter.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/presenter/MiniWorldEditPresenter.java similarity index 94% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/presenter/MiniWorldEditPresenter.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/presenter/MiniWorldEditPresenter.java index b56cc438e..90974bc8a 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/presenter/MiniWorldEditPresenter.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/presenter/MiniWorldEditPresenter.java @@ -1,12 +1,12 @@ -package com.pikolive.app.miniworld.presenter; +package com.bingchuang.app.miniworld.presenter; import android.text.TextUtils; -import com.pikolive.app.miniworld.view.IMiniWorldEditView; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.core.miniworld.model.MiniWorldModel; -import com.pikolive.core.utils.net.DontWarnObserver; +import com.bingchuang.app.miniworld.view.IMiniWorldEditView; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseMvpPresenter; +import com.bingchuang.core.miniworld.model.MiniWorldModel; +import com.bingchuang.core.utils.net.DontWarnObserver; import com.bingchuang.library.base.PresenterEvent; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.SingleToastUtil; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/presenter/MiniWorldGuestPagePresenter.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/presenter/MiniWorldGuestPagePresenter.java similarity index 91% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/presenter/MiniWorldGuestPagePresenter.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/presenter/MiniWorldGuestPagePresenter.java index 876ae20c1..8c720f0ad 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/presenter/MiniWorldGuestPagePresenter.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/presenter/MiniWorldGuestPagePresenter.java @@ -1,26 +1,26 @@ -package com.pikolive.app.miniworld.presenter; +package com.bingchuang.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.pikolive.app.miniworld.view.IMiniWorldGuestPage; -import com.pikolive.app.miniworld.viewmodel.MiniWorldDetailInfoVM; -import com.pikolive.app.miniworld.viewmodel.MiniWorldEditableInfoVM; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.exception.FailReasonException; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core.miniworld.bean.AudioPartyInfo; -import com.pikolive.core.miniworld.bean.MiniWorldDetailInfo; -import com.pikolive.core.miniworld.event.MiniWorldStateChangedEvent; -import com.pikolive.core.miniworld.model.MiniWorldModel; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.utils.net.BeanObserver; -import com.pikolive.core.utils.net.DontWarnObserver; +import com.bingchuang.app.miniworld.view.IMiniWorldGuestPage; +import com.bingchuang.app.miniworld.viewmodel.MiniWorldDetailInfoVM; +import com.bingchuang.app.miniworld.viewmodel.MiniWorldEditableInfoVM; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseMvpPresenter; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.exception.FailReasonException; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core.miniworld.bean.AudioPartyInfo; +import com.bingchuang.core.miniworld.bean.MiniWorldDetailInfo; +import com.bingchuang.core.miniworld.event.MiniWorldStateChangedEvent; +import com.bingchuang.core.miniworld.model.MiniWorldModel; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.utils.net.BeanObserver; +import com.bingchuang.core.utils.net.DontWarnObserver; import com.bingchuang.library.base.PresenterEvent; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.SingleToastUtil; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/presenter/MiniWorldMainPresenter.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/presenter/MiniWorldMainPresenter.java similarity index 89% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/presenter/MiniWorldMainPresenter.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/presenter/MiniWorldMainPresenter.java index 19088d43b..f051379f0 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/presenter/MiniWorldMainPresenter.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/presenter/MiniWorldMainPresenter.java @@ -1,19 +1,19 @@ -package com.pikolive.app.miniworld.presenter; +package com.bingchuang.app.miniworld.presenter; import android.annotation.SuppressLint; import android.text.TextUtils; import android.util.Pair; -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.app.miniworld.view.IMiniWorldMainView; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core2.home.bean.BannerInfo; -import com.pikolive.core.miniworld.bean.MiniWorldCategoryInfo; -import com.pikolive.core.miniworld.bean.MiniWorldInfo; -import com.pikolive.core.miniworld.bean.MiniWorldMainInfo; -import com.pikolive.core.miniworld.bean.MiniWorldMainItemInfo; -import com.pikolive.core.miniworld.model.MiniWorldModel; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.app.base.BaseMvpPresenter; +import com.bingchuang.app.miniworld.view.IMiniWorldMainView; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core2.home.bean.BannerInfo; +import com.bingchuang.core.miniworld.bean.MiniWorldCategoryInfo; +import com.bingchuang.core.miniworld.bean.MiniWorldInfo; +import com.bingchuang.core.miniworld.bean.MiniWorldMainInfo; +import com.bingchuang.core.miniworld.bean.MiniWorldMainItemInfo; +import com.bingchuang.core.miniworld.model.MiniWorldModel; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.base.PresenterEvent; import com.bingchuang.library.utils.ListUtils; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/presenter/MiniWorldMemberListPresenter.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/presenter/MiniWorldMemberListPresenter.java similarity index 94% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/presenter/MiniWorldMemberListPresenter.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/presenter/MiniWorldMemberListPresenter.java index adde5b0eb..8a1444aff 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/presenter/MiniWorldMemberListPresenter.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/presenter/MiniWorldMemberListPresenter.java @@ -1,16 +1,16 @@ -package com.pikolive.app.miniworld.presenter; +package com.bingchuang.app.miniworld.presenter; import android.text.TextUtils; import android.util.Log; -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.app.miniworld.view.IMiniWorldMemberListView; -import com.pikolive.app.miniworld.activity.MiniWorldMemberListActivity; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.miniworld.bean.MiniWorldMemberListInfo; -import com.pikolive.core.miniworld.bean.MiniWorldMemberListMemberInfo; -import com.pikolive.core.miniworld.model.MiniWorldModel; -import com.pikolive.core.utils.net.DontWarnObserver; +import com.bingchuang.app.base.BaseMvpPresenter; +import com.bingchuang.app.miniworld.view.IMiniWorldMemberListView; +import com.bingchuang.app.miniworld.activity.MiniWorldMemberListActivity; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.miniworld.bean.MiniWorldMemberListInfo; +import com.bingchuang.core.miniworld.bean.MiniWorldMemberListMemberInfo; +import com.bingchuang.core.miniworld.model.MiniWorldModel; +import com.bingchuang.core.utils.net.DontWarnObserver; import com.bingchuang.library.base.PresenterEvent; import java.util.List; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/presenter/MiniWorldNoticePresenter.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/presenter/MiniWorldNoticePresenter.java similarity index 78% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/presenter/MiniWorldNoticePresenter.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/presenter/MiniWorldNoticePresenter.java index d93dbc56d..9739f4351 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/presenter/MiniWorldNoticePresenter.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/presenter/MiniWorldNoticePresenter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.miniworld.presenter; +package com.bingchuang.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.pikolive.app.miniworld.view.IMiniWorldNoticeView; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.app.common.widget.CustomImageSpan; +import com.bingchuang.app.miniworld.view.IMiniWorldNoticeView; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseMvpPresenter; +import com.bingchuang.app.common.widget.CustomImageSpan; public class MiniWorldNoticePresenter extends BaseMvpPresenter { diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/presenter/MiniWorldPresenter.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/presenter/MiniWorldPresenter.java similarity index 82% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/presenter/MiniWorldPresenter.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/presenter/MiniWorldPresenter.java index 98d93cd52..fffb17e12 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/presenter/MiniWorldPresenter.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/presenter/MiniWorldPresenter.java @@ -1,13 +1,13 @@ -package com.pikolive.app.miniworld.presenter; +package com.bingchuang.app.miniworld.presenter; import android.annotation.SuppressLint; -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.app.miniworld.view.IMiniWorldView; -import com.pikolive.core.miniworld.bean.MiniWorldCategoryInfo; -import com.pikolive.core.miniworld.model.MiniWorldModel; -import com.pikolive.core.utils.net.RxHelper; -import com.pikolive.core.utils.net.ServerException; +import com.bingchuang.app.base.BaseMvpPresenter; +import com.bingchuang.app.miniworld.view.IMiniWorldView; +import com.bingchuang.core.miniworld.bean.MiniWorldCategoryInfo; +import com.bingchuang.core.miniworld.model.MiniWorldModel; +import com.bingchuang.core.utils.net.RxHelper; +import com.bingchuang.core.utils.net.ServerException; import com.bingchuang.library.base.PresenterEvent; import com.bingchuang.library.utils.ListUtils; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/presenter/MiniWorldSearchPresenter.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/presenter/MiniWorldSearchPresenter.java similarity index 86% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/presenter/MiniWorldSearchPresenter.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/presenter/MiniWorldSearchPresenter.java index 02267c255..e3512ea86 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/presenter/MiniWorldSearchPresenter.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/presenter/MiniWorldSearchPresenter.java @@ -1,12 +1,12 @@ -package com.pikolive.app.miniworld.presenter; +package com.bingchuang.app.miniworld.presenter; import android.annotation.SuppressLint; -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.app.miniworld.view.IMiniWorldSearchView; -import com.pikolive.core.miniworld.bean.MiniWorldInfo; -import com.pikolive.core.miniworld.model.MiniWorldModel; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.app.base.BaseMvpPresenter; +import com.bingchuang.app.miniworld.view.IMiniWorldSearchView; +import com.bingchuang.core.miniworld.bean.MiniWorldInfo; +import com.bingchuang.core.miniworld.model.MiniWorldModel; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.base.PresenterEvent; import com.bingchuang.library.utils.ListUtils; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/view/IAudioPartyDialogView.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/view/IAudioPartyDialogView.java similarity index 64% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/view/IAudioPartyDialogView.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/view/IAudioPartyDialogView.java index 51c42156e..4f6ce35d4 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/view/IAudioPartyDialogView.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/view/IAudioPartyDialogView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.miniworld.view; +package com.bingchuang.app.miniworld.view; public interface IAudioPartyDialogView { void worldRoomListSuccess(); diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/view/IMWTeamMessageView.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/view/IMWTeamMessageView.java similarity index 84% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/view/IMWTeamMessageView.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/view/IMWTeamMessageView.java index fdd2876ce..473bdaf2a 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/view/IMWTeamMessageView.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/view/IMWTeamMessageView.java @@ -1,6 +1,6 @@ -package com.pikolive.app.miniworld.view; +package com.bingchuang.app.miniworld.view; -import com.pikolive.core.miniworld.bean.MWChatInfo; +import com.bingchuang.core.miniworld.bean.MWChatInfo; import com.bingchuang.library.base.IMvpBaseView; public interface IMWTeamMessageView extends IMvpBaseView { diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/view/IMWThemeView.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/view/IMWThemeView.java similarity index 75% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/view/IMWThemeView.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/view/IMWThemeView.java index f4942926f..d1da85d0d 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/view/IMWThemeView.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/view/IMWThemeView.java @@ -1,6 +1,6 @@ -package com.pikolive.app.miniworld.view; +package com.bingchuang.app.miniworld.view; -import com.pikolive.core.miniworld.bean.TopicInfo; +import com.bingchuang.core.miniworld.bean.TopicInfo; import com.bingchuang.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/view/IMiniWorldCategoryView.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/view/IMiniWorldCategoryView.java similarity index 81% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/view/IMiniWorldCategoryView.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/view/IMiniWorldCategoryView.java index b91ff30c8..e33796932 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/view/IMiniWorldCategoryView.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/view/IMiniWorldCategoryView.java @@ -1,6 +1,6 @@ -package com.pikolive.app.miniworld.view; +package com.bingchuang.app.miniworld.view; -import com.pikolive.core.miniworld.bean.MiniWorldInfo; +import com.bingchuang.core.miniworld.bean.MiniWorldInfo; import com.bingchuang.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/view/IMiniWorldEditView.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/view/IMiniWorldEditView.java similarity index 91% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/view/IMiniWorldEditView.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/view/IMiniWorldEditView.java index 5e87b336b..399d2f9c7 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/view/IMiniWorldEditView.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/view/IMiniWorldEditView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.miniworld.view; +package com.bingchuang.app.miniworld.view; import com.bingchuang.library.base.IMvpBaseView; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/view/IMiniWorldGuestPage.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/view/IMiniWorldGuestPage.java similarity index 87% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/view/IMiniWorldGuestPage.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/view/IMiniWorldGuestPage.java index 8468124d2..cb94b4c8a 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/view/IMiniWorldGuestPage.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/view/IMiniWorldGuestPage.java @@ -1,9 +1,9 @@ -package com.pikolive.app.miniworld.view; +package com.bingchuang.app.miniworld.view; import androidx.annotation.NonNull; -import com.pikolive.app.miniworld.viewmodel.MiniWorldDetailInfoVM; -import com.pikolive.core.miniworld.bean.AudioPartyInfo; +import com.bingchuang.app.miniworld.viewmodel.MiniWorldDetailInfoVM; +import com.bingchuang.core.miniworld.bean.AudioPartyInfo; import com.bingchuang.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/view/IMiniWorldMainView.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/view/IMiniWorldMainView.java similarity index 65% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/view/IMiniWorldMainView.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/view/IMiniWorldMainView.java index 94e1deab2..695ec25d9 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/view/IMiniWorldMainView.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/view/IMiniWorldMainView.java @@ -1,7 +1,7 @@ -package com.pikolive.app.miniworld.view; +package com.bingchuang.app.miniworld.view; -import com.pikolive.core2.home.bean.BannerInfo; -import com.pikolive.core.miniworld.bean.MiniWorldMainItemInfo; +import com.bingchuang.core2.home.bean.BannerInfo; +import com.bingchuang.core.miniworld.bean.MiniWorldMainItemInfo; import com.bingchuang.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/view/IMiniWorldMemberListView.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/view/IMiniWorldMemberListView.java similarity index 89% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/view/IMiniWorldMemberListView.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/view/IMiniWorldMemberListView.java index a0b47bd0a..43280d23c 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/view/IMiniWorldMemberListView.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/view/IMiniWorldMemberListView.java @@ -1,6 +1,6 @@ -package com.pikolive.app.miniworld.view; +package com.bingchuang.app.miniworld.view; -import com.pikolive.core.miniworld.bean.MiniWorldMemberListMemberInfo; +import com.bingchuang.core.miniworld.bean.MiniWorldMemberListMemberInfo; import com.bingchuang.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/view/IMiniWorldNoticeView.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/view/IMiniWorldNoticeView.java similarity index 72% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/view/IMiniWorldNoticeView.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/view/IMiniWorldNoticeView.java index 116ea6c12..09c6933ce 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/view/IMiniWorldNoticeView.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/view/IMiniWorldNoticeView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.miniworld.view; +package com.bingchuang.app.miniworld.view; import com.bingchuang.library.base.IMvpBaseView; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/view/IMiniWorldSearchView.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/view/IMiniWorldSearchView.java similarity index 76% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/view/IMiniWorldSearchView.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/view/IMiniWorldSearchView.java index 15652754e..461212c20 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/view/IMiniWorldSearchView.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/view/IMiniWorldSearchView.java @@ -1,6 +1,6 @@ -package com.pikolive.app.miniworld.view; +package com.bingchuang.app.miniworld.view; -import com.pikolive.core.miniworld.bean.MiniWorldInfo; +import com.bingchuang.core.miniworld.bean.MiniWorldInfo; import com.bingchuang.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/view/IMiniWorldView.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/view/IMiniWorldView.java similarity index 81% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/view/IMiniWorldView.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/view/IMiniWorldView.java index d584e52b8..d93b0cda0 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/view/IMiniWorldView.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/view/IMiniWorldView.java @@ -1,6 +1,6 @@ -package com.pikolive.app.miniworld.view; +package com.bingchuang.app.miniworld.view; -import com.pikolive.core.miniworld.bean.MiniWorldCategoryInfo; +import com.bingchuang.core.miniworld.bean.MiniWorldCategoryInfo; import com.bingchuang.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/viewmodel/MiniWorldDetailInfoVM.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/viewmodel/MiniWorldDetailInfoVM.java similarity index 95% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/viewmodel/MiniWorldDetailInfoVM.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/viewmodel/MiniWorldDetailInfoVM.java index c1aebfb82..dee4e3c4b 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/viewmodel/MiniWorldDetailInfoVM.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/viewmodel/MiniWorldDetailInfoVM.java @@ -1,12 +1,12 @@ -package com.pikolive.app.miniworld.viewmodel; +package com.bingchuang.app.miniworld.viewmodel; import android.text.TextUtils; -import com.pikolive.app.R; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.miniworld.bean.MiniWorldDetailInfo; -import com.pikolive.core.miniworld.bean.MiniWorldDetailInfoWithCurrentMember; -import com.pikolive.core.miniworld.bean.MiniWorldDetailInfoWithMemberInfo; +import com.bingchuang.app.R; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.miniworld.bean.MiniWorldDetailInfo; +import com.bingchuang.core.miniworld.bean.MiniWorldDetailInfoWithCurrentMember; +import com.bingchuang.core.miniworld.bean.MiniWorldDetailInfoWithMemberInfo; import com.bingchuang.library.utils.ListUtils; import com.bingchuang.library.utils.ResUtil; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/viewmodel/MiniWorldEditableInfoVM.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/viewmodel/MiniWorldEditableInfoVM.java similarity index 98% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/viewmodel/MiniWorldEditableInfoVM.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/viewmodel/MiniWorldEditableInfoVM.java index 83f696fa8..461a8514b 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/viewmodel/MiniWorldEditableInfoVM.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/viewmodel/MiniWorldEditableInfoVM.java @@ -1,4 +1,4 @@ -package com.pikolive.app.miniworld.viewmodel; +package com.bingchuang.app.miniworld.viewmodel; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/widget/MWMagicIndicator.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/widget/MWMagicIndicator.java similarity index 79% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/widget/MWMagicIndicator.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/widget/MWMagicIndicator.java index b14e98c31..a013b8c9d 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/widget/MWMagicIndicator.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/widget/MWMagicIndicator.java @@ -1,4 +1,4 @@ -package com.pikolive.app.miniworld.widget; +package com.bingchuang.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.pikolive.app.R; -import com.pikolive.app.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; -import com.pikolive.core2.home.bean.TabInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.bingchuang.core2.home.bean.TabInfo; import java.util.List; diff --git a/app/src/module_mini_world/java/com/pikolive/app/miniworld/widget/MiniWorldEditChooseClassifyDialog.java b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/widget/MiniWorldEditChooseClassifyDialog.java similarity index 91% rename from app/src/module_mini_world/java/com/pikolive/app/miniworld/widget/MiniWorldEditChooseClassifyDialog.java rename to app/src/module_mini_world/java/com/bingchuang/app/miniworld/widget/MiniWorldEditChooseClassifyDialog.java index cf932a293..74ddfd5c0 100644 --- a/app/src/module_mini_world/java/com/pikolive/app/miniworld/widget/MiniWorldEditChooseClassifyDialog.java +++ b/app/src/module_mini_world/java/com/bingchuang/app/miniworld/widget/MiniWorldEditChooseClassifyDialog.java @@ -1,4 +1,4 @@ -package com.pikolive.app.miniworld.widget; +package com.bingchuang.app.miniworld.widget; import android.app.Dialog; import android.content.Context; @@ -15,12 +15,12 @@ import androidx.recyclerview.widget.RecyclerView; import com.google.android.material.bottomsheet.BottomSheetDialogFragment; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.pikolive.app.miniworld.adapter.MiniWorldEditClassifyAdapter; -import com.pikolive.app.R; -import com.pikolive.app.ui.widget.recyclerview.decoration.SpacingDecoration; -import com.pikolive.core.miniworld.bean.MiniWorldEditClassifyInfo; -import com.pikolive.core.miniworld.model.MiniWorldModel; -import com.pikolive.core.utils.net.DontWarnObserver; +import com.bingchuang.app.miniworld.adapter.MiniWorldEditClassifyAdapter; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.widget.recyclerview.decoration.SpacingDecoration; +import com.bingchuang.core.miniworld.bean.MiniWorldEditClassifyInfo; +import com.bingchuang.core.miniworld.model.MiniWorldModel; +import com.bingchuang.core.utils.net.DontWarnObserver; import com.bingchuang.library.utils.SingleToastUtil; import java.util.List; 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 78a14fb95..589763003 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 067720935..2453cf20e 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 @@ -4,21 +4,20 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/bg_normal_1c1b22" - android:orientation="vertical" - tools:context="com.pikolive.app.com.pikolive.erban.miniworld.activity.MiniWorldActivity"> + android:orientation="vertical"> - - - + 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 ac54cd664..ffcfa5841 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.pikolive.app.miniworld.activity.MiniWorldActivity"> + tools:context="com.bingchuang.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 70458fb60..820f98864 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"> - + android:orientation="vertical"> - 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 957d13010..67c34b580 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 +82,6 @@ - +- @@ -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 169735f8d..b4e454cec 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 @@ -4,8 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/white" - android:orientation="vertical" - tools:context="com.pikolive.app.com.pikolive.erban.miniworld.activity.MiniWorldSearchActivity"> + android:orientation="vertical">- 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 e79c7f672..baebda7b6 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.pikolive.app.ui.widget.AppBarLayoutBehavior"> + app:layout_behavior="com.bingchuang.app.ui.widget.AppBarLayoutBehavior">@@ -95,5 +94,5 @@ - +- + tools:context="com.bingchuang.app.HomePartyRoomFragment"> @@ -12,7 +12,7 @@ + type="com.bingchuang.core.room.bean.RoomInfo" /> - - - - - - - - + type="com.bingchuang.core.room.bean.RoomInfo" /> - @@ -119,14 +119,14 @@ - - - - - + android:layout_height="match_parent"> - + 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 f79a99273..d502fc9de 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.bingchuang.app.avroom.fragment.SingleRoomFragment"> @@ -16,7 +16,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - \ No newline at end of file diff --git a/app/src/module_public_chat_hall/res/layout/fragment_public_chat_hall_attention.xml b/app/src/module_public_chat_hall/res/layout/fragment_public_chat_hall_attention.xml index e38e5e5de..f624887bd 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 @@ -- - - - - - - - - + tools:context="com.bingchuang.app.miniworld.adapter.MiniWorldMainAdapter"> + tools:context="com.bingchuang.app.miniworld.adapter.MiniWorldMainAdapter"> - - 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 51819f5c2..cfda8e669 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/pikolive/app/music/fragment/LocalMusicListFragment.java b/app/src/module_music/java/com/bingchuang/app/music/fragment/LocalMusicListFragment.java similarity index 92% rename from app/src/module_music/java/com/pikolive/app/music/fragment/LocalMusicListFragment.java rename to app/src/module_music/java/com/bingchuang/app/music/fragment/LocalMusicListFragment.java index 8fc3b98c3..5194893f0 100644 --- a/app/src/module_music/java/com/pikolive/app/music/fragment/LocalMusicListFragment.java +++ b/app/src/module_music/java/com/bingchuang/app/music/fragment/LocalMusicListFragment.java @@ -1,4 +1,4 @@ -package com.pikolive.app.music.fragment; +package com.bingchuang.app.music.fragment; import android.app.Activity; import android.content.Intent; @@ -13,25 +13,25 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.netease.nim.uikit.common.util.sys.NetworkUtil; -import com.pikolive.app.music.presenter.LocalMusicListPresenter; +import com.bingchuang.app.music.presenter.LocalMusicListPresenter; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; import com.scwang.smartrefresh.layout.listener.OnRefreshLoadmoreListener; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseMvpFragment; -import com.pikolive.app.music.activity.AddLocalMusicListActivity; -import com.pikolive.app.music.activity.MusicListActivity; -import com.pikolive.app.music.adapter.LocalMusicListAdapter; -import com.pikolive.app.music.widget.VoiceSeekDialog; -import com.pikolive.core.Constants; -import com.pikolive.core.music.db.bean.LocalMusicBean; -import com.pikolive.core.music.event.CurrentMusicUpdateEvent; -import com.pikolive.core.music.event.MusicPauseEvent; -import com.pikolive.core.music.event.MusicPlayingEvent; -import com.pikolive.core.music.event.MusicStopEvent; -import com.pikolive.core.music.model.IPlayerModel; -import com.pikolive.core.music.model.PlayerModel; -import com.pikolive.core.music.view.ILocalMusicListView; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseMvpFragment; +import com.bingchuang.app.music.activity.AddLocalMusicListActivity; +import com.bingchuang.app.music.activity.MusicListActivity; +import com.bingchuang.app.music.adapter.LocalMusicListAdapter; +import com.bingchuang.app.music.widget.VoiceSeekDialog; +import com.bingchuang.core.Constants; +import com.bingchuang.core.music.db.bean.LocalMusicBean; +import com.bingchuang.core.music.event.CurrentMusicUpdateEvent; +import com.bingchuang.core.music.event.MusicPauseEvent; +import com.bingchuang.core.music.event.MusicPlayingEvent; +import com.bingchuang.core.music.event.MusicStopEvent; +import com.bingchuang.core.music.model.IPlayerModel; +import com.bingchuang.core.music.model.PlayerModel; +import com.bingchuang.core.music.view.ILocalMusicListView; import com.bingchuang.library.base.factory.CreatePresenter; import com.bingchuang.library.utils.ListUtils; import com.bingchuang.library.utils.ResUtil; diff --git a/app/src/module_music/java/com/pikolive/app/music/fragment/ShareMusicListFragment.java b/app/src/module_music/java/com/bingchuang/app/music/fragment/ShareMusicListFragment.java similarity index 94% rename from app/src/module_music/java/com/pikolive/app/music/fragment/ShareMusicListFragment.java rename to app/src/module_music/java/com/bingchuang/app/music/fragment/ShareMusicListFragment.java index 56760c048..4f1946cbf 100644 --- a/app/src/module_music/java/com/pikolive/app/music/fragment/ShareMusicListFragment.java +++ b/app/src/module_music/java/com/bingchuang/app/music/fragment/ShareMusicListFragment.java @@ -1,4 +1,4 @@ -package com.pikolive.app.music.fragment; +package com.bingchuang.app.music.fragment; import android.text.Editable; import android.text.SpannableStringBuilder; @@ -14,19 +14,19 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.netease.nim.uikit.common.util.sys.NetworkUtil; -import com.pikolive.app.music.presenter.ShareMusicListPresenter; +import com.bingchuang.app.music.presenter.ShareMusicListPresenter; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; import com.scwang.smartrefresh.layout.listener.OnRefreshLoadmoreListener; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseMvpFragment; -import com.pikolive.app.utils.KeyBoardUtils; -import com.pikolive.app.music.activity.MusicListActivity; -import com.pikolive.app.music.adapter.ShareMusicListAdapter; -import com.pikolive.core.Constants; -import com.pikolive.core.music.bean.ShareMusicInfo; -import com.pikolive.core.music.db.bean.LocalMusicBean; -import com.pikolive.core.music.view.IShareMusicListView; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseMvpFragment; +import com.bingchuang.app.utils.KeyBoardUtils; +import com.bingchuang.app.music.activity.MusicListActivity; +import com.bingchuang.app.music.adapter.ShareMusicListAdapter; +import com.bingchuang.core.Constants; +import com.bingchuang.core.music.bean.ShareMusicInfo; +import com.bingchuang.core.music.db.bean.LocalMusicBean; +import com.bingchuang.core.music.view.IShareMusicListView; import com.bingchuang.library.base.factory.CreatePresenter; import com.bingchuang.library.utils.ListUtils; import com.bingchuang.library.utils.ResUtil; diff --git a/app/src/module_music/java/com/pikolive/app/music/presenter/AddLocalMusicListPresenter.kt b/app/src/module_music/java/com/bingchuang/app/music/presenter/AddLocalMusicListPresenter.kt similarity index 92% rename from app/src/module_music/java/com/pikolive/app/music/presenter/AddLocalMusicListPresenter.kt rename to app/src/module_music/java/com/bingchuang/app/music/presenter/AddLocalMusicListPresenter.kt index e8ff92fb4..cbd9c6fa2 100644 --- a/app/src/module_music/java/com/pikolive/app/music/presenter/AddLocalMusicListPresenter.kt +++ b/app/src/module_music/java/com/bingchuang/app/music/presenter/AddLocalMusicListPresenter.kt @@ -1,14 +1,14 @@ -package com.pikolive.app.music.presenter +package com.bingchuang.app.music.presenter import android.net.Uri import android.os.Build import android.os.Environment -import com.pikolive.app.base.BaseMvpPresenter -import com.pikolive.core.music.db.bean.LocalMusicBean -import com.pikolive.core.music.db.model.LocalMusicDbModel -import com.pikolive.core.music.view.IAddLocalMusicListView -import com.pikolive.core.utils.Logger -import com.pikolive.core.utils.net.RxHelper +import com.bingchuang.app.base.BaseMvpPresenter +import com.bingchuang.core.music.db.bean.LocalMusicBean +import com.bingchuang.core.music.db.model.LocalMusicDbModel +import com.bingchuang.core.music.view.IAddLocalMusicListView +import com.bingchuang.core.utils.Logger +import com.bingchuang.core.utils.net.RxHelper import com.bingchuang.library.base.PresenterEvent import com.bingchuang.library.common.file.FileHelper import io.reactivex.disposables.Disposable diff --git a/app/src/module_music/java/com/pikolive/app/music/presenter/LocalMusicListPresenter.java b/app/src/module_music/java/com/bingchuang/app/music/presenter/LocalMusicListPresenter.java similarity index 89% rename from app/src/module_music/java/com/pikolive/app/music/presenter/LocalMusicListPresenter.java rename to app/src/module_music/java/com/bingchuang/app/music/presenter/LocalMusicListPresenter.java index 8e3492c0b..3507852c5 100644 --- a/app/src/module_music/java/com/pikolive/app/music/presenter/LocalMusicListPresenter.java +++ b/app/src/module_music/java/com/bingchuang/app/music/presenter/LocalMusicListPresenter.java @@ -1,15 +1,15 @@ -package com.pikolive.app.music.presenter; +package com.bingchuang.app.music.presenter; import android.annotation.SuppressLint; -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.core.database.AppDataBase; -import com.pikolive.core.Constants; -import com.pikolive.core.music.db.bean.LocalMusicBean; -import com.pikolive.core.music.db.model.LocalMusicDbModel; -import com.pikolive.core.music.model.PlayerModel; -import com.pikolive.core.music.view.ILocalMusicListView; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.app.base.BaseMvpPresenter; +import com.bingchuang.core.database.AppDataBase; +import com.bingchuang.core.Constants; +import com.bingchuang.core.music.db.bean.LocalMusicBean; +import com.bingchuang.core.music.db.model.LocalMusicDbModel; +import com.bingchuang.core.music.model.PlayerModel; +import com.bingchuang.core.music.view.ILocalMusicListView; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.base.PresenterEvent; import com.bingchuang.library.utils.ListUtils; diff --git a/app/src/module_music/java/com/bingchuang/app/music/presenter/MusicListPresenter.java b/app/src/module_music/java/com/bingchuang/app/music/presenter/MusicListPresenter.java new file mode 100644 index 000000000..60bdbdf78 --- /dev/null +++ b/app/src/module_music/java/com/bingchuang/app/music/presenter/MusicListPresenter.java @@ -0,0 +1,7 @@ +package com.bingchuang.app.music.presenter; + +import com.bingchuang.app.base.BaseMvpPresenter; +import com.bingchuang.core.music.view.IMusicListView; + +public class MusicListPresenter extends BaseMvpPresenter { +} diff --git a/app/src/module_music/java/com/pikolive/app/music/presenter/ShareMusicListPresenter.java b/app/src/module_music/java/com/bingchuang/app/music/presenter/ShareMusicListPresenter.java similarity index 92% rename from app/src/module_music/java/com/pikolive/app/music/presenter/ShareMusicListPresenter.java rename to app/src/module_music/java/com/bingchuang/app/music/presenter/ShareMusicListPresenter.java index 465aeb08c..fa494092d 100644 --- a/app/src/module_music/java/com/pikolive/app/music/presenter/ShareMusicListPresenter.java +++ b/app/src/module_music/java/com/bingchuang/app/music/presenter/ShareMusicListPresenter.java @@ -1,15 +1,15 @@ -package com.pikolive.app.music.presenter; +package com.bingchuang.app.music.presenter; import android.annotation.SuppressLint; -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.core.database.AppDataBase; -import com.pikolive.core.Constants; -import com.pikolive.core.music.bean.ShareMusicInfo; -import com.pikolive.core.music.db.bean.LocalMusicBean; -import com.pikolive.core.music.model.ShareMusicListModel; -import com.pikolive.core.music.view.IShareMusicListView; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.app.base.BaseMvpPresenter; +import com.bingchuang.core.database.AppDataBase; +import com.bingchuang.core.Constants; +import com.bingchuang.core.music.bean.ShareMusicInfo; +import com.bingchuang.core.music.db.bean.LocalMusicBean; +import com.bingchuang.core.music.model.ShareMusicListModel; +import com.bingchuang.core.music.view.IShareMusicListView; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.base.PresenterEvent; import com.bingchuang.library.utils.ListUtils; diff --git a/app/src/module_music/java/com/pikolive/app/music/widget/MusicPlayerView.java b/app/src/module_music/java/com/bingchuang/app/music/widget/MusicPlayerView.java similarity index 94% rename from app/src/module_music/java/com/pikolive/app/music/widget/MusicPlayerView.java rename to app/src/module_music/java/com/bingchuang/app/music/widget/MusicPlayerView.java index 377a73f93..388e937dd 100644 --- a/app/src/module_music/java/com/pikolive/app/music/widget/MusicPlayerView.java +++ b/app/src/module_music/java/com/bingchuang/app/music/widget/MusicPlayerView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.music.widget; +package com.bingchuang.app.music.widget; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -18,18 +18,18 @@ import android.widget.RelativeLayout; import android.widget.SeekBar; import android.widget.TextView; -import com.pikolive.app.music.activity.MusicListActivity; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseMvpActivity; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.pikolive.core.DemoCache; -import com.pikolive.core.music.db.bean.LocalMusicBean; -import com.pikolive.core.music.event.CurrentMusicUpdateEvent; -import com.pikolive.core.music.event.MusicPauseEvent; -import com.pikolive.core.music.event.MusicPlayingEvent; -import com.pikolive.core.music.event.MusicStopEvent; -import com.pikolive.core.music.model.IPlayerModel; -import com.pikolive.core.music.model.PlayerModel; +import com.bingchuang.app.music.activity.MusicListActivity; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseMvpActivity; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.core.DemoCache; +import com.bingchuang.core.music.db.bean.LocalMusicBean; +import com.bingchuang.core.music.event.CurrentMusicUpdateEvent; +import com.bingchuang.core.music.event.MusicPauseEvent; +import com.bingchuang.core.music.event.MusicPlayingEvent; +import com.bingchuang.core.music.event.MusicStopEvent; +import com.bingchuang.core.music.model.IPlayerModel; +import com.bingchuang.core.music.model.PlayerModel; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.SingleToastUtil; diff --git a/app/src/module_music/java/com/pikolive/app/music/widget/VoiceSeekDialog.java b/app/src/module_music/java/com/bingchuang/app/music/widget/VoiceSeekDialog.java similarity index 94% rename from app/src/module_music/java/com/pikolive/app/music/widget/VoiceSeekDialog.java rename to app/src/module_music/java/com/bingchuang/app/music/widget/VoiceSeekDialog.java index b8ddb51be..fdf5ee8bc 100644 --- a/app/src/module_music/java/com/pikolive/app/music/widget/VoiceSeekDialog.java +++ b/app/src/module_music/java/com/bingchuang/app/music/widget/VoiceSeekDialog.java @@ -1,4 +1,4 @@ -package com.pikolive.app.music.widget; +package com.bingchuang.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.pikolive.app.R; -import com.pikolive.app.common.util.Utils; -import com.pikolive.core.music.model.PlayerModel; +import com.bingchuang.app.R; +import com.bingchuang.app.common.util.Utils; +import com.bingchuang.core.music.model.PlayerModel; /** diff --git a/app/src/module_music/java/com/pikolive/app/music/TEMP.java b/app/src/module_music/java/com/pikolive/app/music/TEMP.java deleted file mode 100644 index 9be2bb3e1..000000000 --- a/app/src/module_music/java/com/pikolive/app/music/TEMP.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pikolive.app.music; - -public class TEMP { -} diff --git a/app/src/module_music/java/com/pikolive/app/music/presenter/MusicListPresenter.java b/app/src/module_music/java/com/pikolive/app/music/presenter/MusicListPresenter.java deleted file mode 100644 index dc9280fcd..000000000 --- a/app/src/module_music/java/com/pikolive/app/music/presenter/MusicListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.pikolive.app.music.presenter; - -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.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 ca12a68da..571442f43 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"> - - + () { + + override fun init() { + } +} \ No newline at end of file diff --git a/app/src/module_other/java/com/bingchuang/app/other/OtherMusicActivity.kt b/app/src/module_other/java/com/bingchuang/app/other/OtherMusicActivity.kt new file mode 100644 index 000000000..3309e05d2 --- /dev/null +++ b/app/src/module_other/java/com/bingchuang/app/other/OtherMusicActivity.kt @@ -0,0 +1,11 @@ +package com.bingchuang.app.other + +import android.content.Intent +import com.bingchuang.app.base.BaseBindingActivity +import com.bingchuang.app.databinding.OtherMusicActivityBinding + +class OtherMusicActivity : BaseBindingActivity () { + + override fun init() { + } +} \ No newline at end of file diff --git a/app/src/module_other/java/com/bingchuang/app/other/OtherRoomActivity.kt b/app/src/module_other/java/com/bingchuang/app/other/OtherRoomActivity.kt new file mode 100644 index 000000000..e4acacb78 --- /dev/null +++ b/app/src/module_other/java/com/bingchuang/app/other/OtherRoomActivity.kt @@ -0,0 +1,12 @@ +package com.bingchuang.app.other + +import android.content.Intent +import com.bingchuang.app.base.BaseBindingActivity +import com.bingchuang.app.databinding.OtherActivityBinding +import com.bingchuang.app.databinding.OtherRoomActivityBinding + +class OtherRoomActivity : BaseBindingActivity () { + + override fun init() { + } +} \ No newline at end of file diff --git a/app/src/module_other/java/com/bingchuang/app/other/OtherUserInfoActivity.kt b/app/src/module_other/java/com/bingchuang/app/other/OtherUserInfoActivity.kt new file mode 100644 index 000000000..406008851 --- /dev/null +++ b/app/src/module_other/java/com/bingchuang/app/other/OtherUserInfoActivity.kt @@ -0,0 +1,11 @@ +package com.bingchuang.app.other + +import com.bingchuang.app.base.BaseBindingActivity +import com.bingchuang.app.databinding.OtherActivityBinding +import com.bingchuang.app.databinding.OtherUserInfoActivityBinding + +class OtherUserInfoActivity : BaseBindingActivity () { + + override fun init() { + } +} \ No newline at end of file diff --git a/app/src/module_other/java/com/pikolive/app/other/OtherMomentActivity.kt b/app/src/module_other/java/com/pikolive/app/other/OtherMomentActivity.kt deleted file mode 100644 index 68c7b463e..000000000 --- a/app/src/module_other/java/com/pikolive/app/other/OtherMomentActivity.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.pikolive.app.other - -import com.pikolive.app.base.BaseBindingActivity -import com.pikolive.app.databinding.OtherMomentActivityBinding - -class OtherMomentActivity : BaseBindingActivity () { - - override fun init() { - } -} \ No newline at end of file diff --git a/app/src/module_other/java/com/pikolive/app/other/OtherMusicActivity.kt b/app/src/module_other/java/com/pikolive/app/other/OtherMusicActivity.kt deleted file mode 100644 index 404cf64de..000000000 --- a/app/src/module_other/java/com/pikolive/app/other/OtherMusicActivity.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.pikolive.app.other - -import android.content.Intent -import com.pikolive.app.base.BaseBindingActivity -import com.pikolive.app.databinding.OtherMusicActivityBinding - -class OtherMusicActivity : BaseBindingActivity () { - - override fun init() { - } -} \ No newline at end of file diff --git a/app/src/module_other/java/com/pikolive/app/other/OtherRoomActivity.kt b/app/src/module_other/java/com/pikolive/app/other/OtherRoomActivity.kt deleted file mode 100644 index 60841ac19..000000000 --- a/app/src/module_other/java/com/pikolive/app/other/OtherRoomActivity.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.pikolive.app.other - -import android.content.Intent -import com.pikolive.app.base.BaseBindingActivity -import com.pikolive.app.databinding.OtherActivityBinding -import com.pikolive.app.databinding.OtherRoomActivityBinding - -class OtherRoomActivity : BaseBindingActivity () { - - override fun init() { - } -} \ No newline at end of file diff --git a/app/src/module_other/java/com/pikolive/app/other/OtherUserInfoActivity.kt b/app/src/module_other/java/com/pikolive/app/other/OtherUserInfoActivity.kt deleted file mode 100644 index 27dfe3fd1..000000000 --- a/app/src/module_other/java/com/pikolive/app/other/OtherUserInfoActivity.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.pikolive.app.other - -import com.pikolive.app.base.BaseBindingActivity -import com.pikolive.app.databinding.OtherActivityBinding -import com.pikolive.app.databinding.OtherUserInfoActivityBinding - -class OtherUserInfoActivity : BaseBindingActivity () { - - override fun init() { - } -} \ No newline at end of file diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/activity/AitFriendsSearchActivity.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/activity/AitFriendsSearchActivity.java similarity index 91% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/activity/AitFriendsSearchActivity.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/activity/AitFriendsSearchActivity.java index 33143ff3c..d49a41643 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/activity/AitFriendsSearchActivity.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/activity/AitFriendsSearchActivity.java @@ -1,8 +1,8 @@ -package com.pikolive.app.public_chat_hall.activity; -import com.pikolive.app.public_chat_hall.adapter.AitFriendsSearchAdapter; -import com.pikolive.app.public_chat_hall.bean.PublicChatHallSearchRoomInfo; -import com.pikolive.app.public_chat_hall.event.PublicChatHallAitFriendSearchCompleteEvent; -import com.pikolive.app.public_chat_hall.event.PublicChatHallAitFriendSearchFinishEvent; +package com.bingchuang.app.public_chat_hall.activity; +import com.bingchuang.app.public_chat_hall.adapter.AitFriendsSearchAdapter; +import com.bingchuang.app.public_chat_hall.bean.PublicChatHallSearchRoomInfo; +import com.bingchuang.app.public_chat_hall.event.PublicChatHallAitFriendSearchCompleteEvent; +import com.bingchuang.app.public_chat_hall.event.PublicChatHallAitFriendSearchFinishEvent; import com.bingchuang.library.utils.ResUtil; import android.annotation.SuppressLint; @@ -22,11 +22,11 @@ import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseBindingActivity; -import com.pikolive.app.databinding.ActivityPublicChatHallSearchFriendsBinding; -import com.pikolive.core.contacts.ContactModel; -import com.pikolive.core.room.bean.SearchRoomInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseBindingActivity; +import com.bingchuang.app.databinding.ActivityPublicChatHallSearchFriendsBinding; +import com.bingchuang.core.contacts.ContactModel; +import com.bingchuang.core.room.bean.SearchRoomInfo; import com.bingchuang.library.annatation.ActLayoutRes; import com.bingchuang.library.utils.ImeUtil; import com.bingchuang.library.utils.SingleToastUtil; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/activity/PublicChatHallAitFriendsActivity.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/activity/PublicChatHallAitFriendsActivity.java similarity index 84% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/activity/PublicChatHallAitFriendsActivity.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/activity/PublicChatHallAitFriendsActivity.java index fdc02c4a4..2a6290a22 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/activity/PublicChatHallAitFriendsActivity.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/activity/PublicChatHallAitFriendsActivity.java @@ -1,11 +1,11 @@ -package com.pikolive.app.public_chat_hall.activity; -import com.pikolive.app.public_chat_hall.adapter.PagerDataAdapter; -import com.pikolive.app.public_chat_hall.event.AitFriendEvent; -import com.pikolive.app.public_chat_hall.event.PublicChatHallAitFriendSearchCompleteEvent; -import com.pikolive.app.public_chat_hall.event.PublicChatHallSelectFriendEvent; -import com.pikolive.app.public_chat_hall.fragment.PublicChatHallAttentionFragment; -import com.pikolive.app.public_chat_hall.fragment.PublicChatHallFansListFragment; -import com.pikolive.app.public_chat_hall.fragment.PublicChatHallFriendListFragment; +package com.bingchuang.app.public_chat_hall.activity; +import com.bingchuang.app.public_chat_hall.adapter.PagerDataAdapter; +import com.bingchuang.app.public_chat_hall.event.AitFriendEvent; +import com.bingchuang.app.public_chat_hall.event.PublicChatHallAitFriendSearchCompleteEvent; +import com.bingchuang.app.public_chat_hall.event.PublicChatHallSelectFriendEvent; +import com.bingchuang.app.public_chat_hall.fragment.PublicChatHallAttentionFragment; +import com.bingchuang.app.public_chat_hall.fragment.PublicChatHallFansListFragment; +import com.bingchuang.app.public_chat_hall.fragment.PublicChatHallFriendListFragment; import com.bingchuang.library.utils.ResUtil; import android.content.Context; @@ -15,9 +15,9 @@ import androidx.fragment.app.Fragment; import android.view.View; import com.netease.nim.uikit.StatusBarUtil; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseBindingActivity; -import com.pikolive.app.databinding.ActivityPublicChatHallAitFriendsBinding; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseBindingActivity; +import com.bingchuang.app.databinding.ActivityPublicChatHallAitFriendsBinding; import com.bingchuang.library.annatation.ActLayoutRes; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/activity/PublicChatHallHomeActivity.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/activity/PublicChatHallHomeActivity.java similarity index 89% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/activity/PublicChatHallHomeActivity.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/activity/PublicChatHallHomeActivity.java index 360e0ebed..94d79769a 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/activity/PublicChatHallHomeActivity.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/activity/PublicChatHallHomeActivity.java @@ -1,6 +1,6 @@ -package com.pikolive.app.public_chat_hall.activity; -import com.pikolive.app.public_chat_hall.adapter.PagerDataAdapter; -import com.pikolive.app.public_chat_hall.fragment.PublicChatHallMessageFragment; +package com.bingchuang.app.public_chat_hall.activity; +import com.bingchuang.app.public_chat_hall.adapter.PagerDataAdapter; +import com.bingchuang.app.public_chat_hall.fragment.PublicChatHallMessageFragment; import com.bingchuang.library.utils.ResUtil; import android.content.Context; @@ -9,13 +9,13 @@ import androidx.fragment.app.Fragment; import android.view.View; import com.netease.nim.uikit.StatusBarUtil; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseBindingActivity; -import com.pikolive.app.databinding.ActivityPublicChatHallBinding; -import com.pikolive.app.headline.HeadLineFragment; -import com.pikolive.app.ui.webview.CommonWebViewActivity; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.pikolive.core2.UriProvider; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseBindingActivity; +import com.bingchuang.app.databinding.ActivityPublicChatHallBinding; +import com.bingchuang.app.headline.HeadLineFragment; +import com.bingchuang.app.ui.webview.CommonWebViewActivity; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.core2.UriProvider; import com.bingchuang.library.annatation.ActLayoutRes; import com.zyyoona7.lib.EasyPopup; import com.zyyoona7.lib.HorizontalGravity; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/activity/PublicChatHallRelatedToMeActivity.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/activity/PublicChatHallRelatedToMeActivity.java similarity index 83% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/activity/PublicChatHallRelatedToMeActivity.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/activity/PublicChatHallRelatedToMeActivity.java index 355e593a4..f6560c1cb 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/activity/PublicChatHallRelatedToMeActivity.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/activity/PublicChatHallRelatedToMeActivity.java @@ -1,7 +1,7 @@ -package com.pikolive.app.public_chat_hall.activity; -import com.pikolive.app.public_chat_hall.adapter.PagerDataAdapter; -import com.pikolive.app.public_chat_hall.fragment.PublicChatHallMessageFragment; -import com.pikolive.app.public_chat_hall.fragment.PublicChatHallMyMessageFragment; +package com.bingchuang.app.public_chat_hall.activity; +import com.bingchuang.app.public_chat_hall.adapter.PagerDataAdapter; +import com.bingchuang.app.public_chat_hall.fragment.PublicChatHallMessageFragment; +import com.bingchuang.app.public_chat_hall.fragment.PublicChatHallMyMessageFragment; import com.bingchuang.library.utils.ResUtil; import android.content.Context; @@ -10,10 +10,10 @@ import androidx.fragment.app.Fragment; import android.view.View; import com.netease.nim.uikit.StatusBarUtil; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseBindingActivity; -import com.pikolive.app.databinding.ActivityPublicChatHallRelatedToMeBinding; -import com.pikolive.app.headline.MyHeadLineFragment; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseBindingActivity; +import com.bingchuang.app.databinding.ActivityPublicChatHallRelatedToMeBinding; +import com.bingchuang.app.headline.MyHeadLineFragment; import com.bingchuang.library.annatation.ActLayoutRes; import java.util.ArrayList; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/adapter/AitFriendsSearchAdapter.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/adapter/AitFriendsSearchAdapter.java similarity index 87% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/adapter/AitFriendsSearchAdapter.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/adapter/AitFriendsSearchAdapter.java index 63796ade8..4feb83e12 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/adapter/AitFriendsSearchAdapter.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/adapter/AitFriendsSearchAdapter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.public_chat_hall.adapter; +package com.bingchuang.app.public_chat_hall.adapter; import android.content.Context; import androidx.appcompat.widget.AppCompatImageView; @@ -8,14 +8,14 @@ import android.widget.CheckBox; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.pikolive.app.R; -import com.pikolive.app.public_chat_hall.bean.PublicChatHallSearchRoomInfo; -import com.pikolive.app.public_chat_hall.event.AitFriendEvent; -import com.pikolive.app.public_chat_hall.event.PublicChatHallAitFriendSearchFinishEvent; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.app.ui.widget.NobleAvatarView; -import com.pikolive.core.noble.NobleUtil; -import com.pikolive.core.room.bean.SearchRoomInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.public_chat_hall.bean.PublicChatHallSearchRoomInfo; +import com.bingchuang.app.public_chat_hall.event.AitFriendEvent; +import com.bingchuang.app.public_chat_hall.event.PublicChatHallAitFriendSearchFinishEvent; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.app.ui.widget.NobleAvatarView; +import com.bingchuang.core.noble.NobleUtil; +import com.bingchuang.core.room.bean.SearchRoomInfo; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/adapter/PagerDataAdapter.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/adapter/PagerDataAdapter.java similarity index 92% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/adapter/PagerDataAdapter.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/adapter/PagerDataAdapter.java index d930d3074..52ffd6940 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/adapter/PagerDataAdapter.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/adapter/PagerDataAdapter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.public_chat_hall.adapter; +package com.bingchuang.app.public_chat_hall.adapter; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/adapter/PublicChatHallAttentionListAdapter.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/adapter/PublicChatHallAttentionListAdapter.java similarity index 90% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/adapter/PublicChatHallAttentionListAdapter.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/adapter/PublicChatHallAttentionListAdapter.java index 2a98d07d0..87f83b61a 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/adapter/PublicChatHallAttentionListAdapter.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/adapter/PublicChatHallAttentionListAdapter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.public_chat_hall.adapter; +package com.bingchuang.app.public_chat_hall.adapter; import androidx.appcompat.widget.AppCompatImageView; import android.text.TextUtils; @@ -6,13 +6,13 @@ import android.view.View; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.pikolive.app.R; -import com.pikolive.app.public_chat_hall.bean.PublicChatHallAttentionInfo; -import com.pikolive.app.public_chat_hall.event.AitFriendEvent; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.app.ui.widget.NobleAvatarView; -import com.pikolive.core.noble.NobleUtil; -import com.pikolive.core.user.bean.AttentionInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.public_chat_hall.bean.PublicChatHallAttentionInfo; +import com.bingchuang.app.public_chat_hall.event.AitFriendEvent; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.app.ui.widget.NobleAvatarView; +import com.bingchuang.core.noble.NobleUtil; +import com.bingchuang.core.user.bean.AttentionInfo; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/adapter/PublicChatHallFansViewAdapter.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/adapter/PublicChatHallFansViewAdapter.java similarity index 89% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/adapter/PublicChatHallFansViewAdapter.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/adapter/PublicChatHallFansViewAdapter.java index 6c6c58514..83b9717b0 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/adapter/PublicChatHallFansViewAdapter.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/adapter/PublicChatHallFansViewAdapter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.public_chat_hall.adapter; +package com.bingchuang.app.public_chat_hall.adapter; import androidx.appcompat.widget.AppCompatImageView; import android.text.TextUtils; @@ -7,13 +7,13 @@ import android.view.View; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.pikolive.app.R; -import com.pikolive.app.public_chat_hall.bean.PublicChatHallFansInfo; -import com.pikolive.app.public_chat_hall.event.AitFriendEvent; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.app.ui.widget.NobleAvatarView; -import com.pikolive.core.noble.NobleUtil; -import com.pikolive.core.user.bean.FansInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.public_chat_hall.bean.PublicChatHallFansInfo; +import com.bingchuang.app.public_chat_hall.event.AitFriendEvent; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.app.ui.widget.NobleAvatarView; +import com.bingchuang.core.noble.NobleUtil; +import com.bingchuang.core.user.bean.FansInfo; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/adapter/PublicChatHallFriendListAdapter.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/adapter/PublicChatHallFriendListAdapter.java similarity index 90% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/adapter/PublicChatHallFriendListAdapter.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/adapter/PublicChatHallFriendListAdapter.java index c73bfe420..204aff217 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/adapter/PublicChatHallFriendListAdapter.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/adapter/PublicChatHallFriendListAdapter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.public_chat_hall.adapter; +package com.bingchuang.app.public_chat_hall.adapter; import android.app.Activity; import androidx.appcompat.widget.AppCompatImageView; @@ -8,13 +8,13 @@ import android.widget.CheckBox; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.pikolive.app.public_chat_hall.bean.PublicChatHallFriendInfo; -import com.pikolive.app.public_chat_hall.event.AitFriendEvent; -import com.pikolive.app.R; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.app.ui.widget.NobleAvatarView; -import com.pikolive.core.noble.NobleUtil; -import com.pikolive.core.user.bean.UserInfo; +import com.bingchuang.app.public_chat_hall.bean.PublicChatHallFriendInfo; +import com.bingchuang.app.public_chat_hall.event.AitFriendEvent; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.app.ui.widget.NobleAvatarView; +import com.bingchuang.core.noble.NobleUtil; +import com.bingchuang.core.user.bean.UserInfo; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/adapter/PublicChatHallMsgAdapter.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/adapter/PublicChatHallMsgAdapter.java similarity index 96% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/adapter/PublicChatHallMsgAdapter.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/adapter/PublicChatHallMsgAdapter.java index a36f8925f..a1cd69219 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/adapter/PublicChatHallMsgAdapter.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/adapter/PublicChatHallMsgAdapter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.public_chat_hall.adapter; +package com.bingchuang.app.public_chat_hall.adapter; import androidx.recyclerview.widget.RecyclerView; import android.view.View; @@ -7,12 +7,12 @@ import com.netease.nim.uikit.business.session.module.Container; import com.netease.nim.uikit.common.util.sys.TimeUtil; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.pikolive.app.R; -import com.pikolive.app.public_chat_hall.msg.BaseMultiItemFetchLoadAdapter; -import com.pikolive.app.public_chat_hall.msg.BaseViewHolder; -import com.pikolive.app.public_chat_hall.msg.viewholder.ChatRoomMsgViewHolderBase; -import com.pikolive.app.public_chat_hall.msg.viewholder.ChatRoomMsgViewHolderFactory; -import com.pikolive.core.public_chat_hall.bean.PublicChatHallMessage; +import com.bingchuang.app.R; +import com.bingchuang.app.public_chat_hall.msg.BaseMultiItemFetchLoadAdapter; +import com.bingchuang.app.public_chat_hall.msg.BaseViewHolder; +import com.bingchuang.app.public_chat_hall.msg.viewholder.ChatRoomMsgViewHolderBase; +import com.bingchuang.app.public_chat_hall.msg.viewholder.ChatRoomMsgViewHolderFactory; +import com.bingchuang.core.public_chat_hall.bean.PublicChatHallMessage; import java.util.HashMap; import java.util.HashSet; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/bean/PublicChatHallAttentionInfo.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/bean/PublicChatHallAttentionInfo.java similarity index 87% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/bean/PublicChatHallAttentionInfo.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/bean/PublicChatHallAttentionInfo.java index 30b5f40f5..2d6eb7416 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/bean/PublicChatHallAttentionInfo.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/bean/PublicChatHallAttentionInfo.java @@ -1,6 +1,6 @@ -package com.pikolive.app.public_chat_hall.bean; +package com.bingchuang.app.public_chat_hall.bean; -import com.pikolive.core.user.bean.AttentionInfo; +import com.bingchuang.core.user.bean.AttentionInfo; public class PublicChatHallAttentionInfo { diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/bean/PublicChatHallFansInfo.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/bean/PublicChatHallFansInfo.java similarity index 86% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/bean/PublicChatHallFansInfo.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/bean/PublicChatHallFansInfo.java index 3c0c5483b..5b751aee5 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/bean/PublicChatHallFansInfo.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/bean/PublicChatHallFansInfo.java @@ -1,6 +1,6 @@ -package com.pikolive.app.public_chat_hall.bean; +package com.bingchuang.app.public_chat_hall.bean; -import com.pikolive.core.user.bean.FansInfo; +import com.bingchuang.core.user.bean.FansInfo; public class PublicChatHallFansInfo { diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/bean/PublicChatHallFriendInfo.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/bean/PublicChatHallFriendInfo.java similarity index 86% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/bean/PublicChatHallFriendInfo.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/bean/PublicChatHallFriendInfo.java index 11fb52e5b..a8e59ddf9 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/bean/PublicChatHallFriendInfo.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/bean/PublicChatHallFriendInfo.java @@ -1,6 +1,6 @@ -package com.pikolive.app.public_chat_hall.bean; +package com.bingchuang.app.public_chat_hall.bean; -import com.pikolive.core.user.bean.UserInfo; +import com.bingchuang.core.user.bean.UserInfo; public class PublicChatHallFriendInfo { diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/bean/PublicChatHallSearchRoomInfo.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/bean/PublicChatHallSearchRoomInfo.java similarity index 92% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/bean/PublicChatHallSearchRoomInfo.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/bean/PublicChatHallSearchRoomInfo.java index 0da983cf9..dfd6dcd90 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/bean/PublicChatHallSearchRoomInfo.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/bean/PublicChatHallSearchRoomInfo.java @@ -1,9 +1,9 @@ -package com.pikolive.app.public_chat_hall.bean; +package com.bingchuang.app.public_chat_hall.bean; import android.os.Parcel; import android.os.Parcelable; -import com.pikolive.core.room.bean.SearchRoomInfo; +import com.bingchuang.core.room.bean.SearchRoomInfo; import lombok.Data; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/event/AitFriendEvent.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/event/AitFriendEvent.java similarity index 94% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/event/AitFriendEvent.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/event/AitFriendEvent.java index def5b6eac..4b9dc1beb 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/event/AitFriendEvent.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/event/AitFriendEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.app.public_chat_hall.event; +package com.bingchuang.app.public_chat_hall.event; public class AitFriendEvent { diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/event/PublicChatHallAitFriendSearchCompleteEvent.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/event/PublicChatHallAitFriendSearchCompleteEvent.java similarity index 54% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/event/PublicChatHallAitFriendSearchCompleteEvent.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/event/PublicChatHallAitFriendSearchCompleteEvent.java index c1db54250..d8e4e1756 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/event/PublicChatHallAitFriendSearchCompleteEvent.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/event/PublicChatHallAitFriendSearchCompleteEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.app.public_chat_hall.event; +package com.bingchuang.app.public_chat_hall.event; public class PublicChatHallAitFriendSearchCompleteEvent { } diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/event/PublicChatHallAitFriendSearchFinishEvent.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/event/PublicChatHallAitFriendSearchFinishEvent.java similarity index 53% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/event/PublicChatHallAitFriendSearchFinishEvent.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/event/PublicChatHallAitFriendSearchFinishEvent.java index 162070b24..715dee3c5 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/event/PublicChatHallAitFriendSearchFinishEvent.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/event/PublicChatHallAitFriendSearchFinishEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.app.public_chat_hall.event; +package com.bingchuang.app.public_chat_hall.event; public class PublicChatHallAitFriendSearchFinishEvent { } diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/event/PublicChatHallAvatarClickEvent.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/event/PublicChatHallAvatarClickEvent.java similarity index 90% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/event/PublicChatHallAvatarClickEvent.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/event/PublicChatHallAvatarClickEvent.java index 0b05175a4..8d6c6930e 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/event/PublicChatHallAvatarClickEvent.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/event/PublicChatHallAvatarClickEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.app.public_chat_hall.event; +package com.bingchuang.app.public_chat_hall.event; import android.content.Context; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/event/PublicChatHallSelectFriendEvent.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/event/PublicChatHallSelectFriendEvent.java similarity index 93% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/event/PublicChatHallSelectFriendEvent.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/event/PublicChatHallSelectFriendEvent.java index 4ebe910c1..cfdf979af 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/event/PublicChatHallSelectFriendEvent.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/event/PublicChatHallSelectFriendEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.app.public_chat_hall.event; +package com.bingchuang.app.public_chat_hall.event; import java.util.List; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/fragment/PublicChatHallAttentionFragment.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/fragment/PublicChatHallAttentionFragment.java similarity index 91% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/fragment/PublicChatHallAttentionFragment.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/fragment/PublicChatHallAttentionFragment.java index 9df3de3c9..2f7956391 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/fragment/PublicChatHallAttentionFragment.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/fragment/PublicChatHallAttentionFragment.java @@ -1,4 +1,4 @@ -package com.pikolive.app.public_chat_hall.fragment; +package com.bingchuang.app.public_chat_hall.fragment; import android.os.Bundle; @@ -9,14 +9,14 @@ import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.widget.CheckBox; -import com.pikolive.app.public_chat_hall.adapter.PublicChatHallAttentionListAdapter; -import com.pikolive.app.public_chat_hall.bean.PublicChatHallAttentionInfo; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseFragment; -import com.pikolive.core.Constants; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.user.AttentionModel; -import com.pikolive.core.user.bean.AttentionInfo; +import com.bingchuang.app.public_chat_hall.adapter.PublicChatHallAttentionListAdapter; +import com.bingchuang.app.public_chat_hall.bean.PublicChatHallAttentionInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseFragment; +import com.bingchuang.core.Constants; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.user.AttentionModel; +import com.bingchuang.core.user.bean.AttentionInfo; import com.bingchuang.library.utils.ListUtils; import java.util.ArrayList; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/fragment/PublicChatHallFansListFragment.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/fragment/PublicChatHallFansListFragment.java similarity index 91% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/fragment/PublicChatHallFansListFragment.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/fragment/PublicChatHallFansListFragment.java index ef71e28ea..0a346145f 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/fragment/PublicChatHallFansListFragment.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/fragment/PublicChatHallFansListFragment.java @@ -1,4 +1,4 @@ -package com.pikolive.app.public_chat_hall.fragment; +package com.bingchuang.app.public_chat_hall.fragment; import android.content.Context; import android.os.Bundle; @@ -10,15 +10,15 @@ import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.widget.CheckBox; -import com.pikolive.app.public_chat_hall.adapter.PublicChatHallFansViewAdapter; -import com.pikolive.app.public_chat_hall.bean.PublicChatHallFansInfo; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseFragment; -import com.pikolive.core.Constants; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.user.AttentionModel; -import com.pikolive.core.user.bean.FansInfo; -import com.pikolive.core.user.bean.FansListInfo; +import com.bingchuang.app.public_chat_hall.adapter.PublicChatHallFansViewAdapter; +import com.bingchuang.app.public_chat_hall.bean.PublicChatHallFansInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseFragment; +import com.bingchuang.core.Constants; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.user.AttentionModel; +import com.bingchuang.core.user.bean.FansInfo; +import com.bingchuang.core.user.bean.FansListInfo; import com.bingchuang.library.utils.ListUtils; import java.util.ArrayList; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/fragment/PublicChatHallFriendListFragment.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/fragment/PublicChatHallFriendListFragment.java similarity index 88% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/fragment/PublicChatHallFriendListFragment.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/fragment/PublicChatHallFriendListFragment.java index ed5e9ca63..d127f674c 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/fragment/PublicChatHallFriendListFragment.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/fragment/PublicChatHallFriendListFragment.java @@ -1,4 +1,4 @@ -package com.pikolive.app.public_chat_hall.fragment; +package com.bingchuang.app.public_chat_hall.fragment; import android.os.Bundle; import androidx.annotation.Nullable; @@ -6,16 +6,16 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.pikolive.app.public_chat_hall.bean.PublicChatHallFriendInfo; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseFragment; -import com.pikolive.app.public_chat_hall.adapter.PublicChatHallFriendListAdapter; -import com.pikolive.core.im.friend.IMFriendModel; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.manager.RelationShipEvent; -import com.pikolive.core.user.UserModel; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.user.event.LoginUserInfoUpdateEvent; +import com.bingchuang.app.public_chat_hall.bean.PublicChatHallFriendInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseFragment; +import com.bingchuang.app.public_chat_hall.adapter.PublicChatHallFriendListAdapter; +import com.bingchuang.core.im.friend.IMFriendModel; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.manager.RelationShipEvent; +import com.bingchuang.core.user.UserModel; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.user.event.LoginUserInfoUpdateEvent; import com.bingchuang.library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/fragment/PublicChatHallMessageFragment.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/fragment/PublicChatHallMessageFragment.java similarity index 91% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/fragment/PublicChatHallMessageFragment.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/fragment/PublicChatHallMessageFragment.java index 17b08a0fb..b3759b8b7 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/fragment/PublicChatHallMessageFragment.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/fragment/PublicChatHallMessageFragment.java @@ -1,4 +1,4 @@ -package com.pikolive.app.public_chat_hall.fragment; +package com.bingchuang.app.public_chat_hall.fragment; import android.annotation.SuppressLint; import android.content.Intent; @@ -34,41 +34,41 @@ import com.netease.nimlib.sdk.msg.model.CustomMessageConfig; import com.netease.nimlib.sdk.msg.model.IMMessage; import com.netease.nimlib.sdk.robot.model.NimRobotInfo; import com.netease.nimlib.sdk.robot.model.RobotAttachment; -import com.pikolive.app.public_chat_hall.event.PublicChatHallAvatarClickEvent; -import com.pikolive.app.public_chat_hall.event.PublicChatHallSelectFriendEvent; -import com.pikolive.app.public_chat_hall.module.PublicChatHallInputPanel; -import com.pikolive.app.public_chat_hall.module.PublicChatHallMessageListPanel; -import com.pikolive.app.public_chat_hall.utils.RemainCountManager; -import com.pikolive.app.public_chat_hall.widget.PublicChatHallGiftAnimationDialog; -import com.pikolive.app.R; -import com.pikolive.app.avroom.ButtonItemFactory; -import com.pikolive.app.avroom.widget.ViewItem; -import com.pikolive.app.ui.gift.callback.OnGiftDialogBtnClickListenerWrapper; -import com.pikolive.app.ui.widget.GiftDialog; -import com.pikolive.app.ui.widget.UserInfoDialog; -import com.pikolive.app.ui.widget.dialog.OpenNobleDialog; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.gift.GiftModel; -import com.pikolive.core.gift.bean.GiftInfo; -import com.pikolive.core.gift.bean.GiftReceiveInfo; -import com.pikolive.core.gift.toolbox.GiftToolbox; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.im.custom.bean.ImTipAttachment; -import com.pikolive.core.im.custom.bean.RouterType; -import com.pikolive.core.initial.InitialModel; -import com.pikolive.core.public_chat_hall.attachment.AitFriendsAttachment; -import com.pikolive.core.public_chat_hall.attachment.AitMeAttachment; -import com.pikolive.core.public_chat_hall.bean.AitFriendsInfo; -import com.pikolive.core.public_chat_hall.bean.AitMeInfo; -import com.pikolive.core.public_chat_hall.event.PublicChatHallMsgCountingDownEvent; -import com.pikolive.core.public_chat_hall.event.PublicChatHallMsgIncomingEvent; -import com.pikolive.core.public_chat_hall.event.PublicChatHallPlayGiftAnimationEvent; -import com.pikolive.core.public_chat_hall.manager.PublicChatHallDataManager; -import com.pikolive.core.public_chat_hall.model.PublicChatHallModel; -import com.pikolive.core.room.queue.bean.MicMemberInfo; -import com.pikolive.core.user.UserModel; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.user.event.LoginUserInfoUpdateEvent; +import com.bingchuang.app.public_chat_hall.event.PublicChatHallAvatarClickEvent; +import com.bingchuang.app.public_chat_hall.event.PublicChatHallSelectFriendEvent; +import com.bingchuang.app.public_chat_hall.module.PublicChatHallInputPanel; +import com.bingchuang.app.public_chat_hall.module.PublicChatHallMessageListPanel; +import com.bingchuang.app.public_chat_hall.utils.RemainCountManager; +import com.bingchuang.app.public_chat_hall.widget.PublicChatHallGiftAnimationDialog; +import com.bingchuang.app.R; +import com.bingchuang.app.avroom.ButtonItemFactory; +import com.bingchuang.app.avroom.widget.ViewItem; +import com.bingchuang.app.ui.gift.callback.OnGiftDialogBtnClickListenerWrapper; +import com.bingchuang.app.ui.widget.GiftDialog; +import com.bingchuang.app.ui.widget.UserInfoDialog; +import com.bingchuang.app.ui.widget.dialog.OpenNobleDialog; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.gift.GiftModel; +import com.bingchuang.core.gift.bean.GiftInfo; +import com.bingchuang.core.gift.bean.GiftReceiveInfo; +import com.bingchuang.core.gift.toolbox.GiftToolbox; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.im.custom.bean.ImTipAttachment; +import com.bingchuang.core.im.custom.bean.RouterType; +import com.bingchuang.core.initial.InitialModel; +import com.bingchuang.core.public_chat_hall.attachment.AitFriendsAttachment; +import com.bingchuang.core.public_chat_hall.attachment.AitMeAttachment; +import com.bingchuang.core.public_chat_hall.bean.AitFriendsInfo; +import com.bingchuang.core.public_chat_hall.bean.AitMeInfo; +import com.bingchuang.core.public_chat_hall.event.PublicChatHallMsgCountingDownEvent; +import com.bingchuang.core.public_chat_hall.event.PublicChatHallMsgIncomingEvent; +import com.bingchuang.core.public_chat_hall.event.PublicChatHallPlayGiftAnimationEvent; +import com.bingchuang.core.public_chat_hall.manager.PublicChatHallDataManager; +import com.bingchuang.core.public_chat_hall.model.PublicChatHallModel; +import com.bingchuang.core.room.queue.bean.MicMemberInfo; +import com.bingchuang.core.user.UserModel; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.user.event.LoginUserInfoUpdateEvent; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.SingleToastUtil; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/fragment/PublicChatHallMyHistoryMessageFragment.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/fragment/PublicChatHallMyHistoryMessageFragment.java similarity index 92% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/fragment/PublicChatHallMyHistoryMessageFragment.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/fragment/PublicChatHallMyHistoryMessageFragment.java index 85f40e5fa..4f4039064 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/fragment/PublicChatHallMyHistoryMessageFragment.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/fragment/PublicChatHallMyHistoryMessageFragment.java @@ -1,4 +1,4 @@ -package com.pikolive.app.public_chat_hall.fragment; +package com.bingchuang.app.public_chat_hall.fragment; import android.os.Bundle; import androidx.annotation.NonNull; @@ -18,19 +18,19 @@ import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; 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.pikolive.app.public_chat_hall.adapter.PublicChatHallMsgAdapter; -import com.pikolive.app.public_chat_hall.presenter.PublicChatHallMyMessagePresenter; -import com.pikolive.app.public_chat_hall.view.IPublicChatHallMyMessageView; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseMvpFragment; -import com.pikolive.core.Constants; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.im.custom.bean.GiftAttachment; -import com.pikolive.core.im.custom.bean.ImTipAttachment; -import com.pikolive.core.public_chat_hall.attachment.AitFriendsAttachment; -import com.pikolive.core.public_chat_hall.bean.PublicChatHallMessage; -import com.pikolive.core.public_chat_hall.manager.PublicChatHallDataManager; +import com.bingchuang.app.public_chat_hall.adapter.PublicChatHallMsgAdapter; +import com.bingchuang.app.public_chat_hall.presenter.PublicChatHallMyMessagePresenter; +import com.bingchuang.app.public_chat_hall.view.IPublicChatHallMyMessageView; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseMvpFragment; +import com.bingchuang.core.Constants; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.im.custom.bean.GiftAttachment; +import com.bingchuang.core.im.custom.bean.ImTipAttachment; +import com.bingchuang.core.public_chat_hall.attachment.AitFriendsAttachment; +import com.bingchuang.core.public_chat_hall.bean.PublicChatHallMessage; +import com.bingchuang.core.public_chat_hall.manager.PublicChatHallDataManager; import com.bingchuang.library.base.factory.CreatePresenter; import com.bingchuang.library.utils.ListUtils; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/fragment/PublicChatHallMyMessageFragment.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/fragment/PublicChatHallMyMessageFragment.java similarity index 89% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/fragment/PublicChatHallMyMessageFragment.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/fragment/PublicChatHallMyMessageFragment.java index eccb329e5..46096d4d0 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/fragment/PublicChatHallMyMessageFragment.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/fragment/PublicChatHallMyMessageFragment.java @@ -1,14 +1,14 @@ -package com.pikolive.app.public_chat_hall.fragment; -import com.pikolive.app.public_chat_hall.adapter.PagerDataAdapter; +package com.bingchuang.app.public_chat_hall.fragment; +import com.bingchuang.app.public_chat_hall.adapter.PagerDataAdapter; import com.bingchuang.library.utils.ResUtil; import androidx.fragment.app.Fragment; import androidx.viewpager.widget.ViewPager; import com.flyco.tablayout.listener.OnTabSelectListener; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseBindingFragment; -import com.pikolive.app.databinding.FragmentPublicChatHallMyMesageBinding; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseBindingFragment; +import com.bingchuang.app.databinding.FragmentPublicChatHallMyMesageBinding; import com.bingchuang.library.annatation.ActLayoutRes; import java.util.ArrayList; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/module/PublicChatHallInputPanel.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/module/PublicChatHallInputPanel.java similarity index 98% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/module/PublicChatHallInputPanel.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/module/PublicChatHallInputPanel.java index ac24cfae9..4c6982080 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/module/PublicChatHallInputPanel.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/module/PublicChatHallInputPanel.java @@ -1,4 +1,4 @@ -package com.pikolive.app.public_chat_hall.module; +package com.bingchuang.app.public_chat_hall.module; import com.bingchuang.library.utils.ResUtil; import android.app.Activity; @@ -52,15 +52,15 @@ import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.CustomNotification; import com.netease.nimlib.sdk.msg.model.CustomNotificationConfig; import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.pikolive.app.R; -import com.pikolive.app.public_chat_hall.activity.PublicChatHallAitFriendsActivity; -import com.pikolive.app.public_chat_hall.utils.RemainCountManager; -import com.pikolive.app.utils.KeyBoardUtils; -import com.pikolive.core.initial.InitialModel; -import com.pikolive.core.public_chat_hall.manager.PublicChatHallDataManager; -import com.pikolive.core.user.UserModel; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.utils.StringUtils; +import com.bingchuang.app.R; +import com.bingchuang.app.public_chat_hall.activity.PublicChatHallAitFriendsActivity; +import com.bingchuang.app.public_chat_hall.utils.RemainCountManager; +import com.bingchuang.app.utils.KeyBoardUtils; +import com.bingchuang.core.initial.InitialModel; +import com.bingchuang.core.public_chat_hall.manager.PublicChatHallDataManager; +import com.bingchuang.core.user.UserModel; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.utils.StringUtils; import com.bingchuang.library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/module/PublicChatHallMessageListPanel.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/module/PublicChatHallMessageListPanel.java similarity index 97% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/module/PublicChatHallMessageListPanel.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/module/PublicChatHallMessageListPanel.java index 702fc3e64..25aabab26 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/module/PublicChatHallMessageListPanel.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/module/PublicChatHallMessageListPanel.java @@ -1,5 +1,5 @@ -package com.pikolive.app.public_chat_hall.module; -import com.pikolive.app.public_chat_hall.adapter.PublicChatHallMsgAdapter; +package com.bingchuang.app.public_chat_hall.module; +import com.bingchuang.app.public_chat_hall.adapter.PublicChatHallMsgAdapter; import com.bingchuang.library.utils.ResUtil; @@ -40,12 +40,12 @@ import com.netease.nimlib.sdk.msg.model.AttachmentProgress; import com.netease.nimlib.sdk.msg.model.IMMessage; import com.netease.nimlib.sdk.robot.model.RobotAttachment; import com.netease.nimlib.sdk.robot.model.RobotMsgType; -import com.pikolive.app.R; -import com.pikolive.app.public_chat_hall.msg.BaseFetchLoadAdapter; -import com.pikolive.app.public_chat_hall.msg.MsgListFetchLoadMoreView; -import com.pikolive.app.public_chat_hall.msg.OnItemClickListener; -import com.pikolive.app.public_chat_hall.msg.viewholder.ChatRoomMsgViewHolderBase; -import com.pikolive.core.public_chat_hall.manager.PublicChatHallDataManager; +import com.bingchuang.app.R; +import com.bingchuang.app.public_chat_hall.msg.BaseFetchLoadAdapter; +import com.bingchuang.app.public_chat_hall.msg.MsgListFetchLoadMoreView; +import com.bingchuang.app.public_chat_hall.msg.OnItemClickListener; +import com.bingchuang.app.public_chat_hall.msg.viewholder.ChatRoomMsgViewHolderBase; +import com.bingchuang.core.public_chat_hall.manager.PublicChatHallDataManager; import com.bingchuang.library.utils.SingleToastUtil; import java.util.ArrayList; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/BaseFetchLoadAdapter.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/BaseFetchLoadAdapter.java similarity index 99% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/BaseFetchLoadAdapter.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/BaseFetchLoadAdapter.java index c7273e73e..bcdcc2ee5 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/BaseFetchLoadAdapter.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/BaseFetchLoadAdapter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.public_chat_hall.msg; +package com.bingchuang.app.public_chat_hall.msg; import android.animation.Animator; import android.content.Context; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/BaseMultiItemFetchLoadAdapter.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/BaseMultiItemFetchLoadAdapter.java similarity index 98% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/BaseMultiItemFetchLoadAdapter.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/BaseMultiItemFetchLoadAdapter.java index 650dfa55c..58b32cbe9 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/BaseMultiItemFetchLoadAdapter.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/BaseMultiItemFetchLoadAdapter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.public_chat_hall.msg; +package com.bingchuang.app.public_chat_hall.msg; import androidx.annotation.LayoutRes; import androidx.recyclerview.widget.RecyclerView; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/BaseViewHolder.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/BaseViewHolder.java similarity index 99% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/BaseViewHolder.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/BaseViewHolder.java index 4cc9ee42c..d4f2111ce 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/BaseViewHolder.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/BaseViewHolder.java @@ -1,4 +1,4 @@ -package com.pikolive.app.public_chat_hall.msg; +package com.bingchuang.app.public_chat_hall.msg; import android.content.Context; import android.graphics.Bitmap; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/LoadMoreView.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/LoadMoreView.java similarity index 98% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/LoadMoreView.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/LoadMoreView.java index e88245e61..d1cb25a90 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/LoadMoreView.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/LoadMoreView.java @@ -1,4 +1,4 @@ -package com.pikolive.app.public_chat_hall.msg; +package com.bingchuang.app.public_chat_hall.msg; import androidx.annotation.IdRes; import androidx.annotation.LayoutRes; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/MsgListFetchLoadMoreView.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/MsgListFetchLoadMoreView.java similarity index 86% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/MsgListFetchLoadMoreView.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/MsgListFetchLoadMoreView.java index bad639cfa..834fc52a6 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/MsgListFetchLoadMoreView.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/MsgListFetchLoadMoreView.java @@ -1,6 +1,6 @@ -package com.pikolive.app.public_chat_hall.msg; +package com.bingchuang.app.public_chat_hall.msg; -import com.pikolive.app.R; +import com.bingchuang.app.R; public final class MsgListFetchLoadMoreView extends LoadMoreView { diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/OnItemClickListener.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/OnItemClickListener.java similarity index 93% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/OnItemClickListener.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/OnItemClickListener.java index 7274f4498..8c502a613 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/OnItemClickListener.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/OnItemClickListener.java @@ -1,4 +1,4 @@ -package com.pikolive.app.public_chat_hall.msg; +package com.bingchuang.app.public_chat_hall.msg; import android.view.View; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/RecyclerViewHolder.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/RecyclerViewHolder.java similarity index 90% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/RecyclerViewHolder.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/RecyclerViewHolder.java index 32dccd7d2..fcdc6630f 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/RecyclerViewHolder.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/RecyclerViewHolder.java @@ -1,4 +1,4 @@ -package com.pikolive.app.public_chat_hall.msg; +package com.bingchuang.app.public_chat_hall.msg; import androidx.recyclerview.widget.RecyclerView; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/SimpleClickListener.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/SimpleClickListener.java similarity index 99% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/SimpleClickListener.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/SimpleClickListener.java index 3ffc091e8..3d8531337 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/SimpleClickListener.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/SimpleClickListener.java @@ -1,4 +1,4 @@ -package com.pikolive.app.public_chat_hall.msg; +package com.bingchuang.app.public_chat_hall.msg; import android.os.Build; import androidx.core.view.GestureDetectorCompat; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/SimpleLoadMoreView.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/SimpleLoadMoreView.java similarity index 85% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/SimpleLoadMoreView.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/SimpleLoadMoreView.java index aad2d8ed2..b73d50e0c 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/SimpleLoadMoreView.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/SimpleLoadMoreView.java @@ -1,6 +1,6 @@ -package com.pikolive.app.public_chat_hall.msg; +package com.bingchuang.app.public_chat_hall.msg; -import com.pikolive.app.R; +import com.bingchuang.app.R; public final class SimpleLoadMoreView extends LoadMoreView { diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderAitFriends.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderAitFriends.java similarity index 89% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderAitFriends.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderAitFriends.java index 71368a006..34ac15655 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderAitFriends.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderAitFriends.java @@ -1,4 +1,4 @@ -package com.pikolive.app.public_chat_hall.msg.viewholder; +package com.bingchuang.app.public_chat_hall.msg.viewholder; import android.text.Spannable; import android.text.SpannableStringBuilder; @@ -10,11 +10,11 @@ import androidx.core.content.ContextCompat; import com.netease.nim.uikit.api.NimUIKit; import com.netease.nim.uikit.business.session.emoji.MoonUtil; -import com.pikolive.app.R; -import com.pikolive.app.public_chat_hall.msg.BaseMultiItemFetchLoadAdapter; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.public_chat_hall.attachment.AitFriendsAttachment; -import com.pikolive.core.public_chat_hall.bean.AitFriendsInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.public_chat_hall.msg.BaseMultiItemFetchLoadAdapter; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.public_chat_hall.attachment.AitFriendsAttachment; +import com.bingchuang.core.public_chat_hall.bean.AitFriendsInfo; import java.util.Objects; import java.util.regex.Matcher; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderBase.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderBase.java similarity index 95% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderBase.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderBase.java index a0fd14d18..959d6d4f5 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderBase.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderBase.java @@ -1,4 +1,4 @@ -package com.pikolive.app.public_chat_hall.msg.viewholder; +package com.bingchuang.app.public_chat_hall.msg.viewholder; import android.content.Context; import android.text.TextUtils; @@ -20,18 +20,18 @@ import com.netease.nimlib.sdk.msg.MsgService; import com.netease.nimlib.sdk.msg.attachment.FileAttachment; import com.netease.nimlib.sdk.msg.constant.MsgDirectionEnum; import com.netease.nimlib.sdk.msg.constant.MsgStatusEnum; -import com.pikolive.app.public_chat_hall.adapter.PublicChatHallMsgAdapter; -import com.pikolive.app.public_chat_hall.event.PublicChatHallAvatarClickEvent; -import com.pikolive.app.R; -import com.pikolive.app.public_chat_hall.msg.BaseMultiItemFetchLoadAdapter; -import com.pikolive.app.public_chat_hall.msg.BaseViewHolder; -import com.pikolive.app.public_chat_hall.msg.RecyclerViewHolder; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.core.level.UserLevelResourceType; -import com.pikolive.core.noble.NobleResourceType; -import com.pikolive.core.noble.NobleUtil; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.utils.StringUtils; +import com.bingchuang.app.public_chat_hall.adapter.PublicChatHallMsgAdapter; +import com.bingchuang.app.public_chat_hall.event.PublicChatHallAvatarClickEvent; +import com.bingchuang.app.R; +import com.bingchuang.app.public_chat_hall.msg.BaseMultiItemFetchLoadAdapter; +import com.bingchuang.app.public_chat_hall.msg.BaseViewHolder; +import com.bingchuang.app.public_chat_hall.msg.RecyclerViewHolder; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.core.level.UserLevelResourceType; +import com.bingchuang.core.noble.NobleResourceType; +import com.bingchuang.core.noble.NobleUtil; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.utils.StringUtils; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderFactory.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderFactory.java similarity index 92% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderFactory.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderFactory.java index 45cc99598..1bfa82b2b 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderFactory.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderFactory.java @@ -1,4 +1,4 @@ -package com.pikolive.app.public_chat_hall.msg.viewholder; +package com.bingchuang.app.public_chat_hall.msg.viewholder; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.netease.nimlib.sdk.chatroom.model.ChatRoomNotificationAttachment; @@ -6,9 +6,9 @@ import com.netease.nimlib.sdk.msg.attachment.ImageAttachment; import com.netease.nimlib.sdk.msg.attachment.MsgAttachment; import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum; import com.netease.nimlib.sdk.robot.model.RobotAttachment; -import com.pikolive.core.im.custom.bean.GiftAttachment; -import com.pikolive.core.im.custom.bean.ImTipAttachment; -import com.pikolive.core.public_chat_hall.attachment.AitFriendsAttachment; +import com.bingchuang.core.im.custom.bean.GiftAttachment; +import com.bingchuang.core.im.custom.bean.ImTipAttachment; +import com.bingchuang.core.public_chat_hall.attachment.AitFriendsAttachment; import java.util.ArrayList; import java.util.HashMap; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderGiftText.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderGiftText.java similarity index 84% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderGiftText.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderGiftText.java index f7fab54a2..68599abeb 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderGiftText.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderGiftText.java @@ -1,18 +1,18 @@ -package com.pikolive.app.public_chat_hall.msg.viewholder; +package com.bingchuang.app.public_chat_hall.msg.viewholder; import android.widget.ImageView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import com.pikolive.app.R; -import com.pikolive.app.public_chat_hall.msg.BaseMultiItemFetchLoadAdapter; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.core.gift.GiftModel; -import com.pikolive.core.gift.bean.GiftInfo; -import com.pikolive.core.gift.bean.GiftReceiveInfo; -import com.pikolive.core.im.custom.bean.GiftAttachment; -import com.pikolive.core.public_chat_hall.event.PublicChatHallPlayGiftAnimationEvent; +import com.bingchuang.app.R; +import com.bingchuang.app.public_chat_hall.msg.BaseMultiItemFetchLoadAdapter; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.core.gift.GiftModel; +import com.bingchuang.core.gift.bean.GiftInfo; +import com.bingchuang.core.gift.bean.GiftReceiveInfo; +import com.bingchuang.core.im.custom.bean.GiftAttachment; +import com.bingchuang.core.public_chat_hall.event.PublicChatHallPlayGiftAnimationEvent; import com.bingchuang.library.utils.ResUtil; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderNotification.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderNotification.java similarity index 89% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderNotification.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderNotification.java index 78690f5e2..1ebf733ce 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderNotification.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderNotification.java @@ -1,11 +1,11 @@ -package com.pikolive.app.public_chat_hall.msg.viewholder; +package com.bingchuang.app.public_chat_hall.msg.viewholder; import android.widget.TextView; import com.netease.nim.uikit.R; import com.netease.nim.uikit.business.chatroom.helper.ChatRoomNotificationHelper; import com.netease.nimlib.sdk.chatroom.model.ChatRoomNotificationAttachment; -import com.pikolive.app.public_chat_hall.msg.BaseMultiItemFetchLoadAdapter; +import com.bingchuang.app.public_chat_hall.msg.BaseMultiItemFetchLoadAdapter; public class ChatRoomMsgViewHolderNotification extends ChatRoomMsgViewHolderBase { diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderPicture.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderPicture.java similarity index 82% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderPicture.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderPicture.java index 6480bd1aa..b7ff84cc0 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderPicture.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderPicture.java @@ -1,8 +1,8 @@ -package com.pikolive.app.public_chat_hall.msg.viewholder; +package com.bingchuang.app.public_chat_hall.msg.viewholder; import com.netease.nim.uikit.R; import com.netease.nim.uikit.business.session.activity.WatchMessagePictureActivity; -import com.pikolive.app.public_chat_hall.msg.BaseMultiItemFetchLoadAdapter; +import com.bingchuang.app.public_chat_hall.msg.BaseMultiItemFetchLoadAdapter; public class ChatRoomMsgViewHolderPicture extends ChatRoomMsgViewHolderThumbBase { diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderRobot.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderRobot.java similarity index 94% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderRobot.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderRobot.java index c6c889fe5..24c95edb3 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderRobot.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderRobot.java @@ -1,4 +1,4 @@ -package com.pikolive.app.public_chat_hall.msg.viewholder; +package com.bingchuang.app.public_chat_hall.msg.viewholder; import android.view.View; import android.widget.TextView; @@ -11,8 +11,8 @@ import com.netease.nim.uikit.common.util.sys.ScreenUtil; import com.netease.nim.uikit.impl.NimUIKitImpl; import com.netease.nimlib.sdk.robot.model.NimRobotInfo; import com.netease.nimlib.sdk.robot.model.RobotAttachment; -import com.pikolive.app.public_chat_hall.msg.BaseMultiItemFetchLoadAdapter; -import com.pikolive.app.public_chat_hall.msg.BaseViewHolder; +import com.bingchuang.app.public_chat_hall.msg.BaseMultiItemFetchLoadAdapter; +import com.bingchuang.app.public_chat_hall.msg.BaseViewHolder; import java.util.HashSet; import java.util.Set; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderText.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderText.java similarity index 89% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderText.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderText.java index 40b5cd4cd..8bd753fe7 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderText.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderText.java @@ -1,4 +1,4 @@ -package com.pikolive.app.public_chat_hall.msg.viewholder; +package com.bingchuang.app.public_chat_hall.msg.viewholder; import android.text.method.LinkMovementMethod; import android.text.style.ImageSpan; @@ -9,8 +9,8 @@ import androidx.core.content.ContextCompat; import com.netease.nim.uikit.api.NimUIKit; import com.netease.nim.uikit.business.session.emoji.MoonUtil; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.pikolive.app.R; -import com.pikolive.app.public_chat_hall.msg.BaseMultiItemFetchLoadAdapter; +import com.bingchuang.app.R; +import com.bingchuang.app.public_chat_hall.msg.BaseMultiItemFetchLoadAdapter; /** * Created by hzxuwen on 2016/1/18. diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderThumbBase.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderThumbBase.java similarity index 97% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderThumbBase.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderThumbBase.java index 91f6b97d6..5c9b10371 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderThumbBase.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderThumbBase.java @@ -1,4 +1,4 @@ -package com.pikolive.app.public_chat_hall.msg.viewholder; +package com.bingchuang.app.public_chat_hall.msg.viewholder; import android.text.TextUtils; import android.view.View; @@ -16,7 +16,7 @@ import com.netease.nimlib.sdk.msg.attachment.VideoAttachment; import com.netease.nimlib.sdk.msg.constant.AttachStatusEnum; import com.netease.nimlib.sdk.msg.constant.MsgStatusEnum; import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum; -import com.pikolive.app.public_chat_hall.msg.BaseMultiItemFetchLoadAdapter; +import com.bingchuang.app.public_chat_hall.msg.BaseMultiItemFetchLoadAdapter; import java.io.File; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderTip.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderTip.java similarity index 74% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderTip.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderTip.java index b9b59a4ae..be0f5ed1f 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderTip.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderTip.java @@ -1,11 +1,11 @@ -package com.pikolive.app.public_chat_hall.msg.viewholder; +package com.bingchuang.app.public_chat_hall.msg.viewholder; import androidx.databinding.DataBindingUtil; -import com.pikolive.app.R; -import com.pikolive.app.databinding.ItemImTipsBinding; -import com.pikolive.app.public_chat_hall.msg.BaseMultiItemFetchLoadAdapter; -import com.pikolive.core.im.custom.bean.ImTipAttachment; +import com.bingchuang.app.R; +import com.bingchuang.app.databinding.ItemImTipsBinding; +import com.bingchuang.app.public_chat_hall.msg.BaseMultiItemFetchLoadAdapter; +import com.bingchuang.core.im.custom.bean.ImTipAttachment; public class ChatRoomMsgViewHolderTip extends ChatRoomMsgViewHolderBase { diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderUnknown.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderUnknown.java similarity index 84% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderUnknown.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderUnknown.java index ae420bf29..dff3c9c56 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderUnknown.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderUnknown.java @@ -1,8 +1,8 @@ -package com.pikolive.app.public_chat_hall.msg.viewholder; +package com.bingchuang.app.public_chat_hall.msg.viewholder; import com.netease.nim.uikit.R; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; -import com.pikolive.app.public_chat_hall.msg.BaseMultiItemFetchLoadAdapter; +import com.bingchuang.app.public_chat_hall.msg.BaseMultiItemFetchLoadAdapter; /** * Created by huangjun on 2016/12/27. diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/ChatRoomViewHolderHelper.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/ChatRoomViewHolderHelper.java similarity index 96% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/ChatRoomViewHolderHelper.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/ChatRoomViewHolderHelper.java index f63eeaf03..c6aea7cb5 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/ChatRoomViewHolderHelper.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/ChatRoomViewHolderHelper.java @@ -1,4 +1,4 @@ -package com.pikolive.app.public_chat_hall.msg.viewholder; +package com.bingchuang.app.public_chat_hall.msg.viewholder; import android.view.View; import android.widget.ImageView; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/MsgViewHolderAitMe.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/MsgViewHolderAitMe.java similarity index 85% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/MsgViewHolderAitMe.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/MsgViewHolderAitMe.java index c1432fd75..fc9616d83 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/msg/viewholder/MsgViewHolderAitMe.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/msg/viewholder/MsgViewHolderAitMe.java @@ -1,4 +1,4 @@ -package com.pikolive.app.public_chat_hall.msg.viewholder; +package com.bingchuang.app.public_chat_hall.msg.viewholder; import android.text.Spannable; import android.text.SpannableStringBuilder; @@ -9,11 +9,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.pikolive.app.R; -import com.pikolive.app.ui.im.RouterHandler; -import com.pikolive.core.public_chat_hall.attachment.AitMeAttachment; -import com.pikolive.core.public_chat_hall.bean.AitMeInfo; -import com.pikolive.core.utils.StringUtils; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.im.RouterHandler; +import com.bingchuang.core.public_chat_hall.attachment.AitMeAttachment; +import com.bingchuang.core.public_chat_hall.bean.AitMeInfo; +import com.bingchuang.core.utils.StringUtils; import com.bingchuang.library.utils.ResUtil; public class MsgViewHolderAitMe extends MsgViewHolderBase { diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/presenter/PublicChatHallMyMessagePresenter.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/presenter/PublicChatHallMyMessagePresenter.java similarity index 77% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/presenter/PublicChatHallMyMessagePresenter.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/presenter/PublicChatHallMyMessagePresenter.java index 5a4ff8348..88934640d 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/presenter/PublicChatHallMyMessagePresenter.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/presenter/PublicChatHallMyMessagePresenter.java @@ -1,13 +1,13 @@ -package com.pikolive.app.public_chat_hall.presenter; +package com.bingchuang.app.public_chat_hall.presenter; import android.annotation.SuppressLint; -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.app.public_chat_hall.view.IPublicChatHallMyMessageView; -import com.pikolive.app.public_chat_hall.fragment.PublicChatHallMyHistoryMessageFragment; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.public_chat_hall.bean.PublicChatHallMessage; -import com.pikolive.core.public_chat_hall.model.PublicChatHallModel; +import com.bingchuang.app.base.BaseMvpPresenter; +import com.bingchuang.app.public_chat_hall.view.IPublicChatHallMyMessageView; +import com.bingchuang.app.public_chat_hall.fragment.PublicChatHallMyHistoryMessageFragment; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.public_chat_hall.bean.PublicChatHallMessage; +import com.bingchuang.core.public_chat_hall.model.PublicChatHallModel; import java.util.List; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/utils/RemainCountManager.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/utils/RemainCountManager.java similarity index 95% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/utils/RemainCountManager.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/utils/RemainCountManager.java index a20bfcdfb..fdfda165c 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/utils/RemainCountManager.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/utils/RemainCountManager.java @@ -1,6 +1,6 @@ -package com.pikolive.app.public_chat_hall.utils; +package com.bingchuang.app.public_chat_hall.utils; -import com.pikolive.core.utils.SharedPreferenceUtils; +import com.bingchuang.core.utils.SharedPreferenceUtils; import java.util.Calendar; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/view/IPublicChatHallMyMessageView.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/view/IPublicChatHallMyMessageView.java similarity index 70% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/view/IPublicChatHallMyMessageView.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/view/IPublicChatHallMyMessageView.java index ce650d061..561e3f109 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/view/IPublicChatHallMyMessageView.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/view/IPublicChatHallMyMessageView.java @@ -1,6 +1,6 @@ -package com.pikolive.app.public_chat_hall.view; +package com.bingchuang.app.public_chat_hall.view; -import com.pikolive.core.public_chat_hall.bean.PublicChatHallMessage; +import com.bingchuang.core.public_chat_hall.bean.PublicChatHallMessage; import com.bingchuang.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/widget/PublicChatHallGiftAnimationDialog.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/widget/PublicChatHallGiftAnimationDialog.java similarity index 89% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/widget/PublicChatHallGiftAnimationDialog.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/widget/PublicChatHallGiftAnimationDialog.java index ab2fe7196..a8344377d 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/widget/PublicChatHallGiftAnimationDialog.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/widget/PublicChatHallGiftAnimationDialog.java @@ -1,4 +1,4 @@ -package com.pikolive.app.public_chat_hall.widget; +package com.bingchuang.app.public_chat_hall.widget; import android.content.Context; import android.graphics.Color; @@ -18,15 +18,15 @@ import com.opensource.svgaplayer.SVGADrawable; import com.opensource.svgaplayer.SVGAImageView; import com.opensource.svgaplayer.SVGAParser; import com.opensource.svgaplayer.SVGAVideoEntity; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseSdDialog; -import com.pikolive.app.common.svga.SimpleSvgaCallback; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.pikolive.core.gift.GiftModel; -import com.pikolive.core.gift.bean.GiftInfo; -import com.pikolive.core.gift.bean.GiftReceiveInfo; -import com.pikolive.core.utils.ActivityUtil; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseSdDialog; +import com.bingchuang.app.common.svga.SimpleSvgaCallback; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.core.gift.GiftModel; +import com.bingchuang.core.gift.bean.GiftInfo; +import com.bingchuang.core.gift.bean.GiftReceiveInfo; +import com.bingchuang.core.utils.ActivityUtil; import java.net.MalformedURLException; import java.net.URL; diff --git a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/widget/ShutUpDialog.java b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/widget/ShutUpDialog.java similarity index 89% rename from app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/widget/ShutUpDialog.java rename to app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/widget/ShutUpDialog.java index b2777e48c..800c14a45 100644 --- a/app/src/module_public_chat_hall/java/com/pikolive/app/public_chat_hall/widget/ShutUpDialog.java +++ b/app/src/module_public_chat_hall/java/com/bingchuang/app/public_chat_hall/widget/ShutUpDialog.java @@ -1,18 +1,18 @@ -package com.pikolive.app.public_chat_hall.widget; +package com.bingchuang.app.public_chat_hall.widget; import com.bingchuang.library.utils.ResUtil; import android.content.Context; import android.text.TextUtils; import android.view.View; -import com.pikolive.app.R; -import com.pikolive.app.treasure_box.widget.dialog.BaseBindingDialog; -import com.pikolive.app.databinding.DialogPubRoomShutupBinding; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.pikolive.core.public_chat_hall.manager.PublicChatHallDataManager; -import com.pikolive.core.public_chat_hall.model.PublicChatHallModel; -import com.pikolive.core.user.UserModel; -import com.pikolive.core.user.bean.UserInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.treasure_box.widget.dialog.BaseBindingDialog; +import com.bingchuang.app.databinding.DialogPubRoomShutupBinding; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.core.public_chat_hall.manager.PublicChatHallDataManager; +import com.bingchuang.core.public_chat_hall.model.PublicChatHallModel; +import com.bingchuang.core.user.UserModel; +import com.bingchuang.core.user.bean.UserInfo; import com.bingchuang.library.annatation.ActLayoutRes; import com.bingchuang.library.utils.SingleToastUtil; import com.zyyoona7.lib.EasyPopup; diff --git a/app/src/module_public_chat_hall/res/layout/activity_public_chat_hall.xml b/app/src/module_public_chat_hall/res/layout/activity_public_chat_hall.xml index 2659a6e0b..6b1e185ab 100644 --- a/app/src/module_public_chat_hall/res/layout/activity_public_chat_hall.xml +++ b/app/src/module_public_chat_hall/res/layout/activity_public_chat_hall.xml @@ -7,7 +7,7 @@ + type="com.bingchuang.core.noble.AllServiceGiftProtocol" /> - -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 d83257bb3..53f830a48 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"> - +@@ -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 1f8581345..4643ddc6c 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 @@ - +- - - - - { diff --git a/app/src/module_room_chat/java/com/pikolive/app/room_chat/adapter/RoomMsgTeamRecentViewHolder.java b/app/src/module_room_chat/java/com/bingchuang/app/room_chat/adapter/RoomMsgTeamRecentViewHolder.java similarity index 96% rename from app/src/module_room_chat/java/com/pikolive/app/room_chat/adapter/RoomMsgTeamRecentViewHolder.java rename to app/src/module_room_chat/java/com/bingchuang/app/room_chat/adapter/RoomMsgTeamRecentViewHolder.java index e30e94a02..272c736d0 100644 --- a/app/src/module_room_chat/java/com/pikolive/app/room_chat/adapter/RoomMsgTeamRecentViewHolder.java +++ b/app/src/module_room_chat/java/com/bingchuang/app/room_chat/adapter/RoomMsgTeamRecentViewHolder.java @@ -1,4 +1,4 @@ -package com.pikolive.app.room_chat.adapter; +package com.bingchuang.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.pikolive.app.R; -import com.pikolive.app.ui.im.recent.TeamExt; -import com.pikolive.core.im.custom.bean.LuckyMoneyAttachment; -import com.pikolive.core.im.custom.bean.LuckyMoneyTipsAttachment; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.im.recent.TeamExt; +import com.bingchuang.core.im.custom.bean.LuckyMoneyAttachment; +import com.bingchuang.core.im.custom.bean.LuckyMoneyTipsAttachment; public class RoomMsgTeamRecentViewHolder extends RoomMsgRecentViewHolder { diff --git a/app/src/module_room_chat/java/com/pikolive/app/room_chat/adapter/RoomNewbieListAdapter.java b/app/src/module_room_chat/java/com/bingchuang/app/room_chat/adapter/RoomNewbieListAdapter.java similarity index 93% rename from app/src/module_room_chat/java/com/pikolive/app/room_chat/adapter/RoomNewbieListAdapter.java rename to app/src/module_room_chat/java/com/bingchuang/app/room_chat/adapter/RoomNewbieListAdapter.java index 3293c8785..e9e37618e 100644 --- a/app/src/module_room_chat/java/com/pikolive/app/room_chat/adapter/RoomNewbieListAdapter.java +++ b/app/src/module_room_chat/java/com/bingchuang/app/room_chat/adapter/RoomNewbieListAdapter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.room_chat.adapter; +package com.bingchuang.app.room_chat.adapter; import android.graphics.drawable.GradientDrawable; import android.text.TextUtils; @@ -9,10 +9,10 @@ import androidx.appcompat.widget.AppCompatImageView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.pikolive.app.R; -import com.pikolive.app.ui.user.activity.UserInfoActivity; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.core.bean.RoomNewbieInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.user.activity.UserInfoActivity; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.core.bean.RoomNewbieInfo; import com.bingchuang.library.utils.ResUtil; /** diff --git a/app/src/module_room_chat/java/com/pikolive/app/room_chat/adapter/RoomNewbieMessageAdapter.java b/app/src/module_room_chat/java/com/bingchuang/app/room_chat/adapter/RoomNewbieMessageAdapter.java similarity index 90% rename from app/src/module_room_chat/java/com/pikolive/app/room_chat/adapter/RoomNewbieMessageAdapter.java rename to app/src/module_room_chat/java/com/bingchuang/app/room_chat/adapter/RoomNewbieMessageAdapter.java index c6e6ada9b..ced01aaad 100644 --- a/app/src/module_room_chat/java/com/pikolive/app/room_chat/adapter/RoomNewbieMessageAdapter.java +++ b/app/src/module_room_chat/java/com/bingchuang/app/room_chat/adapter/RoomNewbieMessageAdapter.java @@ -1,11 +1,11 @@ -package com.pikolive.app.room_chat.adapter; +package com.bingchuang.app.room_chat.adapter; import android.widget.RadioButton; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.pikolive.app.R; -import com.pikolive.core.bean.RoomNewbieMessageInfo; +import com.bingchuang.app.R; +import com.bingchuang.core.bean.RoomNewbieMessageInfo; /** * @author jack diff --git a/app/src/module_room_chat/java/com/bingchuang/app/room_chat/event/ChangeNewbieMessageEvent.java b/app/src/module_room_chat/java/com/bingchuang/app/room_chat/event/ChangeNewbieMessageEvent.java new file mode 100644 index 000000000..998a8d1b3 --- /dev/null +++ b/app/src/module_room_chat/java/com/bingchuang/app/room_chat/event/ChangeNewbieMessageEvent.java @@ -0,0 +1,4 @@ +package com.bingchuang.app.room_chat.event; + +public class ChangeNewbieMessageEvent { +} diff --git a/app/src/module_room_chat/java/com/bingchuang/app/room_chat/event/ClickRootViewEvent.java b/app/src/module_room_chat/java/com/bingchuang/app/room_chat/event/ClickRootViewEvent.java new file mode 100644 index 000000000..4ee9f1c4f --- /dev/null +++ b/app/src/module_room_chat/java/com/bingchuang/app/room_chat/event/ClickRootViewEvent.java @@ -0,0 +1,4 @@ +package com.bingchuang.app.room_chat.event; + +public class ClickRootViewEvent { +} diff --git a/app/src/module_room_chat/java/com/bingchuang/app/room_chat/event/SendHelloEvent.java b/app/src/module_room_chat/java/com/bingchuang/app/room_chat/event/SendHelloEvent.java new file mode 100644 index 000000000..576e9dbc0 --- /dev/null +++ b/app/src/module_room_chat/java/com/bingchuang/app/room_chat/event/SendHelloEvent.java @@ -0,0 +1,4 @@ +package com.bingchuang.app.room_chat.event; + +public class SendHelloEvent { +} diff --git a/app/src/module_room_chat/java/com/bingchuang/app/room_chat/event/SendHelloSuccessEvent.java b/app/src/module_room_chat/java/com/bingchuang/app/room_chat/event/SendHelloSuccessEvent.java new file mode 100644 index 000000000..fcbdcd32d --- /dev/null +++ b/app/src/module_room_chat/java/com/bingchuang/app/room_chat/event/SendHelloSuccessEvent.java @@ -0,0 +1,4 @@ +package com.bingchuang.app.room_chat.event; + +public class SendHelloSuccessEvent { +} diff --git a/app/src/module_room_chat/java/com/pikolive/app/room_chat/fragment/NewbieFilterDialog.kt b/app/src/module_room_chat/java/com/bingchuang/app/room_chat/fragment/NewbieFilterDialog.kt similarity index 88% rename from app/src/module_room_chat/java/com/pikolive/app/room_chat/fragment/NewbieFilterDialog.kt rename to app/src/module_room_chat/java/com/bingchuang/app/room_chat/fragment/NewbieFilterDialog.kt index 4a4137bdc..5f6d426a4 100644 --- a/app/src/module_room_chat/java/com/pikolive/app/room_chat/fragment/NewbieFilterDialog.kt +++ b/app/src/module_room_chat/java/com/bingchuang/app/room_chat/fragment/NewbieFilterDialog.kt @@ -1,10 +1,10 @@ -package com.pikolive.app.room_chat.fragment +package com.bingchuang.app.room_chat.fragment import android.view.Gravity import android.view.WindowManager -import com.pikolive.app.R -import com.pikolive.app.base.BaseDialog -import com.pikolive.app.databinding.DialogNewbieFilterBinding +import com.bingchuang.app.R +import com.bingchuang.app.base.BaseDialog +import com.bingchuang.app.databinding.DialogNewbieFilterBinding class NewbieFilterDialog : BaseDialog () { diff --git a/app/src/module_room_chat/java/com/pikolive/app/room_chat/fragment/RoomMsgAttentionFragment.java b/app/src/module_room_chat/java/com/bingchuang/app/room_chat/fragment/RoomMsgAttentionFragment.java similarity index 89% rename from app/src/module_room_chat/java/com/pikolive/app/room_chat/fragment/RoomMsgAttentionFragment.java rename to app/src/module_room_chat/java/com/bingchuang/app/room_chat/fragment/RoomMsgAttentionFragment.java index 4666ba3de..2de1a6327 100644 --- a/app/src/module_room_chat/java/com/pikolive/app/room_chat/fragment/RoomMsgAttentionFragment.java +++ b/app/src/module_room_chat/java/com/bingchuang/app/room_chat/fragment/RoomMsgAttentionFragment.java @@ -1,6 +1,6 @@ -package com.pikolive.app.room_chat.fragment; +package com.bingchuang.app.room_chat.fragment; -import static com.pikolive.app.R.id.swipe_refresh; +import static com.bingchuang.app.R.id.swipe_refresh; import android.os.Bundle; @@ -10,18 +10,18 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseFragment; -import com.pikolive.app.friend.view.SelectFriendActivity; -import com.pikolive.app.room_chat.activity.NimRoomP2PMessageActivity; -import com.pikolive.app.room_chat.adapter.RoomMsgAttentionListAdapter; -import com.pikolive.core.Constants; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.praise.event.PraiseEvent; -import com.pikolive.core.user.AttentionModel; -import com.pikolive.core.user.bean.AttentionInfo; -import com.pikolive.core.user.event.LoginUserInfoUpdateEvent; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseFragment; +import com.bingchuang.app.friend.view.SelectFriendActivity; +import com.bingchuang.app.room_chat.activity.NimRoomP2PMessageActivity; +import com.bingchuang.app.room_chat.adapter.RoomMsgAttentionListAdapter; +import com.bingchuang.core.Constants; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.praise.event.PraiseEvent; +import com.bingchuang.core.user.AttentionModel; +import com.bingchuang.core.user.bean.AttentionInfo; +import com.bingchuang.core.user.event.LoginUserInfoUpdateEvent; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/module_room_chat/java/com/pikolive/app/room_chat/fragment/RoomMsgFansListFragment.java b/app/src/module_room_chat/java/com/bingchuang/app/room_chat/fragment/RoomMsgFansListFragment.java similarity index 91% rename from app/src/module_room_chat/java/com/pikolive/app/room_chat/fragment/RoomMsgFansListFragment.java rename to app/src/module_room_chat/java/com/bingchuang/app/room_chat/fragment/RoomMsgFansListFragment.java index 314a752b0..f5d086d2c 100644 --- a/app/src/module_room_chat/java/com/pikolive/app/room_chat/fragment/RoomMsgFansListFragment.java +++ b/app/src/module_room_chat/java/com/bingchuang/app/room_chat/fragment/RoomMsgFansListFragment.java @@ -1,4 +1,4 @@ -package com.pikolive.app.room_chat.fragment; +package com.bingchuang.app.room_chat.fragment; import android.annotation.SuppressLint; import android.content.Context; @@ -10,19 +10,19 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseFragment; -import com.pikolive.app.common.NoDataFragment; -import com.pikolive.app.room_chat.activity.NimRoomP2PMessageActivity; -import com.pikolive.app.room_chat.adapter.RoomMsgFansViewAdapter; -import com.pikolive.core.Constants; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.praise.event.PraiseEvent; -import com.pikolive.core.user.AttentionModel; -import com.pikolive.core.user.bean.FansInfo; -import com.pikolive.core.user.bean.FansListInfo; -import com.pikolive.core.user.event.LoginUserInfoUpdateEvent; -import com.pikolive.core.utils.SystemUidUtil; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseFragment; +import com.bingchuang.app.common.NoDataFragment; +import com.bingchuang.app.room_chat.activity.NimRoomP2PMessageActivity; +import com.bingchuang.app.room_chat.adapter.RoomMsgFansViewAdapter; +import com.bingchuang.core.Constants; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.praise.event.PraiseEvent; +import com.bingchuang.core.user.AttentionModel; +import com.bingchuang.core.user.bean.FansInfo; +import com.bingchuang.core.user.bean.FansListInfo; +import com.bingchuang.core.user.event.LoginUserInfoUpdateEvent; +import com.bingchuang.core.utils.SystemUidUtil; import com.bingchuang.library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/module_room_chat/java/com/pikolive/app/room_chat/fragment/RoomMsgFriendListFragment.java b/app/src/module_room_chat/java/com/bingchuang/app/room_chat/fragment/RoomMsgFriendListFragment.java similarity index 91% rename from app/src/module_room_chat/java/com/pikolive/app/room_chat/fragment/RoomMsgFriendListFragment.java rename to app/src/module_room_chat/java/com/bingchuang/app/room_chat/fragment/RoomMsgFriendListFragment.java index 2c158a3b7..e75b2a1f1 100644 --- a/app/src/module_room_chat/java/com/pikolive/app/room_chat/fragment/RoomMsgFriendListFragment.java +++ b/app/src/module_room_chat/java/com/bingchuang/app/room_chat/fragment/RoomMsgFriendListFragment.java @@ -1,4 +1,4 @@ -package com.pikolive.app.room_chat.fragment; +package com.bingchuang.app.room_chat.fragment; import android.os.Bundle; import android.view.View; @@ -9,17 +9,17 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.orhanobut.logger.Logger; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseFragment; -import com.pikolive.app.common.NoDataFragment; -import com.pikolive.app.room_chat.activity.NimRoomP2PMessageActivity; -import com.pikolive.app.room_chat.adapter.RoomMsgFriendListAdapter; -import com.pikolive.core.im.friend.IMFriendModel; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.manager.RelationShipEvent; -import com.pikolive.core.user.UserModel; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.user.event.LoginUserInfoUpdateEvent; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseFragment; +import com.bingchuang.app.common.NoDataFragment; +import com.bingchuang.app.room_chat.activity.NimRoomP2PMessageActivity; +import com.bingchuang.app.room_chat.adapter.RoomMsgFriendListAdapter; +import com.bingchuang.core.im.friend.IMFriendModel; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.manager.RelationShipEvent; +import com.bingchuang.core.user.UserModel; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.user.event.LoginUserInfoUpdateEvent; import com.bingchuang.library.utils.ListUtils; import com.bingchuang.library.utils.ResUtil; diff --git a/app/src/module_room_chat/java/com/pikolive/app/room_chat/fragment/RoomMsgRecentContactsFragment.java b/app/src/module_room_chat/java/com/bingchuang/app/room_chat/fragment/RoomMsgRecentContactsFragment.java similarity index 99% rename from app/src/module_room_chat/java/com/pikolive/app/room_chat/fragment/RoomMsgRecentContactsFragment.java rename to app/src/module_room_chat/java/com/bingchuang/app/room_chat/fragment/RoomMsgRecentContactsFragment.java index f8201d234..27ac0ad5a 100644 --- a/app/src/module_room_chat/java/com/pikolive/app/room_chat/fragment/RoomMsgRecentContactsFragment.java +++ b/app/src/module_room_chat/java/com/bingchuang/app/room_chat/fragment/RoomMsgRecentContactsFragment.java @@ -1,4 +1,4 @@ -package com.pikolive.app.room_chat.fragment; +package com.bingchuang.app.room_chat.fragment; import android.os.Bundle; import android.text.TextUtils; @@ -39,8 +39,8 @@ 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.pikolive.app.R; -import com.pikolive.app.room_chat.adapter.RoomMsgRecentContactAdapter; +import com.bingchuang.app.R; +import com.bingchuang.app.room_chat.adapter.RoomMsgRecentContactAdapter; import com.bingchuang.library.utils.ResUtil; import java.util.ArrayList; diff --git a/app/src/module_room_chat/java/com/pikolive/app/room_chat/fragment/RoomMsgRecentListFragment.java b/app/src/module_room_chat/java/com/bingchuang/app/room_chat/fragment/RoomMsgRecentListFragment.java similarity index 87% rename from app/src/module_room_chat/java/com/pikolive/app/room_chat/fragment/RoomMsgRecentListFragment.java rename to app/src/module_room_chat/java/com/bingchuang/app/room_chat/fragment/RoomMsgRecentListFragment.java index 6ee1b8270..3203d9aa2 100644 --- a/app/src/module_room_chat/java/com/pikolive/app/room_chat/fragment/RoomMsgRecentListFragment.java +++ b/app/src/module_room_chat/java/com/bingchuang/app/room_chat/fragment/RoomMsgRecentListFragment.java @@ -1,4 +1,4 @@ -package com.pikolive.app.room_chat.fragment; +package com.bingchuang.app.room_chat.fragment; import android.annotation.SuppressLint; import android.os.Bundle; @@ -15,22 +15,22 @@ 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.pikolive.app.R; -import com.pikolive.app.base.BaseFragment; -import com.pikolive.app.miniworld.activity.MWTeamRoomMessageAct; -import com.pikolive.app.module_hall.im.NimHelper; -import com.pikolive.app.ui.im.recent.TeamExt; -import com.pikolive.app.room_chat.activity.NimHallTeamRoomMessageActivity; -import com.pikolive.app.room_chat.activity.NimRoomP2PMessageActivity; -import com.pikolive.app.room_chat.activity.NimTeamRoomMessageActivity; -import com.pikolive.app.room_chat.activity.RoomNewbieActivity; -import com.pikolive.core.auth.event.LoginEvent; -import com.pikolive.core.initial.InitialModel; -import com.pikolive.core.level.UserLevelVo; -import com.pikolive.core.user.UserModel; -import com.pikolive.core.user.event.LoadLoginUserInfoEvent; -import com.pikolive.core.utils.SharedPreferenceUtils; -import com.pikolive.core.utils.net.BeanObserver; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseFragment; +import com.bingchuang.app.miniworld.activity.MWTeamRoomMessageAct; +import com.bingchuang.app.module_hall.im.NimHelper; +import com.bingchuang.app.ui.im.recent.TeamExt; +import com.bingchuang.app.room_chat.activity.NimHallTeamRoomMessageActivity; +import com.bingchuang.app.room_chat.activity.NimRoomP2PMessageActivity; +import com.bingchuang.app.room_chat.activity.NimTeamRoomMessageActivity; +import com.bingchuang.app.room_chat.activity.RoomNewbieActivity; +import com.bingchuang.core.auth.event.LoginEvent; +import com.bingchuang.core.initial.InitialModel; +import com.bingchuang.core.level.UserLevelVo; +import com.bingchuang.core.user.UserModel; +import com.bingchuang.core.user.event.LoadLoginUserInfoEvent; +import com.bingchuang.core.utils.SharedPreferenceUtils; +import com.bingchuang.core.utils.net.BeanObserver; import com.bingchuang.library.utils.ResUtil; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/module_room_chat/java/com/pikolive/app/room_chat/fragment/RoomNewbieListFragment.java b/app/src/module_room_chat/java/com/bingchuang/app/room_chat/fragment/RoomNewbieListFragment.java similarity index 92% rename from app/src/module_room_chat/java/com/pikolive/app/room_chat/fragment/RoomNewbieListFragment.java rename to app/src/module_room_chat/java/com/bingchuang/app/room_chat/fragment/RoomNewbieListFragment.java index 1ba221692..95812c24d 100644 --- a/app/src/module_room_chat/java/com/pikolive/app/room_chat/fragment/RoomNewbieListFragment.java +++ b/app/src/module_room_chat/java/com/bingchuang/app/room_chat/fragment/RoomNewbieListFragment.java @@ -1,4 +1,4 @@ -package com.pikolive.app.room_chat.fragment; +package com.bingchuang.app.room_chat.fragment; import android.os.Bundle; import android.view.View; @@ -9,14 +9,14 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.pikolive.app.R; -import com.pikolive.app.avroom.presenter.RoomNewbiePresenter; -import com.pikolive.app.base.BaseMvpFragment; -import com.pikolive.app.module.IRoomNewbieView; -import com.pikolive.app.room_chat.activity.RoomNewbieMessageActivity; -import com.pikolive.app.room_chat.adapter.RoomNewbieListAdapter; -import com.pikolive.app.room_chat.event.SendHelloSuccessEvent; -import com.pikolive.core.bean.RoomNewbieInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.avroom.presenter.RoomNewbiePresenter; +import com.bingchuang.app.base.BaseMvpFragment; +import com.bingchuang.app.module.IRoomNewbieView; +import com.bingchuang.app.room_chat.activity.RoomNewbieMessageActivity; +import com.bingchuang.app.room_chat.adapter.RoomNewbieListAdapter; +import com.bingchuang.app.room_chat.event.SendHelloSuccessEvent; +import com.bingchuang.core.bean.RoomNewbieInfo; import com.bingchuang.library.base.factory.CreatePresenter; import com.bingchuang.library.utils.ListUtils; import com.bingchuang.library.utils.ResUtil; diff --git a/app/src/module_room_chat/java/com/pikolive/app/room_chat/fragment/RoomNewbieMessageFragment.java b/app/src/module_room_chat/java/com/bingchuang/app/room_chat/fragment/RoomNewbieMessageFragment.java similarity index 91% rename from app/src/module_room_chat/java/com/pikolive/app/room_chat/fragment/RoomNewbieMessageFragment.java rename to app/src/module_room_chat/java/com/bingchuang/app/room_chat/fragment/RoomNewbieMessageFragment.java index 3db616990..4d41c807d 100644 --- a/app/src/module_room_chat/java/com/pikolive/app/room_chat/fragment/RoomNewbieMessageFragment.java +++ b/app/src/module_room_chat/java/com/bingchuang/app/room_chat/fragment/RoomNewbieMessageFragment.java @@ -1,4 +1,4 @@ -package com.pikolive.app.room_chat.fragment; +package com.bingchuang.app.room_chat.fragment; import android.os.Bundle; 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.pikolive.app.room_chat.event.SendHelloEvent; -import com.pikolive.app.R; -import com.pikolive.app.avroom.presenter.RoomNewbieHellowWordPresenter; -import com.pikolive.app.base.BaseMvpFragment; -import com.pikolive.app.module.IRoomNewbieMessageView; -import com.pikolive.app.module.RoomNewbieModel; -import com.pikolive.app.room_chat.adapter.RoomNewbieMessageAdapter; -import com.pikolive.app.room_chat.event.ChangeNewbieMessageEvent; -import com.pikolive.app.room_chat.event.SendHelloSuccessEvent; -import com.pikolive.core.bean.RoomNewbieMessageInfo; +import com.bingchuang.app.room_chat.event.SendHelloEvent; +import com.bingchuang.app.R; +import com.bingchuang.app.avroom.presenter.RoomNewbieHellowWordPresenter; +import com.bingchuang.app.base.BaseMvpFragment; +import com.bingchuang.app.module.IRoomNewbieMessageView; +import com.bingchuang.app.module.RoomNewbieModel; +import com.bingchuang.app.room_chat.adapter.RoomNewbieMessageAdapter; +import com.bingchuang.app.room_chat.event.ChangeNewbieMessageEvent; +import com.bingchuang.app.room_chat.event.SendHelloSuccessEvent; +import com.bingchuang.core.bean.RoomNewbieMessageInfo; import com.bingchuang.library.base.factory.CreatePresenter; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.SingleToastUtil; diff --git a/app/src/module_room_chat/java/com/pikolive/app/room_chat/utils/InViteFansTimer.java b/app/src/module_room_chat/java/com/bingchuang/app/room_chat/utils/InViteFansTimer.java similarity index 96% rename from app/src/module_room_chat/java/com/pikolive/app/room_chat/utils/InViteFansTimer.java rename to app/src/module_room_chat/java/com/bingchuang/app/room_chat/utils/InViteFansTimer.java index 19ce17bbe..961f32d85 100644 --- a/app/src/module_room_chat/java/com/pikolive/app/room_chat/utils/InViteFansTimer.java +++ b/app/src/module_room_chat/java/com/bingchuang/app/room_chat/utils/InViteFansTimer.java @@ -1,11 +1,11 @@ -package com.pikolive.app.room_chat.utils; +package com.bingchuang.app.room_chat.utils; import android.content.Context; import android.os.CountDownTimer; import android.text.Html; import android.widget.TextView; -import com.pikolive.app.R; +import com.bingchuang.app.R; import com.bingchuang.library.utils.ResUtil; diff --git a/app/src/module_room_chat/java/com/pikolive/app/room_chat/TEMP.java b/app/src/module_room_chat/java/com/pikolive/app/room_chat/TEMP.java deleted file mode 100644 index 3b773a9b4..000000000 --- a/app/src/module_room_chat/java/com/pikolive/app/room_chat/TEMP.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pikolive.app.room_chat; - -public class TEMP { -} diff --git a/app/src/module_room_chat/java/com/pikolive/app/room_chat/event/ChangeNewbieMessageEvent.java b/app/src/module_room_chat/java/com/pikolive/app/room_chat/event/ChangeNewbieMessageEvent.java deleted file mode 100644 index ad5dd94c4..000000000 --- a/app/src/module_room_chat/java/com/pikolive/app/room_chat/event/ChangeNewbieMessageEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pikolive.app.room_chat.event; - -public class ChangeNewbieMessageEvent { -} diff --git a/app/src/module_room_chat/java/com/pikolive/app/room_chat/event/ClickRootViewEvent.java b/app/src/module_room_chat/java/com/pikolive/app/room_chat/event/ClickRootViewEvent.java deleted file mode 100644 index 3e37911f9..000000000 --- a/app/src/module_room_chat/java/com/pikolive/app/room_chat/event/ClickRootViewEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pikolive.app.room_chat.event; - -public class ClickRootViewEvent { -} diff --git a/app/src/module_room_chat/java/com/pikolive/app/room_chat/event/SendHelloEvent.java b/app/src/module_room_chat/java/com/pikolive/app/room_chat/event/SendHelloEvent.java deleted file mode 100644 index f7056a9e0..000000000 --- a/app/src/module_room_chat/java/com/pikolive/app/room_chat/event/SendHelloEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pikolive.app.room_chat.event; - -public class SendHelloEvent { -} diff --git a/app/src/module_room_chat/java/com/pikolive/app/room_chat/event/SendHelloSuccessEvent.java b/app/src/module_room_chat/java/com/pikolive/app/room_chat/event/SendHelloSuccessEvent.java deleted file mode 100644 index 7fd308571..000000000 --- a/app/src/module_room_chat/java/com/pikolive/app/room_chat/event/SendHelloSuccessEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pikolive.app.room_chat.event; - -public class SendHelloSuccessEvent { -} diff --git a/app/src/module_super_admin/java/com/pikolive/app/sadmin/RoomSAdminManagerActivity.java b/app/src/module_super_admin/java/com/bingchuang/app/sadmin/RoomSAdminManagerActivity.java similarity index 88% rename from app/src/module_super_admin/java/com/pikolive/app/sadmin/RoomSAdminManagerActivity.java rename to app/src/module_super_admin/java/com/bingchuang/app/sadmin/RoomSAdminManagerActivity.java index 0a300e082..3e00c5525 100644 --- a/app/src/module_super_admin/java/com/pikolive/app/sadmin/RoomSAdminManagerActivity.java +++ b/app/src/module_super_admin/java/com/bingchuang/app/sadmin/RoomSAdminManagerActivity.java @@ -1,4 +1,4 @@ -package com.pikolive.app.sadmin; +package com.bingchuang.app.sadmin; import android.content.Context; import android.content.Intent; @@ -6,21 +6,21 @@ import android.view.View; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.pikolive.app.R; -import com.pikolive.app.avroom.activity.RoomBlackListActivity; -import com.pikolive.app.base.BaseViewBindingActivity; -import com.pikolive.app.common.widget.dialog.DialogManager; -import com.pikolive.app.databinding.ActivityRoomSAdminManagerBinding; -import com.pikolive.core.base.CancelNoToastException; -import com.pikolive.core.kick.KickModel; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.room.model.AvRoomModel; -import com.pikolive.core.admin.model.ISuperAdminModel; -import com.pikolive.core.admin.model.SuperAdminModel; -import com.pikolive.core.admin.util.SaAttachmentFactory; -import com.pikolive.core.utils.net.DontWarnObserver; +import com.bingchuang.app.R; +import com.bingchuang.app.avroom.activity.RoomBlackListActivity; +import com.bingchuang.app.base.BaseViewBindingActivity; +import com.bingchuang.app.common.widget.dialog.DialogManager; +import com.bingchuang.app.databinding.ActivityRoomSAdminManagerBinding; +import com.bingchuang.core.base.CancelNoToastException; +import com.bingchuang.core.kick.KickModel; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.room.model.AvRoomModel; +import com.bingchuang.core.admin.model.ISuperAdminModel; +import com.bingchuang.core.admin.model.SuperAdminModel; +import com.bingchuang.core.admin.util.SaAttachmentFactory; +import com.bingchuang.core.utils.net.DontWarnObserver; import com.bingchuang.library.net.rxnet.callback.CallBack; import com.bingchuang.library.utils.ResUtil; diff --git a/app/src/module_super_admin/java/com/pikolive/app/sadmin/utils/SaAttachmentToMsgUtil.java b/app/src/module_super_admin/java/com/bingchuang/app/sadmin/utils/SaAttachmentToMsgUtil.java similarity index 91% rename from app/src/module_super_admin/java/com/pikolive/app/sadmin/utils/SaAttachmentToMsgUtil.java rename to app/src/module_super_admin/java/com/bingchuang/app/sadmin/utils/SaAttachmentToMsgUtil.java index 3b6acac94..c5e4fea93 100644 --- a/app/src/module_super_admin/java/com/pikolive/app/sadmin/utils/SaAttachmentToMsgUtil.java +++ b/app/src/module_super_admin/java/com/bingchuang/app/sadmin/utils/SaAttachmentToMsgUtil.java @@ -1,15 +1,15 @@ -package com.pikolive.app.sadmin.utils; +package com.bingchuang.app.sadmin.utils; import android.text.TextUtils; import android.text.style.ForegroundColorSpan; import android.widget.TextView; -import com.pikolive.app.R; -import com.pikolive.app.avroom.widget.MessageView; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core.admin.attachment.SuperAdminOpAttachment; -import com.pikolive.core.admin.bean.SaOpInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.avroom.widget.MessageView; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core.admin.attachment.SuperAdminOpAttachment; +import com.bingchuang.core.admin.bean.SaOpInfo; import com.bingchuang.library.utils.ResUtil; /** diff --git a/app/src/module_super_admin/java/com/pikolive/app/sadmin/utils/SuperAdminUiHelper.java b/app/src/module_super_admin/java/com/bingchuang/app/sadmin/utils/SuperAdminUiHelper.java similarity index 65% rename from app/src/module_super_admin/java/com/pikolive/app/sadmin/utils/SuperAdminUiHelper.java rename to app/src/module_super_admin/java/com/bingchuang/app/sadmin/utils/SuperAdminUiHelper.java index 07028fbdf..613a4ad79 100644 --- a/app/src/module_super_admin/java/com/pikolive/app/sadmin/utils/SuperAdminUiHelper.java +++ b/app/src/module_super_admin/java/com/bingchuang/app/sadmin/utils/SuperAdminUiHelper.java @@ -1,4 +1,4 @@ -package com.pikolive.app.sadmin.utils; +package com.bingchuang.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 14e669cf6..ede0941c1 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/pikolive/app/shipantics/RadishRankingActivity.java b/app/src/module_treasure_box/java/com/bingchuang/app/shipantics/RadishRankingActivity.java similarity index 84% rename from app/src/module_treasure_box/java/com/pikolive/app/shipantics/RadishRankingActivity.java rename to app/src/module_treasure_box/java/com/bingchuang/app/shipantics/RadishRankingActivity.java index 1d960a70e..ee1469c85 100644 --- a/app/src/module_treasure_box/java/com/pikolive/app/shipantics/RadishRankingActivity.java +++ b/app/src/module_treasure_box/java/com/bingchuang/app/shipantics/RadishRankingActivity.java @@ -1,4 +1,4 @@ -package com.pikolive.app.shipantics; +package com.bingchuang.app.shipantics; import android.annotation.SuppressLint; import android.content.Context; @@ -7,15 +7,15 @@ import android.view.View; import androidx.fragment.app.Fragment; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseViewBindingActivity; -import com.pikolive.app.common.ViewPagerAdapter; -import com.pikolive.app.databinding.ActivityRadishRankingBinding; -import com.pikolive.app.decoration.view.widgets.CarMagicIndicator; -import com.pikolive.app.room_chat.event.ClickRootViewEvent; -import com.pikolive.core2.home.bean.TabInfo; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.manager.RoomEvent; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseViewBindingActivity; +import com.bingchuang.app.common.ViewPagerAdapter; +import com.bingchuang.app.databinding.ActivityRadishRankingBinding; +import com.bingchuang.app.decoration.view.widgets.CarMagicIndicator; +import com.bingchuang.app.room_chat.event.ClickRootViewEvent; +import com.bingchuang.core2.home.bean.TabInfo; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.manager.RoomEvent; import com.bingchuang.library.utils.ResUtil; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/module_treasure_box/java/com/pikolive/app/shipantics/RadishRankingFragment.java b/app/src/module_treasure_box/java/com/bingchuang/app/shipantics/RadishRankingFragment.java similarity index 95% rename from app/src/module_treasure_box/java/com/pikolive/app/shipantics/RadishRankingFragment.java rename to app/src/module_treasure_box/java/com/bingchuang/app/shipantics/RadishRankingFragment.java index ae070088f..2060761ca 100644 --- a/app/src/module_treasure_box/java/com/pikolive/app/shipantics/RadishRankingFragment.java +++ b/app/src/module_treasure_box/java/com/bingchuang/app/shipantics/RadishRankingFragment.java @@ -1,4 +1,4 @@ -package com.pikolive.app.shipantics; +package com.bingchuang.app.shipantics; import android.os.Bundle; import android.view.View; @@ -9,10 +9,10 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseMvpFragment; -import com.pikolive.core.room.treasure_box.bean.BoxRankingInfo; -import com.pikolive.core.room.treasure_box.event.RefreshBoxRankingEvent; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseMvpFragment; +import com.bingchuang.core.room.treasure_box.bean.BoxRankingInfo; +import com.bingchuang.core.room.treasure_box.event.RefreshBoxRankingEvent; import com.bingchuang.library.base.factory.CreatePresenter; import com.bingchuang.library.utils.ListUtils; import com.bingchuang.library.utils.ResUtil; diff --git a/app/src/module_treasure_box/java/com/pikolive/app/shipantics/RadishRankingListAdapter.java b/app/src/module_treasure_box/java/com/bingchuang/app/shipantics/RadishRankingListAdapter.java similarity index 92% rename from app/src/module_treasure_box/java/com/pikolive/app/shipantics/RadishRankingListAdapter.java rename to app/src/module_treasure_box/java/com/bingchuang/app/shipantics/RadishRankingListAdapter.java index 1ce4d2e4c..ee986ef48 100644 --- a/app/src/module_treasure_box/java/com/pikolive/app/shipantics/RadishRankingListAdapter.java +++ b/app/src/module_treasure_box/java/com/bingchuang/app/shipantics/RadishRankingListAdapter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.shipantics; +package com.bingchuang.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.pikolive.app.R; -import com.pikolive.app.ui.utils.ImageLoadKt; -import com.pikolive.core.room.treasure_box.bean.BoxRankingInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.utils.ImageLoadKt; +import com.bingchuang.core.room.treasure_box.bean.BoxRankingInfo; /** * @author jack diff --git a/app/src/module_treasure_box/java/com/pikolive/app/shipantics/RadishRankingPresenter.java b/app/src/module_treasure_box/java/com/bingchuang/app/shipantics/RadishRankingPresenter.java similarity index 87% rename from app/src/module_treasure_box/java/com/pikolive/app/shipantics/RadishRankingPresenter.java rename to app/src/module_treasure_box/java/com/bingchuang/app/shipantics/RadishRankingPresenter.java index ca59502d0..4a6c855be 100644 --- a/app/src/module_treasure_box/java/com/pikolive/app/shipantics/RadishRankingPresenter.java +++ b/app/src/module_treasure_box/java/com/bingchuang/app/shipantics/RadishRankingPresenter.java @@ -1,10 +1,10 @@ -package com.pikolive.app.shipantics; +package com.bingchuang.app.shipantics; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.treasure_box.model.RadishModel; -import com.pikolive.core.Constants; -import com.pikolive.core.room.treasure_box.bean.BoxRankingInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseMvpPresenter; +import com.bingchuang.treasure_box.model.RadishModel; +import com.bingchuang.core.Constants; +import com.bingchuang.core.room.treasure_box.bean.BoxRankingInfo; import com.bingchuang.library.utils.ResUtil; import io.reactivex.SingleObserver; diff --git a/app/src/module_treasure_box/java/com/pikolive/app/shipantics/RadishResultDialog.kt b/app/src/module_treasure_box/java/com/bingchuang/app/shipantics/RadishResultDialog.kt similarity index 86% rename from app/src/module_treasure_box/java/com/pikolive/app/shipantics/RadishResultDialog.kt rename to app/src/module_treasure_box/java/com/bingchuang/app/shipantics/RadishResultDialog.kt index 41ea45a8e..25be3e8f1 100644 --- a/app/src/module_treasure_box/java/com/pikolive/app/shipantics/RadishResultDialog.kt +++ b/app/src/module_treasure_box/java/com/bingchuang/app/shipantics/RadishResultDialog.kt @@ -1,4 +1,4 @@ -package com.pikolive.app.shipantics +package com.bingchuang.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.pikolive.app.R -import com.pikolive.app.base.BaseDialog -import com.pikolive.app.databinding.DialogRadishResultBinding -import com.pikolive.app.ui.utils.RVDelegate -import com.pikolive.app.ui.utils.load -import com.pikolive.treasure_box.bean.OpenBoxResult -import com.pikolive.treasure_box.bean.PrizeInfo +import com.bingchuang.app.R +import com.bingchuang.app.base.BaseDialog +import com.bingchuang.app.databinding.DialogRadishResultBinding +import com.bingchuang.app.ui.utils.RVDelegate +import com.bingchuang.app.ui.utils.load +import com.bingchuang.treasure_box.bean.OpenBoxResult +import com.bingchuang.treasure_box.bean.PrizeInfo class RadishResultDialog : BaseDialog () { diff --git a/app/src/module_treasure_box/java/com/pikolive/app/treasure_box/activity/BoxRankingActivity.java b/app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/activity/BoxRankingActivity.java similarity index 80% rename from app/src/module_treasure_box/java/com/pikolive/app/treasure_box/activity/BoxRankingActivity.java rename to app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/activity/BoxRankingActivity.java index 5ed0db6b7..7078ff0e9 100644 --- a/app/src/module_treasure_box/java/com/pikolive/app/treasure_box/activity/BoxRankingActivity.java +++ b/app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/activity/BoxRankingActivity.java @@ -1,4 +1,4 @@ -package com.pikolive.app.treasure_box.activity; +package com.bingchuang.app.treasure_box.activity; import android.annotation.SuppressLint; import android.content.Context; @@ -7,17 +7,17 @@ import android.view.View; import androidx.fragment.app.Fragment; -import com.pikolive.app.treasure_box.fragment.BoxRankingFragment; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseViewBindingActivity; -import com.pikolive.app.common.ViewPagerAdapter; -import com.pikolive.app.databinding.ActivityRoomBoxRankingBinding; -import com.pikolive.app.decoration.view.widgets.CarMagicIndicator; -import com.pikolive.app.room_chat.event.ClickRootViewEvent; -import com.pikolive.core2.home.bean.TabInfo; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.manager.RoomEvent; -import com.pikolive.core.room.treasure_box.event.RefreshBoxRankingEvent; +import com.bingchuang.app.treasure_box.fragment.BoxRankingFragment; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseViewBindingActivity; +import com.bingchuang.app.common.ViewPagerAdapter; +import com.bingchuang.app.databinding.ActivityRoomBoxRankingBinding; +import com.bingchuang.app.decoration.view.widgets.CarMagicIndicator; +import com.bingchuang.app.room_chat.event.ClickRootViewEvent; +import com.bingchuang.core2.home.bean.TabInfo; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.manager.RoomEvent; +import com.bingchuang.core.room.treasure_box.event.RefreshBoxRankingEvent; import com.bingchuang.library.utils.ResUtil; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/module_treasure_box/java/com/pikolive/app/treasure_box/activity/TreasureBoxActivity.java b/app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/activity/TreasureBoxActivity.java similarity index 89% rename from app/src/module_treasure_box/java/com/pikolive/app/treasure_box/activity/TreasureBoxActivity.java rename to app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/activity/TreasureBoxActivity.java index 8272292c7..eeb4f6a26 100644 --- a/app/src/module_treasure_box/java/com/pikolive/app/treasure_box/activity/TreasureBoxActivity.java +++ b/app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/activity/TreasureBoxActivity.java @@ -1,14 +1,14 @@ -package com.pikolive.app.treasure_box.activity; +package com.bingchuang.app.treasure_box.activity; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_BOX; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_FAIRY; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_ALL; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_NOTIFY; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_SERVER_ALL; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ALL_ROOM_NOTIFY_BY_SVGA; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L5; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_BOX; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_FAIRY; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_ALL; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_NOTIFY; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_SERVER_ALL; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ALL_ROOM_NOTIFY_BY_SVGA; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L5; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -35,37 +35,37 @@ 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.pikolive.app.R; -import com.pikolive.app.base.BaseBindingActivity; -import com.pikolive.app.databinding.ActivityTreasureBoxBinding; -import com.pikolive.app.treasure_box.widget.dialog.BoxLoveLackDialog; -import com.pikolive.app.treasure_box.widget.dialog.BoxMoreDialog; -import com.pikolive.app.treasure_box.widget.dialog.BuyLoveDialog; -import com.pikolive.app.treasure_box.widget.dialog.TreasureBoxDialog; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.app.utils.KeyBoardUtils; -import com.pikolive.app.utils.UserUtils; -import com.pikolive.treasure_box.bean.PrizeNewInfo; -import com.pikolive.treasure_box.bean.UserTicketInfo; -import com.pikolive.treasure_box.model.BoxModel; -import com.pikolive.core.DemoCache; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.bean.BaseProtocol; -import com.pikolive.core.exception.FailReasonException; -import com.pikolive.core.gift.bean.LuckyBagNoticeInfo; -import com.pikolive.core.im.custom.bean.FairyMsgAttachment; -import com.pikolive.core.im.custom.bean.RoomBoxPrizeAttachment; -import com.pikolive.core.im.custom.bean.RoomBoxPrizeInfo; -import com.pikolive.core.im.custom.bean.RoomLuckySeaAttachment; -import com.pikolive.core.im.custom.bean.RoomLuckySeaMsgBean; -import com.pikolive.core.im.custom.bean.RoomReceivedLuckyGiftAttachment; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.manager.RoomEvent; -import com.pikolive.core.pay.PayModel; -import com.pikolive.core.pay.bean.WalletInfo; -import com.pikolive.core.room.bean.FindLoveSwitchVo; -import com.pikolive.core2.treasurefairy.FairyMsgInfoBean; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseBindingActivity; +import com.bingchuang.app.databinding.ActivityTreasureBoxBinding; +import com.bingchuang.app.treasure_box.widget.dialog.BoxLoveLackDialog; +import com.bingchuang.app.treasure_box.widget.dialog.BoxMoreDialog; +import com.bingchuang.app.treasure_box.widget.dialog.BuyLoveDialog; +import com.bingchuang.app.treasure_box.widget.dialog.TreasureBoxDialog; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.app.utils.KeyBoardUtils; +import com.bingchuang.app.utils.UserUtils; +import com.bingchuang.treasure_box.bean.PrizeNewInfo; +import com.bingchuang.treasure_box.bean.UserTicketInfo; +import com.bingchuang.treasure_box.model.BoxModel; +import com.bingchuang.core.DemoCache; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.bean.BaseProtocol; +import com.bingchuang.core.exception.FailReasonException; +import com.bingchuang.core.gift.bean.LuckyBagNoticeInfo; +import com.bingchuang.core.im.custom.bean.FairyMsgAttachment; +import com.bingchuang.core.im.custom.bean.RoomBoxPrizeAttachment; +import com.bingchuang.core.im.custom.bean.RoomBoxPrizeInfo; +import com.bingchuang.core.im.custom.bean.RoomLuckySeaAttachment; +import com.bingchuang.core.im.custom.bean.RoomLuckySeaMsgBean; +import com.bingchuang.core.im.custom.bean.RoomReceivedLuckyGiftAttachment; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.manager.RoomEvent; +import com.bingchuang.core.pay.PayModel; +import com.bingchuang.core.pay.bean.WalletInfo; +import com.bingchuang.core.room.bean.FindLoveSwitchVo; +import com.bingchuang.core2.treasurefairy.FairyMsgInfoBean; import com.bingchuang.library.annatation.ActLayoutRes; import com.bingchuang.library.common.SpConstants; import com.bingchuang.library.common.util.SPUtils; diff --git a/app/src/module_treasure_box/java/com/pikolive/app/treasure_box/activity/TreasureBoxHonourActivity.java b/app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/activity/TreasureBoxHonourActivity.java similarity index 93% rename from app/src/module_treasure_box/java/com/pikolive/app/treasure_box/activity/TreasureBoxHonourActivity.java rename to app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/activity/TreasureBoxHonourActivity.java index 7f1babece..69b0e8fdc 100644 --- a/app/src/module_treasure_box/java/com/pikolive/app/treasure_box/activity/TreasureBoxHonourActivity.java +++ b/app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/activity/TreasureBoxHonourActivity.java @@ -1,4 +1,4 @@ -package com.pikolive.app.treasure_box.activity; +package com.bingchuang.app.treasure_box.activity; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -20,22 +20,22 @@ import android.widget.TextView; import com.netease.nim.uikit.StatusBarUtil; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseBindingActivity; -import com.pikolive.app.databinding.ActivityTreasureBoxHonourBinding; -import com.pikolive.app.treasure_box.widget.dialog.BoxMoreDialog; -import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.pikolive.app.ui.webview.DialogWebViewActivity; -import com.pikolive.treasure_box.bean.PrizeInfo; -import com.pikolive.treasure_box.model.BoxModel; -import com.pikolive.treasure_box.model.IBoxModel; -import com.pikolive.core.DemoCache; -import com.pikolive.core2.UriProvider; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.manager.RoomEvent; -import com.pikolive.core.pay.PayModel; -import com.pikolive.core.pay.bean.WalletInfo; -import com.pikolive.core.utils.StringUtils; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseBindingActivity; +import com.bingchuang.app.databinding.ActivityTreasureBoxHonourBinding; +import com.bingchuang.app.treasure_box.widget.dialog.BoxMoreDialog; +import com.bingchuang.app.ui.utils.ImageLoadUtils; +import com.bingchuang.app.ui.webview.DialogWebViewActivity; +import com.bingchuang.treasure_box.bean.PrizeInfo; +import com.bingchuang.treasure_box.model.BoxModel; +import com.bingchuang.treasure_box.model.IBoxModel; +import com.bingchuang.core.DemoCache; +import com.bingchuang.core2.UriProvider; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.manager.RoomEvent; +import com.bingchuang.core.pay.PayModel; +import com.bingchuang.core.pay.bean.WalletInfo; +import com.bingchuang.core.utils.StringUtils; import com.bingchuang.library.annatation.ActLayoutRes; import com.bingchuang.library.utils.FormatUtils; import com.bingchuang.library.utils.ResUtil; diff --git a/app/src/module_treasure_box/java/com/pikolive/app/treasure_box/adapter/BoxRankingListAdapter.java b/app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/adapter/BoxRankingListAdapter.java similarity index 92% rename from app/src/module_treasure_box/java/com/pikolive/app/treasure_box/adapter/BoxRankingListAdapter.java rename to app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/adapter/BoxRankingListAdapter.java index 77a8890ea..2db673243 100644 --- a/app/src/module_treasure_box/java/com/pikolive/app/treasure_box/adapter/BoxRankingListAdapter.java +++ b/app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/adapter/BoxRankingListAdapter.java @@ -1,4 +1,4 @@ -package com.pikolive.app.treasure_box.adapter; +package com.bingchuang.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.pikolive.app.R; -import com.pikolive.app.ui.utils.ImageLoadKt; -import com.pikolive.core.room.treasure_box.bean.TreasureRankingInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.utils.ImageLoadKt; +import com.bingchuang.core.room.treasure_box.bean.TreasureRankingInfo; /** * @author jack diff --git a/app/src/module_treasure_box/java/com/pikolive/app/treasure_box/fragment/BoxRankingFragment.java b/app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/fragment/BoxRankingFragment.java similarity index 87% rename from app/src/module_treasure_box/java/com/pikolive/app/treasure_box/fragment/BoxRankingFragment.java rename to app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/fragment/BoxRankingFragment.java index b7f2480c3..caedc187e 100644 --- a/app/src/module_treasure_box/java/com/pikolive/app/treasure_box/fragment/BoxRankingFragment.java +++ b/app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/fragment/BoxRankingFragment.java @@ -1,4 +1,4 @@ -package com.pikolive.app.treasure_box.fragment; +package com.bingchuang.app.treasure_box.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.pikolive.app.treasure_box.presenter.BoxRankingPresenter; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseMvpFragment; -import com.pikolive.app.common.NoDataFragment; -import com.pikolive.app.treasure_box.adapter.BoxRankingListAdapter; -import com.pikolive.app.treasure_box.module.IBoxRankingView; -import com.pikolive.app.treasure_box.widget.BoxRankLoadMoreView; -import com.pikolive.app.ui.user.activity.UserInfoActivity; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.pikolive.app.ui.widget.recyclerview.decoration.HorizontalDecoration; -import com.pikolive.core.room.treasure_box.bean.TreasureRankingInfo; -import com.pikolive.core.room.treasure_box.event.RefreshBoxRankingEvent; +import com.bingchuang.app.treasure_box.presenter.BoxRankingPresenter; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseMvpFragment; +import com.bingchuang.app.common.NoDataFragment; +import com.bingchuang.app.treasure_box.adapter.BoxRankingListAdapter; +import com.bingchuang.app.treasure_box.module.IBoxRankingView; +import com.bingchuang.app.treasure_box.widget.BoxRankLoadMoreView; +import com.bingchuang.app.ui.user.activity.UserInfoActivity; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.app.ui.widget.recyclerview.decoration.HorizontalDecoration; +import com.bingchuang.core.room.treasure_box.bean.TreasureRankingInfo; +import com.bingchuang.core.room.treasure_box.event.RefreshBoxRankingEvent; import com.bingchuang.library.base.factory.CreatePresenter; import com.bingchuang.library.utils.ListUtils; diff --git a/app/src/module_treasure_box/java/com/pikolive/app/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java b/app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java similarity index 96% rename from app/src/module_treasure_box/java/com/pikolive/app/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java rename to app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java index 1e09a482b..397d1f10c 100644 --- a/app/src/module_treasure_box/java/com/pikolive/app/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java +++ b/app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java @@ -1,4 +1,4 @@ -package com.pikolive.app.treasure_box.fragment; +package com.bingchuang.app.treasure_box.fragment; import android.app.Dialog; import android.os.Bundle; @@ -16,9 +16,9 @@ import androidx.constraintlayout.widget.ConstraintLayout; import androidx.fragment.app.DialogFragment; import com.coorchice.library.utils.LogUtils; -import com.pikolive.app.R; -import com.pikolive.app.ui.webview.DialogWebViewActivity; -import com.pikolive.core2.UriProvider; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.webview.DialogWebViewActivity; +import com.bingchuang.core2.UriProvider; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.TimeUtils; diff --git a/app/src/module_treasure_box/java/com/pikolive/app/treasure_box/module/BoxRankingModel.java b/app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/module/BoxRankingModel.java similarity index 81% rename from app/src/module_treasure_box/java/com/pikolive/app/treasure_box/module/BoxRankingModel.java rename to app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/module/BoxRankingModel.java index d14535584..bd52d0304 100644 --- a/app/src/module_treasure_box/java/com/pikolive/app/treasure_box/module/BoxRankingModel.java +++ b/app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/module/BoxRankingModel.java @@ -1,10 +1,10 @@ -package com.pikolive.app.treasure_box.module; +package com.bingchuang.app.treasure_box.module; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.community.CommunityConstant; -import com.pikolive.core.room.treasure_box.bean.TreasureRankingInfo; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.community.CommunityConstant; +import com.bingchuang.core.room.treasure_box.bean.TreasureRankingInfo; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import java.util.List; diff --git a/app/src/module_treasure_box/java/com/pikolive/app/treasure_box/module/IBoxRankingView.java b/app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/module/IBoxRankingView.java similarity index 75% rename from app/src/module_treasure_box/java/com/pikolive/app/treasure_box/module/IBoxRankingView.java rename to app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/module/IBoxRankingView.java index 5318279c2..0f43a58f8 100644 --- a/app/src/module_treasure_box/java/com/pikolive/app/treasure_box/module/IBoxRankingView.java +++ b/app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/module/IBoxRankingView.java @@ -1,6 +1,6 @@ -package com.pikolive.app.treasure_box.module; +package com.bingchuang.app.treasure_box.module; -import com.pikolive.core.room.treasure_box.bean.TreasureRankingInfo; +import com.bingchuang.core.room.treasure_box.bean.TreasureRankingInfo; import com.bingchuang.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_treasure_box/java/com/pikolive/app/treasure_box/presenter/BoxRankingPresenter.java b/app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/presenter/BoxRankingPresenter.java similarity index 84% rename from app/src/module_treasure_box/java/com/pikolive/app/treasure_box/presenter/BoxRankingPresenter.java rename to app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/presenter/BoxRankingPresenter.java index b6d83b087..aea667709 100644 --- a/app/src/module_treasure_box/java/com/pikolive/app/treasure_box/presenter/BoxRankingPresenter.java +++ b/app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/presenter/BoxRankingPresenter.java @@ -1,11 +1,11 @@ -package com.pikolive.app.treasure_box.presenter; +package com.bingchuang.app.treasure_box.presenter; -import com.pikolive.app.R; -import com.pikolive.app.base.BaseMvpPresenter; -import com.pikolive.app.treasure_box.module.BoxRankingModel; -import com.pikolive.app.treasure_box.module.IBoxRankingView; -import com.pikolive.core.Constants; -import com.pikolive.core.room.treasure_box.bean.TreasureRankingInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.base.BaseMvpPresenter; +import com.bingchuang.app.treasure_box.module.BoxRankingModel; +import com.bingchuang.app.treasure_box.module.IBoxRankingView; +import com.bingchuang.core.Constants; +import com.bingchuang.core.room.treasure_box.bean.TreasureRankingInfo; import com.bingchuang.library.utils.ResUtil; import java.util.List; diff --git a/app/src/module_treasure_box/java/com/pikolive/app/treasure_box/widget/BoxRankLoadMoreView.java b/app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/widget/BoxRankLoadMoreView.java similarity index 87% rename from app/src/module_treasure_box/java/com/pikolive/app/treasure_box/widget/BoxRankLoadMoreView.java rename to app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/widget/BoxRankLoadMoreView.java index 08668d109..96106b357 100644 --- a/app/src/module_treasure_box/java/com/pikolive/app/treasure_box/widget/BoxRankLoadMoreView.java +++ b/app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/widget/BoxRankLoadMoreView.java @@ -1,7 +1,7 @@ -package com.pikolive.app.treasure_box.widget; +package com.bingchuang.app.treasure_box.widget; import com.chad.library.adapter.base.loadmore.LoadMoreView; -import com.pikolive.app.R; +import com.bingchuang.app.R; public final class BoxRankLoadMoreView extends LoadMoreView { diff --git a/app/src/module_treasure_box/java/com/pikolive/app/treasure_box/widget/GoldBoxHelper.java b/app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/widget/GoldBoxHelper.java similarity index 84% rename from app/src/module_treasure_box/java/com/pikolive/app/treasure_box/widget/GoldBoxHelper.java rename to app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/widget/GoldBoxHelper.java index 5fec875e2..e80cb2d83 100644 --- a/app/src/module_treasure_box/java/com/pikolive/app/treasure_box/widget/GoldBoxHelper.java +++ b/app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/widget/GoldBoxHelper.java @@ -1,23 +1,23 @@ -package com.pikolive.app.treasure_box.widget; +package com.bingchuang.app.treasure_box.widget; import android.content.Context; import androidx.annotation.Nullable; import androidx.fragment.app.FragmentActivity; -import com.pikolive.app.treasure_box.activity.TreasureBoxActivity; -import com.pikolive.app.treasure_box.activity.TreasureBoxHonourActivity; -import com.pikolive.app.treasure_box.fragment.ChooseTreasureBoxDialogFragment; -import com.pikolive.app.R; -import com.pikolive.core.initial.InitialModel; -import com.pikolive.core.initial.bean.FairyOpenInfo; -import com.pikolive.core.initial.bean.InitInfo; -import com.pikolive.core.level.UserLevelVo; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core2.market_verify.MarketVerifyModel; -import com.pikolive.core.admin.util.SuperAdminUtil; -import com.pikolive.core.user.UserModel; -import com.pikolive.core.user.bean.UserInfo; +import com.bingchuang.app.treasure_box.activity.TreasureBoxActivity; +import com.bingchuang.app.treasure_box.activity.TreasureBoxHonourActivity; +import com.bingchuang.app.treasure_box.fragment.ChooseTreasureBoxDialogFragment; +import com.bingchuang.app.R; +import com.bingchuang.core.initial.InitialModel; +import com.bingchuang.core.initial.bean.FairyOpenInfo; +import com.bingchuang.core.initial.bean.InitInfo; +import com.bingchuang.core.level.UserLevelVo; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core2.market_verify.MarketVerifyModel; +import com.bingchuang.core.admin.util.SuperAdminUtil; +import com.bingchuang.core.user.UserModel; +import com.bingchuang.core.user.bean.UserInfo; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.SingleToastUtil; import com.bingchuang.library.utils.TimeUtils; diff --git a/app/src/module_treasure_box/java/com/pikolive/app/treasure_box/widget/dialog/BaseBindingDialog.java b/app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/widget/dialog/BaseBindingDialog.java similarity index 97% rename from app/src/module_treasure_box/java/com/pikolive/app/treasure_box/widget/dialog/BaseBindingDialog.java rename to app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/widget/dialog/BaseBindingDialog.java index b28b81d38..e18d2c6a6 100644 --- a/app/src/module_treasure_box/java/com/pikolive/app/treasure_box/widget/dialog/BaseBindingDialog.java +++ b/app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/widget/dialog/BaseBindingDialog.java @@ -1,4 +1,4 @@ -package com.pikolive.app.treasure_box.widget.dialog; +package com.bingchuang.app.treasure_box.widget.dialog; import android.content.Context; import android.graphics.Color; diff --git a/app/src/module_treasure_box/java/com/pikolive/app/treasure_box/widget/dialog/BoxLoveLackDialog.kt b/app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/widget/dialog/BoxLoveLackDialog.kt similarity index 89% rename from app/src/module_treasure_box/java/com/pikolive/app/treasure_box/widget/dialog/BoxLoveLackDialog.kt rename to app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/widget/dialog/BoxLoveLackDialog.kt index 62032c8a7..815b64b99 100644 --- a/app/src/module_treasure_box/java/com/pikolive/app/treasure_box/widget/dialog/BoxLoveLackDialog.kt +++ b/app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/widget/dialog/BoxLoveLackDialog.kt @@ -1,4 +1,4 @@ -package com.pikolive.app.treasure_box.widget.dialog +package com.bingchuang.app.treasure_box.widget.dialog import android.annotation.SuppressLint import android.os.Bundle @@ -6,15 +6,15 @@ import android.text.Editable import android.view.Gravity import android.view.WindowManager import com.hjq.toast.ToastUtils -import com.pikolive.app.R -import com.pikolive.app.base.BaseDialog -import com.pikolive.app.databinding.TreasureBoxDialogLoveLackBinding -import com.pikolive.app.treasure_box.activity.TreasureBoxActivity.MAX_BUY_QUANTITY_LIMIT -import com.pikolive.app.treasure_box.widget.dialog.TreasureBoxDialog.Companion.newInstance -import com.pikolive.treasure_box.bean.UserTicketInfo -import com.pikolive.treasure_box.model.BoxModel -import com.pikolive.core.exception.FailReasonException -import com.pikolive.core.utils.StringUtils +import com.bingchuang.app.R +import com.bingchuang.app.base.BaseDialog +import com.bingchuang.app.databinding.TreasureBoxDialogLoveLackBinding +import com.bingchuang.app.treasure_box.activity.TreasureBoxActivity.MAX_BUY_QUANTITY_LIMIT +import com.bingchuang.app.treasure_box.widget.dialog.TreasureBoxDialog.Companion.newInstance +import com.bingchuang.treasure_box.bean.UserTicketInfo +import com.bingchuang.treasure_box.model.BoxModel +import com.bingchuang.core.exception.FailReasonException +import com.bingchuang.core.utils.StringUtils import com.bingchuang.library.common.SpConstants import com.bingchuang.library.common.util.SPUtils import com.bingchuang.library.common.util.SoftKeyboardStateHelper diff --git a/app/src/module_treasure_box/java/com/pikolive/app/treasure_box/widget/dialog/BoxMoreDialog.java b/app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/widget/dialog/BoxMoreDialog.java similarity index 88% rename from app/src/module_treasure_box/java/com/pikolive/app/treasure_box/widget/dialog/BoxMoreDialog.java rename to app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/widget/dialog/BoxMoreDialog.java index a881a97db..1351c0321 100644 --- a/app/src/module_treasure_box/java/com/pikolive/app/treasure_box/widget/dialog/BoxMoreDialog.java +++ b/app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/widget/dialog/BoxMoreDialog.java @@ -1,16 +1,16 @@ -package com.pikolive.app.treasure_box.widget.dialog; +package com.bingchuang.app.treasure_box.widget.dialog; import android.content.Context; import android.view.Gravity; import android.view.Window; import android.view.WindowManager; -import com.pikolive.app.R; -import com.pikolive.app.databinding.DialogBoxMoreBinding; -import com.pikolive.app.ui.webview.DialogWebViewActivity; -import com.pikolive.app.utils.UserUtils; -import com.pikolive.core.DemoCache; -import com.pikolive.core2.UriProvider; +import com.bingchuang.app.R; +import com.bingchuang.app.databinding.DialogBoxMoreBinding; +import com.bingchuang.app.ui.webview.DialogWebViewActivity; +import com.bingchuang.app.utils.UserUtils; +import com.bingchuang.core.DemoCache; +import com.bingchuang.core2.UriProvider; import com.bingchuang.library.annatation.ActLayoutRes; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.SingleToastUtil; diff --git a/app/src/module_treasure_box/java/com/pikolive/app/treasure_box/widget/dialog/BuyLoveDialog.kt b/app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/widget/dialog/BuyLoveDialog.kt similarity index 90% rename from app/src/module_treasure_box/java/com/pikolive/app/treasure_box/widget/dialog/BuyLoveDialog.kt rename to app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/widget/dialog/BuyLoveDialog.kt index 1795ddb95..8467c5bcd 100644 --- a/app/src/module_treasure_box/java/com/pikolive/app/treasure_box/widget/dialog/BuyLoveDialog.kt +++ b/app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/widget/dialog/BuyLoveDialog.kt @@ -1,16 +1,16 @@ -package com.pikolive.app.treasure_box.widget.dialog +package com.bingchuang.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.pikolive.app.R -import com.pikolive.app.base.BaseDialog -import com.pikolive.app.databinding.TreasureBoxDialogBuyLoveBinding -import com.pikolive.treasure_box.bean.UserTicketInfo -import com.pikolive.treasure_box.model.BoxModel -import com.pikolive.core.exception.FailReasonException +import com.bingchuang.app.R +import com.bingchuang.app.base.BaseDialog +import com.bingchuang.app.databinding.TreasureBoxDialogBuyLoveBinding +import com.bingchuang.treasure_box.bean.UserTicketInfo +import com.bingchuang.treasure_box.model.BoxModel +import com.bingchuang.core.exception.FailReasonException import com.bingchuang.library.common.SpConstants import com.bingchuang.library.common.util.SPUtils import com.bingchuang.library.utils.SingleToastUtil diff --git a/app/src/module_treasure_box/java/com/pikolive/app/treasure_box/widget/dialog/BuyLoveSuccessDialog.kt b/app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/widget/dialog/BuyLoveSuccessDialog.kt similarity index 89% rename from app/src/module_treasure_box/java/com/pikolive/app/treasure_box/widget/dialog/BuyLoveSuccessDialog.kt rename to app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/widget/dialog/BuyLoveSuccessDialog.kt index c28a10e1c..5fd20e587 100644 --- a/app/src/module_treasure_box/java/com/pikolive/app/treasure_box/widget/dialog/BuyLoveSuccessDialog.kt +++ b/app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/widget/dialog/BuyLoveSuccessDialog.kt @@ -1,11 +1,11 @@ -package com.pikolive.app.treasure_box.widget.dialog +package com.bingchuang.app.treasure_box.widget.dialog import android.annotation.SuppressLint import android.os.Bundle import android.view.Gravity import android.view.WindowManager -import com.pikolive.app.base.BaseDialog -import com.pikolive.app.databinding.TreasureBoxDialogBuyLoveSuccessBinding +import com.bingchuang.app.base.BaseDialog +import com.bingchuang.app.databinding.TreasureBoxDialogBuyLoveSuccessBinding import com.bingchuang.library.common.SpConstants import com.bingchuang.library.common.util.SPUtils diff --git a/app/src/module_treasure_box/java/com/pikolive/app/treasure_box/widget/dialog/TreasureBoxDialog.kt b/app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/widget/dialog/TreasureBoxDialog.kt similarity index 71% rename from app/src/module_treasure_box/java/com/pikolive/app/treasure_box/widget/dialog/TreasureBoxDialog.kt rename to app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/widget/dialog/TreasureBoxDialog.kt index f280651d6..f84f64ce0 100644 --- a/app/src/module_treasure_box/java/com/pikolive/app/treasure_box/widget/dialog/TreasureBoxDialog.kt +++ b/app/src/module_treasure_box/java/com/bingchuang/app/treasure_box/widget/dialog/TreasureBoxDialog.kt @@ -1,11 +1,11 @@ -package com.pikolive.app.treasure_box.widget.dialog +package com.bingchuang.app.treasure_box.widget.dialog -import com.pikolive.app.base.BaseDialog -import com.pikolive.app.databinding.DialogTreasureBoxBinding -import com.pikolive.app.ui.pay.ChargeActivity -import com.pikolive.app.ui.webview.CommonWebViewActivity -import com.pikolive.core.Constants -import com.pikolive.core2.UriProvider +import com.bingchuang.app.base.BaseDialog +import com.bingchuang.app.databinding.DialogTreasureBoxBinding +import com.bingchuang.app.ui.pay.ChargeActivity +import com.bingchuang.app.ui.webview.CommonWebViewActivity +import com.bingchuang.core.Constants +import com.bingchuang.core2.UriProvider import com.bingchuang.library.common.util.DeviceUtil.getDeviceId import com.bingchuang.library.utils.AppMetaDataUtil 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 53c7b926b..3febb259d 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/pikolive/app/upgrade/AppUpdateDialog.java b/app/src/module_upgrade_app/java/com/bingchuang/app/upgrade/AppUpdateDialog.java similarity index 93% rename from app/src/module_upgrade_app/java/com/pikolive/app/upgrade/AppUpdateDialog.java rename to app/src/module_upgrade_app/java/com/bingchuang/app/upgrade/AppUpdateDialog.java index 99429393f..6e1ea3f5a 100644 --- a/app/src/module_upgrade_app/java/com/pikolive/app/upgrade/AppUpdateDialog.java +++ b/app/src/module_upgrade_app/java/com/bingchuang/app/upgrade/AppUpdateDialog.java @@ -1,4 +1,4 @@ -package com.pikolive.app.upgrade; +package com.bingchuang.app.upgrade; import android.content.Intent; import android.graphics.Color; @@ -17,12 +17,12 @@ import androidx.fragment.app.DialogFragment; import androidx.fragment.app.FragmentManager; import com.orhanobut.logger.Logger; -import com.pikolive.app.R; -import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.pikolive.core2.XChatConstants; -import com.pikolive.core.Constants; -import com.pikolive.core2.UriHelper; -import com.pikolive.core.upgrade.bean.NewestVersionInfo; +import com.bingchuang.app.R; +import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil; +import com.bingchuang.core2.XChatConstants; +import com.bingchuang.core.Constants; +import com.bingchuang.core2.UriHelper; +import com.bingchuang.core.upgrade.bean.NewestVersionInfo; import com.bingchuang.library.utils.AppMetaDataUtil; public class AppUpdateDialog extends DialogFragment implements View.OnClickListener { diff --git a/app/src/module_upgrade_app/java/com/pikolive/app/upgrade/AppUpgradeDataMrg.java b/app/src/module_upgrade_app/java/com/bingchuang/app/upgrade/AppUpgradeDataMrg.java similarity index 96% rename from app/src/module_upgrade_app/java/com/pikolive/app/upgrade/AppUpgradeDataMrg.java rename to app/src/module_upgrade_app/java/com/bingchuang/app/upgrade/AppUpgradeDataMrg.java index d5f405772..93537bb62 100644 --- a/app/src/module_upgrade_app/java/com/pikolive/app/upgrade/AppUpgradeDataMrg.java +++ b/app/src/module_upgrade_app/java/com/bingchuang/app/upgrade/AppUpgradeDataMrg.java @@ -1,11 +1,11 @@ -package com.pikolive.app.upgrade; +package com.bingchuang.app.upgrade; import android.text.TextUtils; import com.google.gson.Gson; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.pikolive.core.upgrade.bean.UpgradeCache; -import com.pikolive.core.utils.SharedPreferenceUtils; +import com.bingchuang.core.upgrade.bean.UpgradeCache; +import com.bingchuang.core.utils.SharedPreferenceUtils; import com.bingchuang.library.utils.TimeUtils; import java.util.Objects; diff --git a/app/src/module_upgrade_app/java/com/pikolive/app/upgrade/AppUpgradeHelper.java b/app/src/module_upgrade_app/java/com/bingchuang/app/upgrade/AppUpgradeHelper.java similarity index 94% rename from app/src/module_upgrade_app/java/com/pikolive/app/upgrade/AppUpgradeHelper.java rename to app/src/module_upgrade_app/java/com/bingchuang/app/upgrade/AppUpgradeHelper.java index 2ea361c84..26ebfac9d 100644 --- a/app/src/module_upgrade_app/java/com/pikolive/app/upgrade/AppUpgradeHelper.java +++ b/app/src/module_upgrade_app/java/com/bingchuang/app/upgrade/AppUpgradeHelper.java @@ -1,16 +1,16 @@ -package com.pikolive.app.upgrade; +package com.bingchuang.app.upgrade; import android.annotation.SuppressLint; import com.trello.rxlifecycle3.android.ActivityEvent; import com.trello.rxlifecycle3.components.support.RxAppCompatActivity; -import com.pikolive.app.common.widget.dialog.DialogManager; -import com.pikolive.core.Constants; -import com.pikolive.core.upgrade.bean.NewestVersionInfo; -import com.pikolive.core.upgrade.bean.UpgradeCache; -import com.pikolive.core.upgrade.model.UpgradeModel; -import com.pikolive.core.utils.ActivityUtil; -import com.pikolive.core.utils.Logger; +import com.bingchuang.app.common.widget.dialog.DialogManager; +import com.bingchuang.core.Constants; +import com.bingchuang.core.upgrade.bean.NewestVersionInfo; +import com.bingchuang.core.upgrade.bean.UpgradeCache; +import com.bingchuang.core.upgrade.model.UpgradeModel; +import com.bingchuang.core.utils.ActivityUtil; +import com.bingchuang.core.utils.Logger; import com.bingchuang.library.utils.AppMetaDataUtil; import com.bingchuang.library.utils.SingleToastUtil; import com.bingchuang.library.utils.config.BasicConfig; diff --git a/app/src/module_upgrade_app/java/com/pikolive/app/upgrade/AppVersionUtil.java b/app/src/module_upgrade_app/java/com/bingchuang/app/upgrade/AppVersionUtil.java similarity index 97% rename from app/src/module_upgrade_app/java/com/pikolive/app/upgrade/AppVersionUtil.java rename to app/src/module_upgrade_app/java/com/bingchuang/app/upgrade/AppVersionUtil.java index cad2a0b1b..6f98351bb 100644 --- a/app/src/module_upgrade_app/java/com/pikolive/app/upgrade/AppVersionUtil.java +++ b/app/src/module_upgrade_app/java/com/bingchuang/app/upgrade/AppVersionUtil.java @@ -1,4 +1,4 @@ -package com.pikolive.app.upgrade; +package com.bingchuang.app.upgrade; /** * @Author: yangming diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/UriHelper.java b/core/src/diff_src_erban/java/com/bingchuang/core2/UriHelper.java similarity index 98% rename from core/src/diff_src_erban/java/com/pikolive/core2/UriHelper.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/UriHelper.java index 405d1623c..baec5968c 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/UriHelper.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/UriHelper.java @@ -1,4 +1,4 @@ -package com.pikolive.core2; +package com.bingchuang.core2; import android.net.Uri; import android.text.TextUtils; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/UriProvider.java b/core/src/diff_src_erban/java/com/bingchuang/core2/UriProvider.java similarity index 99% rename from core/src/diff_src_erban/java/com/pikolive/core2/UriProvider.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/UriProvider.java index 2f331b9cd..fa98cb012 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/UriProvider.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/UriProvider.java @@ -1,8 +1,8 @@ -package com.pikolive.core2; +package com.bingchuang.core2; import android.text.TextUtils; -import com.pikolive.core.manager.AvRoomDataManager; +import com.bingchuang.core.manager.AvRoomDataManager; import com.bingchuang.library.common.application.Env; /** @@ -191,7 +191,7 @@ public class UriProvider { } /** - * Peko专属,实名认证页面 + * Peki专属,实名认证页面 * * @return */ diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/XChatConstants.java b/core/src/diff_src_erban/java/com/bingchuang/core2/XChatConstants.java similarity index 96% rename from core/src/diff_src_erban/java/com/pikolive/core2/XChatConstants.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/XChatConstants.java index 7c7b61721..42123a96b 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/XChatConstants.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/XChatConstants.java @@ -1,7 +1,7 @@ -package com.pikolive.core2; +package com.bingchuang.core2; -import com.pikolive.core.BuildConfig; -import com.pikolive.core.R; +import com.bingchuang.core.BuildConfig; +import com.bingchuang.core.R; import com.bingchuang.library.utils.ResUtil; /** @@ -13,7 +13,7 @@ public class XChatConstants { /** * 包名(各種緩存目錄的根目錄) */ - public static final String XCHAT_DIR_NAME = "com.mango.piko"; + public static final String XCHAT_DIR_NAME = "com.mango.peki"; /** * sp名字 @@ -230,7 +230,7 @@ public class XChatConstants { * Referer (RELEASE) */ public static final String KEY_REFERER_RELEASE = "https://api.pikolive.fun/"; - public static final String APP_MARK = "peko"; + public static final String APP_MARK = "peki"; /** * 聊天室文本消息易盾反垃圾業務id */ @@ -246,8 +246,8 @@ public class XChatConstants { public static final String ADJUST_APP_TOKEN = "ujzc7mbv3g8w"; /** - * peko谷歌下载地址 + * peki谷歌下载地址 */ - public static String appDownloadUrl = "https://play.google.com/store/apps/details?id=fun.piko.live"; + public static String appDownloadUrl = "https://play.google.com/store/apps/details?id=fun.peki.live"; } diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/association/bean/ClanListInfo.kt b/core/src/diff_src_erban/java/com/bingchuang/core2/association/bean/ClanListInfo.kt similarity index 86% rename from core/src/diff_src_erban/java/com/pikolive/core2/association/bean/ClanListInfo.kt rename to core/src/diff_src_erban/java/com/bingchuang/core2/association/bean/ClanListInfo.kt index b64844043..b383ad5d9 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/association/bean/ClanListInfo.kt +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/association/bean/ClanListInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core2.association.bean +package com.bingchuang.core2.association.bean data class ClanListInfo( val clanId: Int = 0, diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/association/bean/HallListInfo.java b/core/src/diff_src_erban/java/com/bingchuang/core2/association/bean/HallListInfo.java similarity index 91% rename from core/src/diff_src_erban/java/com/pikolive/core2/association/bean/HallListInfo.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/association/bean/HallListInfo.java index 5c2ee2bdd..386f333c7 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/association/bean/HallListInfo.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/association/bean/HallListInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.association.bean; +package com.bingchuang.core2.association.bean; import lombok.Data; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/association/bean/MemberExchangeInfo.kt b/core/src/diff_src_erban/java/com/bingchuang/core2/association/bean/MemberExchangeInfo.kt similarity index 90% rename from core/src/diff_src_erban/java/com/pikolive/core2/association/bean/MemberExchangeInfo.kt rename to core/src/diff_src_erban/java/com/bingchuang/core2/association/bean/MemberExchangeInfo.kt index f65452144..6c52281ae 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/association/bean/MemberExchangeInfo.kt +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/association/bean/MemberExchangeInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core2.association.bean +package com.bingchuang.core2.association.bean import lombok.Data diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/association/bean/UserLevelInfo.kt b/core/src/diff_src_erban/java/com/bingchuang/core2/association/bean/UserLevelInfo.kt similarity index 89% rename from core/src/diff_src_erban/java/com/pikolive/core2/association/bean/UserLevelInfo.kt rename to core/src/diff_src_erban/java/com/bingchuang/core2/association/bean/UserLevelInfo.kt index e3843ac62..056349349 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/association/bean/UserLevelInfo.kt +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/association/bean/UserLevelInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core2.association.bean +package com.bingchuang.core2.association.bean import lombok.Data diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/association/model/AssociationModel.kt b/core/src/diff_src_erban/java/com/bingchuang/core2/association/model/AssociationModel.kt similarity index 80% rename from core/src/diff_src_erban/java/com/pikolive/core2/association/model/AssociationModel.kt rename to core/src/diff_src_erban/java/com/bingchuang/core2/association/model/AssociationModel.kt index eafa40583..43abe3248 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/association/model/AssociationModel.kt +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/association/model/AssociationModel.kt @@ -1,12 +1,12 @@ -package com.pikolive.core2.association.model +package com.bingchuang.core2.association.model -import com.pikolive.core.base.BaseModel -import com.pikolive.core.bean.response.ServiceResult -import com.pikolive.core.utils.net.launchRequest +import com.bingchuang.core.base.BaseModel +import com.bingchuang.core.bean.response.ServiceResult +import com.bingchuang.core.utils.net.launchRequest import com.bingchuang.library.net.rxnet.RxNet -import com.pikolive.core2.association.bean.ClanListInfo -import com.pikolive.core2.association.bean.HallListInfo -import com.pikolive.core2.association.bean.MemberExchangeInfo +import com.bingchuang.core2.association.bean.ClanListInfo +import com.bingchuang.core2.association.bean.HallListInfo +import com.bingchuang.core2.association.bean.MemberExchangeInfo import retrofit2.http.* object AssociationModel : BaseModel() { diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/audio/AudioModel.java b/core/src/diff_src_erban/java/com/bingchuang/core2/audio/AudioModel.java similarity index 91% rename from core/src/diff_src_erban/java/com/pikolive/core2/audio/AudioModel.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/audio/AudioModel.java index bcf35f3b8..34902c912 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/audio/AudioModel.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/audio/AudioModel.java @@ -1,15 +1,15 @@ -package com.pikolive.core2.audio; +package com.bingchuang.core2.audio; import com.google.gson.JsonElement; -import com.pikolive.core2.audio.bean.HistoryVoiceInfo; -import com.pikolive.core2.audio.bean.SaveVoiceSuccessResultInfo; -import com.pikolive.core2.audio.bean.UserVoiceInfo; -import com.pikolive.core2.audio.bean.VoiceCardInfo; -import com.pikolive.core2.audio.bean.VoiceMatchInfo; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core2.audio.bean.HistoryVoiceInfo; +import com.bingchuang.core2.audio.bean.SaveVoiceSuccessResultInfo; +import com.bingchuang.core2.audio.bean.UserVoiceInfo; +import com.bingchuang.core2.audio.bean.VoiceCardInfo; +import com.bingchuang.core2.audio.bean.VoiceMatchInfo; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import java.util.ArrayList; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/audio/IAudioModel.java b/core/src/diff_src_erban/java/com/bingchuang/core2/audio/IAudioModel.java similarity index 84% rename from core/src/diff_src_erban/java/com/pikolive/core2/audio/IAudioModel.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/audio/IAudioModel.java index 52173f54f..b7e09569e 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/audio/IAudioModel.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/audio/IAudioModel.java @@ -1,11 +1,11 @@ -package com.pikolive.core2.audio; +package com.bingchuang.core2.audio; -import com.pikolive.core2.audio.bean.HistoryVoiceInfo; -import com.pikolive.core2.audio.bean.SaveVoiceSuccessResultInfo; -import com.pikolive.core2.audio.bean.UserVoiceInfo; -import com.pikolive.core2.audio.bean.VoiceCardInfo; -import com.pikolive.core2.audio.bean.VoiceMatchInfo; -import com.pikolive.core.base.IModel; +import com.bingchuang.core2.audio.bean.HistoryVoiceInfo; +import com.bingchuang.core2.audio.bean.SaveVoiceSuccessResultInfo; +import com.bingchuang.core2.audio.bean.UserVoiceInfo; +import com.bingchuang.core2.audio.bean.VoiceCardInfo; +import com.bingchuang.core2.audio.bean.VoiceMatchInfo; +import com.bingchuang.core.base.IModel; import java.util.List; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/audio/bean/HistoryVoiceInfo.java b/core/src/diff_src_erban/java/com/bingchuang/core2/audio/bean/HistoryVoiceInfo.java similarity index 98% rename from core/src/diff_src_erban/java/com/pikolive/core2/audio/bean/HistoryVoiceInfo.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/audio/bean/HistoryVoiceInfo.java index 12ea82fbd..1738e5c08 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/audio/bean/HistoryVoiceInfo.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/audio/bean/HistoryVoiceInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.audio.bean; +package com.bingchuang.core2.audio.bean; /** * 查询旧版本个人介绍声音 diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/audio/bean/SaveVoiceSuccessResultInfo.java b/core/src/diff_src_erban/java/com/bingchuang/core2/audio/bean/SaveVoiceSuccessResultInfo.java similarity index 98% rename from core/src/diff_src_erban/java/com/pikolive/core2/audio/bean/SaveVoiceSuccessResultInfo.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/audio/bean/SaveVoiceSuccessResultInfo.java index 41599c0a7..34ce0b25d 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/audio/bean/SaveVoiceSuccessResultInfo.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/audio/bean/SaveVoiceSuccessResultInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.audio.bean; +package com.bingchuang.core2.audio.bean; /** * 保存声音成功时 接口返回的声音信息 diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/audio/bean/UserVoiceInfo.java b/core/src/diff_src_erban/java/com/bingchuang/core2/audio/bean/UserVoiceInfo.java similarity index 98% rename from core/src/diff_src_erban/java/com/pikolive/core2/audio/bean/UserVoiceInfo.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/audio/bean/UserVoiceInfo.java index 4df6b90b3..a34d75c6b 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/audio/bean/UserVoiceInfo.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/audio/bean/UserVoiceInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.audio.bean; +package com.bingchuang.core2.audio.bean; /** * 我的声音列表 diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/audio/bean/VoiceCardInfo.java b/core/src/diff_src_erban/java/com/bingchuang/core2/audio/bean/VoiceCardInfo.java similarity index 96% rename from core/src/diff_src_erban/java/com/pikolive/core2/audio/bean/VoiceCardInfo.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/audio/bean/VoiceCardInfo.java index d039258ec..6a9749f4e 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/audio/bean/VoiceCardInfo.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/audio/bean/VoiceCardInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.audio.bean; +package com.bingchuang.core2.audio.bean; /** * 声音卡片的信息 diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/audio/bean/VoiceMatchInfo.java b/core/src/diff_src_erban/java/com/bingchuang/core2/audio/bean/VoiceMatchInfo.java similarity index 95% rename from core/src/diff_src_erban/java/com/pikolive/core2/audio/bean/VoiceMatchInfo.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/audio/bean/VoiceMatchInfo.java index d95e66763..281c4d55e 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/audio/bean/VoiceMatchInfo.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/audio/bean/VoiceMatchInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.audio.bean; +package com.bingchuang.core2.audio.bean; import lombok.Data; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/channel/ChannelModel.java b/core/src/diff_src_erban/java/com/bingchuang/core2/channel/ChannelModel.java similarity index 91% rename from core/src/diff_src_erban/java/com/pikolive/core2/channel/ChannelModel.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/channel/ChannelModel.java index 7ee30d501..83774f3ce 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/channel/ChannelModel.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/channel/ChannelModel.java @@ -1,12 +1,12 @@ -package com.pikolive.core2.channel; +package com.bingchuang.core2.channel; import com.orhanobut.logger.Logger; -import com.pikolive.core.R; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.user.UserModel; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.user.event.CurrentUserInfoCompleteEvent; +import com.bingchuang.core.R; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.user.UserModel; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.user.event.CurrentUserInfoCompleteEvent; import com.bingchuang.library.utils.AppMetaDataUtil; import com.bingchuang.library.utils.ResUtil; diff --git a/core/src/diff_src_erban/java/com/bingchuang/core2/channel/IChannelModel.java b/core/src/diff_src_erban/java/com/bingchuang/core2/channel/IChannelModel.java new file mode 100644 index 000000000..8064f5766 --- /dev/null +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/channel/IChannelModel.java @@ -0,0 +1,6 @@ +package com.bingchuang.core2.channel; + +import com.bingchuang.core.base.IModel; + +public interface IChannelModel extends IModel { +} diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/ClanHallMemberIncomeTotalInfo.kt b/core/src/diff_src_erban/java/com/bingchuang/core2/earn/bean/ClanHallMemberIncomeTotalInfo.kt similarity index 90% rename from core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/ClanHallMemberIncomeTotalInfo.kt rename to core/src/diff_src_erban/java/com/bingchuang/core2/earn/bean/ClanHallMemberIncomeTotalInfo.kt index 156acef0d..c326019d9 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/ClanHallMemberIncomeTotalInfo.kt +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/earn/bean/ClanHallMemberIncomeTotalInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core2.earn.bean +package com.bingchuang.core2.earn.bean import lombok.Data import java.math.BigDecimal diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/ConfigWithdrawInfo.kt b/core/src/diff_src_erban/java/com/bingchuang/core2/earn/bean/ConfigWithdrawInfo.kt similarity index 90% rename from core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/ConfigWithdrawInfo.kt rename to core/src/diff_src_erban/java/com/bingchuang/core2/earn/bean/ConfigWithdrawInfo.kt index ad67afe39..ad186d89b 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/ConfigWithdrawInfo.kt +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/earn/bean/ConfigWithdrawInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core2.earn.bean +package com.bingchuang.core2.earn.bean import lombok.Data import java.io.Serializable diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/EarnRecordInfo.kt b/core/src/diff_src_erban/java/com/bingchuang/core2/earn/bean/EarnRecordInfo.kt similarity index 88% rename from core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/EarnRecordInfo.kt rename to core/src/diff_src_erban/java/com/bingchuang/core2/earn/bean/EarnRecordInfo.kt index c9d24accb..e56251fcc 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/EarnRecordInfo.kt +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/earn/bean/EarnRecordInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core2.earn.bean +package com.bingchuang.core2.earn.bean import lombok.Data import java.math.BigDecimal diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/GoldRecordInfo.kt b/core/src/diff_src_erban/java/com/bingchuang/core2/earn/bean/GoldRecordInfo.kt similarity index 76% rename from core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/GoldRecordInfo.kt rename to core/src/diff_src_erban/java/com/bingchuang/core2/earn/bean/GoldRecordInfo.kt index 680a1b93f..c71ba4773 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/GoldRecordInfo.kt +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/earn/bean/GoldRecordInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core2.earn.bean +package com.bingchuang.core2.earn.bean import lombok.Data diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/GoldToDiamondInfo.kt b/core/src/diff_src_erban/java/com/bingchuang/core2/earn/bean/GoldToDiamondInfo.kt similarity index 90% rename from core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/GoldToDiamondInfo.kt rename to core/src/diff_src_erban/java/com/bingchuang/core2/earn/bean/GoldToDiamondInfo.kt index 7b3494e00..58f50067c 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/GoldToDiamondInfo.kt +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/earn/bean/GoldToDiamondInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core2.earn.bean +package com.bingchuang.core2.earn.bean import lombok.Data import java.io.Serializable diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/HallMemberGoldFlowInfo.kt b/core/src/diff_src_erban/java/com/bingchuang/core2/earn/bean/HallMemberGoldFlowInfo.kt similarity index 90% rename from core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/HallMemberGoldFlowInfo.kt rename to core/src/diff_src_erban/java/com/bingchuang/core2/earn/bean/HallMemberGoldFlowInfo.kt index b1fb7e967..04b372251 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/HallMemberGoldFlowInfo.kt +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/earn/bean/HallMemberGoldFlowInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core2.earn.bean +package com.bingchuang.core2.earn.bean import lombok.Data diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/HallMemberGoldFlowTotalInfo.kt b/core/src/diff_src_erban/java/com/bingchuang/core2/earn/bean/HallMemberGoldFlowTotalInfo.kt similarity index 79% rename from core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/HallMemberGoldFlowTotalInfo.kt rename to core/src/diff_src_erban/java/com/bingchuang/core2/earn/bean/HallMemberGoldFlowTotalInfo.kt index 05142a98a..cb21dc394 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/HallMemberGoldFlowTotalInfo.kt +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/earn/bean/HallMemberGoldFlowTotalInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core2.earn.bean +package com.bingchuang.core2.earn.bean import lombok.Data diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/HallVo.kt b/core/src/diff_src_erban/java/com/bingchuang/core2/earn/bean/HallVo.kt similarity index 79% rename from core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/HallVo.kt rename to core/src/diff_src_erban/java/com/bingchuang/core2/earn/bean/HallVo.kt index dec672b60..6b2cf4fcf 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/HallVo.kt +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/earn/bean/HallVo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core2.earn.bean +package com.bingchuang.core2.earn.bean import lombok.Data diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/RoomTypeInfo.kt b/core/src/diff_src_erban/java/com/bingchuang/core2/earn/bean/RoomTypeInfo.kt similarity index 90% rename from core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/RoomTypeInfo.kt rename to core/src/diff_src_erban/java/com/bingchuang/core2/earn/bean/RoomTypeInfo.kt index a848de6ef..d1de9dff9 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/RoomTypeInfo.kt +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/earn/bean/RoomTypeInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core2.earn.bean +package com.bingchuang.core2.earn.bean import java.math.BigDecimal diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/WithdrawAccount.kt b/core/src/diff_src_erban/java/com/bingchuang/core2/earn/bean/WithdrawAccount.kt similarity index 89% rename from core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/WithdrawAccount.kt rename to core/src/diff_src_erban/java/com/bingchuang/core2/earn/bean/WithdrawAccount.kt index c8ab9bbb6..88423bd5d 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/WithdrawAccount.kt +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/earn/bean/WithdrawAccount.kt @@ -1,4 +1,4 @@ -package com.pikolive.core2.earn.bean +package com.bingchuang.core2.earn.bean import lombok.Data import java.io.Serializable diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/earn/model/EarnModel.kt b/core/src/diff_src_erban/java/com/bingchuang/core2/earn/model/EarnModel.kt similarity index 95% rename from core/src/diff_src_erban/java/com/pikolive/core2/earn/model/EarnModel.kt rename to core/src/diff_src_erban/java/com/bingchuang/core2/earn/model/EarnModel.kt index 3594683e5..69f6534ce 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/earn/model/EarnModel.kt +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/earn/model/EarnModel.kt @@ -1,10 +1,10 @@ -package com.pikolive.core2.earn.model +package com.bingchuang.core2.earn.model -import com.pikolive.core2.earn.bean.* -import com.pikolive.core.utils.net.launchRequest +import com.bingchuang.core2.earn.bean.* +import com.bingchuang.core.utils.net.launchRequest import com.bingchuang.library.net.rxnet.RxNet -import com.pikolive.core.base.BaseModel -import com.pikolive.core.bean.response.ServiceResult +import com.bingchuang.core.base.BaseModel +import com.bingchuang.core.bean.response.ServiceResult import retrofit2.http.GET import retrofit2.http.POST import retrofit2.http.Query diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/helper/AtProxy.java b/core/src/diff_src_erban/java/com/bingchuang/core2/helper/AtProxy.java similarity index 98% rename from core/src/diff_src_erban/java/com/pikolive/core2/helper/AtProxy.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/helper/AtProxy.java index 04f333750..f96056339 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/helper/AtProxy.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/helper/AtProxy.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.helper; +package com.bingchuang.core2.helper; import android.widget.EditText; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/helper/ImHelperUtils.java b/core/src/diff_src_erban/java/com/bingchuang/core2/helper/ImHelperUtils.java similarity index 78% rename from core/src/diff_src_erban/java/com/pikolive/core2/helper/ImHelperUtils.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/helper/ImHelperUtils.java index 49c48d45a..93902b0f7 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/helper/ImHelperUtils.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/helper/ImHelperUtils.java @@ -1,26 +1,26 @@ -package com.pikolive.core2.helper; +package com.bingchuang.core2.helper; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_CAR; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_NOBLE; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ASSISTANT_MSG; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_COMMON_SYSTEM_MSG; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_LOTTERY; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_LUCKY_MONEY; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_NOTICE; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_OPEN_ROOM_NOTI; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_PACKET; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_SHARE_IN_APP; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MODULE_HALL; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_NEWBIE; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_PUBLIC_CHAT_HALL; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RED_PACKAGE; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_FAMILY; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_ROOM; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_TEAM; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHIFT_OUT; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_PUBLIC_CHAT_HALL_AIT_ME; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_RECEIVE_LUCKY_MONEY; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_LUCKY_MONEY; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_CAR; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_NOBLE; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ASSISTANT_MSG; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_COMMON_SYSTEM_MSG; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_LOTTERY; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_LUCKY_MONEY; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_NOTICE; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_OPEN_ROOM_NOTI; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_PACKET; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_SHARE_IN_APP; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MODULE_HALL; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_NEWBIE; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_PUBLIC_CHAT_HALL; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RED_PACKAGE; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_FAMILY; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_ROOM; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_TEAM; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHIFT_OUT; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_PUBLIC_CHAT_HALL_AIT_ME; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_RECEIVE_LUCKY_MONEY; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_LUCKY_MONEY; import androidx.annotation.NonNull; @@ -34,27 +34,27 @@ 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.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.R; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.community.im.WorldDynamicAttachment; -import com.pikolive.core.im.custom.bean.AssistantAttachment; -import com.pikolive.core.im.custom.bean.CarAttachment; -import com.pikolive.core.im.custom.bean.CarveUpGoldThirdLevelAttachment; -import com.pikolive.core.im.custom.bean.ChatHintAttachment; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.im.custom.bean.ImTipAttachment; -import com.pikolive.core.im.custom.bean.LuckyMoneyTipsAttachment; -import com.pikolive.core.im.custom.bean.MatchAttachment; -import com.pikolive.core.im.custom.bean.NewbieHelloAttachment; -import com.pikolive.core.im.custom.bean.NobleAttachment; -import com.pikolive.core.im.custom.bean.NoticeAttachment; -import com.pikolive.core.im.custom.bean.RedPacketAttachment; -import com.pikolive.core.im.custom.bean.SysMsgVoiceAttachment; -import com.pikolive.core.luckymoney.LuckyMoneyInfo; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core.public_chat_hall.attachment.AitMeAttachment; -import com.pikolive.core.public_chat_hall.bean.AitMeInfo; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.R; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.community.im.WorldDynamicAttachment; +import com.bingchuang.core.im.custom.bean.AssistantAttachment; +import com.bingchuang.core.im.custom.bean.CarAttachment; +import com.bingchuang.core.im.custom.bean.CarveUpGoldThirdLevelAttachment; +import com.bingchuang.core.im.custom.bean.ChatHintAttachment; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.im.custom.bean.ImTipAttachment; +import com.bingchuang.core.im.custom.bean.LuckyMoneyTipsAttachment; +import com.bingchuang.core.im.custom.bean.MatchAttachment; +import com.bingchuang.core.im.custom.bean.NewbieHelloAttachment; +import com.bingchuang.core.im.custom.bean.NobleAttachment; +import com.bingchuang.core.im.custom.bean.NoticeAttachment; +import com.bingchuang.core.im.custom.bean.RedPacketAttachment; +import com.bingchuang.core.im.custom.bean.SysMsgVoiceAttachment; +import com.bingchuang.core.luckymoney.LuckyMoneyInfo; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core.public_chat_hall.attachment.AitMeAttachment; +import com.bingchuang.core.public_chat_hall.bean.AitMeInfo; import com.bingchuang.library.utils.ResUtil; import java.util.ArrayList; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/home/IHomeTabMapView.java b/core/src/diff_src_erban/java/com/bingchuang/core2/home/IHomeTabMapView.java similarity index 79% rename from core/src/diff_src_erban/java/com/pikolive/core2/home/IHomeTabMapView.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/home/IHomeTabMapView.java index c1e05f20d..0fe1de240 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/home/IHomeTabMapView.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/home/IHomeTabMapView.java @@ -1,6 +1,6 @@ -package com.pikolive.core2.home; +package com.bingchuang.core2.home; -import com.pikolive.core2.home.bean.HomeTabMapInfo; +import com.bingchuang.core2.home.bean.HomeTabMapInfo; import com.bingchuang.library.base.IMvpBaseView; import java.util.List; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/BannerInfo.java b/core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/BannerInfo.java similarity index 98% rename from core/src/diff_src_erban/java/com/pikolive/core2/home/bean/BannerInfo.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/BannerInfo.java index 81fe24ac4..c0f8ca816 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/BannerInfo.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/BannerInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.home.bean; +package com.bingchuang.core2.home.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/CollectionRoomInfo.java b/core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/CollectionRoomInfo.java similarity index 96% rename from core/src/diff_src_erban/java/com/pikolive/core2/home/bean/CollectionRoomInfo.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/CollectionRoomInfo.java index 6e34a2e02..46b53a520 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/CollectionRoomInfo.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/CollectionRoomInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.home.bean; +package com.bingchuang.core2.home.bean; import java.util.List; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/CurrentResourceInfo.kt b/core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/CurrentResourceInfo.kt similarity index 85% rename from core/src/diff_src_erban/java/com/pikolive/core2/home/bean/CurrentResourceInfo.kt rename to core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/CurrentResourceInfo.kt index 2549532d9..b54b0f19f 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/CurrentResourceInfo.kt +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/CurrentResourceInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core2.home.bean +package com.bingchuang.core2.home.bean import lombok.Data diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/HomeConcernsInfo.java b/core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/HomeConcernsInfo.java similarity index 86% rename from core/src/diff_src_erban/java/com/pikolive/core2/home/bean/HomeConcernsInfo.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/HomeConcernsInfo.java index cb8130907..1b4e3b537 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/HomeConcernsInfo.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/HomeConcernsInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.home.bean; +package com.bingchuang.core2.home.bean; import java.io.Serializable; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/HomeRoomInfo.java b/core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/HomeRoomInfo.java similarity index 97% rename from core/src/diff_src_erban/java/com/pikolive/core2/home/bean/HomeRoomInfo.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/HomeRoomInfo.java index 02bedefb4..abd5bc93f 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/HomeRoomInfo.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/HomeRoomInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.home.bean; +package com.bingchuang.core2.home.bean; import android.text.TextUtils; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/HomeTabMapInfo.java b/core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/HomeTabMapInfo.java similarity index 98% rename from core/src/diff_src_erban/java/com/pikolive/core2/home/bean/HomeTabMapInfo.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/HomeTabMapInfo.java index 821e4fee3..e11f61346 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/HomeTabMapInfo.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/HomeTabMapInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.home.bean; +package com.bingchuang.core2.home.bean; import com.chad.library.adapter.base.entity.MultiItemEntity; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/HomeTagInfo.java b/core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/HomeTagInfo.java similarity index 94% rename from core/src/diff_src_erban/java/com/pikolive/core2/home/bean/HomeTagInfo.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/HomeTagInfo.java index 2dbbf2c86..2025faab1 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/HomeTagInfo.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/HomeTagInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.home.bean; +package com.bingchuang.core2.home.bean; import lombok.Data; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/MainTabInfo.kt b/core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/MainTabInfo.kt similarity index 85% rename from core/src/diff_src_erban/java/com/pikolive/core2/home/bean/MainTabInfo.kt rename to core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/MainTabInfo.kt index b33510843..8089d1924 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/MainTabInfo.kt +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/MainTabInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core2.home.bean +package com.bingchuang.core2.home.bean import lombok.Data diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/MainTabType.java b/core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/MainTabType.java similarity index 85% rename from core/src/diff_src_erban/java/com/pikolive/core2/home/bean/MainTabType.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/MainTabType.java index d77533193..7f1d7c8ce 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/MainTabType.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/MainTabType.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.home.bean; +package com.bingchuang.core2.home.bean; public interface MainTabType { //tabType(1-派对,2-广场,3-赛事,4-消息,5-我的) diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/MicUsersBean.java b/core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/MicUsersBean.java similarity index 88% rename from core/src/diff_src_erban/java/com/pikolive/core2/home/bean/MicUsersBean.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/MicUsersBean.java index 0b7be0d24..f936547da 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/MicUsersBean.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/MicUsersBean.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.home.bean; +package com.bingchuang.core2.home.bean; import lombok.Data; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/ResourceInfo.kt b/core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/ResourceInfo.kt similarity index 85% rename from core/src/diff_src_erban/java/com/pikolive/core2/home/bean/ResourceInfo.kt rename to core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/ResourceInfo.kt index 5fab5b80d..03a283f25 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/ResourceInfo.kt +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/ResourceInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core2.home.bean +package com.bingchuang.core2.home.bean import lombok.Data diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/TabInfo.java b/core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/TabInfo.java similarity index 97% rename from core/src/diff_src_erban/java/com/pikolive/core2/home/bean/TabInfo.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/TabInfo.java index d4b685cd4..b64775d2e 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/TabInfo.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/TabInfo.java @@ -1,9 +1,9 @@ -package com.pikolive.core2.home.bean; +package com.bingchuang.core2.home.bean; import android.os.Parcel; import android.os.Parcelable; -import com.pikolive.core.R; +import com.bingchuang.core.R; import com.bingchuang.library.utils.ResUtil; import java.io.Serializable; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/TagListInfo.java b/core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/TagListInfo.java similarity index 82% rename from core/src/diff_src_erban/java/com/pikolive/core2/home/bean/TagListInfo.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/TagListInfo.java index b3ed625c1..420392e3c 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/TagListInfo.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/TagListInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.home.bean; +package com.bingchuang.core2.home.bean; import java.io.Serializable; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/VisitorInfo.kt b/core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/VisitorInfo.kt similarity index 85% rename from core/src/diff_src_erban/java/com/pikolive/core2/home/bean/VisitorInfo.kt rename to core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/VisitorInfo.kt index 9ea601350..b89d29e53 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/VisitorInfo.kt +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/home/bean/VisitorInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core2.home.bean +package com.bingchuang.core2.home.bean import lombok.Data diff --git a/core/src/diff_src_erban/java/com/bingchuang/core2/home/event/FollowRoomEvent.java b/core/src/diff_src_erban/java/com/bingchuang/core2/home/event/FollowRoomEvent.java new file mode 100644 index 000000000..fd3fea928 --- /dev/null +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/home/event/FollowRoomEvent.java @@ -0,0 +1,4 @@ +package com.bingchuang.core2.home.event; + +public class FollowRoomEvent { +} diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/home/event/OpenRoomMessageInputEvent.kt b/core/src/diff_src_erban/java/com/bingchuang/core2/home/event/OpenRoomMessageInputEvent.kt similarity index 76% rename from core/src/diff_src_erban/java/com/pikolive/core2/home/event/OpenRoomMessageInputEvent.kt rename to core/src/diff_src_erban/java/com/bingchuang/core2/home/event/OpenRoomMessageInputEvent.kt index 299cb5aa6..d77529df8 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/home/event/OpenRoomMessageInputEvent.kt +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/home/event/OpenRoomMessageInputEvent.kt @@ -1,4 +1,4 @@ -package com.pikolive.core2.home.event +package com.bingchuang.core2.home.event /** * Created by Max on 2023/10/27 11:56 diff --git a/core/src/diff_src_erban/java/com/bingchuang/core2/home/event/RefreshHomeDataEvent.java b/core/src/diff_src_erban/java/com/bingchuang/core2/home/event/RefreshHomeDataEvent.java new file mode 100644 index 000000000..32a43a27c --- /dev/null +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/home/event/RefreshHomeDataEvent.java @@ -0,0 +1,4 @@ +package com.bingchuang.core2.home.event; + +public class RefreshHomeDataEvent { +} diff --git a/core/src/diff_src_erban/java/com/bingchuang/core2/home/event/ShareRoomEvent.java b/core/src/diff_src_erban/java/com/bingchuang/core2/home/event/ShareRoomEvent.java new file mode 100644 index 000000000..0bf02d1e4 --- /dev/null +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/home/event/ShareRoomEvent.java @@ -0,0 +1,4 @@ +package com.bingchuang.core2.home.event; + +public class ShareRoomEvent { +} diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/home/event/VisitorUnreadCountEvent.java b/core/src/diff_src_erban/java/com/bingchuang/core2/home/event/VisitorUnreadCountEvent.java similarity index 78% rename from core/src/diff_src_erban/java/com/pikolive/core2/home/event/VisitorUnreadCountEvent.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/home/event/VisitorUnreadCountEvent.java index 4fabf19f6..bd14d41e4 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/home/event/VisitorUnreadCountEvent.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/home/event/VisitorUnreadCountEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.home.event; +package com.bingchuang.core2.home.event; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/home/model/CollectionRoomModel.java b/core/src/diff_src_erban/java/com/bingchuang/core2/home/model/CollectionRoomModel.java similarity index 91% rename from core/src/diff_src_erban/java/com/pikolive/core2/home/model/CollectionRoomModel.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/home/model/CollectionRoomModel.java index e1accd15e..09a9be2e5 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/home/model/CollectionRoomModel.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/home/model/CollectionRoomModel.java @@ -1,10 +1,10 @@ -package com.pikolive.core2.home.model; +package com.bingchuang.core2.home.model; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core2.home.bean.CollectionRoomInfo; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core2.home.bean.CollectionRoomInfo; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import io.reactivex.Single; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/home/model/CommunityNoticeModel.java b/core/src/diff_src_erban/java/com/bingchuang/core2/home/model/CommunityNoticeModel.java similarity index 92% rename from core/src/diff_src_erban/java/com/pikolive/core2/home/model/CommunityNoticeModel.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/home/model/CommunityNoticeModel.java index f68097d4a..fb017e37d 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/home/model/CommunityNoticeModel.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/home/model/CommunityNoticeModel.java @@ -1,8 +1,8 @@ -package com.pikolive.core2.home.model; +package com.bingchuang.core2.home.model; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.community.bean.CommunityNoticeInfo; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.community.bean.CommunityNoticeInfo; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import java.util.List; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/home/model/GameHomeModel.java b/core/src/diff_src_erban/java/com/bingchuang/core2/home/model/GameHomeModel.java similarity index 87% rename from core/src/diff_src_erban/java/com/pikolive/core2/home/model/GameHomeModel.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/home/model/GameHomeModel.java index 05646867e..a06daa7c2 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/home/model/GameHomeModel.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/home/model/GameHomeModel.java @@ -1,13 +1,13 @@ -package com.pikolive.core2.home.model; +package com.bingchuang.core2.home.model; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.community.CommunityConstant; -import com.pikolive.core2.home.bean.BannerInfo; -import com.pikolive.core2.home.bean.HomeRoomInfo; -import com.pikolive.core2.home.bean.HomeTabMapInfo; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.community.CommunityConstant; +import com.bingchuang.core2.home.bean.BannerInfo; +import com.bingchuang.core2.home.bean.HomeRoomInfo; +import com.bingchuang.core2.home.bean.HomeTabMapInfo; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import java.util.List; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/home/model/HomeModel.kt b/core/src/diff_src_erban/java/com/bingchuang/core2/home/model/HomeModel.kt similarity index 93% rename from core/src/diff_src_erban/java/com/pikolive/core2/home/model/HomeModel.kt rename to core/src/diff_src_erban/java/com/bingchuang/core2/home/model/HomeModel.kt index 4072f424f..3278df20d 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/home/model/HomeModel.kt +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/home/model/HomeModel.kt @@ -1,25 +1,25 @@ -package com.pikolive.core2.home.model +package com.bingchuang.core2.home.model -import com.pikolive.core.R -import com.pikolive.core.auth.AuthModel -import com.pikolive.core.community.CommunityConstant -import com.pikolive.core.community.bean.UnReadCountInfo -import com.pikolive.core2.earn.bean.* -import com.pikolive.core2.home.bean.* -import com.pikolive.core.room.bean.AnchorInfo -import com.pikolive.core.room.bean.HomeLiveTopInfo -import com.pikolive.core.room.bean.MeCenterInfo -import com.pikolive.core.room.game.GameInfo -import com.pikolive.core.utils.net.launchRequest +import com.bingchuang.core.R +import com.bingchuang.core.auth.AuthModel +import com.bingchuang.core.community.CommunityConstant +import com.bingchuang.core.community.bean.UnReadCountInfo +import com.bingchuang.core2.earn.bean.* +import com.bingchuang.core2.home.bean.* +import com.bingchuang.core.room.bean.AnchorInfo +import com.bingchuang.core.room.bean.HomeLiveTopInfo +import com.bingchuang.core.room.bean.MeCenterInfo +import com.bingchuang.core.room.game.GameInfo +import com.bingchuang.core.utils.net.launchRequest import com.bingchuang.library.net.rxnet.RxNet import com.bingchuang.library.utils.ResUtil -import com.pikolive.core.base.BaseModel -import com.pikolive.core.bean.response.ServiceResult -import com.pikolive.core.room.bean.SingleRoomSortInfo -import com.pikolive.core.user.bean.DiamondGiveHistoryInfo -import com.pikolive.core.user.bean.SearchUserInfo -import com.pikolive.core.user.bean.UserInfo -import com.pikolive.core.utils.net.RxHelper +import com.bingchuang.core.base.BaseModel +import com.bingchuang.core.bean.response.ServiceResult +import com.bingchuang.core.room.bean.SingleRoomSortInfo +import com.bingchuang.core.user.bean.DiamondGiveHistoryInfo +import com.bingchuang.core.user.bean.SearchUserInfo +import com.bingchuang.core.user.bean.UserInfo +import com.bingchuang.core.utils.net.RxHelper import io.reactivex.Single import retrofit2.http.GET import retrofit2.http.POST diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/home/model/ICommunityNoticeModel.java b/core/src/diff_src_erban/java/com/bingchuang/core2/home/model/ICommunityNoticeModel.java similarity index 73% rename from core/src/diff_src_erban/java/com/pikolive/core2/home/model/ICommunityNoticeModel.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/home/model/ICommunityNoticeModel.java index b0dab23ed..f84e105be 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/home/model/ICommunityNoticeModel.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/home/model/ICommunityNoticeModel.java @@ -1,6 +1,6 @@ -package com.pikolive.core2.home.model; +package com.bingchuang.core2.home.model; -import com.pikolive.core.community.bean.CommunityNoticeInfo; +import com.bingchuang.core.community.bean.CommunityNoticeInfo; import com.bingchuang.library.base.IMvpBaseView; import java.util.List; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/manager/AudioEngineManager.java b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/AudioEngineManager.java similarity index 96% rename from core/src/diff_src_erban/java/com/pikolive/core2/manager/AudioEngineManager.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/manager/AudioEngineManager.java index a2f0d911a..bf80a7463 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/manager/AudioEngineManager.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/AudioEngineManager.java @@ -1,13 +1,13 @@ -package com.pikolive.core2.manager; +package com.bingchuang.core2.manager; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.pikolive.core2.manager.agora.RtcEngineManager; -import com.pikolive.core2.manager.trtc.TRtcEngineManager; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core.room.bean.RoomAudioSdkType; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.utils.LogUtils; +import com.bingchuang.core2.manager.agora.RtcEngineManager; +import com.bingchuang.core2.manager.trtc.TRtcEngineManager; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core.room.bean.RoomAudioSdkType; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.utils.LogUtils; import io.agora.rtc2.Constants; import io.agora.rtc2.video.VideoCanvas; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/manager/BaseEngine.java b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/BaseEngine.java similarity index 97% rename from core/src/diff_src_erban/java/com/pikolive/core2/manager/BaseEngine.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/manager/BaseEngine.java index e7d877cba..598f0e357 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/manager/BaseEngine.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/BaseEngine.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.manager; +package com.bingchuang.core2.manager; import java.util.ArrayList; import java.util.List; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/manager/EngineType.java b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/EngineType.java similarity index 73% rename from core/src/diff_src_erban/java/com/pikolive/core2/manager/EngineType.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/manager/EngineType.java index 2c2cd2638..5c1ca96e1 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/manager/EngineType.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/EngineType.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.manager; +package com.bingchuang.core2.manager; public enum EngineType { TYPE_AGORA, diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/manager/IAudioEngine.java b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/IAudioEngine.java similarity index 97% rename from core/src/diff_src_erban/java/com/pikolive/core2/manager/IAudioEngine.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/manager/IAudioEngine.java index b77be6ce9..a3acb2a85 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/manager/IAudioEngine.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/IAudioEngine.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.manager; +package com.bingchuang.core2.manager; public interface IAudioEngine { diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/manager/IMNetEaseManager.java b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/IMNetEaseManager.java similarity index 96% rename from core/src/diff_src_erban/java/com/pikolive/core2/manager/IMNetEaseManager.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/manager/IMNetEaseManager.java index a2bb72dfe..9d16ef52f 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/manager/IMNetEaseManager.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/IMNetEaseManager.java @@ -1,7 +1,7 @@ -package com.pikolive.core2.manager; +package com.bingchuang.core2.manager; -import static com.pikolive.core2.XChatConstants.SELECT_ANIM_DURATION; -import static com.pikolive.core.im.custom.bean.CustomAttachment.*; +import static com.bingchuang.core2.XChatConstants.SELECT_ANIM_DURATION; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.*; import android.annotation.SuppressLint; import android.graphics.BitmapFactory; @@ -59,124 +59,124 @@ import com.netease.nimlib.sdk.msg.model.NIMAntiSpamOption; import com.netease.nimlib.sdk.util.Entry; import com.netease.nimlib.sdk.util.api.RequestResult; import com.orhanobut.logger.Logger; -import com.pikolive.core2.XChatConstants; -import com.pikolive.core.BuildConfig; -import com.pikolive.core.Constants; -import com.pikolive.core.R; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.bean.RoomMicInfo; -import com.pikolive.core.bean.RoomQueueInfo; -import com.pikolive.core.bean.attachmsg.RoomQueueMsgAttachment; -import com.pikolive.core.decoration.car.bean.CarInfo; -import com.pikolive.core.decoration.headwear.bean.HeadWearInfo; -import com.pikolive.core.exception.ErrorThrowable; -import com.pikolive.core.family.bean.FamilyInfo; -import com.pikolive.core.family.event.FamilyMineEvent; -import com.pikolive.core.gift.GiftModel; -import com.pikolive.core.gift.bean.GiftInfo; -import com.pikolive.core.gift.bean.GiftReceiveInfo; -import com.pikolive.core.gift.event.UpdateKnapFreeGiftDataEvent; -import com.pikolive.core2.helper.AtProxy; -import com.pikolive.core.im.custom.bean.ActivityTimerAttachment; -import com.pikolive.core.im.custom.bean.AssistantAttachment; -import com.pikolive.core.im.custom.bean.CarAttachment; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.im.custom.bean.DatingAttachment; -import com.pikolive.core.im.custom.bean.DatingPublishAttachment; -import com.pikolive.core.im.custom.bean.GiftAttachment; -import com.pikolive.core.im.custom.bean.GiftBatchAttachment; -import com.pikolive.core.im.custom.bean.InAppSharingFamilyAttachment; -import com.pikolive.core.im.custom.bean.InAppSharingMiniWorldAttachment; -import com.pikolive.core.im.custom.bean.InAppSharingRoomAttachment; -import com.pikolive.core.im.custom.bean.InAppSharingTeamAttachment; -import com.pikolive.core.im.custom.bean.LuckyMoneyAttachment; -import com.pikolive.core.im.custom.bean.LuckyMoneyTipsAttachment; -import com.pikolive.core.im.custom.bean.MagicAllMicAttachment; -import com.pikolive.core.im.custom.bean.MagicAttachment; -import com.pikolive.core.im.custom.bean.MagicBatchAttachment; -import com.pikolive.core.im.custom.bean.MonsterAttackAttachment; -import com.pikolive.core.im.custom.bean.MonsterHuntingResultAttachment; -import com.pikolive.core.im.custom.bean.MonsterStatusAttachment; -import com.pikolive.core.im.custom.bean.MultiGiftAttachment; -import com.pikolive.core.im.custom.bean.NobleAttachment; -import com.pikolive.core.im.custom.bean.RoomBoxPrizeAttachment; -import com.pikolive.core.im.custom.bean.RoomFreeGiftAttachment; -import com.pikolive.core.im.custom.bean.RoomFreeGiftMsgBean; -import com.pikolive.core.im.custom.bean.RoomGiftValueAttachment; -import com.pikolive.core.im.custom.bean.RoomInfoAttachment; -import com.pikolive.core.im.custom.bean.RoomLuckySeaAttachment; -import com.pikolive.core.im.custom.bean.RoomLuckySeaMsgBean; -import com.pikolive.core.im.custom.bean.RoomPKAttachment; -import com.pikolive.core.im.custom.bean.RoomPkBean; -import com.pikolive.core.im.custom.bean.RoomTipAttachment; -import com.pikolive.core.im.custom.bean.RouterType; -import com.pikolive.core.im.custom.bean.SysMsgAttachment; -import com.pikolive.core.im.custom.bean.TarotAttachment; -import com.pikolive.core.im.custom.bean.WelcomeAttachment; -import com.pikolive.core.level.UserLevelVo; -import com.pikolive.core.luckymoney.LuckyMoneyInfo; -import com.pikolive.core.magic.MagicModel; -import com.pikolive.core.magic.bean.MagicInfo; -import com.pikolive.core.magic.toolbox.MagicToolbox; -import com.pikolive.core.miniworld.bean.MiniWorldDetailInfo; -import com.pikolive.core.miniworld.bean.MiniWorldDetailInfoWithCurrentMember; -import com.pikolive.core.miniworld.event.MiniWorldJoinVerifiedEvent; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core.manager.BaseMvpModel; -import com.pikolive.core.manager.IMMessageManager; -import com.pikolive.core.manager.RelationShipEvent; -import com.pikolive.core.manager.RoomEvent; -import com.pikolive.core.monsterhunting.bean.MonsterInfo; -import com.pikolive.core.monsterhunting.bean.MonsterProtocol; -import com.pikolive.core.msg.sys.ErbanSysMsgInfo; -import com.pikolive.core.msg.sys.ErbanSysMsgParamKey; -import com.pikolive.core.msg.sysv2.ErbanSysMsgV2Info; -import com.pikolive.core.noble.NobleInfo; -import com.pikolive.core.noble.NobleResourceType; -import com.pikolive.core.noble.NobleUtil; -import com.pikolive.core.public_chat_hall.manager.PublicChatHallDataManager; -import com.pikolive.core2.retry.ImRetryManager; -import com.pikolive.core2.retry.ReconnectListener; -import com.pikolive.core2.retry.RetryChatRoomMessage; -import com.pikolive.core.room.activitytimer.ActivityTimerEvent; -import com.pikolive.core.room.activitytimer.TimerBean; -import com.pikolive.core.room.auction.bean.AuctionInfo; -import com.pikolive.core.room.bean.LeaveModeAttachment; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.room.exception.AntiSpamHitException; -import com.pikolive.core.room.face.DynamicFaceModel; -import com.pikolive.core.room.giftvalue.helper.GiftValueMrg; -import com.pikolive.core.room.model.AvRoomModel; -import com.pikolive.core.room.model.MicQueueModel; -import com.pikolive.core.room.pk.attachment.RoomPkAttachment; -import com.pikolive.core.room.pk.bean.PKTeamInfo; -import com.pikolive.core.room.pk.bean.RoomPKInvitedUpMicMember; -import com.pikolive.core.room.pk.bean.RoomPkData; -import com.pikolive.core.room.pk.model.PkModel; -import com.pikolive.core.room.queue.bean.MicMemberInfo; -import com.pikolive.core.room.queuing_mic.attachment.QueuingMicAttachment; -import com.pikolive.core.room.queuing_mic.bean.QueuingMicInfo; -import com.pikolive.core.room.queuing_mic.event.QueuingMicEmptyEvent; -import com.pikolive.core.room.queuing_mic.event.QueuingMicNotEmptyEvent; -import com.pikolive.core.share.bean.InAppSharingFamilyInfo; -import com.pikolive.core.share.bean.InAppSharingMiniWorldInfo; -import com.pikolive.core.share.bean.InAppSharingRoomInfo; -import com.pikolive.core.share.bean.InAppSharingTeamInfo; -import com.pikolive.core.share.bean.SessionType; -import com.pikolive.core.statistic.StatLogKey; -import com.pikolive.core.admin.SuperAdminDataMrg; -import com.pikolive.core.admin.attachment.SuperAdminOpAttachment; -import com.pikolive.core.admin.bean.SaOpInfo; -import com.pikolive.core.admin.util.SuperAdminUtil; -import com.pikolive.core.team.bean.TeamInfo; -import com.pikolive.core.user.UserModel; -import com.pikolive.core.user.bean.BaseInfo; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.utils.ExtensionUtils; -import com.pikolive.core.utils.LogUtils; -import com.pikolive.core.utils.SharedPreferenceUtils; -import com.pikolive.core.utils.net.DontWarnObserver; -import com.pikolive.core.vip.VipBroadcastMsgEvent; +import com.bingchuang.core2.XChatConstants; +import com.bingchuang.core.BuildConfig; +import com.bingchuang.core.Constants; +import com.bingchuang.core.R; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.bean.RoomMicInfo; +import com.bingchuang.core.bean.RoomQueueInfo; +import com.bingchuang.core.bean.attachmsg.RoomQueueMsgAttachment; +import com.bingchuang.core.decoration.car.bean.CarInfo; +import com.bingchuang.core.decoration.headwear.bean.HeadWearInfo; +import com.bingchuang.core.exception.ErrorThrowable; +import com.bingchuang.core.family.bean.FamilyInfo; +import com.bingchuang.core.family.event.FamilyMineEvent; +import com.bingchuang.core.gift.GiftModel; +import com.bingchuang.core.gift.bean.GiftInfo; +import com.bingchuang.core.gift.bean.GiftReceiveInfo; +import com.bingchuang.core.gift.event.UpdateKnapFreeGiftDataEvent; +import com.bingchuang.core2.helper.AtProxy; +import com.bingchuang.core.im.custom.bean.ActivityTimerAttachment; +import com.bingchuang.core.im.custom.bean.AssistantAttachment; +import com.bingchuang.core.im.custom.bean.CarAttachment; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.im.custom.bean.DatingAttachment; +import com.bingchuang.core.im.custom.bean.DatingPublishAttachment; +import com.bingchuang.core.im.custom.bean.GiftAttachment; +import com.bingchuang.core.im.custom.bean.GiftBatchAttachment; +import com.bingchuang.core.im.custom.bean.InAppSharingFamilyAttachment; +import com.bingchuang.core.im.custom.bean.InAppSharingMiniWorldAttachment; +import com.bingchuang.core.im.custom.bean.InAppSharingRoomAttachment; +import com.bingchuang.core.im.custom.bean.InAppSharingTeamAttachment; +import com.bingchuang.core.im.custom.bean.LuckyMoneyAttachment; +import com.bingchuang.core.im.custom.bean.LuckyMoneyTipsAttachment; +import com.bingchuang.core.im.custom.bean.MagicAllMicAttachment; +import com.bingchuang.core.im.custom.bean.MagicAttachment; +import com.bingchuang.core.im.custom.bean.MagicBatchAttachment; +import com.bingchuang.core.im.custom.bean.MonsterAttackAttachment; +import com.bingchuang.core.im.custom.bean.MonsterHuntingResultAttachment; +import com.bingchuang.core.im.custom.bean.MonsterStatusAttachment; +import com.bingchuang.core.im.custom.bean.MultiGiftAttachment; +import com.bingchuang.core.im.custom.bean.NobleAttachment; +import com.bingchuang.core.im.custom.bean.RoomBoxPrizeAttachment; +import com.bingchuang.core.im.custom.bean.RoomFreeGiftAttachment; +import com.bingchuang.core.im.custom.bean.RoomFreeGiftMsgBean; +import com.bingchuang.core.im.custom.bean.RoomGiftValueAttachment; +import com.bingchuang.core.im.custom.bean.RoomInfoAttachment; +import com.bingchuang.core.im.custom.bean.RoomLuckySeaAttachment; +import com.bingchuang.core.im.custom.bean.RoomLuckySeaMsgBean; +import com.bingchuang.core.im.custom.bean.RoomPKAttachment; +import com.bingchuang.core.im.custom.bean.RoomPkBean; +import com.bingchuang.core.im.custom.bean.RoomTipAttachment; +import com.bingchuang.core.im.custom.bean.RouterType; +import com.bingchuang.core.im.custom.bean.SysMsgAttachment; +import com.bingchuang.core.im.custom.bean.TarotAttachment; +import com.bingchuang.core.im.custom.bean.WelcomeAttachment; +import com.bingchuang.core.level.UserLevelVo; +import com.bingchuang.core.luckymoney.LuckyMoneyInfo; +import com.bingchuang.core.magic.MagicModel; +import com.bingchuang.core.magic.bean.MagicInfo; +import com.bingchuang.core.magic.toolbox.MagicToolbox; +import com.bingchuang.core.miniworld.bean.MiniWorldDetailInfo; +import com.bingchuang.core.miniworld.bean.MiniWorldDetailInfoWithCurrentMember; +import com.bingchuang.core.miniworld.event.MiniWorldJoinVerifiedEvent; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core.manager.BaseMvpModel; +import com.bingchuang.core.manager.IMMessageManager; +import com.bingchuang.core.manager.RelationShipEvent; +import com.bingchuang.core.manager.RoomEvent; +import com.bingchuang.core.monsterhunting.bean.MonsterInfo; +import com.bingchuang.core.monsterhunting.bean.MonsterProtocol; +import com.bingchuang.core.msg.sys.ErbanSysMsgInfo; +import com.bingchuang.core.msg.sys.ErbanSysMsgParamKey; +import com.bingchuang.core.msg.sysv2.ErbanSysMsgV2Info; +import com.bingchuang.core.noble.NobleInfo; +import com.bingchuang.core.noble.NobleResourceType; +import com.bingchuang.core.noble.NobleUtil; +import com.bingchuang.core.public_chat_hall.manager.PublicChatHallDataManager; +import com.bingchuang.core2.retry.ImRetryManager; +import com.bingchuang.core2.retry.ReconnectListener; +import com.bingchuang.core2.retry.RetryChatRoomMessage; +import com.bingchuang.core.room.activitytimer.ActivityTimerEvent; +import com.bingchuang.core.room.activitytimer.TimerBean; +import com.bingchuang.core.room.auction.bean.AuctionInfo; +import com.bingchuang.core.room.bean.LeaveModeAttachment; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.room.exception.AntiSpamHitException; +import com.bingchuang.core.room.face.DynamicFaceModel; +import com.bingchuang.core.room.giftvalue.helper.GiftValueMrg; +import com.bingchuang.core.room.model.AvRoomModel; +import com.bingchuang.core.room.model.MicQueueModel; +import com.bingchuang.core.room.pk.attachment.RoomPkAttachment; +import com.bingchuang.core.room.pk.bean.PKTeamInfo; +import com.bingchuang.core.room.pk.bean.RoomPKInvitedUpMicMember; +import com.bingchuang.core.room.pk.bean.RoomPkData; +import com.bingchuang.core.room.pk.model.PkModel; +import com.bingchuang.core.room.queue.bean.MicMemberInfo; +import com.bingchuang.core.room.queuing_mic.attachment.QueuingMicAttachment; +import com.bingchuang.core.room.queuing_mic.bean.QueuingMicInfo; +import com.bingchuang.core.room.queuing_mic.event.QueuingMicEmptyEvent; +import com.bingchuang.core.room.queuing_mic.event.QueuingMicNotEmptyEvent; +import com.bingchuang.core.share.bean.InAppSharingFamilyInfo; +import com.bingchuang.core.share.bean.InAppSharingMiniWorldInfo; +import com.bingchuang.core.share.bean.InAppSharingRoomInfo; +import com.bingchuang.core.share.bean.InAppSharingTeamInfo; +import com.bingchuang.core.share.bean.SessionType; +import com.bingchuang.core.statistic.StatLogKey; +import com.bingchuang.core.admin.SuperAdminDataMrg; +import com.bingchuang.core.admin.attachment.SuperAdminOpAttachment; +import com.bingchuang.core.admin.bean.SaOpInfo; +import com.bingchuang.core.admin.util.SuperAdminUtil; +import com.bingchuang.core.team.bean.TeamInfo; +import com.bingchuang.core.user.UserModel; +import com.bingchuang.core.user.bean.BaseInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.utils.ExtensionUtils; +import com.bingchuang.core.utils.LogUtils; +import com.bingchuang.core.utils.SharedPreferenceUtils; +import com.bingchuang.core.utils.net.DontWarnObserver; +import com.bingchuang.core.vip.VipBroadcastMsgEvent; import com.bingchuang.library.net.rxnet.callback.CallBack; import com.bingchuang.library.rxbus.RxBus; import com.bingchuang.library.utils.JavaUtil; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/manager/VolumeSetting.java b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/VolumeSetting.java similarity index 96% rename from core/src/diff_src_erban/java/com/pikolive/core2/manager/VolumeSetting.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/manager/VolumeSetting.java index be0d53e5e..859bf1e16 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/manager/VolumeSetting.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/VolumeSetting.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.manager; +package com.bingchuang.core2.manager; import com.bingchuang.library.utils.config.BasicConfig; import com.bingchuang.library.utils.pref.CommonPref; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/manager/agora/EngineEventHandler.java b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/agora/EngineEventHandler.java similarity index 95% rename from core/src/diff_src_erban/java/com/pikolive/core2/manager/agora/EngineEventHandler.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/manager/agora/EngineEventHandler.java index 697e71b23..65c44ff48 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/manager/agora/EngineEventHandler.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/agora/EngineEventHandler.java @@ -1,12 +1,12 @@ -package com.pikolive.core2.manager.agora; +package com.bingchuang.core2.manager.agora; import android.os.Message; import com.orhanobut.logger.Logger; -import com.pikolive.core.R; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.manager.RoomEvent; +import com.bingchuang.core.R; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.manager.RoomEvent; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.SingleToastUtil; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/manager/agora/RtcEngineHandler.java b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/agora/RtcEngineHandler.java similarity index 91% rename from core/src/diff_src_erban/java/com/pikolive/core2/manager/agora/RtcEngineHandler.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/manager/agora/RtcEngineHandler.java index 37de6e4f2..759c6703b 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/manager/agora/RtcEngineHandler.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/agora/RtcEngineHandler.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.manager.agora; +package com.bingchuang.core2.manager.agora; import static io.agora.rtc2.Constants.AUDIO_RECORDING_QUALITY_LOW; @@ -6,12 +6,12 @@ import android.os.Environment; import android.os.Handler; import android.os.Message; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core2.manager.AudioEngineManager; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.manager.RoomEvent; -import com.pikolive.core.room.bean.RoomInfo; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core2.manager.AudioEngineManager; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.manager.RoomEvent; +import com.bingchuang.core.room.bean.RoomInfo; import com.bingchuang.library.common.file.FileHelper; import com.bingchuang.library.utils.config.BasicConfig; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/manager/agora/RtcEngineManager.java b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/agora/RtcEngineManager.java similarity index 97% rename from core/src/diff_src_erban/java/com/pikolive/core2/manager/agora/RtcEngineManager.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/manager/agora/RtcEngineManager.java index 1ca7c6bde..578c3b06e 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/manager/agora/RtcEngineManager.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/agora/RtcEngineManager.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.manager.agora; +package com.bingchuang.core2.manager.agora; import static io.agora.rtc2.Constants.AUDIO_PROFILE_MUSIC_STANDARD; import static io.agora.rtc2.Constants.AUDIO_SCENARIO_GAME_STREAMING; @@ -12,10 +12,10 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.orhanobut.logger.Logger; -import com.pikolive.core2.XChatConstants; -import com.pikolive.core2.manager.BaseEngine; -import com.pikolive.core.music.db.bean.LocalMusicBean; -import com.pikolive.core.music.model.PlayerModel; +import com.bingchuang.core2.XChatConstants; +import com.bingchuang.core2.manager.BaseEngine; +import com.bingchuang.core.music.db.bean.LocalMusicBean; +import com.bingchuang.core.music.model.PlayerModel; import com.bingchuang.library.common.file.FileHelper; import com.bingchuang.library.utils.config.BasicConfig; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/BaseAdapterImpl.java b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/BaseAdapterImpl.java similarity index 99% rename from core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/BaseAdapterImpl.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/BaseAdapterImpl.java index b25859770..45d579705 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/BaseAdapterImpl.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/BaseAdapterImpl.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.manager.trtc; +package com.bingchuang.core2.manager.trtc; import android.graphics.Bitmap; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/BaseAgoraHandlerInterface.java b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/BaseAgoraHandlerInterface.java similarity index 99% rename from core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/BaseAgoraHandlerInterface.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/BaseAgoraHandlerInterface.java index 0fdbb955b..f5ccce3be 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/BaseAgoraHandlerInterface.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/BaseAgoraHandlerInterface.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.manager.trtc; +package com.bingchuang.core2.manager.trtc; import android.graphics.Rect; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/BaseAgoraInterface.java b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/BaseAgoraInterface.java similarity index 99% rename from core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/BaseAgoraInterface.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/BaseAgoraInterface.java index 87cded916..9b2b11f03 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/BaseAgoraInterface.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/BaseAgoraInterface.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.manager.trtc; +package com.bingchuang.core2.manager.trtc; import io.agora.rtc2.IAudioFrameObserver; import io.agora.rtc2.IMetadataObserver; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/IRTCEngine.java b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/IRTCEngine.java similarity index 97% rename from core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/IRTCEngine.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/IRTCEngine.java index c26e1a02e..ac78b10ae 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/IRTCEngine.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/IRTCEngine.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.manager.trtc; +package com.bingchuang.core2.manager.trtc; import android.graphics.Bitmap; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/IRTCEngineHandler.java b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/IRTCEngineHandler.java similarity index 92% rename from core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/IRTCEngineHandler.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/IRTCEngineHandler.java index 8031f53fd..2950f945c 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/IRTCEngineHandler.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/IRTCEngineHandler.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.manager.trtc; +package com.bingchuang.core2.manager.trtc; import com.tencent.trtc.TRTCCloudDef; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/RoomIdHelper.java b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/RoomIdHelper.java similarity index 77% rename from core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/RoomIdHelper.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/RoomIdHelper.java index 850dbccba..c08a31298 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/RoomIdHelper.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/RoomIdHelper.java @@ -1,6 +1,6 @@ -package com.pikolive.core2.manager.trtc; +package com.bingchuang.core2.manager.trtc; -import com.pikolive.core.utils.StringUtils; +import com.bingchuang.core.utils.StringUtils; public class RoomIdHelper { /** diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/SDKConfig.java b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/SDKConfig.java similarity index 96% rename from core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/SDKConfig.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/SDKConfig.java index f7b9c3663..cb28111ff 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/SDKConfig.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/SDKConfig.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.manager.trtc; +package com.bingchuang.core2.manager.trtc; public class SDKConfig { /** diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/TRTCEffectManager.java b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/TRTCEffectManager.java similarity index 99% rename from core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/TRTCEffectManager.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/TRTCEffectManager.java index 4497034f2..bb8a5f66b 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/TRTCEffectManager.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/TRTCEffectManager.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.manager.trtc; +package com.bingchuang.core2.manager.trtc; import com.tencent.liteav.audio.TXAudioEffectManager; import com.tencent.trtc.TRTCCloud; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/TRTCEngineAdapter.java b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/TRTCEngineAdapter.java similarity index 99% rename from core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/TRTCEngineAdapter.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/TRTCEngineAdapter.java index 4dd3a7131..db1cc3143 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/TRTCEngineAdapter.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/TRTCEngineAdapter.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.manager.trtc; +package com.bingchuang.core2.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.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core.utils.LogUtils; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core.utils.LogUtils; import org.json.JSONException; import org.json.JSONObject; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/TRtcEngineEventHandler.java b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/TRtcEngineEventHandler.java similarity index 96% rename from core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/TRtcEngineEventHandler.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/TRtcEngineEventHandler.java index 28d1129c5..b24bc59a4 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/TRtcEngineEventHandler.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/TRtcEngineEventHandler.java @@ -1,17 +1,17 @@ -package com.pikolive.core2.manager.trtc; +package com.bingchuang.core2.manager.trtc; import android.graphics.Rect; import android.os.Message; import com.orhanobut.logger.Logger; -import com.pikolive.core2.manager.agora.RtcEngineHandler; +import com.bingchuang.core2.manager.agora.RtcEngineHandler; import com.tencent.trtc.TRTCCloudDef; -import com.pikolive.core.R; -import com.pikolive.core.im.custom.bean.RoomPkBean; -import com.pikolive.core2.manager.AudioEngineManager; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.manager.RoomEvent; +import com.bingchuang.core.R; +import com.bingchuang.core.im.custom.bean.RoomPkBean; +import com.bingchuang.core2.manager.AudioEngineManager; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.manager.RoomEvent; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.SingleToastUtil; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/TRtcEngineHandler.java b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/TRtcEngineHandler.java similarity index 92% rename from core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/TRtcEngineHandler.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/TRtcEngineHandler.java index d044f213a..57afa34c9 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/TRtcEngineHandler.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/TRtcEngineHandler.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.manager.trtc; +package com.bingchuang.core2.manager.trtc; import static io.agora.rtc2.Constants.AUDIO_RECORDING_QUALITY_LOW; @@ -6,12 +6,12 @@ import android.os.Environment; import android.os.Handler; import android.os.Message; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core2.manager.AudioEngineManager; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.manager.RoomEvent; -import com.pikolive.core.room.bean.RoomInfo; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core2.manager.AudioEngineManager; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.manager.RoomEvent; +import com.bingchuang.core.room.bean.RoomInfo; import com.bingchuang.library.common.file.FileHelper; import com.bingchuang.library.utils.config.BasicConfig; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/TRtcEngineManager.java b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/TRtcEngineManager.java similarity index 96% rename from core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/TRtcEngineManager.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/TRtcEngineManager.java index d692fbeda..4b15dae8d 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/TRtcEngineManager.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/TRtcEngineManager.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.manager.trtc; +package com.bingchuang.core2.manager.trtc; import static io.agora.rtc2.Constants.AUDIO_PROFILE_MUSIC_STANDARD; import static io.agora.rtc2.Constants.AUDIO_SCENARIO_GAME_STREAMING; @@ -11,12 +11,12 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.orhanobut.logger.Logger; -import com.pikolive.core.initial.InitialModel; -import com.pikolive.core.initial.bean.InitInfo; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core2.manager.BaseEngine; -import com.pikolive.core.music.db.bean.LocalMusicBean; -import com.pikolive.core.music.model.PlayerModel; +import com.bingchuang.core.initial.InitialModel; +import com.bingchuang.core.initial.bean.InitInfo; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core2.manager.BaseEngine; +import com.bingchuang.core.music.db.bean.LocalMusicBean; +import com.bingchuang.core.music.model.PlayerModel; import com.bingchuang.library.utils.config.BasicConfig; import io.agora.rtc2.Constants; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/Unsupport.java b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/Unsupport.java similarity index 78% rename from core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/Unsupport.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/Unsupport.java index da4a94d6e..ea9e0102c 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/Unsupport.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/Unsupport.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.manager.trtc; +package com.bingchuang.core2.manager.trtc; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/Utils.java b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/Utils.java similarity index 97% rename from core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/Utils.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/Utils.java index f64b501ef..8539b1b96 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/Utils.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/Utils.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.manager.trtc; +package com.bingchuang.core2.manager.trtc; import android.graphics.Bitmap; import android.graphics.BitmapFactory; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/Version.java b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/Version.java similarity index 83% rename from core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/Version.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/Version.java index 56663bf24..11b76caab 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/Version.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/manager/trtc/Version.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.manager.trtc; +package com.bingchuang.core2.manager.trtc; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/market_verify/IMarketVerifyModel.java b/core/src/diff_src_erban/java/com/bingchuang/core2/market_verify/IMarketVerifyModel.java similarity index 80% rename from core/src/diff_src_erban/java/com/pikolive/core2/market_verify/IMarketVerifyModel.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/market_verify/IMarketVerifyModel.java index 2d29ab92a..325a722fa 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/market_verify/IMarketVerifyModel.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/market_verify/IMarketVerifyModel.java @@ -1,7 +1,7 @@ -package com.pikolive.core2.market_verify; +package com.bingchuang.core2.market_verify; -import com.pikolive.core.base.IModel; -import com.pikolive.core.bean.LoginTipsInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.bean.LoginTipsInfo; import io.reactivex.Single; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/market_verify/MarketVerifyModel.java b/core/src/diff_src_erban/java/com/bingchuang/core2/market_verify/MarketVerifyModel.java similarity index 91% rename from core/src/diff_src_erban/java/com/pikolive/core2/market_verify/MarketVerifyModel.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/market_verify/MarketVerifyModel.java index ae8c7dcf8..8aace3dd6 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/market_verify/MarketVerifyModel.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/market_verify/MarketVerifyModel.java @@ -1,11 +1,11 @@ -package com.pikolive.core2.market_verify; +package com.bingchuang.core2.market_verify; -import com.pikolive.core2.market_verify.bean.VersionConfig; -import com.pikolive.core.auth.event.LoginEvent; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.LoginTipsInfo; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core2.market_verify.bean.VersionConfig; +import com.bingchuang.core.auth.event.LoginEvent; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.LoginTipsInfo; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import org.greenrobot.eventbus.EventBus; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/market_verify/bean/VersionConfig.java b/core/src/diff_src_erban/java/com/bingchuang/core2/market_verify/bean/VersionConfig.java similarity index 92% rename from core/src/diff_src_erban/java/com/pikolive/core2/market_verify/bean/VersionConfig.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/market_verify/bean/VersionConfig.java index a587efcfe..62aa4b578 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/market_verify/bean/VersionConfig.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/market_verify/bean/VersionConfig.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.market_verify.bean; +package com.bingchuang.core2.market_verify.bean; import lombok.Data; diff --git a/core/src/diff_src_erban/java/com/bingchuang/core2/market_verify/event/MarketVerifyUpdateEvent.java b/core/src/diff_src_erban/java/com/bingchuang/core2/market_verify/event/MarketVerifyUpdateEvent.java new file mode 100644 index 000000000..ed1430fa1 --- /dev/null +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/market_verify/event/MarketVerifyUpdateEvent.java @@ -0,0 +1,4 @@ +package com.bingchuang.core2.market_verify.event; + +public class MarketVerifyUpdateEvent { +} diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/retry/ImRetryManager.java b/core/src/diff_src_erban/java/com/bingchuang/core2/retry/ImRetryManager.java similarity index 95% rename from core/src/diff_src_erban/java/com/pikolive/core2/retry/ImRetryManager.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/retry/ImRetryManager.java index 74eb53f9f..cc5569ddc 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/retry/ImRetryManager.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/retry/ImRetryManager.java @@ -1,11 +1,11 @@ -package com.pikolive.core2.retry; +package com.bingchuang.core2.retry; import android.util.Log; import com.netease.nim.uikit.common.util.log.LogUtil; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.R; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.R; import com.bingchuang.library.utils.ResUtil; import io.reactivex.Single; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/retry/ReconnectListener.java b/core/src/diff_src_erban/java/com/bingchuang/core2/retry/ReconnectListener.java similarity index 88% rename from core/src/diff_src_erban/java/com/pikolive/core2/retry/ReconnectListener.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/retry/ReconnectListener.java index 7c8e035fa..1ce1664af 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/retry/ReconnectListener.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/retry/ReconnectListener.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.retry; +package com.bingchuang.core2.retry; /** * 重发的回调,暂时引入是为了埋点 diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/retry/RetryChatRoomMessage.java b/core/src/diff_src_erban/java/com/bingchuang/core2/retry/RetryChatRoomMessage.java similarity index 88% rename from core/src/diff_src_erban/java/com/pikolive/core2/retry/RetryChatRoomMessage.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/retry/RetryChatRoomMessage.java index 7b026d242..af0365efd 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/retry/RetryChatRoomMessage.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/retry/RetryChatRoomMessage.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.retry; +package com.bingchuang.core2.retry; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/set/bean/ShieldInfo.kt b/core/src/diff_src_erban/java/com/bingchuang/core2/set/bean/ShieldInfo.kt similarity index 87% rename from core/src/diff_src_erban/java/com/pikolive/core2/set/bean/ShieldInfo.kt rename to core/src/diff_src_erban/java/com/bingchuang/core2/set/bean/ShieldInfo.kt index e04d53069..cb0b1e4fb 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/set/bean/ShieldInfo.kt +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/set/bean/ShieldInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core2.set.bean +package com.bingchuang.core2.set.bean import lombok.Data diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/set/model/SetModel.kt b/core/src/diff_src_erban/java/com/bingchuang/core2/set/model/SetModel.kt similarity index 79% rename from core/src/diff_src_erban/java/com/pikolive/core2/set/model/SetModel.kt rename to core/src/diff_src_erban/java/com/bingchuang/core2/set/model/SetModel.kt index 77f1f068f..3b2529ecb 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/set/model/SetModel.kt +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/set/model/SetModel.kt @@ -1,11 +1,11 @@ -package com.pikolive.core2.set.model +package com.bingchuang.core2.set.model -import com.pikolive.core2.home.bean.* -import com.pikolive.core2.set.bean.ShieldInfo -import com.pikolive.core.utils.net.launchRequest +import com.bingchuang.core2.home.bean.* +import com.bingchuang.core2.set.bean.ShieldInfo +import com.bingchuang.core.utils.net.launchRequest import com.bingchuang.library.net.rxnet.RxNet -import com.pikolive.core.base.BaseModel -import com.pikolive.core.bean.response.ServiceResult +import com.bingchuang.core.base.BaseModel +import com.bingchuang.core.bean.response.ServiceResult import retrofit2.http.GET import retrofit2.http.POST import retrofit2.http.Query diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/sound/model/SoundModel.kt b/core/src/diff_src_erban/java/com/bingchuang/core2/sound/model/SoundModel.kt similarity index 76% rename from core/src/diff_src_erban/java/com/pikolive/core2/sound/model/SoundModel.kt rename to core/src/diff_src_erban/java/com/bingchuang/core2/sound/model/SoundModel.kt index 7286aac70..77dbce2e3 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/sound/model/SoundModel.kt +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/sound/model/SoundModel.kt @@ -1,12 +1,12 @@ -package com.pikolive.core2.sound.model +package com.bingchuang.core2.sound.model -import com.pikolive.core2.earn.bean.* -import com.pikolive.core2.home.bean.* +import com.bingchuang.core2.earn.bean.* +import com.bingchuang.core2.home.bean.* -import com.pikolive.core.utils.net.launchRequest +import com.bingchuang.core.utils.net.launchRequest import com.bingchuang.library.net.rxnet.RxNet -import com.pikolive.core.base.BaseModel -import com.pikolive.core.bean.response.ServiceResult +import com.bingchuang.core.base.BaseModel +import com.bingchuang.core.bean.response.ServiceResult import retrofit2.http.POST import retrofit2.http.Query diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/Compound.kt b/core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/Compound.kt similarity index 59% rename from core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/Compound.kt rename to core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/Compound.kt index 50c5cf1e2..f982862d2 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/Compound.kt +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/Compound.kt @@ -1,4 +1,4 @@ -package com.pikolive.core2.treasurefairy +package com.bingchuang.core2.treasurefairy data class Compound( val elfId: Long, diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/DrawInfo.kt b/core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/DrawInfo.kt similarity index 72% rename from core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/DrawInfo.kt rename to core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/DrawInfo.kt index 2a13276e1..9d6ae64ce 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/DrawInfo.kt +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/DrawInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core2.treasurefairy +package com.bingchuang.core2.treasurefairy data class DrawInfo( var drawTicketNum: Int = 0, diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/ExchangeGiftInfo.kt b/core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/ExchangeGiftInfo.kt similarity index 95% rename from core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/ExchangeGiftInfo.kt rename to core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/ExchangeGiftInfo.kt index a83f6044c..6708bb41b 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/ExchangeGiftInfo.kt +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/ExchangeGiftInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core2.treasurefairy +package com.bingchuang.core2.treasurefairy data class ExchangeGiftInfo( val expendNum: Int = 0, diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/FairyInfo.kt b/core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/FairyInfo.kt similarity index 92% rename from core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/FairyInfo.kt rename to core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/FairyInfo.kt index 1ea812294..e4b3382f1 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/FairyInfo.kt +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/FairyInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core2.treasurefairy +package com.bingchuang.core2.treasurefairy import java.io.Serializable diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/FairyMsgInfoBean.java b/core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/FairyMsgInfoBean.java similarity index 90% rename from core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/FairyMsgInfoBean.java rename to core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/FairyMsgInfoBean.java index 5e7651c07..fe1855c04 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/FairyMsgInfoBean.java +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/FairyMsgInfoBean.java @@ -1,4 +1,4 @@ -package com.pikolive.core2.treasurefairy; +package com.bingchuang.core2.treasurefairy; import lombok.Data; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/FairyResolveParam.kt b/core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/FairyResolveParam.kt similarity index 67% rename from core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/FairyResolveParam.kt rename to core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/FairyResolveParam.kt index 60a3534f6..8fd0f1686 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/FairyResolveParam.kt +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/FairyResolveParam.kt @@ -1,4 +1,4 @@ -package com.pikolive.core2.treasurefairy +package com.bingchuang.core2.treasurefairy data class FairyResolveParam( val expendList: MutableList = arrayListOf() diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/FairyTestParam.kt b/core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/FairyTestParam.kt similarity index 72% rename from core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/FairyTestParam.kt rename to core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/FairyTestParam.kt index ee96ebe2f..6060bdd1e 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/FairyTestParam.kt +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/FairyTestParam.kt @@ -1,4 +1,4 @@ -package com.pikolive.core2.treasurefairy +package com.bingchuang.core2.treasurefairy data class FairyTestParam( val expendList: MutableList = arrayListOf(), diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/ForestInfo.kt b/core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/ForestInfo.kt similarity index 84% rename from core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/ForestInfo.kt rename to core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/ForestInfo.kt index 2950c4d7c..6ae707bba 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/ForestInfo.kt +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/ForestInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core2.treasurefairy +package com.bingchuang.core2.treasurefairy data class ForestInfo( val avatar: String = "", diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/MyFairyInfo.kt b/core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/MyFairyInfo.kt similarity index 85% rename from core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/MyFairyInfo.kt rename to core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/MyFairyInfo.kt index f8c01dc7f..c41e1db28 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/MyFairyInfo.kt +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/MyFairyInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core2.treasurefairy +package com.bingchuang.core2.treasurefairy data class MyFairyInfo( val highElves: ArrayList ? = null, diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/PrizeInfo.kt b/core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/PrizeInfo.kt similarity index 90% rename from core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/PrizeInfo.kt rename to core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/PrizeInfo.kt index ab05c5c0c..3d4987cfe 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/PrizeInfo.kt +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/PrizeInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core2.treasurefairy +package com.bingchuang.core2.treasurefairy data class PrizeInfo( val rewardId: Int = 0, diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/PropItemInfo.kt b/core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/PropItemInfo.kt similarity index 76% rename from core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/PropItemInfo.kt rename to core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/PropItemInfo.kt index ae1eaf3cb..fc9a61c18 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/PropItemInfo.kt +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/PropItemInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core2.treasurefairy +package com.bingchuang.core2.treasurefairy data class PropItemInfo( val picUrl: String = "", diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/ResolveInfo.kt b/core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/ResolveInfo.kt similarity index 74% rename from core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/ResolveInfo.kt rename to core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/ResolveInfo.kt index 1e2c4f4f2..c6c46cf0f 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/ResolveInfo.kt +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/ResolveInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core2.treasurefairy +package com.bingchuang.core2.treasurefairy import java.io.Serializable diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/SendFairyInfo.kt b/core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/SendFairyInfo.kt similarity index 87% rename from core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/SendFairyInfo.kt rename to core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/SendFairyInfo.kt index 4cd7f189d..898d5bc09 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/SendFairyInfo.kt +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/SendFairyInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core2.treasurefairy +package com.bingchuang.core2.treasurefairy data class SendFairyInfo( val createTime: Long = 0, diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/TestFairyRecordInfo.kt b/core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/TestFairyRecordInfo.kt similarity index 85% rename from core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/TestFairyRecordInfo.kt rename to core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/TestFairyRecordInfo.kt index 2a02270cb..b2356fbb4 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/TestFairyRecordInfo.kt +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/TestFairyRecordInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core2.treasurefairy +package com.bingchuang.core2.treasurefairy data class TestFairyRecordInfo( val compoundLevel: Int = 0, diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/TreasureFairyModel.kt b/core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/TreasureFairyModel.kt similarity index 94% rename from core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/TreasureFairyModel.kt rename to core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/TreasureFairyModel.kt index d8ecc3e54..8d22e64fd 100644 --- a/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/TreasureFairyModel.kt +++ b/core/src/diff_src_erban/java/com/bingchuang/core2/treasurefairy/TreasureFairyModel.kt @@ -1,13 +1,13 @@ -package com.pikolive.core2.treasurefairy +package com.bingchuang.core2.treasurefairy -import com.pikolive.core2.treasurefairy.FairyInfo.Companion.LEVEL_HIGH -import com.pikolive.core2.treasurefairy.FairyInfo.Companion.LEVEL_LOW -import com.pikolive.core2.treasurefairy.FairyInfo.Companion.LEVEL_MIDDLE -import com.pikolive.core.utils.net.launchRequest +import com.bingchuang.core2.treasurefairy.FairyInfo.Companion.LEVEL_HIGH +import com.bingchuang.core2.treasurefairy.FairyInfo.Companion.LEVEL_LOW +import com.bingchuang.core2.treasurefairy.FairyInfo.Companion.LEVEL_MIDDLE +import com.bingchuang.core.utils.net.launchRequest import com.bingchuang.library.net.rxnet.RxNet -import com.pikolive.core.bean.response.ServiceResult -import com.pikolive.core.gift.bean.SimpleUserInfo -import com.pikolive.core.manager.AvRoomDataManager +import com.bingchuang.core.bean.response.ServiceResult +import com.bingchuang.core.gift.bean.SimpleUserInfo +import com.bingchuang.core.manager.AvRoomDataManager import retrofit2.http.* object TreasureFairyModel { diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/channel/IChannelModel.java b/core/src/diff_src_erban/java/com/pikolive/core2/channel/IChannelModel.java deleted file mode 100644 index 8e42e4c53..000000000 --- a/core/src/diff_src_erban/java/com/pikolive/core2/channel/IChannelModel.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.pikolive.core2.channel; - -import com.pikolive.core.base.IModel; - -public interface IChannelModel extends IModel { -} diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/home/event/FollowRoomEvent.java b/core/src/diff_src_erban/java/com/pikolive/core2/home/event/FollowRoomEvent.java deleted file mode 100644 index 036153b79..000000000 --- a/core/src/diff_src_erban/java/com/pikolive/core2/home/event/FollowRoomEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pikolive.core2.home.event; - -public class FollowRoomEvent { -} diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/home/event/RefreshHomeDataEvent.java b/core/src/diff_src_erban/java/com/pikolive/core2/home/event/RefreshHomeDataEvent.java deleted file mode 100644 index 82d3c6b63..000000000 --- a/core/src/diff_src_erban/java/com/pikolive/core2/home/event/RefreshHomeDataEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pikolive.core2.home.event; - -public class RefreshHomeDataEvent { -} diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/home/event/ShareRoomEvent.java b/core/src/diff_src_erban/java/com/pikolive/core2/home/event/ShareRoomEvent.java deleted file mode 100644 index 1c7ad3301..000000000 --- a/core/src/diff_src_erban/java/com/pikolive/core2/home/event/ShareRoomEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pikolive.core2.home.event; - -public class ShareRoomEvent { -} diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/market_verify/event/MarketVerifyUpdateEvent.java b/core/src/diff_src_erban/java/com/pikolive/core2/market_verify/event/MarketVerifyUpdateEvent.java deleted file mode 100644 index 4f95bc206..000000000 --- a/core/src/diff_src_erban/java/com/pikolive/core2/market_verify/event/MarketVerifyUpdateEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pikolive.core2.market_verify.event; - -public class MarketVerifyUpdateEvent { -} diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml index 7f9d397e6..71f716426 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/pikolive/core/Constants.java b/core/src/main/java/com/bingchuang/core/Constants.java similarity index 97% rename from core/src/main/java/com/pikolive/core/Constants.java rename to core/src/main/java/com/bingchuang/core/Constants.java index e6f7d6e7c..1e2317489 100644 --- a/core/src/main/java/com/pikolive/core/Constants.java +++ b/core/src/main/java/com/bingchuang/core/Constants.java @@ -1,10 +1,10 @@ -package com.pikolive.core; +package com.bingchuang.core; -import com.pikolive.core2.XChatConstants; +import com.bingchuang.core2.XChatConstants; import com.bingchuang.library.common.application.Env; import com.bingchuang.library.utils.config.BasicConfig; import com.bingchuang.library.utils.pref.CommonPref; -import com.pikolive.core.BuildConfig; +import com.bingchuang.core.BuildConfig; import java.io.File; import java.util.Arrays; diff --git a/core/src/main/java/com/pikolive/core/DemoCache.java b/core/src/main/java/com/bingchuang/core/DemoCache.java similarity index 92% rename from core/src/main/java/com/pikolive/core/DemoCache.java rename to core/src/main/java/com/bingchuang/core/DemoCache.java index 2396a9af8..44d16dcd4 100644 --- a/core/src/main/java/com/pikolive/core/DemoCache.java +++ b/core/src/main/java/com/bingchuang/core/DemoCache.java @@ -1,4 +1,4 @@ -package com.pikolive.core; +package com.bingchuang.core; import android.text.TextUtils; @@ -7,26 +7,26 @@ import androidx.annotation.Nullable; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.netease.nimlib.sdk.StatusBarNotificationConfig; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.auth.entity.AccountInfo; -import com.pikolive.core.auth.entity.TicketInfo; -import com.pikolive.core.initial.SplashComponent; -import com.pikolive.core.initial.bean.InitInfo; -import com.pikolive.core.noble.NobleConfig; -import com.pikolive.core.noble.NobleRight; -import com.pikolive.core.utils.CurrentTimeUtils; -import com.pikolive.core.utils.SharedPreferenceUtils; -import com.pikolive.core2.XChatConstants; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.auth.entity.AccountInfo; -import com.pikolive.core.auth.entity.TicketInfo; -import com.pikolive.core.initial.SplashComponent; -import com.pikolive.core.initial.bean.InitInfo; -import com.pikolive.core.noble.NobleConfig; -import com.pikolive.core.noble.NobleRight; -import com.pikolive.core.utils.CurrentTimeUtils; -import com.pikolive.core.utils.SharedPreferenceUtils; -import com.pikolive.core2.home.bean.MainTabInfo; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.auth.entity.AccountInfo; +import com.bingchuang.core.auth.entity.TicketInfo; +import com.bingchuang.core.initial.SplashComponent; +import com.bingchuang.core.initial.bean.InitInfo; +import com.bingchuang.core.noble.NobleConfig; +import com.bingchuang.core.noble.NobleRight; +import com.bingchuang.core.utils.CurrentTimeUtils; +import com.bingchuang.core.utils.SharedPreferenceUtils; +import com.bingchuang.core2.XChatConstants; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.auth.entity.AccountInfo; +import com.bingchuang.core.auth.entity.TicketInfo; +import com.bingchuang.core.initial.SplashComponent; +import com.bingchuang.core.initial.bean.InitInfo; +import com.bingchuang.core.noble.NobleConfig; +import com.bingchuang.core.noble.NobleRight; +import com.bingchuang.core.utils.CurrentTimeUtils; +import com.bingchuang.core.utils.SharedPreferenceUtils; +import com.bingchuang.core2.home.bean.MainTabInfo; import com.bingchuang.library.utils.pref.ObjectPref; import com.bingchuang.library.utils.pref.SettingsPref; diff --git a/core/src/main/java/com/pikolive/core/OldHttpObserver.java b/core/src/main/java/com/bingchuang/core/OldHttpObserver.java similarity index 78% rename from core/src/main/java/com/pikolive/core/OldHttpObserver.java rename to core/src/main/java/com/bingchuang/core/OldHttpObserver.java index af4e67a42..64bb84345 100644 --- a/core/src/main/java/com/pikolive/core/OldHttpObserver.java +++ b/core/src/main/java/com/bingchuang/core/OldHttpObserver.java @@ -1,11 +1,11 @@ -package com.pikolive.core; +package com.bingchuang.core; -import com.pikolive.core.bean.response.RequestError; -import com.pikolive.core.bean.response.ResponseData; -import com.pikolive.core.bean.response.RequestError; -import com.pikolive.core.bean.response.ResponseData; -import com.pikolive.core.bean.response.RequestError; -import com.pikolive.core.bean.response.ResponseData; +import com.bingchuang.core.bean.response.RequestError; +import com.bingchuang.core.bean.response.ResponseData; +import com.bingchuang.core.bean.response.RequestError; +import com.bingchuang.core.bean.response.ResponseData; +import com.bingchuang.core.bean.response.RequestError; +import com.bingchuang.core.bean.response.ResponseData; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; diff --git a/core/src/main/java/com/pikolive/core/PreferencesUtils.java b/core/src/main/java/com/bingchuang/core/PreferencesUtils.java similarity index 92% rename from core/src/main/java/com/pikolive/core/PreferencesUtils.java rename to core/src/main/java/com/bingchuang/core/PreferencesUtils.java index 843325d32..929e32c58 100644 --- a/core/src/main/java/com/pikolive/core/PreferencesUtils.java +++ b/core/src/main/java/com/bingchuang/core/PreferencesUtils.java @@ -1,15 +1,15 @@ -package com.pikolive.core; +package com.bingchuang.core; import android.content.Context; import com.netease.nimlib.sdk.StatusBarNotificationConfig; import com.netease.nimlib.sdk.auth.LoginInfo; -import com.pikolive.core.auth.entity.AccountInfo; -import com.pikolive.core.auth.entity.TicketInfo; -import com.pikolive.core.auth.entity.AccountInfo; -import com.pikolive.core.auth.entity.TicketInfo; -import com.pikolive.core.auth.entity.AccountInfo; -import com.pikolive.core.auth.entity.TicketInfo; +import com.bingchuang.core.auth.entity.AccountInfo; +import com.bingchuang.core.auth.entity.TicketInfo; +import com.bingchuang.core.auth.entity.AccountInfo; +import com.bingchuang.core.auth.entity.TicketInfo; +import com.bingchuang.core.auth.entity.AccountInfo; +import com.bingchuang.core.auth.entity.TicketInfo; import com.bingchuang.library.utils.config.BasicConfig; import com.bingchuang.library.utils.pref.ObjectPref; import com.bingchuang.library.utils.pref.SettingsPref; diff --git a/core/src/main/java/com/pikolive/core/activity/bean/LotteryInfo.java b/core/src/main/java/com/bingchuang/core/activity/bean/LotteryInfo.java similarity index 95% rename from core/src/main/java/com/pikolive/core/activity/bean/LotteryInfo.java rename to core/src/main/java/com/bingchuang/core/activity/bean/LotteryInfo.java index 7ca2b5422..65e6c3c30 100644 --- a/core/src/main/java/com/pikolive/core/activity/bean/LotteryInfo.java +++ b/core/src/main/java/com/bingchuang/core/activity/bean/LotteryInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.activity.bean; +package com.bingchuang.core.activity.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/activity/event/ActivityEvent.java b/core/src/main/java/com/bingchuang/core/activity/event/ActivityEvent.java similarity index 68% rename from core/src/main/java/com/pikolive/core/activity/event/ActivityEvent.java rename to core/src/main/java/com/bingchuang/core/activity/event/ActivityEvent.java index 72e468f75..af4edcd07 100644 --- a/core/src/main/java/com/pikolive/core/activity/event/ActivityEvent.java +++ b/core/src/main/java/com/bingchuang/core/activity/event/ActivityEvent.java @@ -1,6 +1,6 @@ -package com.pikolive.core.activity.event; +package com.bingchuang.core.activity.event; -import com.pikolive.core.activity.bean.LotteryInfo; +import com.bingchuang.core.activity.bean.LotteryInfo; public class ActivityEvent { diff --git a/core/src/main/java/com/bingchuang/core/activity/model/ActivityModel.java b/core/src/main/java/com/bingchuang/core/activity/model/ActivityModel.java new file mode 100644 index 000000000..8c796be7c --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/activity/model/ActivityModel.java @@ -0,0 +1,7 @@ +package com.bingchuang.core.activity.model; + +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.base.BaseModel; + +public class ActivityModel extends BaseModel implements IActivityModel { +} diff --git a/core/src/main/java/com/bingchuang/core/activity/model/IActivityModel.java b/core/src/main/java/com/bingchuang/core/activity/model/IActivityModel.java new file mode 100644 index 000000000..792a5dd36 --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/activity/model/IActivityModel.java @@ -0,0 +1,8 @@ +package com.bingchuang.core.activity.model; + +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.base.IModel; + +public interface IActivityModel extends IModel { +} diff --git a/core/src/main/java/com/pikolive/core/audio/AudioPlayAndRecordManager.java b/core/src/main/java/com/bingchuang/core/audio/AudioPlayAndRecordManager.java similarity index 99% rename from core/src/main/java/com/pikolive/core/audio/AudioPlayAndRecordManager.java rename to core/src/main/java/com/bingchuang/core/audio/AudioPlayAndRecordManager.java index 2c36b69c3..97749aa08 100644 --- a/core/src/main/java/com/pikolive/core/audio/AudioPlayAndRecordManager.java +++ b/core/src/main/java/com/bingchuang/core/audio/AudioPlayAndRecordManager.java @@ -1,4 +1,4 @@ -package com.pikolive.core.audio; +package com.bingchuang.core.audio; import android.content.Context; import android.media.AudioManager; diff --git a/core/src/main/java/com/pikolive/core/audio/bean/SysMsgVoiceInfo.java b/core/src/main/java/com/bingchuang/core/audio/bean/SysMsgVoiceInfo.java similarity index 87% rename from core/src/main/java/com/pikolive/core/audio/bean/SysMsgVoiceInfo.java rename to core/src/main/java/com/bingchuang/core/audio/bean/SysMsgVoiceInfo.java index 2952db748..e4ca1d1e3 100644 --- a/core/src/main/java/com/pikolive/core/audio/bean/SysMsgVoiceInfo.java +++ b/core/src/main/java/com/bingchuang/core/audio/bean/SysMsgVoiceInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.audio.bean; +package com.bingchuang.core.audio.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/audio/bean/VoiceBottleSayHiInfo.java b/core/src/main/java/com/bingchuang/core/audio/bean/VoiceBottleSayHiInfo.java similarity index 81% rename from core/src/main/java/com/pikolive/core/audio/bean/VoiceBottleSayHiInfo.java rename to core/src/main/java/com/bingchuang/core/audio/bean/VoiceBottleSayHiInfo.java index fca2b391e..fb165b749 100644 --- a/core/src/main/java/com/pikolive/core/audio/bean/VoiceBottleSayHiInfo.java +++ b/core/src/main/java/com/bingchuang/core/audio/bean/VoiceBottleSayHiInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.audio.bean; +package com.bingchuang.core.audio.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/audio/event/VoiceShakeHeartEvent.java b/core/src/main/java/com/bingchuang/core/audio/event/VoiceShakeHeartEvent.java similarity index 81% rename from core/src/main/java/com/pikolive/core/audio/event/VoiceShakeHeartEvent.java rename to core/src/main/java/com/bingchuang/core/audio/event/VoiceShakeHeartEvent.java index bde5a07c3..9baff4ca4 100644 --- a/core/src/main/java/com/pikolive/core/audio/event/VoiceShakeHeartEvent.java +++ b/core/src/main/java/com/bingchuang/core/audio/event/VoiceShakeHeartEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.audio.event; +package com.bingchuang.core.audio.event; public class VoiceShakeHeartEvent { public String showTextHint; diff --git a/core/src/main/java/com/pikolive/core/auth/AuthModel.java b/core/src/main/java/com/bingchuang/core/auth/AuthModel.java similarity index 97% rename from core/src/main/java/com/pikolive/core/auth/AuthModel.java rename to core/src/main/java/com/bingchuang/core/auth/AuthModel.java index 468e56a2e..8bac76ee2 100644 --- a/core/src/main/java/com/pikolive/core/auth/AuthModel.java +++ b/core/src/main/java/com/bingchuang/core/auth/AuthModel.java @@ -1,4 +1,4 @@ -package com.pikolive.core.auth; +package com.bingchuang.core.auth; import android.text.TextUtils; import android.util.Log; @@ -18,33 +18,33 @@ 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.pikolive.core.auth.bean.AreaInfoBean; -import com.pikolive.core.auth.entity.AccountInfo; -import com.pikolive.core.auth.entity.ThirdUserInfo; -import com.pikolive.core.auth.entity.TicketInfo; -import com.pikolive.core.auth.event.GetCurrentUidEvent; -import com.pikolive.core.auth.event.KickOutEvent; -import com.pikolive.core.auth.event.LoginEvent; -import com.pikolive.core.auth.event.LoginReportEvent; -import com.pikolive.core.auth.event.LogoutEvent; -import com.pikolive.core.auth.exception.AccountCancelException; -import com.pikolive.core.auth.exception.BanAccountException; -import com.pikolive.core.auth.exception.IsSuperAdminException; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.bean.response.result.LoginResult; -import com.pikolive.core.bean.response.result.RegisterResult; -import com.pikolive.core.bean.response.result.TicketResult; -import com.pikolive.core.exception.FailReasonException; -import com.pikolive.core.im.custom.bean.CustomAttachParser; -import com.pikolive.core.linked.LinkedModel; -import com.pikolive.core.linked.bean.LinkedInfo; -import com.pikolive.core.DemoCache; -import com.pikolive.core.R; -import com.pikolive.core.utils.CheckUtils; -import com.pikolive.core.utils.LogUtils; -import com.pikolive.core.utils.OldHttpErrorHandleUtil; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.auth.bean.AreaInfoBean; +import com.bingchuang.core.auth.entity.AccountInfo; +import com.bingchuang.core.auth.entity.ThirdUserInfo; +import com.bingchuang.core.auth.entity.TicketInfo; +import com.bingchuang.core.auth.event.GetCurrentUidEvent; +import com.bingchuang.core.auth.event.KickOutEvent; +import com.bingchuang.core.auth.event.LoginEvent; +import com.bingchuang.core.auth.event.LoginReportEvent; +import com.bingchuang.core.auth.event.LogoutEvent; +import com.bingchuang.core.auth.exception.AccountCancelException; +import com.bingchuang.core.auth.exception.BanAccountException; +import com.bingchuang.core.auth.exception.IsSuperAdminException; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.bean.response.result.LoginResult; +import com.bingchuang.core.bean.response.result.RegisterResult; +import com.bingchuang.core.bean.response.result.TicketResult; +import com.bingchuang.core.exception.FailReasonException; +import com.bingchuang.core.im.custom.bean.CustomAttachParser; +import com.bingchuang.core.linked.LinkedModel; +import com.bingchuang.core.linked.bean.LinkedInfo; +import com.bingchuang.core.DemoCache; +import com.bingchuang.core.R; +import com.bingchuang.core.utils.CheckUtils; +import com.bingchuang.core.utils.LogUtils; +import com.bingchuang.core.utils.OldHttpErrorHandleUtil; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.utils.DeviceUtils; import com.bingchuang.library.utils.ResUtil; diff --git a/core/src/main/java/com/pikolive/core/auth/IAuthModel.java b/core/src/main/java/com/bingchuang/core/auth/IAuthModel.java similarity index 90% rename from core/src/main/java/com/pikolive/core/auth/IAuthModel.java rename to core/src/main/java/com/bingchuang/core/auth/IAuthModel.java index 60f63ce86..d11a77708 100644 --- a/core/src/main/java/com/pikolive/core/auth/IAuthModel.java +++ b/core/src/main/java/com/bingchuang/core/auth/IAuthModel.java @@ -1,12 +1,12 @@ -package com.pikolive.core.auth; +package com.bingchuang.core.auth; import com.facebook.CallbackManager; -import com.pikolive.core.auth.entity.ThirdUserInfo; -import com.pikolive.core.base.IModel; -import com.pikolive.core.auth.entity.ThirdUserInfo; -import com.pikolive.core.base.IModel; -import com.pikolive.core.auth.entity.ThirdUserInfo; -import com.pikolive.core.base.IModel; +import com.bingchuang.core.auth.entity.ThirdUserInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.auth.entity.ThirdUserInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.auth.entity.ThirdUserInfo; +import com.bingchuang.core.base.IModel; import org.json.JSONObject; diff --git a/core/src/main/java/com/pikolive/core/auth/bean/AreaInfoBean.kt b/core/src/main/java/com/bingchuang/core/auth/bean/AreaInfoBean.kt similarity index 87% rename from core/src/main/java/com/pikolive/core/auth/bean/AreaInfoBean.kt rename to core/src/main/java/com/bingchuang/core/auth/bean/AreaInfoBean.kt index 66eb8e01c..c22d47794 100644 --- a/core/src/main/java/com/pikolive/core/auth/bean/AreaInfoBean.kt +++ b/core/src/main/java/com/bingchuang/core/auth/bean/AreaInfoBean.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.auth.bean +package com.bingchuang.core.auth.bean import lombok.Data diff --git a/core/src/main/java/com/pikolive/core/auth/entity/AccountInfo.java b/core/src/main/java/com/bingchuang/core/auth/entity/AccountInfo.java similarity index 97% rename from core/src/main/java/com/pikolive/core/auth/entity/AccountInfo.java rename to core/src/main/java/com/bingchuang/core/auth/entity/AccountInfo.java index 76043f69a..29b622e4f 100644 --- a/core/src/main/java/com/pikolive/core/auth/entity/AccountInfo.java +++ b/core/src/main/java/com/bingchuang/core/auth/entity/AccountInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.auth.entity; +package com.bingchuang.core.auth.entity; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/auth/entity/ThirdUserInfo.java b/core/src/main/java/com/bingchuang/core/auth/entity/ThirdUserInfo.java similarity index 96% rename from core/src/main/java/com/pikolive/core/auth/entity/ThirdUserInfo.java rename to core/src/main/java/com/bingchuang/core/auth/entity/ThirdUserInfo.java index b859f8b57..787da56f6 100644 --- a/core/src/main/java/com/pikolive/core/auth/entity/ThirdUserInfo.java +++ b/core/src/main/java/com/bingchuang/core/auth/entity/ThirdUserInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.auth.entity; +package com.bingchuang.core.auth.entity; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/auth/entity/TicketInfo.java b/core/src/main/java/com/bingchuang/core/auth/entity/TicketInfo.java similarity index 96% rename from core/src/main/java/com/pikolive/core/auth/entity/TicketInfo.java rename to core/src/main/java/com/bingchuang/core/auth/entity/TicketInfo.java index aed0643fb..c3bd2eec3 100644 --- a/core/src/main/java/com/pikolive/core/auth/entity/TicketInfo.java +++ b/core/src/main/java/com/bingchuang/core/auth/entity/TicketInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.auth.entity; +package com.bingchuang.core.auth.entity; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/auth/event/BindPhoneEvent.java b/core/src/main/java/com/bingchuang/core/auth/event/BindPhoneEvent.java similarity index 69% rename from core/src/main/java/com/pikolive/core/auth/event/BindPhoneEvent.java rename to core/src/main/java/com/bingchuang/core/auth/event/BindPhoneEvent.java index e9164199d..132c1ba0d 100644 --- a/core/src/main/java/com/pikolive/core/auth/event/BindPhoneEvent.java +++ b/core/src/main/java/com/bingchuang/core/auth/event/BindPhoneEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.auth.event; +package com.bingchuang.core.auth.event; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/auth/event/GetCurrentUidEvent.java b/core/src/main/java/com/bingchuang/core/auth/event/GetCurrentUidEvent.java similarity index 51% rename from core/src/main/java/com/pikolive/core/auth/event/GetCurrentUidEvent.java rename to core/src/main/java/com/bingchuang/core/auth/event/GetCurrentUidEvent.java index 0c5c029d5..cc8520618 100644 --- a/core/src/main/java/com/pikolive/core/auth/event/GetCurrentUidEvent.java +++ b/core/src/main/java/com/bingchuang/core/auth/event/GetCurrentUidEvent.java @@ -1,8 +1,8 @@ -package com.pikolive.core.auth.event; +package com.bingchuang.core.auth.event; -import com.pikolive.core.base.BaseDataEvent; -import com.pikolive.core.base.BaseDataEvent; -import com.pikolive.core.base.BaseDataEvent; +import com.bingchuang.core.base.BaseDataEvent; +import com.bingchuang.core.base.BaseDataEvent; +import com.bingchuang.core.base.BaseDataEvent; /** * diff --git a/core/src/main/java/com/pikolive/core/auth/event/KickOutEvent.java b/core/src/main/java/com/bingchuang/core/auth/event/KickOutEvent.java similarity index 57% rename from core/src/main/java/com/pikolive/core/auth/event/KickOutEvent.java rename to core/src/main/java/com/bingchuang/core/auth/event/KickOutEvent.java index b78841fba..c1e955d6d 100644 --- a/core/src/main/java/com/pikolive/core/auth/event/KickOutEvent.java +++ b/core/src/main/java/com/bingchuang/core/auth/event/KickOutEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.auth.event; +package com.bingchuang.core.auth.event; /** * 踢出事件 diff --git a/core/src/main/java/com/pikolive/core/auth/event/LoginEvent.java b/core/src/main/java/com/bingchuang/core/auth/event/LoginEvent.java similarity index 72% rename from core/src/main/java/com/pikolive/core/auth/event/LoginEvent.java rename to core/src/main/java/com/bingchuang/core/auth/event/LoginEvent.java index 3534ddaef..04faf9ba5 100644 --- a/core/src/main/java/com/pikolive/core/auth/event/LoginEvent.java +++ b/core/src/main/java/com/bingchuang/core/auth/event/LoginEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.auth.event; +package com.bingchuang.core.auth.event; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/auth/event/LoginReportEvent.java b/core/src/main/java/com/bingchuang/core/auth/event/LoginReportEvent.java similarity index 84% rename from core/src/main/java/com/pikolive/core/auth/event/LoginReportEvent.java rename to core/src/main/java/com/bingchuang/core/auth/event/LoginReportEvent.java index 41c580d6e..b916581d9 100644 --- a/core/src/main/java/com/pikolive/core/auth/event/LoginReportEvent.java +++ b/core/src/main/java/com/bingchuang/core/auth/event/LoginReportEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.auth.event; +package com.bingchuang.core.auth.event; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/auth/event/LogoutEvent.java b/core/src/main/java/com/bingchuang/core/auth/event/LogoutEvent.java similarity index 60% rename from core/src/main/java/com/pikolive/core/auth/event/LogoutEvent.java rename to core/src/main/java/com/bingchuang/core/auth/event/LogoutEvent.java index d381ddd56..a726ef7b4 100644 --- a/core/src/main/java/com/pikolive/core/auth/event/LogoutEvent.java +++ b/core/src/main/java/com/bingchuang/core/auth/event/LogoutEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.auth.event; +package com.bingchuang.core.auth.event; /** * 退出登录事件 diff --git a/core/src/main/java/com/pikolive/core/auth/exception/AccountCancelException.java b/core/src/main/java/com/bingchuang/core/auth/exception/AccountCancelException.java similarity index 90% rename from core/src/main/java/com/pikolive/core/auth/exception/AccountCancelException.java rename to core/src/main/java/com/bingchuang/core/auth/exception/AccountCancelException.java index 6fd23feed..27f76f932 100644 --- a/core/src/main/java/com/pikolive/core/auth/exception/AccountCancelException.java +++ b/core/src/main/java/com/bingchuang/core/auth/exception/AccountCancelException.java @@ -1,4 +1,4 @@ -package com.pikolive.core.auth.exception; +package com.bingchuang.core.auth.exception; public class AccountCancelException extends Exception { diff --git a/core/src/main/java/com/pikolive/core/auth/exception/BanAccountException.java b/core/src/main/java/com/bingchuang/core/auth/exception/BanAccountException.java similarity index 85% rename from core/src/main/java/com/pikolive/core/auth/exception/BanAccountException.java rename to core/src/main/java/com/bingchuang/core/auth/exception/BanAccountException.java index 303197165..ed3b226de 100644 --- a/core/src/main/java/com/pikolive/core/auth/exception/BanAccountException.java +++ b/core/src/main/java/com/bingchuang/core/auth/exception/BanAccountException.java @@ -1,4 +1,4 @@ -package com.pikolive.core.auth.exception; +package com.bingchuang.core.auth.exception; public class BanAccountException extends Exception { diff --git a/core/src/main/java/com/pikolive/core/auth/exception/BigHeadPhoneException.java b/core/src/main/java/com/bingchuang/core/auth/exception/BigHeadPhoneException.java similarity index 76% rename from core/src/main/java/com/pikolive/core/auth/exception/BigHeadPhoneException.java rename to core/src/main/java/com/bingchuang/core/auth/exception/BigHeadPhoneException.java index 25db8e934..6595fb000 100644 --- a/core/src/main/java/com/pikolive/core/auth/exception/BigHeadPhoneException.java +++ b/core/src/main/java/com/bingchuang/core/auth/exception/BigHeadPhoneException.java @@ -1,4 +1,4 @@ -package com.pikolive.core.auth.exception; +package com.bingchuang.core.auth.exception; public class BigHeadPhoneException extends Exception { diff --git a/core/src/main/java/com/pikolive/core/auth/exception/IsSuperAdminException.java b/core/src/main/java/com/bingchuang/core/auth/exception/IsSuperAdminException.java similarity index 76% rename from core/src/main/java/com/pikolive/core/auth/exception/IsSuperAdminException.java rename to core/src/main/java/com/bingchuang/core/auth/exception/IsSuperAdminException.java index 186ec87e6..114028c90 100644 --- a/core/src/main/java/com/pikolive/core/auth/exception/IsSuperAdminException.java +++ b/core/src/main/java/com/bingchuang/core/auth/exception/IsSuperAdminException.java @@ -1,4 +1,4 @@ -package com.pikolive.core.auth.exception; +package com.bingchuang.core.auth.exception; public class IsSuperAdminException extends Exception { diff --git a/core/src/main/java/com/pikolive/core/base/BaseBusEvent.java b/core/src/main/java/com/bingchuang/core/base/BaseBusEvent.java similarity index 84% rename from core/src/main/java/com/pikolive/core/base/BaseBusEvent.java rename to core/src/main/java/com/bingchuang/core/base/BaseBusEvent.java index d7f32d545..fdfb3a2d8 100644 --- a/core/src/main/java/com/pikolive/core/base/BaseBusEvent.java +++ b/core/src/main/java/com/bingchuang/core/base/BaseBusEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.base; +package com.bingchuang.core.base; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/base/BaseDataEvent.java b/core/src/main/java/com/bingchuang/core/base/BaseDataEvent.java similarity index 91% rename from core/src/main/java/com/pikolive/core/base/BaseDataEvent.java rename to core/src/main/java/com/bingchuang/core/base/BaseDataEvent.java index cb6509a5a..f0c589c43 100644 --- a/core/src/main/java/com/pikolive/core/base/BaseDataEvent.java +++ b/core/src/main/java/com/bingchuang/core/base/BaseDataEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.base; +package com.bingchuang.core.base; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/base/BaseErrorEvent.java b/core/src/main/java/com/bingchuang/core/base/BaseErrorEvent.java similarity index 90% rename from core/src/main/java/com/pikolive/core/base/BaseErrorEvent.java rename to core/src/main/java/com/bingchuang/core/base/BaseErrorEvent.java index 96e2a08f4..0bd82fd3b 100644 --- a/core/src/main/java/com/pikolive/core/base/BaseErrorEvent.java +++ b/core/src/main/java/com/bingchuang/core/base/BaseErrorEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.base; +package com.bingchuang.core.base; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/base/BaseErrorException.java b/core/src/main/java/com/bingchuang/core/base/BaseErrorException.java similarity index 83% rename from core/src/main/java/com/pikolive/core/base/BaseErrorException.java rename to core/src/main/java/com/bingchuang/core/base/BaseErrorException.java index d85fb1965..65fb83b4f 100644 --- a/core/src/main/java/com/pikolive/core/base/BaseErrorException.java +++ b/core/src/main/java/com/bingchuang/core/base/BaseErrorException.java @@ -1,4 +1,4 @@ -package com.pikolive.core.base; +package com.bingchuang.core.base; /** * create by lvzebiao @2019/8/7 diff --git a/core/src/main/java/com/pikolive/core/base/BaseModel.java b/core/src/main/java/com/bingchuang/core/base/BaseModel.java similarity index 96% rename from core/src/main/java/com/pikolive/core/base/BaseModel.java rename to core/src/main/java/com/bingchuang/core/base/BaseModel.java index c849f5cbb..c16409138 100644 --- a/core/src/main/java/com/pikolive/core/base/BaseModel.java +++ b/core/src/main/java/com/bingchuang/core/base/BaseModel.java @@ -1,14 +1,14 @@ -package com.pikolive.core.base; +package com.bingchuang.core.base; import android.content.Context; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.bean.response.ServiceResult; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.bean.response.ServiceResult; import com.bingchuang.library.net.rxnet.callback.CallBack; import com.bingchuang.library.net.rxnet.exception.ExceptionHandle; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.config.BasicConfig; -import com.pikolive.core.R; +import com.bingchuang.core.R; import java.net.UnknownHostException; diff --git a/core/src/main/java/com/pikolive/core/base/CancelNoToastException.java b/core/src/main/java/com/bingchuang/core/base/CancelNoToastException.java similarity index 87% rename from core/src/main/java/com/pikolive/core/base/CancelNoToastException.java rename to core/src/main/java/com/bingchuang/core/base/CancelNoToastException.java index 0e8969e81..d6c04a06d 100644 --- a/core/src/main/java/com/pikolive/core/base/CancelNoToastException.java +++ b/core/src/main/java/com/bingchuang/core/base/CancelNoToastException.java @@ -1,4 +1,4 @@ -package com.pikolive.core.base; +package com.bingchuang.core.base; /** * 点击取消按钮,但是不需要toast error的情况 diff --git a/core/src/main/java/com/bingchuang/core/base/IModel.java b/core/src/main/java/com/bingchuang/core/base/IModel.java new file mode 100644 index 000000000..0c208e917 --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/base/IModel.java @@ -0,0 +1,4 @@ +package com.bingchuang.core.base; + +public interface IModel { +} diff --git a/core/src/main/java/com/pikolive/core/bean/BaseProtocol.java b/core/src/main/java/com/bingchuang/core/bean/BaseProtocol.java similarity index 97% rename from core/src/main/java/com/pikolive/core/bean/BaseProtocol.java rename to core/src/main/java/com/bingchuang/core/bean/BaseProtocol.java index dc3364c31..ee6a677b9 100644 --- a/core/src/main/java/com/pikolive/core/bean/BaseProtocol.java +++ b/core/src/main/java/com/bingchuang/core/bean/BaseProtocol.java @@ -1,4 +1,4 @@ -package com.pikolive.core.bean; +package com.bingchuang.core.bean; /** * 广播通用协议 diff --git a/core/src/main/java/com/pikolive/core/bean/CarButtonInfo.java b/core/src/main/java/com/bingchuang/core/bean/CarButtonInfo.java similarity index 80% rename from core/src/main/java/com/pikolive/core/bean/CarButtonInfo.java rename to core/src/main/java/com/bingchuang/core/bean/CarButtonInfo.java index 1def43eac..de423014b 100644 --- a/core/src/main/java/com/pikolive/core/bean/CarButtonInfo.java +++ b/core/src/main/java/com/bingchuang/core/bean/CarButtonInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.bean; +package com.bingchuang.core.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/bean/GiftTitleInfo.java b/core/src/main/java/com/bingchuang/core/bean/GiftTitleInfo.java similarity index 82% rename from core/src/main/java/com/pikolive/core/bean/GiftTitleInfo.java rename to core/src/main/java/com/bingchuang/core/bean/GiftTitleInfo.java index 8fb99eff5..7c2ef7dfb 100644 --- a/core/src/main/java/com/pikolive/core/bean/GiftTitleInfo.java +++ b/core/src/main/java/com/bingchuang/core/bean/GiftTitleInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.bean; +package com.bingchuang.core.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/bean/LoginTipsInfo.java b/core/src/main/java/com/bingchuang/core/bean/LoginTipsInfo.java similarity index 83% rename from core/src/main/java/com/pikolive/core/bean/LoginTipsInfo.java rename to core/src/main/java/com/bingchuang/core/bean/LoginTipsInfo.java index 944b7f5e7..86da2112f 100644 --- a/core/src/main/java/com/pikolive/core/bean/LoginTipsInfo.java +++ b/core/src/main/java/com/bingchuang/core/bean/LoginTipsInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.bean; +package com.bingchuang.core.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/bean/PrivateChatLimitInfo.java b/core/src/main/java/com/bingchuang/core/bean/PrivateChatLimitInfo.java similarity index 87% rename from core/src/main/java/com/pikolive/core/bean/PrivateChatLimitInfo.java rename to core/src/main/java/com/bingchuang/core/bean/PrivateChatLimitInfo.java index 1169e9ec4..1b52ae1db 100644 --- a/core/src/main/java/com/pikolive/core/bean/PrivateChatLimitInfo.java +++ b/core/src/main/java/com/bingchuang/core/bean/PrivateChatLimitInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.bean; +package com.bingchuang.core.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/bean/ProgressInfo.java b/core/src/main/java/com/bingchuang/core/bean/ProgressInfo.java similarity index 95% rename from core/src/main/java/com/pikolive/core/bean/ProgressInfo.java rename to core/src/main/java/com/bingchuang/core/bean/ProgressInfo.java index db3123a23..b3863c368 100644 --- a/core/src/main/java/com/pikolive/core/bean/ProgressInfo.java +++ b/core/src/main/java/com/bingchuang/core/bean/ProgressInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.bean; +package com.bingchuang.core.bean; /** * 进度信息 diff --git a/core/src/main/java/com/pikolive/core/bean/RoomHistoryInfo.java b/core/src/main/java/com/bingchuang/core/bean/RoomHistoryInfo.java similarity index 89% rename from core/src/main/java/com/pikolive/core/bean/RoomHistoryInfo.java rename to core/src/main/java/com/bingchuang/core/bean/RoomHistoryInfo.java index a40709af5..185f64cbf 100644 --- a/core/src/main/java/com/pikolive/core/bean/RoomHistoryInfo.java +++ b/core/src/main/java/com/bingchuang/core/bean/RoomHistoryInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.bean; +package com.bingchuang.core.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/bean/RoomMicInfo.java b/core/src/main/java/com/bingchuang/core/bean/RoomMicInfo.java similarity index 98% rename from core/src/main/java/com/pikolive/core/bean/RoomMicInfo.java rename to core/src/main/java/com/bingchuang/core/bean/RoomMicInfo.java index 660e2b7aa..f6bfb97f6 100644 --- a/core/src/main/java/com/pikolive/core/bean/RoomMicInfo.java +++ b/core/src/main/java/com/bingchuang/core/bean/RoomMicInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.bean; +package com.bingchuang.core.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/main/java/com/pikolive/core/bean/RoomNewbieInfo.java b/core/src/main/java/com/bingchuang/core/bean/RoomNewbieInfo.java similarity index 92% rename from core/src/main/java/com/pikolive/core/bean/RoomNewbieInfo.java rename to core/src/main/java/com/bingchuang/core/bean/RoomNewbieInfo.java index 7ac0683c0..dcdb5c7d0 100644 --- a/core/src/main/java/com/pikolive/core/bean/RoomNewbieInfo.java +++ b/core/src/main/java/com/bingchuang/core/bean/RoomNewbieInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.bean; +package com.bingchuang.core.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/bean/RoomNewbieMessageInfo.java b/core/src/main/java/com/bingchuang/core/bean/RoomNewbieMessageInfo.java similarity index 98% rename from core/src/main/java/com/pikolive/core/bean/RoomNewbieMessageInfo.java rename to core/src/main/java/com/bingchuang/core/bean/RoomNewbieMessageInfo.java index 909f77203..98a7f10ad 100644 --- a/core/src/main/java/com/pikolive/core/bean/RoomNewbieMessageInfo.java +++ b/core/src/main/java/com/bingchuang/core/bean/RoomNewbieMessageInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.bean; +package com.bingchuang.core.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/bean/RoomQueueInfo.java b/core/src/main/java/com/bingchuang/core/bean/RoomQueueInfo.java similarity index 66% rename from core/src/main/java/com/pikolive/core/bean/RoomQueueInfo.java rename to core/src/main/java/com/bingchuang/core/bean/RoomQueueInfo.java index 8ab2c2a5f..0972e7124 100644 --- a/core/src/main/java/com/pikolive/core/bean/RoomQueueInfo.java +++ b/core/src/main/java/com/bingchuang/core/bean/RoomQueueInfo.java @@ -1,11 +1,11 @@ -package com.pikolive.core.bean; +package com.bingchuang.core.bean; -import com.pikolive.core.room.giftvalue.bean.GiftValueData; -import com.pikolive.core.room.queue.bean.MicMemberInfo; -import com.pikolive.core.room.giftvalue.bean.GiftValueData; -import com.pikolive.core.room.queue.bean.MicMemberInfo; -import com.pikolive.core.room.giftvalue.bean.GiftValueData; -import com.pikolive.core.room.queue.bean.MicMemberInfo; +import com.bingchuang.core.room.giftvalue.bean.GiftValueData; +import com.bingchuang.core.room.queue.bean.MicMemberInfo; +import com.bingchuang.core.room.giftvalue.bean.GiftValueData; +import com.bingchuang.core.room.queue.bean.MicMemberInfo; +import com.bingchuang.core.room.giftvalue.bean.GiftValueData; +import com.bingchuang.core.room.queue.bean.MicMemberInfo; /** * 房间麦序单个坑位信息实体,包含麦序状态,成员信息
diff --git a/core/src/main/java/com/pikolive/core/bean/UserInfoItem.java b/core/src/main/java/com/bingchuang/core/bean/UserInfoItem.java similarity index 98% rename from core/src/main/java/com/pikolive/core/bean/UserInfoItem.java rename to core/src/main/java/com/bingchuang/core/bean/UserInfoItem.java index 613c10309..db29d2bb5 100644 --- a/core/src/main/java/com/pikolive/core/bean/UserInfoItem.java +++ b/core/src/main/java/com/bingchuang/core/bean/UserInfoItem.java @@ -1,4 +1,4 @@ -package com.pikolive.core.bean; +package com.bingchuang.core.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/main/java/com/pikolive/core/bean/VersionInfo.java b/core/src/main/java/com/bingchuang/core/bean/VersionInfo.java similarity index 96% rename from core/src/main/java/com/pikolive/core/bean/VersionInfo.java rename to core/src/main/java/com/bingchuang/core/bean/VersionInfo.java index 7089481b1..b743e2f4e 100644 --- a/core/src/main/java/com/pikolive/core/bean/VersionInfo.java +++ b/core/src/main/java/com/bingchuang/core/bean/VersionInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.bean; +package com.bingchuang.core.bean; /** * Created by huangmeng1 on 2018/7/18. diff --git a/core/src/main/java/com/pikolive/core/bean/attachmsg/RoomQueueMsgAttachment.java b/core/src/main/java/com/bingchuang/core/bean/attachmsg/RoomQueueMsgAttachment.java similarity index 92% rename from core/src/main/java/com/pikolive/core/bean/attachmsg/RoomQueueMsgAttachment.java rename to core/src/main/java/com/bingchuang/core/bean/attachmsg/RoomQueueMsgAttachment.java index ae67ae569..8ef298fdc 100644 --- a/core/src/main/java/com/pikolive/core/bean/attachmsg/RoomQueueMsgAttachment.java +++ b/core/src/main/java/com/bingchuang/core/bean/attachmsg/RoomQueueMsgAttachment.java @@ -1,8 +1,8 @@ -package com.pikolive.core.bean.attachmsg; +package com.bingchuang.core.bean.attachmsg; import com.alibaba.fastjson.JSONObject; -import com.pikolive.core.bean.RoomQueueInfo; -import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.bean.RoomQueueInfo; +import com.bingchuang.core.im.custom.bean.CustomAttachment; /** *队列自定义消息
diff --git a/core/src/main/java/com/pikolive/core/bean/response/BeanResult.kt b/core/src/main/java/com/bingchuang/core/bean/response/BeanResult.kt similarity index 86% rename from core/src/main/java/com/pikolive/core/bean/response/BeanResult.kt rename to core/src/main/java/com/bingchuang/core/bean/response/BeanResult.kt index 066355536..d80b61d60 100644 --- a/core/src/main/java/com/pikolive/core/bean/response/BeanResult.kt +++ b/core/src/main/java/com/bingchuang/core/bean/response/BeanResult.kt @@ -1,7 +1,7 @@ -package com.pikolive.core.bean.response +package com.bingchuang.core.bean.response -import com.pikolive.core.R -import com.pikolive.core.utils.net.ServerException +import com.bingchuang.core.R +import com.bingchuang.core.utils.net.ServerException import com.bingchuang.library.utils.ResUtil data class BeanResult( diff --git a/core/src/main/java/com/pikolive/core/bean/response/JsonServiceResult.java b/core/src/main/java/com/bingchuang/core/bean/response/JsonServiceResult.java similarity index 79% rename from core/src/main/java/com/pikolive/core/bean/response/JsonServiceResult.java rename to core/src/main/java/com/bingchuang/core/bean/response/JsonServiceResult.java index 16bf3d455..41973c79c 100644 --- a/core/src/main/java/com/pikolive/core/bean/response/JsonServiceResult.java +++ b/core/src/main/java/com/bingchuang/core/bean/response/JsonServiceResult.java @@ -1,4 +1,4 @@ -package com.pikolive.core.bean.response; +package com.bingchuang.core.bean.response; import com.google.gson.JsonElement; diff --git a/core/src/main/java/com/pikolive/core/bean/response/ListResult.kt b/core/src/main/java/com/bingchuang/core/bean/response/ListResult.kt similarity index 90% rename from core/src/main/java/com/pikolive/core/bean/response/ListResult.kt rename to core/src/main/java/com/bingchuang/core/bean/response/ListResult.kt index eeda23724..67714e2c9 100644 --- a/core/src/main/java/com/pikolive/core/bean/response/ListResult.kt +++ b/core/src/main/java/com/bingchuang/core/bean/response/ListResult.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.bean.response +package com.bingchuang.core.bean.response data class ListResult ( val isSuccess: Boolean, diff --git a/core/src/main/java/com/pikolive/core/bean/response/RequestError.java b/core/src/main/java/com/bingchuang/core/bean/response/RequestError.java similarity index 95% rename from core/src/main/java/com/pikolive/core/bean/response/RequestError.java rename to core/src/main/java/com/bingchuang/core/bean/response/RequestError.java index f917b4b7a..5cf85f3f6 100644 --- a/core/src/main/java/com/pikolive/core/bean/response/RequestError.java +++ b/core/src/main/java/com/bingchuang/core/bean/response/RequestError.java @@ -1,4 +1,4 @@ -package com.pikolive.core.bean.response; +package com.bingchuang.core.bean.response; /** * Created by zhongyongsheng on 14-6-6. diff --git a/core/src/main/java/com/pikolive/core/bean/response/ResponseData.java b/core/src/main/java/com/bingchuang/core/bean/response/ResponseData.java similarity index 98% rename from core/src/main/java/com/pikolive/core/bean/response/ResponseData.java rename to core/src/main/java/com/bingchuang/core/bean/response/ResponseData.java index 16e33492d..68fc76b31 100644 --- a/core/src/main/java/com/pikolive/core/bean/response/ResponseData.java +++ b/core/src/main/java/com/bingchuang/core/bean/response/ResponseData.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.pikolive.core.bean.response; +package com.bingchuang.core.bean.response; import com.google.gson.Gson; -import com.pikolive.core.R; +import com.bingchuang.core.R; import com.bingchuang.library.coremanager.CoreError; import com.bingchuang.library.utils.ResUtil; diff --git a/core/src/main/java/com/pikolive/core/bean/response/ServiceResult.java b/core/src/main/java/com/bingchuang/core/bean/response/ServiceResult.java similarity index 98% rename from core/src/main/java/com/pikolive/core/bean/response/ServiceResult.java rename to core/src/main/java/com/bingchuang/core/bean/response/ServiceResult.java index e31a0a6f8..b49f236eb 100644 --- a/core/src/main/java/com/pikolive/core/bean/response/ServiceResult.java +++ b/core/src/main/java/com/bingchuang/core/bean/response/ServiceResult.java @@ -1,7 +1,7 @@ -package com.pikolive.core.bean.response; +package com.bingchuang.core.bean.response; import com.bingchuang.library.utils.ResUtil; -import com.pikolive.core.R; +import com.bingchuang.core.R; import java.io.Serializable; diff --git a/core/src/main/java/com/bingchuang/core/bean/response/result/ActionDialogResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/ActionDialogResult.java new file mode 100644 index 000000000..e947c681a --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/ActionDialogResult.java @@ -0,0 +1,14 @@ +package com.bingchuang.core.bean.response.result; + + +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.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/bingchuang/core/bean/response/result/AttentionListResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/AttentionListResult.java new file mode 100644 index 000000000..6699e693f --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/AttentionListResult.java @@ -0,0 +1,15 @@ +package com.bingchuang.core.bean.response.result; + +import com.bingchuang.core.user.bean.AttentionInfo; +import com.bingchuang.core.user.bean.AttentionInfo; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.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/bingchuang/core/bean/response/result/AuctionInfoResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/AuctionInfoResult.java new file mode 100644 index 000000000..3c540ceb6 --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/AuctionInfoResult.java @@ -0,0 +1,13 @@ +package com.bingchuang.core.bean.response.result; + +import com.bingchuang.core.room.auction.bean.AuctionInfo; +import com.bingchuang.core.room.auction.bean.AuctionInfo; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.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/bingchuang/core/bean/response/result/AuctionListUserInfoResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/AuctionListUserInfoResult.java new file mode 100644 index 000000000..0ac3e92ec --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/AuctionListUserInfoResult.java @@ -0,0 +1,15 @@ +package com.bingchuang.core.bean.response.result; + +import com.bingchuang.core.room.auction.bean.AuctionListUserInfo; +import com.bingchuang.core.room.auction.bean.AuctionListUserInfo; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.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/bingchuang/core/bean/response/result/AuctionUserListResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/AuctionUserListResult.java new file mode 100644 index 000000000..49b1a576e --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/AuctionUserListResult.java @@ -0,0 +1,15 @@ +package com.bingchuang.core.bean.response.result; + +import com.bingchuang.core.room.auction.bean.AuctionUser; +import com.bingchuang.core.room.auction.bean.AuctionUser; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.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/bingchuang/core/bean/response/result/AuctionUserResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/AuctionUserResult.java new file mode 100644 index 000000000..8fd9fb3d6 --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/AuctionUserResult.java @@ -0,0 +1,13 @@ +package com.bingchuang.core.bean.response.result; + +import com.bingchuang.core.room.auction.bean.AuctionUser; +import com.bingchuang.core.room.auction.bean.AuctionUser; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.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/pikolive/core/bean/response/result/BoolApiResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/BoolApiResult.java similarity index 50% rename from core/src/main/java/com/pikolive/core/bean/response/result/BoolApiResult.java rename to core/src/main/java/com/bingchuang/core/bean/response/result/BoolApiResult.java index 1b66d4389..9e9a8c9a0 100644 --- a/core/src/main/java/com/pikolive/core/bean/response/result/BoolApiResult.java +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/BoolApiResult.java @@ -1,6 +1,6 @@ -package com.pikolive.core.bean.response.result; +package com.bingchuang.core.bean.response.result; -import com.pikolive.core.bean.response.ServiceResult; +import com.bingchuang.core.bean.response.ServiceResult; /** * Created by chenran on 2017/2/16. diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/BooleanResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/BooleanResult.java similarity index 52% rename from core/src/main/java/com/pikolive/core/bean/response/result/BooleanResult.java rename to core/src/main/java/com/bingchuang/core/bean/response/result/BooleanResult.java index f21f89504..cb9a1df78 100644 --- a/core/src/main/java/com/pikolive/core/bean/response/result/BooleanResult.java +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/BooleanResult.java @@ -1,6 +1,6 @@ -package com.pikolive.core.bean.response.result; +package com.bingchuang.core.bean.response.result; -import com.pikolive.core.bean.response.ServiceResult; +import com.bingchuang.core.bean.response.ServiceResult; /** * Created by zhouxiangfeng on 2017/5/27. diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/ChargeListResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/ChargeListResult.java similarity index 69% rename from core/src/main/java/com/pikolive/core/bean/response/result/ChargeListResult.java rename to core/src/main/java/com/bingchuang/core/bean/response/result/ChargeListResult.java index 3f3707e5e..c194b4c6f 100644 --- a/core/src/main/java/com/pikolive/core/bean/response/result/ChargeListResult.java +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/ChargeListResult.java @@ -1,6 +1,6 @@ -package com.pikolive.core.bean.response.result; +package com.bingchuang.core.bean.response.result; -import com.pikolive.core.pay.bean.ChargeBean; +import com.bingchuang.core.pay.bean.ChargeBean; import java.util.List; diff --git a/core/src/main/java/com/bingchuang/core/bean/response/result/CheckLostUserResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/CheckLostUserResult.java new file mode 100644 index 000000000..594a6e28b --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/CheckLostUserResult.java @@ -0,0 +1,7 @@ +package com.bingchuang.core.bean.response.result; + +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.recall.bean.CheckLostUserInfo; + +public class CheckLostUserResult extends ServiceResult { +} diff --git a/core/src/main/java/com/bingchuang/core/bean/response/result/ExchangeInfoResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/ExchangeInfoResult.java new file mode 100644 index 000000000..95e103506 --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/ExchangeInfoResult.java @@ -0,0 +1,11 @@ +package com.bingchuang.core.bean.response.result; + +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.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/bingchuang/core/bean/response/result/FaceResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/FaceResult.java new file mode 100644 index 000000000..26644feb4 --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/FaceResult.java @@ -0,0 +1,13 @@ +package com.bingchuang.core.bean.response.result; + +import com.bingchuang.core.room.face.FaceListInfo; +import com.bingchuang.core.room.face.FaceListInfo; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.room.face.FaceListInfo; + +/** + * Created by chenran on 2017/7/27. + */ + +public class FaceResult extends ServiceResult { +} diff --git a/core/src/main/java/com/bingchuang/core/bean/response/result/FansListResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/FansListResult.java new file mode 100644 index 000000000..3e24d76eb --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/FansListResult.java @@ -0,0 +1,13 @@ +package com.bingchuang.core.bean.response.result; + +import com.bingchuang.core.user.bean.FansListInfo; +import com.bingchuang.core.user.bean.FansListInfo; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.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/bingchuang/core/bean/response/result/GiftInfosResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/GiftInfosResult.java new file mode 100644 index 000000000..0cc074290 --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/GiftInfosResult.java @@ -0,0 +1,13 @@ +package com.bingchuang.core.bean.response.result; + +import com.bingchuang.core.bills.bean.TextInfos; +import com.bingchuang.core.bills.bean.TextInfos; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.bills.bean.TextInfos; + +/** + * Created by Seven on 2017/9/9. + */ + +public class GiftInfosResult extends ServiceResult { +} diff --git a/core/src/main/java/com/bingchuang/core/bean/response/result/GiftRecieveInfoResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/GiftRecieveInfoResult.java new file mode 100644 index 000000000..df5d5643b --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/GiftRecieveInfoResult.java @@ -0,0 +1,13 @@ +package com.bingchuang.core.bean.response.result; + +import com.bingchuang.core.gift.bean.GiftReceiveInfo; +import com.bingchuang.core.gift.bean.GiftReceiveInfo; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.gift.bean.GiftReceiveInfo; + +/** + * Created by chenran on 2017/11/25. + */ + +public class GiftRecieveInfoResult extends ServiceResult { +} diff --git a/core/src/main/java/com/bingchuang/core/bean/response/result/GiftResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/GiftResult.java new file mode 100644 index 000000000..41f0d615a --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/GiftResult.java @@ -0,0 +1,13 @@ +package com.bingchuang.core.bean.response.result; + +import com.bingchuang.core.gift.bean.GiftListInfo; +import com.bingchuang.core.gift.bean.GiftListInfo; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.gift.bean.GiftListInfo; + +/** + * Created by chenran on 2017/7/27. + */ + +public class GiftResult extends ServiceResult { +} diff --git a/core/src/main/java/com/bingchuang/core/bean/response/result/GiftWallListResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/GiftWallListResult.java new file mode 100644 index 000000000..111703bf5 --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/GiftWallListResult.java @@ -0,0 +1,15 @@ +package com.bingchuang.core.bean.response.result; + +import com.bingchuang.core.user.bean.GiftWallInfo; +import com.bingchuang.core.user.bean.GiftWallInfo; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.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/bingchuang/core/bean/response/result/GoBackResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/GoBackResult.java new file mode 100644 index 000000000..88ec3e3e4 --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/GoBackResult.java @@ -0,0 +1,7 @@ +package com.bingchuang.core.bean.response.result; + +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.recall.bean.GoBackInfo; + +public class GoBackResult extends ServiceResult
{ +} diff --git a/core/src/main/java/com/bingchuang/core/bean/response/result/IdQueryUserInfoResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/IdQueryUserInfoResult.java new file mode 100644 index 000000000..844868e1a --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/IdQueryUserInfoResult.java @@ -0,0 +1,12 @@ +package com.bingchuang.core.bean.response.result; + +import com.bingchuang.core.auth.entity.AccountInfo; +import com.bingchuang.core.bean.response.ServiceResult; + +/** + * Created by chenran on 2017/2/16. + */ + +public class IdQueryUserInfoResult extends ServiceResult { + +} diff --git a/core/src/main/java/com/bingchuang/core/bean/response/result/InitResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/InitResult.java new file mode 100644 index 000000000..3d384e41d --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/InitResult.java @@ -0,0 +1,12 @@ +package com.bingchuang.core.bean.response.result; + +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.initial.bean.InitInfo; + +/** + * @author xiaoyu + * @date 2017/12/8 + */ + +public class InitResult extends ServiceResult { +} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/IntegerResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/IntegerResult.java similarity index 50% rename from core/src/main/java/com/pikolive/core/bean/response/result/IntegerResult.java rename to core/src/main/java/com/bingchuang/core/bean/response/result/IntegerResult.java index 22953fdc4..20f30d999 100644 --- a/core/src/main/java/com/pikolive/core/bean/response/result/IntegerResult.java +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/IntegerResult.java @@ -1,6 +1,6 @@ -package com.pikolive.core.bean.response.result; +package com.bingchuang.core.bean.response.result; -import com.pikolive.core.bean.response.ServiceResult; +import com.bingchuang.core.bean.response.ServiceResult; /** * Created by chenran on 2017/11/15. diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/LoginResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/LoginResult.java similarity index 80% rename from core/src/main/java/com/pikolive/core/bean/response/result/LoginResult.java rename to core/src/main/java/com/bingchuang/core/bean/response/result/LoginResult.java index 9c62e4222..abdb6f4a3 100644 --- a/core/src/main/java/com/pikolive/core/bean/response/result/LoginResult.java +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/LoginResult.java @@ -1,7 +1,7 @@ -package com.pikolive.core.bean.response.result; +package com.bingchuang.core.bean.response.result; -import com.pikolive.core.auth.entity.AccountInfo; -import com.pikolive.core.bean.response.ServiceResult; +import com.bingchuang.core.auth.entity.AccountInfo; +import com.bingchuang.core.bean.response.ServiceResult; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/com/bingchuang/core/bean/response/result/MultiGiftRecieveInfoResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/MultiGiftRecieveInfoResult.java new file mode 100644 index 000000000..8825717ae --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/MultiGiftRecieveInfoResult.java @@ -0,0 +1,13 @@ +package com.bingchuang.core.bean.response.result; + +import com.bingchuang.core.gift.bean.MultiGiftReceiveInfo; +import com.bingchuang.core.gift.bean.MultiGiftReceiveInfo; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.gift.bean.MultiGiftReceiveInfo; + +/** + * Created by chenran on 2017/11/25. + */ + +public class MultiGiftRecieveInfoResult extends ServiceResult { +} diff --git a/core/src/main/java/com/bingchuang/core/bean/response/result/RedDrawListInfoResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/RedDrawListInfoResult.java new file mode 100644 index 000000000..4f3636b86 --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/RedDrawListInfoResult.java @@ -0,0 +1,13 @@ +package com.bingchuang.core.bean.response.result; + +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.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/bingchuang/core/bean/response/result/RedPacketResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/RedPacketResult.java new file mode 100644 index 000000000..e8fb94cd9 --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/RedPacketResult.java @@ -0,0 +1,12 @@ +package com.bingchuang.core.bean.response.result; + + +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.redPacket.bean.RedPacketInfo; + +/** + * Created by zhouxiangfeng on 2017/5/28. + */ + +public class RedPacketResult extends ServiceResult
{ +} diff --git a/core/src/main/java/com/bingchuang/core/bean/response/result/RegisterResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/RegisterResult.java new file mode 100644 index 000000000..4c5201668 --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/RegisterResult.java @@ -0,0 +1,12 @@ +package com.bingchuang.core.bean.response.result; + +import com.bingchuang.core.auth.entity.TicketInfo; +import com.bingchuang.core.bean.response.ServiceResult; + +/** + * Created by chenran on 2017/2/16. + */ + +public class RegisterResult extends ServiceResult { + +} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/RequestChargeResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/RequestChargeResult.java similarity index 60% rename from core/src/main/java/com/pikolive/core/bean/response/result/RequestChargeResult.java rename to core/src/main/java/com/bingchuang/core/bean/response/result/RequestChargeResult.java index cb9ae0e0f..e7ae5045c 100644 --- a/core/src/main/java/com/pikolive/core/bean/response/result/RequestChargeResult.java +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/RequestChargeResult.java @@ -1,7 +1,7 @@ -package com.pikolive.core.bean.response.result; +package com.bingchuang.core.bean.response.result; import com.google.gson.JsonObject; -import com.pikolive.core.bean.response.ServiceResult; +import com.bingchuang.core.bean.response.ServiceResult; /** * Created by zhouxiangfeng on 2017/5/4. diff --git a/core/src/main/java/com/bingchuang/core/bean/response/result/RoomConsumeInfoListResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/RoomConsumeInfoListResult.java new file mode 100644 index 000000000..655aefe8a --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/RoomConsumeInfoListResult.java @@ -0,0 +1,15 @@ +package com.bingchuang.core.bean.response.result; + +import com.bingchuang.core.room.queue.bean.RoomConsumeInfo; +import com.bingchuang.core.room.queue.bean.RoomConsumeInfo; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.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/bingchuang/core/bean/response/result/RoomRewardResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/RoomRewardResult.java new file mode 100644 index 000000000..2a79ba86a --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/RoomRewardResult.java @@ -0,0 +1,12 @@ +package com.bingchuang.core.bean.response.result; + +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.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/bingchuang/core/bean/response/result/ShareRedPacketResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/ShareRedPacketResult.java new file mode 100644 index 000000000..f65c12122 --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/ShareRedPacketResult.java @@ -0,0 +1,12 @@ +package com.bingchuang.core.bean.response.result; + + +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.redPacket.bean.ShareRedBagInfo; + +/** + * Created by zhouxiangfeng on 2017/5/28. + */ + +public class ShareRedPacketResult extends ServiceResult { +} diff --git a/core/src/main/java/com/bingchuang/core/bean/response/result/TabResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/TabResult.java new file mode 100644 index 000000000..fba61b3c2 --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/TabResult.java @@ -0,0 +1,18 @@ +package com.bingchuang.core.bean.response.result; + +import com.bingchuang.core.room.bean.RoomSettingTabInfo; +import com.bingchuang.core.room.bean.RoomSettingTabInfo; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.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/bingchuang/core/bean/response/result/TicketResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/TicketResult.java new file mode 100644 index 000000000..f373f77ef --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/TicketResult.java @@ -0,0 +1,12 @@ +package com.bingchuang.core.bean.response.result; + +import com.bingchuang.core.auth.entity.TicketInfo; +import com.bingchuang.core.bean.response.ServiceResult; + +/** + * Created by zhouxiangfeng on 2017/5/4. + */ + +public class TicketResult extends ServiceResult
{ + +} diff --git a/core/src/main/java/com/bingchuang/core/bean/response/result/UserListResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/UserListResult.java new file mode 100644 index 000000000..7d634eb28 --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/UserListResult.java @@ -0,0 +1,16 @@ +package com.bingchuang.core.bean.response.result; + +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.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/bingchuang/core/bean/response/result/UserResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/UserResult.java new file mode 100644 index 000000000..f21eb11f8 --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/UserResult.java @@ -0,0 +1,14 @@ +package com.bingchuang.core.bean.response.result; + +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.user.bean.UserInfo; + +/** + * Created by zhouxiangfeng on 2017/5/4. + */ + +public class UserResult extends ServiceResult
{ + +} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/VersionsResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/VersionsResult.java similarity index 53% rename from core/src/main/java/com/pikolive/core/bean/response/result/VersionsResult.java rename to core/src/main/java/com/bingchuang/core/bean/response/result/VersionsResult.java index 1320ef2d8..73293fa62 100644 --- a/core/src/main/java/com/pikolive/core/bean/response/result/VersionsResult.java +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/VersionsResult.java @@ -1,6 +1,6 @@ -package com.pikolive.core.bean.response.result; +package com.bingchuang.core.bean.response.result; -import com.pikolive.core.bean.response.ServiceResult; +import com.bingchuang.core.bean.response.ServiceResult; /** * Created by Administrator on 2017/7/12 0012. diff --git a/core/src/main/java/com/bingchuang/core/bean/response/result/WalletInfoResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/WalletInfoResult.java new file mode 100644 index 000000000..2b5bb023e --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/WalletInfoResult.java @@ -0,0 +1,12 @@ +package com.bingchuang.core.bean.response.result; + +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.pay.bean.WalletInfo; + +/** + * Created by zhouxiangfeng on 2017/5/4. + */ + +public class WalletInfoResult extends ServiceResult { + +} diff --git a/core/src/main/java/com/bingchuang/core/bean/response/result/WithdrawListResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/WithdrawListResult.java new file mode 100644 index 000000000..a26c44f8d --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/WithdrawListResult.java @@ -0,0 +1,13 @@ +package com.bingchuang.core.bean.response.result; + +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.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/bingchuang/core/bean/response/result/WithdrawRedListResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/WithdrawRedListResult.java new file mode 100644 index 000000000..f6168604c --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/WithdrawRedListResult.java @@ -0,0 +1,14 @@ +package com.bingchuang.core.bean.response.result; + + +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.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/bingchuang/core/bean/response/result/WithdrawRedSucceedResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/WithdrawRedSucceedResult.java new file mode 100644 index 000000000..f42e4a60e --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/WithdrawRedSucceedResult.java @@ -0,0 +1,12 @@ +package com.bingchuang.core.bean.response.result; + + +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.redPacket.bean.WithdrawRedSucceedInfo; + +/** + * Created by zhouxiangfeng on 2017/5/28. + */ + +public class WithdrawRedSucceedResult extends ServiceResult
{ +} diff --git a/core/src/main/java/com/bingchuang/core/bean/response/result/WithdrawUserInfoResult.java b/core/src/main/java/com/bingchuang/core/bean/response/result/WithdrawUserInfoResult.java new file mode 100644 index 000000000..5a213158a --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bean/response/result/WithdrawUserInfoResult.java @@ -0,0 +1,12 @@ +package com.bingchuang.core.bean.response.result; + +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.withdraw.bean.WithdrawInfo; + +/** + * Created by zhouxiangfeng on 2017/5/4. + */ + +public class WithdrawUserInfoResult extends ServiceResult { + +} diff --git a/core/src/main/java/com/pikolive/core/bills/BillModel.java b/core/src/main/java/com/bingchuang/core/bills/BillModel.java similarity index 88% rename from core/src/main/java/com/pikolive/core/bills/BillModel.java rename to core/src/main/java/com/bingchuang/core/bills/BillModel.java index d93c7ad55..4c276feba 100644 --- a/core/src/main/java/com/pikolive/core/bills/BillModel.java +++ b/core/src/main/java/com/bingchuang/core/bills/BillModel.java @@ -1,29 +1,29 @@ -package com.pikolive.core.bills; +package com.bingchuang.core.bills; import com.google.gson.Gson; import com.google.gson.JsonElement; -import com.pikolive.core.bills.bean.BillType; -import com.pikolive.core.bills.bean.NobleBillListInfo; -import com.pikolive.core.bills.result.ChargeResult; -import com.pikolive.core.bills.result.ExpendResult; -import com.pikolive.core.bills.result.IncomedResult; -import com.pikolive.core.bills.result.RedBagResult; -import com.pikolive.core.bills.bean.BillType; -import com.pikolive.core.bills.bean.NobleBillListInfo; -import com.pikolive.core.bills.result.ChargeResult; -import com.pikolive.core.bills.result.ExpendResult; -import com.pikolive.core.bills.result.IncomedResult; -import com.pikolive.core.bills.result.RedBagResult; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.bills.bean.BillType; -import com.pikolive.core.bills.bean.NobleBillListInfo; -import com.pikolive.core.bills.result.ChargeResult; -import com.pikolive.core.bills.result.ExpendResult; -import com.pikolive.core.bills.result.IncomedResult; -import com.pikolive.core.bills.result.RedBagResult; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.bills.bean.BillType; +import com.bingchuang.core.bills.bean.NobleBillListInfo; +import com.bingchuang.core.bills.result.ChargeResult; +import com.bingchuang.core.bills.result.ExpendResult; +import com.bingchuang.core.bills.result.IncomedResult; +import com.bingchuang.core.bills.result.RedBagResult; +import com.bingchuang.core.bills.bean.BillType; +import com.bingchuang.core.bills.bean.NobleBillListInfo; +import com.bingchuang.core.bills.result.ChargeResult; +import com.bingchuang.core.bills.result.ExpendResult; +import com.bingchuang.core.bills.result.IncomedResult; +import com.bingchuang.core.bills.result.RedBagResult; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.bills.bean.BillType; +import com.bingchuang.core.bills.bean.NobleBillListInfo; +import com.bingchuang.core.bills.result.ChargeResult; +import com.bingchuang.core.bills.result.ExpendResult; +import com.bingchuang.core.bills.result.IncomedResult; +import com.bingchuang.core.bills.result.RedBagResult; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import io.reactivex.Single; diff --git a/core/src/main/java/com/pikolive/core/bills/IBillModel.java b/core/src/main/java/com/bingchuang/core/bills/IBillModel.java similarity index 61% rename from core/src/main/java/com/pikolive/core/bills/IBillModel.java rename to core/src/main/java/com/bingchuang/core/bills/IBillModel.java index 2f87ceb85..4cba49696 100644 --- a/core/src/main/java/com/pikolive/core/bills/IBillModel.java +++ b/core/src/main/java/com/bingchuang/core/bills/IBillModel.java @@ -1,21 +1,21 @@ -package com.pikolive.core.bills; +package com.bingchuang.core.bills; -import com.pikolive.core.bills.bean.NobleBillListInfo; -import com.pikolive.core.bills.result.ChargeResult; -import com.pikolive.core.bills.result.ExpendResult; -import com.pikolive.core.bills.result.IncomedResult; -import com.pikolive.core.bills.result.RedBagResult; -import com.pikolive.core.bills.bean.NobleBillListInfo; -import com.pikolive.core.bills.result.ChargeResult; -import com.pikolive.core.bills.result.ExpendResult; -import com.pikolive.core.bills.result.IncomedResult; -import com.pikolive.core.bills.result.RedBagResult; -import com.pikolive.core.base.IModel; -import com.pikolive.core.bills.bean.NobleBillListInfo; -import com.pikolive.core.bills.result.ChargeResult; -import com.pikolive.core.bills.result.ExpendResult; -import com.pikolive.core.bills.result.IncomedResult; -import com.pikolive.core.bills.result.RedBagResult; +import com.bingchuang.core.bills.bean.NobleBillListInfo; +import com.bingchuang.core.bills.result.ChargeResult; +import com.bingchuang.core.bills.result.ExpendResult; +import com.bingchuang.core.bills.result.IncomedResult; +import com.bingchuang.core.bills.result.RedBagResult; +import com.bingchuang.core.bills.bean.NobleBillListInfo; +import com.bingchuang.core.bills.result.ChargeResult; +import com.bingchuang.core.bills.result.ExpendResult; +import com.bingchuang.core.bills.result.IncomedResult; +import com.bingchuang.core.bills.result.RedBagResult; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.bills.bean.NobleBillListInfo; +import com.bingchuang.core.bills.result.ChargeResult; +import com.bingchuang.core.bills.result.ExpendResult; +import com.bingchuang.core.bills.result.IncomedResult; +import com.bingchuang.core.bills.result.RedBagResult; import io.reactivex.Single; diff --git a/core/src/main/java/com/bingchuang/core/bills/IRadishGiftModel.java b/core/src/main/java/com/bingchuang/core/bills/IRadishGiftModel.java new file mode 100644 index 000000000..735f90889 --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bills/IRadishGiftModel.java @@ -0,0 +1,16 @@ +package com.bingchuang.core.bills; + +import com.bingchuang.core.bills.result.RadishGiftResult; +import com.bingchuang.core.bills.result.RadishGiftResult; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.bills.result.RadishGiftResult; +import com.bingchuang.core.user.bean.RadishWallInfo; + +import java.util.List; + +import io.reactivex.Single; + +public interface IRadishGiftModel extends IModel { + Single getRadishRecord(int page, int pageSize, long date, byte type); + Single > getRadishWall(long uid); +} diff --git a/core/src/main/java/com/pikolive/core/bills/RadishGiftModel.java b/core/src/main/java/com/bingchuang/core/bills/RadishGiftModel.java similarity index 87% rename from core/src/main/java/com/pikolive/core/bills/RadishGiftModel.java rename to core/src/main/java/com/bingchuang/core/bills/RadishGiftModel.java index 71c68fdfd..f5ef959d0 100644 --- a/core/src/main/java/com/pikolive/core/bills/RadishGiftModel.java +++ b/core/src/main/java/com/bingchuang/core/bills/RadishGiftModel.java @@ -1,15 +1,15 @@ -package com.pikolive.core.bills; +package com.bingchuang.core.bills; import com.google.gson.Gson; import com.google.gson.JsonElement; -import com.pikolive.core.bills.result.RadishGiftResult; -import com.pikolive.core.bills.result.RadishGiftResult; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.bills.result.RadishGiftResult; -import com.pikolive.core.user.bean.RadishWallInfo; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.bills.result.RadishGiftResult; +import com.bingchuang.core.bills.result.RadishGiftResult; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.bills.result.RadishGiftResult; +import com.bingchuang.core.user.bean.RadishWallInfo; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/bills/bean/BillItemEntity.java b/core/src/main/java/com/bingchuang/core/bills/bean/BillItemEntity.java similarity index 96% rename from core/src/main/java/com/pikolive/core/bills/bean/BillItemEntity.java rename to core/src/main/java/com/bingchuang/core/bills/bean/BillItemEntity.java index f8ed6306d..d04f8a65c 100644 --- a/core/src/main/java/com/pikolive/core/bills/bean/BillItemEntity.java +++ b/core/src/main/java/com/bingchuang/core/bills/bean/BillItemEntity.java @@ -1,4 +1,4 @@ -package com.pikolive.core.bills.bean; +package com.bingchuang.core.bills.bean; import com.chad.library.adapter.base.entity.MultiItemEntity; diff --git a/core/src/main/java/com/pikolive/core/bills/bean/BillType.java b/core/src/main/java/com/bingchuang/core/bills/bean/BillType.java similarity index 92% rename from core/src/main/java/com/pikolive/core/bills/bean/BillType.java rename to core/src/main/java/com/bingchuang/core/bills/bean/BillType.java index 4f4d58aac..3978fdf55 100644 --- a/core/src/main/java/com/pikolive/core/bills/bean/BillType.java +++ b/core/src/main/java/com/bingchuang/core/bills/bean/BillType.java @@ -1,4 +1,4 @@ -package com.pikolive.core.bills.bean; +package com.bingchuang.core.bills.bean; public class BillType { diff --git a/core/src/main/java/com/pikolive/core/bills/bean/ExpendInfo.java b/core/src/main/java/com/bingchuang/core/bills/bean/ExpendInfo.java similarity index 98% rename from core/src/main/java/com/pikolive/core/bills/bean/ExpendInfo.java rename to core/src/main/java/com/bingchuang/core/bills/bean/ExpendInfo.java index 5343a9e13..5019e8ef8 100644 --- a/core/src/main/java/com/pikolive/core/bills/bean/ExpendInfo.java +++ b/core/src/main/java/com/bingchuang/core/bills/bean/ExpendInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.bills.bean; +package com.bingchuang.core.bills.bean; import com.google.gson.annotations.SerializedName; diff --git a/core/src/main/java/com/pikolive/core/bills/bean/ExpendListInfo.java b/core/src/main/java/com/bingchuang/core/bills/bean/ExpendListInfo.java similarity index 93% rename from core/src/main/java/com/pikolive/core/bills/bean/ExpendListInfo.java rename to core/src/main/java/com/bingchuang/core/bills/bean/ExpendListInfo.java index b4312ffe5..43c241783 100644 --- a/core/src/main/java/com/pikolive/core/bills/bean/ExpendListInfo.java +++ b/core/src/main/java/com/bingchuang/core/bills/bean/ExpendListInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.bills.bean; +package com.bingchuang.core.bills.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/bills/bean/IncomeInfo.java b/core/src/main/java/com/bingchuang/core/bills/bean/IncomeInfo.java similarity index 98% rename from core/src/main/java/com/pikolive/core/bills/bean/IncomeInfo.java rename to core/src/main/java/com/bingchuang/core/bills/bean/IncomeInfo.java index aec9a2dd1..440ac32a0 100644 --- a/core/src/main/java/com/pikolive/core/bills/bean/IncomeInfo.java +++ b/core/src/main/java/com/bingchuang/core/bills/bean/IncomeInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.bills.bean; +package com.bingchuang.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/pikolive/core/bills/bean/IncomeListInfo.java b/core/src/main/java/com/bingchuang/core/bills/bean/IncomeListInfo.java similarity index 93% rename from core/src/main/java/com/pikolive/core/bills/bean/IncomeListInfo.java rename to core/src/main/java/com/bingchuang/core/bills/bean/IncomeListInfo.java index bf43ae679..1eb7957e8 100644 --- a/core/src/main/java/com/pikolive/core/bills/bean/IncomeListInfo.java +++ b/core/src/main/java/com/bingchuang/core/bills/bean/IncomeListInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.bills.bean; +package com.bingchuang.core.bills.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/bills/bean/NobleBillListInfo.java b/core/src/main/java/com/bingchuang/core/bills/bean/NobleBillListInfo.java similarity index 96% rename from core/src/main/java/com/pikolive/core/bills/bean/NobleBillListInfo.java rename to core/src/main/java/com/bingchuang/core/bills/bean/NobleBillListInfo.java index 16c6add24..82d6c767d 100644 --- a/core/src/main/java/com/pikolive/core/bills/bean/NobleBillListInfo.java +++ b/core/src/main/java/com/bingchuang/core/bills/bean/NobleBillListInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.bills.bean; +package com.bingchuang.core.bills.bean; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/com/pikolive/core/bills/bean/RadishGiftInfo.java b/core/src/main/java/com/bingchuang/core/bills/bean/RadishGiftInfo.java similarity index 94% rename from core/src/main/java/com/pikolive/core/bills/bean/RadishGiftInfo.java rename to core/src/main/java/com/bingchuang/core/bills/bean/RadishGiftInfo.java index c862da6d8..3f2a70d1e 100644 --- a/core/src/main/java/com/pikolive/core/bills/bean/RadishGiftInfo.java +++ b/core/src/main/java/com/bingchuang/core/bills/bean/RadishGiftInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.bills.bean; +package com.bingchuang.core.bills.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/bills/bean/RadishGiftListInfo.java b/core/src/main/java/com/bingchuang/core/bills/bean/RadishGiftListInfo.java similarity index 93% rename from core/src/main/java/com/pikolive/core/bills/bean/RadishGiftListInfo.java rename to core/src/main/java/com/bingchuang/core/bills/bean/RadishGiftListInfo.java index bdfb636e4..5a3f4162c 100644 --- a/core/src/main/java/com/pikolive/core/bills/bean/RadishGiftListInfo.java +++ b/core/src/main/java/com/bingchuang/core/bills/bean/RadishGiftListInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.bills.bean; +package com.bingchuang.core.bills.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/bills/bean/RadishRecordInfo.java b/core/src/main/java/com/bingchuang/core/bills/bean/RadishRecordInfo.java similarity index 90% rename from core/src/main/java/com/pikolive/core/bills/bean/RadishRecordInfo.java rename to core/src/main/java/com/bingchuang/core/bills/bean/RadishRecordInfo.java index ceedf3d11..3c9217c1e 100644 --- a/core/src/main/java/com/pikolive/core/bills/bean/RadishRecordInfo.java +++ b/core/src/main/java/com/bingchuang/core/bills/bean/RadishRecordInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.bills.bean; +package com.bingchuang.core.bills.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/bills/bean/RadishRecordListInfo.java b/core/src/main/java/com/bingchuang/core/bills/bean/RadishRecordListInfo.java similarity index 93% rename from core/src/main/java/com/pikolive/core/bills/bean/RadishRecordListInfo.java rename to core/src/main/java/com/bingchuang/core/bills/bean/RadishRecordListInfo.java index de9750095..598f92f53 100644 --- a/core/src/main/java/com/pikolive/core/bills/bean/RadishRecordListInfo.java +++ b/core/src/main/java/com/bingchuang/core/bills/bean/RadishRecordListInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.bills.bean; +package com.bingchuang.core.bills.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/bills/bean/RedBagInfo.java b/core/src/main/java/com/bingchuang/core/bills/bean/RedBagInfo.java similarity index 97% rename from core/src/main/java/com/pikolive/core/bills/bean/RedBagInfo.java rename to core/src/main/java/com/bingchuang/core/bills/bean/RedBagInfo.java index 493dca4b3..f87375c62 100644 --- a/core/src/main/java/com/pikolive/core/bills/bean/RedBagInfo.java +++ b/core/src/main/java/com/bingchuang/core/bills/bean/RedBagInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.bills.bean; +package com.bingchuang.core.bills.bean; import com.google.gson.annotations.SerializedName; diff --git a/core/src/main/java/com/pikolive/core/bills/bean/RedBagListInfo.java b/core/src/main/java/com/bingchuang/core/bills/bean/RedBagListInfo.java similarity index 94% rename from core/src/main/java/com/pikolive/core/bills/bean/RedBagListInfo.java rename to core/src/main/java/com/bingchuang/core/bills/bean/RedBagListInfo.java index 1037ef9af..357a97385 100644 --- a/core/src/main/java/com/pikolive/core/bills/bean/RedBagListInfo.java +++ b/core/src/main/java/com/bingchuang/core/bills/bean/RedBagListInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.bills.bean; +package com.bingchuang.core.bills.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/bills/bean/TextInfos.java b/core/src/main/java/com/bingchuang/core/bills/bean/TextInfos.java similarity index 93% rename from core/src/main/java/com/pikolive/core/bills/bean/TextInfos.java rename to core/src/main/java/com/bingchuang/core/bills/bean/TextInfos.java index e185fbdc2..5264a7523 100644 --- a/core/src/main/java/com/pikolive/core/bills/bean/TextInfos.java +++ b/core/src/main/java/com/bingchuang/core/bills/bean/TextInfos.java @@ -1,4 +1,4 @@ -package com.pikolive.core.bills.bean; +package com.bingchuang.core.bills.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/bills/bean/TimeInfo.java b/core/src/main/java/com/bingchuang/core/bills/bean/TimeInfo.java similarity index 89% rename from core/src/main/java/com/pikolive/core/bills/bean/TimeInfo.java rename to core/src/main/java/com/bingchuang/core/bills/bean/TimeInfo.java index a8f873a0e..f0d224275 100644 --- a/core/src/main/java/com/pikolive/core/bills/bean/TimeInfo.java +++ b/core/src/main/java/com/bingchuang/core/bills/bean/TimeInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.bills.bean; +package com.bingchuang.core.bills.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/bingchuang/core/bills/result/ChargeResult.java b/core/src/main/java/com/bingchuang/core/bills/result/ChargeResult.java new file mode 100644 index 000000000..15615a719 --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bills/result/ChargeResult.java @@ -0,0 +1,11 @@ +package com.bingchuang.core.bills.result; + +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.bills.bean.ExpendListInfo; + +/** + * Created by Seven on 2017/9/9. + */ + +public class ChargeResult extends ServiceResult
{ +} diff --git a/core/src/main/java/com/bingchuang/core/bills/result/ExpendResult.java b/core/src/main/java/com/bingchuang/core/bills/result/ExpendResult.java new file mode 100644 index 000000000..5c5665a4a --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bills/result/ExpendResult.java @@ -0,0 +1,11 @@ +package com.bingchuang.core.bills.result; + +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.bills.bean.ExpendListInfo; + +/** + * Created by Seven on 2017/9/9. + */ + +public class ExpendResult extends ServiceResult { +} diff --git a/core/src/main/java/com/bingchuang/core/bills/result/IncomedResult.java b/core/src/main/java/com/bingchuang/core/bills/result/IncomedResult.java new file mode 100644 index 000000000..505339a03 --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bills/result/IncomedResult.java @@ -0,0 +1,11 @@ +package com.bingchuang.core.bills.result; + +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.bills.bean.IncomeListInfo; + +/** + * Created by Seven on 2017/9/9. + */ + +public class IncomedResult extends ServiceResult { +} diff --git a/core/src/main/java/com/bingchuang/core/bills/result/RadishGiftResult.java b/core/src/main/java/com/bingchuang/core/bills/result/RadishGiftResult.java new file mode 100644 index 000000000..3bc581663 --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bills/result/RadishGiftResult.java @@ -0,0 +1,7 @@ +package com.bingchuang.core.bills.result; + +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.bills.bean.RadishGiftListInfo; + +public class RadishGiftResult extends ServiceResult { +} diff --git a/core/src/main/java/com/bingchuang/core/bills/result/RedBagResult.java b/core/src/main/java/com/bingchuang/core/bills/result/RedBagResult.java new file mode 100644 index 000000000..851d26cda --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/bills/result/RedBagResult.java @@ -0,0 +1,11 @@ +package com.bingchuang.core.bills.result; + +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.bills.bean.RedBagListInfo; + +/** + * Created by Seven on 2017/9/9. + */ + +public class RedBagResult extends ServiceResult { +} diff --git a/core/src/main/java/com/pikolive/core/certification/CertificationModel.java b/core/src/main/java/com/bingchuang/core/certification/CertificationModel.java similarity index 92% rename from core/src/main/java/com/pikolive/core/certification/CertificationModel.java rename to core/src/main/java/com/bingchuang/core/certification/CertificationModel.java index d67be191b..7a8f9ef46 100644 --- a/core/src/main/java/com/pikolive/core/certification/CertificationModel.java +++ b/core/src/main/java/com/bingchuang/core/certification/CertificationModel.java @@ -1,7 +1,7 @@ -package com.pikolive.core.certification; +package com.bingchuang.core.certification; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.base.BaseModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.base.BaseModel; public class CertificationModel extends BaseModel implements ICertificationModel { diff --git a/core/src/main/java/com/pikolive/core/certification/ICertificationModel.java b/core/src/main/java/com/bingchuang/core/certification/ICertificationModel.java similarity index 63% rename from core/src/main/java/com/pikolive/core/certification/ICertificationModel.java rename to core/src/main/java/com/bingchuang/core/certification/ICertificationModel.java index ebd695805..5966de842 100644 --- a/core/src/main/java/com/pikolive/core/certification/ICertificationModel.java +++ b/core/src/main/java/com/bingchuang/core/certification/ICertificationModel.java @@ -1,6 +1,6 @@ -package com.pikolive.core.certification; +package com.bingchuang.core.certification; -import com.pikolive.core.base.IModel; +import com.bingchuang.core.base.IModel; public interface ICertificationModel extends IModel { diff --git a/core/src/main/java/com/pikolive/core/certification/event/CertificationResultEvent.java b/core/src/main/java/com/bingchuang/core/certification/event/CertificationResultEvent.java similarity index 84% rename from core/src/main/java/com/pikolive/core/certification/event/CertificationResultEvent.java rename to core/src/main/java/com/bingchuang/core/certification/event/CertificationResultEvent.java index 5f1d1e9f4..36066626a 100644 --- a/core/src/main/java/com/pikolive/core/certification/event/CertificationResultEvent.java +++ b/core/src/main/java/com/bingchuang/core/certification/event/CertificationResultEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.certification.event; +package com.bingchuang.core.certification.event; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/community/UserVo.kt b/core/src/main/java/com/bingchuang/core/community/UserVo.kt similarity index 80% rename from core/src/main/java/com/pikolive/core/community/UserVo.kt rename to core/src/main/java/com/bingchuang/core/community/UserVo.kt index ba65f7c9c..2d0867edb 100644 --- a/core/src/main/java/com/pikolive/core/community/UserVo.kt +++ b/core/src/main/java/com/bingchuang/core/community/UserVo.kt @@ -1,7 +1,7 @@ -package com.pikolive.core.community +package com.bingchuang.core.community -import com.pikolive.core.decoration.headwear.bean.HeadWearInfo -import com.pikolive.core.utils.CurrentTimeUtils +import com.bingchuang.core.decoration.headwear.bean.HeadWearInfo +import com.bingchuang.core.utils.CurrentTimeUtils import java.io.Serializable diff --git a/core/src/main/java/com/pikolive/core/contacts/ContactModel.java b/core/src/main/java/com/bingchuang/core/contacts/ContactModel.java similarity index 74% rename from core/src/main/java/com/pikolive/core/contacts/ContactModel.java rename to core/src/main/java/com/bingchuang/core/contacts/ContactModel.java index 0cb4a7627..628d0af5a 100644 --- a/core/src/main/java/com/pikolive/core/contacts/ContactModel.java +++ b/core/src/main/java/com/bingchuang/core/contacts/ContactModel.java @@ -1,13 +1,13 @@ -package com.pikolive.core.contacts; +package com.bingchuang.core.contacts; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.room.bean.SearchRoomInfo; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.room.bean.SearchRoomInfo; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.room.bean.SearchRoomInfo; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.room.bean.SearchRoomInfo; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.room.bean.SearchRoomInfo; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.room.bean.SearchRoomInfo; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import java.util.List; diff --git a/core/src/main/java/com/bingchuang/core/contacts/IContactModel.java b/core/src/main/java/com/bingchuang/core/contacts/IContactModel.java new file mode 100644 index 000000000..ae82eda35 --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/contacts/IContactModel.java @@ -0,0 +1,20 @@ +package com.bingchuang.core.contacts; + +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.room.bean.SearchRoomInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.room.bean.SearchRoomInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.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/pikolive/core/decoration/DecorationInfo.kt b/core/src/main/java/com/bingchuang/core/decoration/DecorationInfo.kt similarity index 88% rename from core/src/main/java/com/pikolive/core/decoration/DecorationInfo.kt rename to core/src/main/java/com/bingchuang/core/decoration/DecorationInfo.kt index 4cf127093..4bf6bce72 100644 --- a/core/src/main/java/com/pikolive/core/decoration/DecorationInfo.kt +++ b/core/src/main/java/com/bingchuang/core/decoration/DecorationInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.decoration +package com.bingchuang.core.decoration data class DecorationInfo( val dressDay: Int = 0, diff --git a/core/src/main/java/com/pikolive/core/decoration/DecorationInfoEvent.java b/core/src/main/java/com/bingchuang/core/decoration/DecorationInfoEvent.java similarity index 86% rename from core/src/main/java/com/pikolive/core/decoration/DecorationInfoEvent.java rename to core/src/main/java/com/bingchuang/core/decoration/DecorationInfoEvent.java index 7f78ee046..313b43812 100644 --- a/core/src/main/java/com/pikolive/core/decoration/DecorationInfoEvent.java +++ b/core/src/main/java/com/bingchuang/core/decoration/DecorationInfoEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.decoration; +package com.bingchuang.core.decoration; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/decoration/DecorationModel.kt b/core/src/main/java/com/bingchuang/core/decoration/DecorationModel.kt similarity index 87% rename from core/src/main/java/com/pikolive/core/decoration/DecorationModel.kt rename to core/src/main/java/com/bingchuang/core/decoration/DecorationModel.kt index f5bf7a576..b6a6845f4 100644 --- a/core/src/main/java/com/pikolive/core/decoration/DecorationModel.kt +++ b/core/src/main/java/com/bingchuang/core/decoration/DecorationModel.kt @@ -1,9 +1,9 @@ -package com.pikolive.core.decoration +package com.bingchuang.core.decoration -import com.pikolive.core.base.BaseModel -import com.pikolive.core.bean.response.ServiceResult -import com.pikolive.core.utils.net.RxHelper -import com.pikolive.core.utils.net.launchRequest +import com.bingchuang.core.base.BaseModel +import com.bingchuang.core.bean.response.ServiceResult +import com.bingchuang.core.utils.net.RxHelper +import com.bingchuang.core.utils.net.launchRequest import com.bingchuang.library.net.rxnet.RxNet import io.reactivex.Single import retrofit2.http.* diff --git a/core/src/main/java/com/pikolive/core/decoration/backgroud/BackgroundModel.java b/core/src/main/java/com/bingchuang/core/decoration/backgroud/BackgroundModel.java similarity index 94% rename from core/src/main/java/com/pikolive/core/decoration/backgroud/BackgroundModel.java rename to core/src/main/java/com/bingchuang/core/decoration/backgroud/BackgroundModel.java index e85e19200..3846f4216 100644 --- a/core/src/main/java/com/pikolive/core/decoration/backgroud/BackgroundModel.java +++ b/core/src/main/java/com/bingchuang/core/decoration/backgroud/BackgroundModel.java @@ -1,14 +1,14 @@ -package com.pikolive.core.decoration.backgroud; +package com.bingchuang.core.decoration.backgroud; -import com.pikolive.core.R; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.decoration.backgroud.bean.BgInfo; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.decoration.headwear.throwable.HeadwearPulledOffShelvesException; -import com.pikolive.core.utils.net.BalanceNotEnoughExeption; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.R; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.decoration.backgroud.bean.BgInfo; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.decoration.headwear.throwable.HeadwearPulledOffShelvesException; +import com.bingchuang.core.utils.net.BalanceNotEnoughExeption; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.utils.ResUtil; diff --git a/core/src/main/java/com/pikolive/core/decoration/backgroud/IBackgroundModel.java b/core/src/main/java/com/bingchuang/core/decoration/backgroud/IBackgroundModel.java similarity index 69% rename from core/src/main/java/com/pikolive/core/decoration/backgroud/IBackgroundModel.java rename to core/src/main/java/com/bingchuang/core/decoration/backgroud/IBackgroundModel.java index 3f8c2963f..eb029babd 100644 --- a/core/src/main/java/com/pikolive/core/decoration/backgroud/IBackgroundModel.java +++ b/core/src/main/java/com/bingchuang/core/decoration/backgroud/IBackgroundModel.java @@ -1,12 +1,12 @@ -package com.pikolive.core.decoration.backgroud; +package com.bingchuang.core.decoration.backgroud; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.decoration.backgroud.bean.BgInfo; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.decoration.backgroud.bean.BgInfo; -import com.pikolive.core.base.IModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.decoration.backgroud.bean.BgInfo; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.decoration.backgroud.bean.BgInfo; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.decoration.backgroud.bean.BgInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.decoration.backgroud.bean.BgInfo; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/decoration/backgroud/bean/BgInfo.java b/core/src/main/java/com/bingchuang/core/decoration/backgroud/bean/BgInfo.java similarity index 98% rename from core/src/main/java/com/pikolive/core/decoration/backgroud/bean/BgInfo.java rename to core/src/main/java/com/bingchuang/core/decoration/backgroud/bean/BgInfo.java index 6a376c1b0..9c6a51d14 100644 --- a/core/src/main/java/com/pikolive/core/decoration/backgroud/bean/BgInfo.java +++ b/core/src/main/java/com/bingchuang/core/decoration/backgroud/bean/BgInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.decoration.backgroud.bean; +package com.bingchuang.core.decoration.backgroud.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/decoration/bean/BaseDecoration.java b/core/src/main/java/com/bingchuang/core/decoration/bean/BaseDecoration.java similarity index 96% rename from core/src/main/java/com/pikolive/core/decoration/bean/BaseDecoration.java rename to core/src/main/java/com/bingchuang/core/decoration/bean/BaseDecoration.java index c9c4ff2b0..44708465b 100644 --- a/core/src/main/java/com/pikolive/core/decoration/bean/BaseDecoration.java +++ b/core/src/main/java/com/bingchuang/core/decoration/bean/BaseDecoration.java @@ -1,4 +1,4 @@ -package com.pikolive.core.decoration.bean; +package com.bingchuang.core.decoration.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/decoration/bean/CurrencyType.java b/core/src/main/java/com/bingchuang/core/decoration/bean/CurrencyType.java similarity index 77% rename from core/src/main/java/com/pikolive/core/decoration/bean/CurrencyType.java rename to core/src/main/java/com/bingchuang/core/decoration/bean/CurrencyType.java index 9dd8177d8..e4d4b748c 100644 --- a/core/src/main/java/com/pikolive/core/decoration/bean/CurrencyType.java +++ b/core/src/main/java/com/bingchuang/core/decoration/bean/CurrencyType.java @@ -1,4 +1,4 @@ -package com.pikolive.core.decoration.bean; +package com.bingchuang.core.decoration.bean; /** * 虚拟币类型 diff --git a/core/src/main/java/com/pikolive/core/decoration/bean/DecorationStoreRouterType.java b/core/src/main/java/com/bingchuang/core/decoration/bean/DecorationStoreRouterType.java similarity index 86% rename from core/src/main/java/com/pikolive/core/decoration/bean/DecorationStoreRouterType.java rename to core/src/main/java/com/bingchuang/core/decoration/bean/DecorationStoreRouterType.java index a7b3525f5..c6a130df4 100644 --- a/core/src/main/java/com/pikolive/core/decoration/bean/DecorationStoreRouterType.java +++ b/core/src/main/java/com/bingchuang/core/decoration/bean/DecorationStoreRouterType.java @@ -1,4 +1,4 @@ -package com.pikolive.core.decoration.bean; +package com.bingchuang.core.decoration.bean; public class DecorationStoreRouterType { diff --git a/core/src/main/java/com/pikolive/core/decoration/car/CarModel.java b/core/src/main/java/com/bingchuang/core/decoration/car/CarModel.java similarity index 96% rename from core/src/main/java/com/pikolive/core/decoration/car/CarModel.java rename to core/src/main/java/com/bingchuang/core/decoration/car/CarModel.java index 22eaa0740..24b13e9e5 100644 --- a/core/src/main/java/com/pikolive/core/decoration/car/CarModel.java +++ b/core/src/main/java/com/bingchuang/core/decoration/car/CarModel.java @@ -1,15 +1,15 @@ -package com.pikolive.core.decoration.car; +package com.bingchuang.core.decoration.car; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.decoration.bean.CurrencyType; -import com.pikolive.core.decoration.car.bean.CarInfo; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.utils.net.BalanceNotEnoughExeption; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.decoration.bean.CurrencyType; +import com.bingchuang.core.decoration.car.bean.CarInfo; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.utils.net.BalanceNotEnoughExeption; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.utils.ResUtil; -import com.pikolive.core.R; +import com.bingchuang.core.R; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/decoration/car/ICarModel.java b/core/src/main/java/com/bingchuang/core/decoration/car/ICarModel.java similarity index 74% rename from core/src/main/java/com/pikolive/core/decoration/car/ICarModel.java rename to core/src/main/java/com/bingchuang/core/decoration/car/ICarModel.java index 46b1a9b93..641e633c1 100644 --- a/core/src/main/java/com/pikolive/core/decoration/car/ICarModel.java +++ b/core/src/main/java/com/bingchuang/core/decoration/car/ICarModel.java @@ -1,16 +1,16 @@ -package com.pikolive.core.decoration.car; +package com.bingchuang.core.decoration.car; -import com.pikolive.core.base.IModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.decoration.bean.CurrencyType; -import com.pikolive.core.decoration.car.bean.CarInfo; -import com.pikolive.core.base.IModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.decoration.bean.CurrencyType; -import com.pikolive.core.decoration.car.bean.CarInfo; -import com.pikolive.core.base.IModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.decoration.car.bean.CarInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.decoration.bean.CurrencyType; +import com.bingchuang.core.decoration.car.bean.CarInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.decoration.bean.CurrencyType; +import com.bingchuang.core.decoration.car.bean.CarInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.decoration.car.bean.CarInfo; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/decoration/car/bean/CarInfo.java b/core/src/main/java/com/bingchuang/core/decoration/car/bean/CarInfo.java similarity index 94% rename from core/src/main/java/com/pikolive/core/decoration/car/bean/CarInfo.java rename to core/src/main/java/com/bingchuang/core/decoration/car/bean/CarInfo.java index eb3a094c7..a221d1c72 100644 --- a/core/src/main/java/com/pikolive/core/decoration/car/bean/CarInfo.java +++ b/core/src/main/java/com/bingchuang/core/decoration/car/bean/CarInfo.java @@ -1,9 +1,9 @@ -package com.pikolive.core.decoration.car.bean; +package com.bingchuang.core.decoration.car.bean; import com.google.gson.annotations.SerializedName; -import com.pikolive.core.decoration.bean.BaseDecoration; -import com.pikolive.core.decoration.bean.BaseDecoration; -import com.pikolive.core.decoration.bean.BaseDecoration; +import com.bingchuang.core.decoration.bean.BaseDecoration; +import com.bingchuang.core.decoration.bean.BaseDecoration; +import com.bingchuang.core.decoration.bean.BaseDecoration; import java.io.Serializable; import java.util.HashMap; diff --git a/core/src/main/java/com/pikolive/core/decoration/headwear/HeadwearModel.java b/core/src/main/java/com/bingchuang/core/decoration/headwear/HeadwearModel.java similarity index 95% rename from core/src/main/java/com/pikolive/core/decoration/headwear/HeadwearModel.java rename to core/src/main/java/com/bingchuang/core/decoration/headwear/HeadwearModel.java index 54c68af5c..b76df9a6a 100644 --- a/core/src/main/java/com/pikolive/core/decoration/headwear/HeadwearModel.java +++ b/core/src/main/java/com/bingchuang/core/decoration/headwear/HeadwearModel.java @@ -1,20 +1,20 @@ -package com.pikolive.core.decoration.headwear; +package com.bingchuang.core.decoration.headwear; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.decoration.headwear.bean.ChatBubbleInfo; -import com.pikolive.core.decoration.headwear.bean.HeadWearInfo; -import com.pikolive.core.decoration.headwear.bean.UserCardWearInfo; -import com.pikolive.core.decoration.headwear.throwable.HeadwearPulledOffShelvesException; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.decoration.bean.CurrencyType; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.utils.net.BalanceNotEnoughExeption; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.decoration.headwear.bean.ChatBubbleInfo; +import com.bingchuang.core.decoration.headwear.bean.HeadWearInfo; +import com.bingchuang.core.decoration.headwear.bean.UserCardWearInfo; +import com.bingchuang.core.decoration.headwear.throwable.HeadwearPulledOffShelvesException; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.decoration.bean.CurrencyType; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.utils.net.BalanceNotEnoughExeption; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.utils.ResUtil; -import com.pikolive.core.R; +import com.bingchuang.core.R; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/decoration/headwear/IHeadwearModel.java b/core/src/main/java/com/bingchuang/core/decoration/headwear/IHeadwearModel.java similarity index 72% rename from core/src/main/java/com/pikolive/core/decoration/headwear/IHeadwearModel.java rename to core/src/main/java/com/bingchuang/core/decoration/headwear/IHeadwearModel.java index 30c0a93f4..49140cc7c 100644 --- a/core/src/main/java/com/pikolive/core/decoration/headwear/IHeadwearModel.java +++ b/core/src/main/java/com/bingchuang/core/decoration/headwear/IHeadwearModel.java @@ -1,21 +1,21 @@ -package com.pikolive.core.decoration.headwear; +package com.bingchuang.core.decoration.headwear; -import com.pikolive.core.base.IModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.decoration.headwear.bean.ChatBubbleInfo; -import com.pikolive.core.decoration.headwear.bean.HeadWearInfo; -import com.pikolive.core.decoration.headwear.bean.UserCardWearInfo; -import com.pikolive.core.base.IModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.decoration.bean.CurrencyType; -import com.pikolive.core.decoration.headwear.bean.ChatBubbleInfo; -import com.pikolive.core.decoration.headwear.bean.HeadWearInfo; -import com.pikolive.core.decoration.headwear.bean.UserCardWearInfo; -import com.pikolive.core.base.IModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.decoration.headwear.bean.ChatBubbleInfo; -import com.pikolive.core.decoration.headwear.bean.HeadWearInfo; -import com.pikolive.core.decoration.headwear.bean.UserCardWearInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.decoration.headwear.bean.ChatBubbleInfo; +import com.bingchuang.core.decoration.headwear.bean.HeadWearInfo; +import com.bingchuang.core.decoration.headwear.bean.UserCardWearInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.decoration.bean.CurrencyType; +import com.bingchuang.core.decoration.headwear.bean.ChatBubbleInfo; +import com.bingchuang.core.decoration.headwear.bean.HeadWearInfo; +import com.bingchuang.core.decoration.headwear.bean.UserCardWearInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.decoration.headwear.bean.ChatBubbleInfo; +import com.bingchuang.core.decoration.headwear.bean.HeadWearInfo; +import com.bingchuang.core.decoration.headwear.bean.UserCardWearInfo; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/decoration/headwear/bean/ChatBubbleInfo.java b/core/src/main/java/com/bingchuang/core/decoration/headwear/bean/ChatBubbleInfo.java similarity index 84% rename from core/src/main/java/com/pikolive/core/decoration/headwear/bean/ChatBubbleInfo.java rename to core/src/main/java/com/bingchuang/core/decoration/headwear/bean/ChatBubbleInfo.java index 79b40d9a3..7becf2494 100644 --- a/core/src/main/java/com/pikolive/core/decoration/headwear/bean/ChatBubbleInfo.java +++ b/core/src/main/java/com/bingchuang/core/decoration/headwear/bean/ChatBubbleInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.decoration.headwear.bean; +package com.bingchuang.core.decoration.headwear.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/decoration/headwear/bean/HeadWearInfo.java b/core/src/main/java/com/bingchuang/core/decoration/headwear/bean/HeadWearInfo.java similarity index 95% rename from core/src/main/java/com/pikolive/core/decoration/headwear/bean/HeadWearInfo.java rename to core/src/main/java/com/bingchuang/core/decoration/headwear/bean/HeadWearInfo.java index b30d093f0..534aef9b5 100644 --- a/core/src/main/java/com/pikolive/core/decoration/headwear/bean/HeadWearInfo.java +++ b/core/src/main/java/com/bingchuang/core/decoration/headwear/bean/HeadWearInfo.java @@ -1,6 +1,6 @@ -package com.pikolive.core.decoration.headwear.bean; +package com.bingchuang.core.decoration.headwear.bean; -import com.pikolive.core.decoration.bean.BaseDecoration; +import com.bingchuang.core.decoration.bean.BaseDecoration; import java.io.Serializable; import java.util.HashMap; diff --git a/core/src/main/java/com/pikolive/core/decoration/headwear/bean/UserCardWearInfo.java b/core/src/main/java/com/bingchuang/core/decoration/headwear/bean/UserCardWearInfo.java similarity index 84% rename from core/src/main/java/com/pikolive/core/decoration/headwear/bean/UserCardWearInfo.java rename to core/src/main/java/com/bingchuang/core/decoration/headwear/bean/UserCardWearInfo.java index ca3533318..605f269a8 100644 --- a/core/src/main/java/com/pikolive/core/decoration/headwear/bean/UserCardWearInfo.java +++ b/core/src/main/java/com/bingchuang/core/decoration/headwear/bean/UserCardWearInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.decoration.headwear.bean; +package com.bingchuang.core.decoration.headwear.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/decoration/headwear/throwable/HeadwearPulledOffShelvesException.java b/core/src/main/java/com/bingchuang/core/decoration/headwear/throwable/HeadwearPulledOffShelvesException.java similarity index 79% rename from core/src/main/java/com/pikolive/core/decoration/headwear/throwable/HeadwearPulledOffShelvesException.java rename to core/src/main/java/com/bingchuang/core/decoration/headwear/throwable/HeadwearPulledOffShelvesException.java index f0560f2fe..355d0a753 100644 --- a/core/src/main/java/com/pikolive/core/decoration/headwear/throwable/HeadwearPulledOffShelvesException.java +++ b/core/src/main/java/com/bingchuang/core/decoration/headwear/throwable/HeadwearPulledOffShelvesException.java @@ -1,4 +1,4 @@ -package com.pikolive.core.decoration.headwear.throwable; +package com.bingchuang.core.decoration.headwear.throwable; public class HeadwearPulledOffShelvesException extends Exception{ public final static int code = 6202;//头饰下架异常码 diff --git a/core/src/main/java/com/bingchuang/core/decoration/nameplate/INamePlateModel.java b/core/src/main/java/com/bingchuang/core/decoration/nameplate/INamePlateModel.java new file mode 100644 index 000000000..f0b1d07f4 --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/decoration/nameplate/INamePlateModel.java @@ -0,0 +1,22 @@ +package com.bingchuang.core.decoration.nameplate; + +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.decoration.nameplate.bean.NamePlateInfo; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.decoration.nameplate.bean.NamePlateInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.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/pikolive/core/decoration/nameplate/NamePlateModel.java b/core/src/main/java/com/bingchuang/core/decoration/nameplate/NamePlateModel.java similarity index 84% rename from core/src/main/java/com/pikolive/core/decoration/nameplate/NamePlateModel.java rename to core/src/main/java/com/bingchuang/core/decoration/nameplate/NamePlateModel.java index ded4e521e..348668a7a 100644 --- a/core/src/main/java/com/pikolive/core/decoration/nameplate/NamePlateModel.java +++ b/core/src/main/java/com/bingchuang/core/decoration/nameplate/NamePlateModel.java @@ -1,15 +1,15 @@ -package com.pikolive.core.decoration.nameplate; +package com.bingchuang.core.decoration.nameplate; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.decoration.nameplate.bean.NamePlateInfo; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.decoration.nameplate.bean.NamePlateInfo; -import com.pikolive.core.R; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.decoration.nameplate.bean.NamePlateInfo; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.decoration.nameplate.bean.NamePlateInfo; +import com.bingchuang.core.R; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.utils.ResUtil; diff --git a/core/src/main/java/com/pikolive/core/decoration/nameplate/bean/NamePlateInfo.java b/core/src/main/java/com/bingchuang/core/decoration/nameplate/bean/NamePlateInfo.java similarity index 98% rename from core/src/main/java/com/pikolive/core/decoration/nameplate/bean/NamePlateInfo.java rename to core/src/main/java/com/bingchuang/core/decoration/nameplate/bean/NamePlateInfo.java index 2f64b204e..dcd429aff 100644 --- a/core/src/main/java/com/pikolive/core/decoration/nameplate/bean/NamePlateInfo.java +++ b/core/src/main/java/com/bingchuang/core/decoration/nameplate/bean/NamePlateInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.decoration.nameplate.bean; +package com.bingchuang.core.decoration.nameplate.bean; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/exception/ErrorThrowable.java b/core/src/main/java/com/bingchuang/core/exception/ErrorThrowable.java similarity index 94% rename from core/src/main/java/com/pikolive/core/exception/ErrorThrowable.java rename to core/src/main/java/com/bingchuang/core/exception/ErrorThrowable.java index e3a20ece0..8d669b3bf 100644 --- a/core/src/main/java/com/pikolive/core/exception/ErrorThrowable.java +++ b/core/src/main/java/com/bingchuang/core/exception/ErrorThrowable.java @@ -1,4 +1,4 @@ -package com.pikolive.core.exception; +package com.bingchuang.core.exception; import androidx.annotation.StringDef; diff --git a/core/src/main/java/com/pikolive/core/exception/FailReasonException.java b/core/src/main/java/com/bingchuang/core/exception/FailReasonException.java similarity index 92% rename from core/src/main/java/com/pikolive/core/exception/FailReasonException.java rename to core/src/main/java/com/bingchuang/core/exception/FailReasonException.java index 3d50baa8c..cdee6389a 100644 --- a/core/src/main/java/com/pikolive/core/exception/FailReasonException.java +++ b/core/src/main/java/com/bingchuang/core/exception/FailReasonException.java @@ -1,4 +1,4 @@ -package com.pikolive.core.exception; +package com.bingchuang.core.exception; /** * 接口上返回的 error code,用这个类封装起来 diff --git a/core/src/main/java/com/pikolive/core/exception/NullDataException.java b/core/src/main/java/com/bingchuang/core/exception/NullDataException.java similarity index 81% rename from core/src/main/java/com/pikolive/core/exception/NullDataException.java rename to core/src/main/java/com/bingchuang/core/exception/NullDataException.java index 75f90caaf..da28251ba 100644 --- a/core/src/main/java/com/pikolive/core/exception/NullDataException.java +++ b/core/src/main/java/com/bingchuang/core/exception/NullDataException.java @@ -1,4 +1,4 @@ -package com.pikolive.core.exception; +package com.bingchuang.core.exception; /** * Created by MadisonRong on 2019-08-16 diff --git a/core/src/main/java/com/pikolive/core/exception/UnKnowException.java b/core/src/main/java/com/bingchuang/core/exception/UnKnowException.java similarity index 74% rename from core/src/main/java/com/pikolive/core/exception/UnKnowException.java rename to core/src/main/java/com/bingchuang/core/exception/UnKnowException.java index 06fefa7ce..69058f808 100644 --- a/core/src/main/java/com/pikolive/core/exception/UnKnowException.java +++ b/core/src/main/java/com/bingchuang/core/exception/UnKnowException.java @@ -1,4 +1,4 @@ -package com.pikolive.core.exception; +package com.bingchuang.core.exception; /** * 未知错误 diff --git a/core/src/main/java/com/pikolive/core/family/bean/BillDateDivInfo.java b/core/src/main/java/com/bingchuang/core/family/bean/BillDateDivInfo.java similarity index 84% rename from core/src/main/java/com/pikolive/core/family/bean/BillDateDivInfo.java rename to core/src/main/java/com/bingchuang/core/family/bean/BillDateDivInfo.java index e5f0f23b3..193a46aa4 100644 --- a/core/src/main/java/com/pikolive/core/family/bean/BillDateDivInfo.java +++ b/core/src/main/java/com/bingchuang/core/family/bean/BillDateDivInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.family.bean; +package com.bingchuang.core.family.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/family/bean/CustomServiceInfo.java b/core/src/main/java/com/bingchuang/core/family/bean/CustomServiceInfo.java similarity index 89% rename from core/src/main/java/com/pikolive/core/family/bean/CustomServiceInfo.java rename to core/src/main/java/com/bingchuang/core/family/bean/CustomServiceInfo.java index c212e5b60..64419a23b 100644 --- a/core/src/main/java/com/pikolive/core/family/bean/CustomServiceInfo.java +++ b/core/src/main/java/com/bingchuang/core/family/bean/CustomServiceInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.family.bean; +package com.bingchuang.core.family.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/family/bean/FamilyCustomServiceInfo.java b/core/src/main/java/com/bingchuang/core/family/bean/FamilyCustomServiceInfo.java similarity index 82% rename from core/src/main/java/com/pikolive/core/family/bean/FamilyCustomServiceInfo.java rename to core/src/main/java/com/bingchuang/core/family/bean/FamilyCustomServiceInfo.java index eba97144d..00e752794 100644 --- a/core/src/main/java/com/pikolive/core/family/bean/FamilyCustomServiceInfo.java +++ b/core/src/main/java/com/bingchuang/core/family/bean/FamilyCustomServiceInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.family.bean; +package com.bingchuang.core.family.bean; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/family/bean/FamilyGameInfo.java b/core/src/main/java/com/bingchuang/core/family/bean/FamilyGameInfo.java similarity index 86% rename from core/src/main/java/com/pikolive/core/family/bean/FamilyGameInfo.java rename to core/src/main/java/com/bingchuang/core/family/bean/FamilyGameInfo.java index ac48b203c..af5cb2b6e 100644 --- a/core/src/main/java/com/pikolive/core/family/bean/FamilyGameInfo.java +++ b/core/src/main/java/com/bingchuang/core/family/bean/FamilyGameInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.family.bean; +package com.bingchuang.core.family.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/family/bean/FamilyGroupInfo.java b/core/src/main/java/com/bingchuang/core/family/bean/FamilyGroupInfo.java similarity index 95% rename from core/src/main/java/com/pikolive/core/family/bean/FamilyGroupInfo.java rename to core/src/main/java/com/bingchuang/core/family/bean/FamilyGroupInfo.java index 8f0ebe59a..25537b54f 100644 --- a/core/src/main/java/com/pikolive/core/family/bean/FamilyGroupInfo.java +++ b/core/src/main/java/com/bingchuang/core/family/bean/FamilyGroupInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.family.bean; +package com.bingchuang.core.family.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/family/bean/FamilyInfo.java b/core/src/main/java/com/bingchuang/core/family/bean/FamilyInfo.java similarity index 97% rename from core/src/main/java/com/pikolive/core/family/bean/FamilyInfo.java rename to core/src/main/java/com/bingchuang/core/family/bean/FamilyInfo.java index db776107c..3012c92f7 100644 --- a/core/src/main/java/com/pikolive/core/family/bean/FamilyInfo.java +++ b/core/src/main/java/com/bingchuang/core/family/bean/FamilyInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.family.bean; +package com.bingchuang.core.family.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/family/bean/FamilyManageItemInfo.java b/core/src/main/java/com/bingchuang/core/family/bean/FamilyManageItemInfo.java similarity index 91% rename from core/src/main/java/com/pikolive/core/family/bean/FamilyManageItemInfo.java rename to core/src/main/java/com/bingchuang/core/family/bean/FamilyManageItemInfo.java index 491a46b9c..8fd7e960d 100644 --- a/core/src/main/java/com/pikolive/core/family/bean/FamilyManageItemInfo.java +++ b/core/src/main/java/com/bingchuang/core/family/bean/FamilyManageItemInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.family.bean; +package com.bingchuang.core.family.bean; import androidx.annotation.DrawableRes; diff --git a/core/src/main/java/com/pikolive/core/family/bean/FamilyMemberInfo.java b/core/src/main/java/com/bingchuang/core/family/bean/FamilyMemberInfo.java similarity index 69% rename from core/src/main/java/com/pikolive/core/family/bean/FamilyMemberInfo.java rename to core/src/main/java/com/bingchuang/core/family/bean/FamilyMemberInfo.java index b48a956ff..c50bd410c 100644 --- a/core/src/main/java/com/pikolive/core/family/bean/FamilyMemberInfo.java +++ b/core/src/main/java/com/bingchuang/core/family/bean/FamilyMemberInfo.java @@ -1,11 +1,11 @@ -package com.pikolive.core.family.bean; +package com.bingchuang.core.family.bean; -import com.pikolive.core.level.UserLevelVo; -import com.pikolive.core.noble.NobleInfo; -import com.pikolive.core.level.UserLevelVo; -import com.pikolive.core.noble.NobleInfo; -import com.pikolive.core.level.UserLevelVo; -import com.pikolive.core.noble.NobleInfo; +import com.bingchuang.core.level.UserLevelVo; +import com.bingchuang.core.noble.NobleInfo; +import com.bingchuang.core.level.UserLevelVo; +import com.bingchuang.core.noble.NobleInfo; +import com.bingchuang.core.level.UserLevelVo; +import com.bingchuang.core.noble.NobleInfo; import java.io.Serializable; diff --git a/core/src/main/java/com/bingchuang/core/family/bean/FamilyPlazaInfo.java b/core/src/main/java/com/bingchuang/core/family/bean/FamilyPlazaInfo.java new file mode 100644 index 000000000..e824dafc9 --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/family/bean/FamilyPlazaInfo.java @@ -0,0 +1,20 @@ +package com.bingchuang.core.family.bean; + +import com.bingchuang.core.family.bean.response.familyPlaza.RespFamily; +import com.bingchuang.core.family.bean.response.familyPlaza.RespFamily; +import com.bingchuang.core.family.bean.response.familyPlaza.RespFamily; + +import java.util.List; + +import lombok.Data; + +/** + * @author jack + * @Description + * @Date 2018/5/31 + */ +@Data +public class FamilyPlazaInfo { + private List banners; + private RespFamily familys; +} diff --git a/core/src/main/java/com/pikolive/core/family/bean/FindBannerInfo.java b/core/src/main/java/com/bingchuang/core/family/bean/FindBannerInfo.java similarity index 98% rename from core/src/main/java/com/pikolive/core/family/bean/FindBannerInfo.java rename to core/src/main/java/com/bingchuang/core/family/bean/FindBannerInfo.java index 6cf8428a5..6f9478da5 100644 --- a/core/src/main/java/com/pikolive/core/family/bean/FindBannerInfo.java +++ b/core/src/main/java/com/bingchuang/core/family/bean/FindBannerInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.family.bean; +package com.bingchuang.core.family.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/main/java/com/pikolive/core/family/bean/HomeBannerInfo.java b/core/src/main/java/com/bingchuang/core/family/bean/HomeBannerInfo.java similarity index 82% rename from core/src/main/java/com/pikolive/core/family/bean/HomeBannerInfo.java rename to core/src/main/java/com/bingchuang/core/family/bean/HomeBannerInfo.java index bd12e9c92..8bb89fb75 100644 --- a/core/src/main/java/com/pikolive/core/family/bean/HomeBannerInfo.java +++ b/core/src/main/java/com/bingchuang/core/family/bean/HomeBannerInfo.java @@ -1,6 +1,6 @@ -package com.pikolive.core.family.bean; +package com.bingchuang.core.family.bean; -import com.pikolive.core2.home.bean.BannerInfo; +import com.bingchuang.core2.home.bean.BannerInfo; import com.bingchuang.library.utils.ListUtils; import java.util.ArrayList; diff --git a/core/src/main/java/com/pikolive/core/family/bean/HomeTitleInfo.java b/core/src/main/java/com/bingchuang/core/family/bean/HomeTitleInfo.java similarity index 93% rename from core/src/main/java/com/pikolive/core/family/bean/HomeTitleInfo.java rename to core/src/main/java/com/bingchuang/core/family/bean/HomeTitleInfo.java index 256a4828b..53097a0c0 100644 --- a/core/src/main/java/com/pikolive/core/family/bean/HomeTitleInfo.java +++ b/core/src/main/java/com/bingchuang/core/family/bean/HomeTitleInfo.java @@ -1,6 +1,6 @@ -package com.pikolive.core.family.bean; +package com.bingchuang.core.family.bean; -import com.pikolive.core.utils.SharedPreferenceUtils; +import com.bingchuang.core.utils.SharedPreferenceUtils; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/family/bean/TransactionRecordInfo.java b/core/src/main/java/com/bingchuang/core/family/bean/TransactionRecordInfo.java similarity index 88% rename from core/src/main/java/com/pikolive/core/family/bean/TransactionRecordInfo.java rename to core/src/main/java/com/bingchuang/core/family/bean/TransactionRecordInfo.java index d85db3e0e..8e85b90ea 100644 --- a/core/src/main/java/com/pikolive/core/family/bean/TransactionRecordInfo.java +++ b/core/src/main/java/com/bingchuang/core/family/bean/TransactionRecordInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.family.bean; +package com.bingchuang.core.family.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/family/bean/VMBillItemInfo.java b/core/src/main/java/com/bingchuang/core/family/bean/VMBillItemInfo.java similarity index 94% rename from core/src/main/java/com/pikolive/core/family/bean/VMBillItemInfo.java rename to core/src/main/java/com/bingchuang/core/family/bean/VMBillItemInfo.java index 54b235c80..5020f0bfb 100644 --- a/core/src/main/java/com/pikolive/core/family/bean/VMBillItemInfo.java +++ b/core/src/main/java/com/bingchuang/core/family/bean/VMBillItemInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.family.bean; +package com.bingchuang.core.family.bean; import com.chad.library.adapter.base.entity.MultiItemEntity; diff --git a/core/src/main/java/com/pikolive/core/family/bean/response/RankingFamilyInfo.java b/core/src/main/java/com/bingchuang/core/family/bean/response/RankingFamilyInfo.java similarity index 95% rename from core/src/main/java/com/pikolive/core/family/bean/response/RankingFamilyInfo.java rename to core/src/main/java/com/bingchuang/core/family/bean/response/RankingFamilyInfo.java index 7806c85fc..7d8375cd9 100644 --- a/core/src/main/java/com/pikolive/core/family/bean/response/RankingFamilyInfo.java +++ b/core/src/main/java/com/bingchuang/core/family/bean/response/RankingFamilyInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.family.bean.response; +package com.bingchuang.core.family.bean.response; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/family/bean/response/RespFamilyGameList.java b/core/src/main/java/com/bingchuang/core/family/bean/response/RespFamilyGameList.java similarity index 64% rename from core/src/main/java/com/pikolive/core/family/bean/response/RespFamilyGameList.java rename to core/src/main/java/com/bingchuang/core/family/bean/response/RespFamilyGameList.java index 38256bbf5..792531474 100644 --- a/core/src/main/java/com/pikolive/core/family/bean/response/RespFamilyGameList.java +++ b/core/src/main/java/com/bingchuang/core/family/bean/response/RespFamilyGameList.java @@ -1,6 +1,6 @@ -package com.pikolive.core.family.bean.response; +package com.bingchuang.core.family.bean.response; -import com.pikolive.core.family.bean.FamilyGameInfo; +import com.bingchuang.core.family.bean.FamilyGameInfo; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/family/bean/response/RespFamilyRankList.java b/core/src/main/java/com/bingchuang/core/family/bean/response/RespFamilyRankList.java similarity index 87% rename from core/src/main/java/com/pikolive/core/family/bean/response/RespFamilyRankList.java rename to core/src/main/java/com/bingchuang/core/family/bean/response/RespFamilyRankList.java index 8cef872e4..d564e0be5 100644 --- a/core/src/main/java/com/pikolive/core/family/bean/response/RespFamilyRankList.java +++ b/core/src/main/java/com/bingchuang/core/family/bean/response/RespFamilyRankList.java @@ -1,4 +1,4 @@ -package com.pikolive.core.family.bean.response; +package com.bingchuang.core.family.bean.response; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/family/bean/response/familyPlaza/RespFamily.java b/core/src/main/java/com/bingchuang/core/family/bean/response/familyPlaza/RespFamily.java similarity index 63% rename from core/src/main/java/com/pikolive/core/family/bean/response/familyPlaza/RespFamily.java rename to core/src/main/java/com/bingchuang/core/family/bean/response/familyPlaza/RespFamily.java index d8e94f5e9..3306ee94d 100644 --- a/core/src/main/java/com/pikolive/core/family/bean/response/familyPlaza/RespFamily.java +++ b/core/src/main/java/com/bingchuang/core/family/bean/response/familyPlaza/RespFamily.java @@ -1,6 +1,6 @@ -package com.pikolive.core.family.bean.response.familyPlaza; +package com.bingchuang.core.family.bean.response.familyPlaza; -import com.pikolive.core.family.bean.FamilyInfo; +import com.bingchuang.core.family.bean.FamilyInfo; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/family/bean/response/memberList/RespFamilymember.java b/core/src/main/java/com/bingchuang/core/family/bean/response/memberList/RespFamilymember.java similarity index 65% rename from core/src/main/java/com/pikolive/core/family/bean/response/memberList/RespFamilymember.java rename to core/src/main/java/com/bingchuang/core/family/bean/response/memberList/RespFamilymember.java index ee9947b8a..038b11ace 100644 --- a/core/src/main/java/com/pikolive/core/family/bean/response/memberList/RespFamilymember.java +++ b/core/src/main/java/com/bingchuang/core/family/bean/response/memberList/RespFamilymember.java @@ -1,6 +1,6 @@ -package com.pikolive.core.family.bean.response.memberList; +package com.bingchuang.core.family.bean.response.memberList; -import com.pikolive.core.family.bean.FamilyMemberInfo; +import com.bingchuang.core.family.bean.FamilyMemberInfo; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/family/bean/response/moneyManagement/FamilyMoneyManagementInfo.java b/core/src/main/java/com/bingchuang/core/family/bean/response/moneyManagement/FamilyMoneyManagementInfo.java similarity index 87% rename from core/src/main/java/com/pikolive/core/family/bean/response/moneyManagement/FamilyMoneyManagementInfo.java rename to core/src/main/java/com/bingchuang/core/family/bean/response/moneyManagement/FamilyMoneyManagementInfo.java index 4a8be69fa..35de6d3e7 100644 --- a/core/src/main/java/com/pikolive/core/family/bean/response/moneyManagement/FamilyMoneyManagementInfo.java +++ b/core/src/main/java/com/bingchuang/core/family/bean/response/moneyManagement/FamilyMoneyManagementInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.family.bean.response.moneyManagement; +package com.bingchuang.core.family.bean.response.moneyManagement; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/family/bean/response/moneyManagement/MonthlyRecord.java b/core/src/main/java/com/bingchuang/core/family/bean/response/moneyManagement/MonthlyRecord.java similarity index 95% rename from core/src/main/java/com/pikolive/core/family/bean/response/moneyManagement/MonthlyRecord.java rename to core/src/main/java/com/bingchuang/core/family/bean/response/moneyManagement/MonthlyRecord.java index 723b1b47e..c1d0a61fc 100644 --- a/core/src/main/java/com/pikolive/core/family/bean/response/moneyManagement/MonthlyRecord.java +++ b/core/src/main/java/com/bingchuang/core/family/bean/response/moneyManagement/MonthlyRecord.java @@ -1,4 +1,4 @@ -package com.pikolive.core.family.bean.response.moneyManagement; +package com.bingchuang.core.family.bean.response.moneyManagement; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/family/bean/response/moneyManagement/TradeMoneyRecord.java b/core/src/main/java/com/bingchuang/core/family/bean/response/moneyManagement/TradeMoneyRecord.java similarity index 76% rename from core/src/main/java/com/pikolive/core/family/bean/response/moneyManagement/TradeMoneyRecord.java rename to core/src/main/java/com/bingchuang/core/family/bean/response/moneyManagement/TradeMoneyRecord.java index 33bdff49d..6d9d8086d 100644 --- a/core/src/main/java/com/pikolive/core/family/bean/response/moneyManagement/TradeMoneyRecord.java +++ b/core/src/main/java/com/bingchuang/core/family/bean/response/moneyManagement/TradeMoneyRecord.java @@ -1,4 +1,4 @@ -package com.pikolive.core.family.bean.response.moneyManagement; +package com.bingchuang.core.family.bean.response.moneyManagement; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/family/event/FamilyCurrencyUpdateEvent.java b/core/src/main/java/com/bingchuang/core/family/event/FamilyCurrencyUpdateEvent.java similarity index 79% rename from core/src/main/java/com/pikolive/core/family/event/FamilyCurrencyUpdateEvent.java rename to core/src/main/java/com/bingchuang/core/family/event/FamilyCurrencyUpdateEvent.java index f88ed05d8..30857f83a 100644 --- a/core/src/main/java/com/pikolive/core/family/event/FamilyCurrencyUpdateEvent.java +++ b/core/src/main/java/com/bingchuang/core/family/event/FamilyCurrencyUpdateEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.family.event; +package com.bingchuang.core.family.event; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/family/event/FamilyMemberUpdateEvent.java b/core/src/main/java/com/bingchuang/core/family/event/FamilyMemberUpdateEvent.java similarity index 70% rename from core/src/main/java/com/pikolive/core/family/event/FamilyMemberUpdateEvent.java rename to core/src/main/java/com/bingchuang/core/family/event/FamilyMemberUpdateEvent.java index d58c3df43..3a8eb50c1 100644 --- a/core/src/main/java/com/pikolive/core/family/event/FamilyMemberUpdateEvent.java +++ b/core/src/main/java/com/bingchuang/core/family/event/FamilyMemberUpdateEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.family.event; +package com.bingchuang.core.family.event; /** * @author jack diff --git a/core/src/main/java/com/pikolive/core/family/event/FamilyMineEvent.java b/core/src/main/java/com/bingchuang/core/family/event/FamilyMineEvent.java similarity index 97% rename from core/src/main/java/com/pikolive/core/family/event/FamilyMineEvent.java rename to core/src/main/java/com/bingchuang/core/family/event/FamilyMineEvent.java index ad614592e..c60185187 100644 --- a/core/src/main/java/com/pikolive/core/family/event/FamilyMineEvent.java +++ b/core/src/main/java/com/bingchuang/core/family/event/FamilyMineEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.family.event; +package com.bingchuang.core.family.event; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/family/event/FamilyUpdateEvent.java b/core/src/main/java/com/bingchuang/core/family/event/FamilyUpdateEvent.java similarity index 83% rename from core/src/main/java/com/pikolive/core/family/event/FamilyUpdateEvent.java rename to core/src/main/java/com/bingchuang/core/family/event/FamilyUpdateEvent.java index 25508848a..215496485 100644 --- a/core/src/main/java/com/pikolive/core/family/event/FamilyUpdateEvent.java +++ b/core/src/main/java/com/bingchuang/core/family/event/FamilyUpdateEvent.java @@ -1,6 +1,6 @@ -package com.pikolive.core.family.event; +package com.bingchuang.core.family.event; -import com.pikolive.core.family.bean.FamilyInfo; +import com.bingchuang.core.family.bean.FamilyInfo; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/family/model/FamilyModel.java b/core/src/main/java/com/bingchuang/core/family/model/FamilyModel.java similarity index 95% rename from core/src/main/java/com/pikolive/core/family/model/FamilyModel.java rename to core/src/main/java/com/bingchuang/core/family/model/FamilyModel.java index d6495135d..668030e42 100644 --- a/core/src/main/java/com/pikolive/core/family/model/FamilyModel.java +++ b/core/src/main/java/com/bingchuang/core/family/model/FamilyModel.java @@ -1,4 +1,4 @@ -package com.pikolive.core.family.model; +package com.bingchuang.core.family.model; import android.annotation.SuppressLint; import android.text.TextUtils; @@ -6,39 +6,39 @@ import android.text.TextUtils; import androidx.annotation.Nullable; import com.orhanobut.logger.Logger; -import com.pikolive.core.auth.event.LoginEvent; -import com.pikolive.core.auth.event.LogoutEvent; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.auth.event.LoginEvent; -import com.pikolive.core.auth.event.LogoutEvent; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.R; -import com.pikolive.core.Constants; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.auth.event.LoginEvent; -import com.pikolive.core.auth.event.LogoutEvent; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.family.bean.FamilyCustomServiceInfo; -import com.pikolive.core.family.bean.FamilyGameInfo; -import com.pikolive.core.family.bean.FamilyInfo; -import com.pikolive.core.family.bean.FamilyPlazaInfo; -import com.pikolive.core.family.bean.FindBannerInfo; -import com.pikolive.core.family.bean.response.RespFamilyGameList; -import com.pikolive.core.family.bean.response.RespFamilyRankList; -import com.pikolive.core.family.bean.response.familyPlaza.RespFamily; -import com.pikolive.core.family.bean.response.memberList.RespFamilymember; -import com.pikolive.core.family.bean.response.moneyManagement.FamilyMoneyManagementInfo; -import com.pikolive.core.family.bean.response.moneyManagement.TradeMoneyRecord; -import com.pikolive.core.family.event.FamilyCurrencyUpdateEvent; -import com.pikolive.core.family.event.FamilyMineEvent; -import com.pikolive.core.family.event.FamilyUpdateEvent; -import com.pikolive.core.user.UserModel; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.auth.event.LoginEvent; +import com.bingchuang.core.auth.event.LogoutEvent; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.auth.event.LoginEvent; +import com.bingchuang.core.auth.event.LogoutEvent; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.R; +import com.bingchuang.core.Constants; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.auth.event.LoginEvent; +import com.bingchuang.core.auth.event.LogoutEvent; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.family.bean.FamilyCustomServiceInfo; +import com.bingchuang.core.family.bean.FamilyGameInfo; +import com.bingchuang.core.family.bean.FamilyInfo; +import com.bingchuang.core.family.bean.FamilyPlazaInfo; +import com.bingchuang.core.family.bean.FindBannerInfo; +import com.bingchuang.core.family.bean.response.RespFamilyGameList; +import com.bingchuang.core.family.bean.response.RespFamilyRankList; +import com.bingchuang.core.family.bean.response.familyPlaza.RespFamily; +import com.bingchuang.core.family.bean.response.memberList.RespFamilymember; +import com.bingchuang.core.family.bean.response.moneyManagement.FamilyMoneyManagementInfo; +import com.bingchuang.core.family.bean.response.moneyManagement.TradeMoneyRecord; +import com.bingchuang.core.family.event.FamilyCurrencyUpdateEvent; +import com.bingchuang.core.family.event.FamilyMineEvent; +import com.bingchuang.core.family.event.FamilyUpdateEvent; +import com.bingchuang.core.user.UserModel; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.rxbus.RxBusHelper; import com.bingchuang.library.utils.ResUtil; diff --git a/core/src/main/java/com/pikolive/core/family/model/IFamilyModel.java b/core/src/main/java/com/bingchuang/core/family/model/IFamilyModel.java similarity index 87% rename from core/src/main/java/com/pikolive/core/family/model/IFamilyModel.java rename to core/src/main/java/com/bingchuang/core/family/model/IFamilyModel.java index f1c8c4488..cc6936fab 100644 --- a/core/src/main/java/com/pikolive/core/family/model/IFamilyModel.java +++ b/core/src/main/java/com/bingchuang/core/family/model/IFamilyModel.java @@ -1,20 +1,20 @@ -package com.pikolive.core.family.model; +package com.bingchuang.core.family.model; import androidx.annotation.Nullable; -import com.pikolive.core.base.IModel; -import com.pikolive.core.base.IModel; -import com.pikolive.core.base.IModel; -import com.pikolive.core.family.bean.FamilyCustomServiceInfo; -import com.pikolive.core.family.bean.FamilyGameInfo; -import com.pikolive.core.family.bean.FamilyInfo; -import com.pikolive.core.family.bean.FamilyPlazaInfo; -import com.pikolive.core.family.bean.FindBannerInfo; -import com.pikolive.core.family.bean.response.RespFamilyRankList; -import com.pikolive.core.family.bean.response.familyPlaza.RespFamily; -import com.pikolive.core.family.bean.response.memberList.RespFamilymember; -import com.pikolive.core.family.bean.response.moneyManagement.FamilyMoneyManagementInfo; -import com.pikolive.core.family.bean.response.moneyManagement.TradeMoneyRecord; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.family.bean.FamilyCustomServiceInfo; +import com.bingchuang.core.family.bean.FamilyGameInfo; +import com.bingchuang.core.family.bean.FamilyInfo; +import com.bingchuang.core.family.bean.FamilyPlazaInfo; +import com.bingchuang.core.family.bean.FindBannerInfo; +import com.bingchuang.core.family.bean.response.RespFamilyRankList; +import com.bingchuang.core.family.bean.response.familyPlaza.RespFamily; +import com.bingchuang.core.family.bean.response.memberList.RespFamilymember; +import com.bingchuang.core.family.bean.response.moneyManagement.FamilyMoneyManagementInfo; +import com.bingchuang.core.family.bean.response.moneyManagement.TradeMoneyRecord; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/fansteam/FansTeamInfo.kt b/core/src/main/java/com/bingchuang/core/fansteam/FansTeamInfo.kt similarity index 80% rename from core/src/main/java/com/pikolive/core/fansteam/FansTeamInfo.kt rename to core/src/main/java/com/bingchuang/core/fansteam/FansTeamInfo.kt index 6aa5f907f..6e0b9e4db 100644 --- a/core/src/main/java/com/pikolive/core/fansteam/FansTeamInfo.kt +++ b/core/src/main/java/com/bingchuang/core/fansteam/FansTeamInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.fansteam +package com.bingchuang.core.fansteam data class FansTeamInfo( val anchorAvatar: String = "", diff --git a/core/src/main/java/com/pikolive/core/fansteam/FansTeamInitInfo.kt b/core/src/main/java/com/bingchuang/core/fansteam/FansTeamInitInfo.kt similarity index 87% rename from core/src/main/java/com/pikolive/core/fansteam/FansTeamInitInfo.kt rename to core/src/main/java/com/bingchuang/core/fansteam/FansTeamInitInfo.kt index 8f9512412..1c382fdcc 100644 --- a/core/src/main/java/com/pikolive/core/fansteam/FansTeamInitInfo.kt +++ b/core/src/main/java/com/bingchuang/core/fansteam/FansTeamInitInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.fansteam +package com.bingchuang.core.fansteam data class FansTeamInitInfo( val anchorFansNum: Int = 0, diff --git a/core/src/main/java/com/pikolive/core/fansteam/FansTeamJoinInfo.kt b/core/src/main/java/com/bingchuang/core/fansteam/FansTeamJoinInfo.kt similarity index 90% rename from core/src/main/java/com/pikolive/core/fansteam/FansTeamJoinInfo.kt rename to core/src/main/java/com/bingchuang/core/fansteam/FansTeamJoinInfo.kt index ba62aa06f..3cf21a063 100644 --- a/core/src/main/java/com/pikolive/core/fansteam/FansTeamJoinInfo.kt +++ b/core/src/main/java/com/bingchuang/core/fansteam/FansTeamJoinInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.fansteam +package com.bingchuang.core.fansteam data class FansTeamJoinInfo( diff --git a/core/src/main/java/com/pikolive/core/fansteam/FansTeamJoinedInfo.kt b/core/src/main/java/com/bingchuang/core/fansteam/FansTeamJoinedInfo.kt similarity index 91% rename from core/src/main/java/com/pikolive/core/fansteam/FansTeamJoinedInfo.kt rename to core/src/main/java/com/bingchuang/core/fansteam/FansTeamJoinedInfo.kt index 132ad9be9..43b4ee3a6 100644 --- a/core/src/main/java/com/pikolive/core/fansteam/FansTeamJoinedInfo.kt +++ b/core/src/main/java/com/bingchuang/core/fansteam/FansTeamJoinedInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.fansteam +package com.bingchuang.core.fansteam data class FansTeamJoinedInfo( val anchorAvatar: String = "", diff --git a/core/src/main/java/com/pikolive/core/fansteam/FansTeamModel.kt b/core/src/main/java/com/bingchuang/core/fansteam/FansTeamModel.kt similarity index 90% rename from core/src/main/java/com/pikolive/core/fansteam/FansTeamModel.kt rename to core/src/main/java/com/bingchuang/core/fansteam/FansTeamModel.kt index 51ba6214d..47f5cb3c9 100644 --- a/core/src/main/java/com/pikolive/core/fansteam/FansTeamModel.kt +++ b/core/src/main/java/com/bingchuang/core/fansteam/FansTeamModel.kt @@ -1,9 +1,9 @@ -package com.pikolive.core.fansteam +package com.bingchuang.core.fansteam -import com.pikolive.core.base.BaseModel -import com.pikolive.core.bean.response.ServiceResult -import com.pikolive.core.manager.AvRoomDataManager -import com.pikolive.core.utils.net.launchRequest +import com.bingchuang.core.base.BaseModel +import com.bingchuang.core.bean.response.ServiceResult +import com.bingchuang.core.manager.AvRoomDataManager +import com.bingchuang.core.utils.net.launchRequest import com.bingchuang.library.net.rxnet.RxNet import retrofit2.http.GET import retrofit2.http.Query diff --git a/core/src/main/java/com/pikolive/core/fansteam/FansTeamMsgInfo.kt b/core/src/main/java/com/bingchuang/core/fansteam/FansTeamMsgInfo.kt similarity index 63% rename from core/src/main/java/com/pikolive/core/fansteam/FansTeamMsgInfo.kt rename to core/src/main/java/com/bingchuang/core/fansteam/FansTeamMsgInfo.kt index 6b16882ae..18dee43f8 100644 --- a/core/src/main/java/com/pikolive/core/fansteam/FansTeamMsgInfo.kt +++ b/core/src/main/java/com/bingchuang/core/fansteam/FansTeamMsgInfo.kt @@ -1,6 +1,6 @@ -package com.pikolive.core.fansteam +package com.bingchuang.core.fansteam -import com.pikolive.core.gift.bean.GiftInfo +import com.bingchuang.core.gift.bean.GiftInfo data class FansTeamMsgInfo( val uid: Long = 0, diff --git a/core/src/main/java/com/pikolive/core/fansteam/FansTeamTaskInfo.kt b/core/src/main/java/com/bingchuang/core/fansteam/FansTeamTaskInfo.kt similarity index 87% rename from core/src/main/java/com/pikolive/core/fansteam/FansTeamTaskInfo.kt rename to core/src/main/java/com/bingchuang/core/fansteam/FansTeamTaskInfo.kt index b6df54c09..6d2d3a91d 100644 --- a/core/src/main/java/com/pikolive/core/fansteam/FansTeamTaskInfo.kt +++ b/core/src/main/java/com/bingchuang/core/fansteam/FansTeamTaskInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.fansteam +package com.bingchuang.core.fansteam data class FansTeamTaskInfo( val awardVal: Int = 0, diff --git a/core/src/main/java/com/pikolive/core/fansteam/PrivilegeConfigVo.kt b/core/src/main/java/com/bingchuang/core/fansteam/PrivilegeConfigVo.kt similarity index 82% rename from core/src/main/java/com/pikolive/core/fansteam/PrivilegeConfigVo.kt rename to core/src/main/java/com/bingchuang/core/fansteam/PrivilegeConfigVo.kt index 339b64cf4..fed2f15d2 100644 --- a/core/src/main/java/com/pikolive/core/fansteam/PrivilegeConfigVo.kt +++ b/core/src/main/java/com/bingchuang/core/fansteam/PrivilegeConfigVo.kt @@ -1,6 +1,6 @@ -package com.pikolive.core.fansteam +package com.bingchuang.core.fansteam -import com.pikolive.core.gift.bean.GiftInfo +import com.bingchuang.core.gift.bean.GiftInfo data class PrivilegeConfigVo( val createTime: String = "", diff --git a/core/src/main/java/com/pikolive/core/file/FileModel.java b/core/src/main/java/com/bingchuang/core/file/FileModel.java similarity index 94% rename from core/src/main/java/com/pikolive/core/file/FileModel.java rename to core/src/main/java/com/bingchuang/core/file/FileModel.java index 97721b1ab..4802f8d83 100644 --- a/core/src/main/java/com/pikolive/core/file/FileModel.java +++ b/core/src/main/java/com/bingchuang/core/file/FileModel.java @@ -1,4 +1,4 @@ -package com.pikolive.core.file; +package com.bingchuang.core.file; import android.text.TextUtils; @@ -6,12 +6,12 @@ import com.netease.nim.uikit.common.util.log.LogUtil; import com.qiniu.android.common.FixedZone; import com.qiniu.android.storage.Configuration; import com.qiniu.android.storage.UploadManager; -import com.pikolive.core.R; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.community.bean.DynamicMedia; -import com.pikolive.core.exception.ErrorThrowable; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.R; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.community.bean.DynamicMedia; +import com.bingchuang.core.exception.ErrorThrowable; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.utils.ResUtil; diff --git a/core/src/main/java/com/pikolive/core/file/IFileModel.java b/core/src/main/java/com/bingchuang/core/file/IFileModel.java similarity index 79% rename from core/src/main/java/com/pikolive/core/file/IFileModel.java rename to core/src/main/java/com/bingchuang/core/file/IFileModel.java index f934be275..1b8b55d2c 100644 --- a/core/src/main/java/com/pikolive/core/file/IFileModel.java +++ b/core/src/main/java/com/bingchuang/core/file/IFileModel.java @@ -1,7 +1,7 @@ -package com.pikolive.core.file; +package com.bingchuang.core.file; -import com.pikolive.core.base.IModel; -import com.pikolive.core.community.bean.DynamicMedia; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.community.bean.DynamicMedia; import io.reactivex.Single; diff --git a/core/src/main/java/com/pikolive/core/file/UploadToken.java b/core/src/main/java/com/bingchuang/core/file/UploadToken.java similarity index 75% rename from core/src/main/java/com/pikolive/core/file/UploadToken.java rename to core/src/main/java/com/bingchuang/core/file/UploadToken.java index be83922be..65212d62d 100644 --- a/core/src/main/java/com/pikolive/core/file/UploadToken.java +++ b/core/src/main/java/com/bingchuang/core/file/UploadToken.java @@ -1,4 +1,4 @@ -package com.pikolive.core.file; +package com.bingchuang.core.file; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/gift/ChargeListener.java b/core/src/main/java/com/bingchuang/core/gift/ChargeListener.java similarity index 64% rename from core/src/main/java/com/pikolive/core/gift/ChargeListener.java rename to core/src/main/java/com/bingchuang/core/gift/ChargeListener.java index fc24fecec..21a7b54b5 100644 --- a/core/src/main/java/com/pikolive/core/gift/ChargeListener.java +++ b/core/src/main/java/com/bingchuang/core/gift/ChargeListener.java @@ -1,4 +1,4 @@ -package com.pikolive.core.gift; +package com.bingchuang.core.gift; public interface ChargeListener { void onNeedCharge(); diff --git a/core/src/main/java/com/pikolive/core/gift/GiftModel.java b/core/src/main/java/com/bingchuang/core/gift/GiftModel.java similarity index 89% rename from core/src/main/java/com/pikolive/core/gift/GiftModel.java rename to core/src/main/java/com/bingchuang/core/gift/GiftModel.java index 4dd8fe85a..27b1e9ef3 100644 --- a/core/src/main/java/com/pikolive/core/gift/GiftModel.java +++ b/core/src/main/java/com/bingchuang/core/gift/GiftModel.java @@ -1,8 +1,8 @@ -package com.pikolive.core.gift; +package com.bingchuang.core.gift; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_ALL_MIC_LUCKY_GIFT; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_LUCKY_GIFT; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_MULTI_LUCK_GIFT; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_ALL_MIC_LUCKY_GIFT; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_LUCKY_GIFT; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_MULTI_LUCK_GIFT; import android.os.CountDownTimer; import android.os.Handler; @@ -14,70 +14,70 @@ 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.pikolive.core.gift.bean.GiftFreeInfo; -import com.pikolive.core.gift.bean.GiftInfo; -import com.pikolive.core.gift.bean.GiftListInfo; -import com.pikolive.core.gift.bean.GiftMultiReceiverInfo; -import com.pikolive.core.gift.bean.GiftSendType; -import com.pikolive.core.gift.bean.GiftSource; -import com.pikolive.core.gift.bean.GiftType; -import com.pikolive.core.gift.bean.LuckyBagGifts; -import com.pikolive.core.gift.bean.LuckyBagNoticeInfo; -import com.pikolive.core.gift.bean.MultiGiftReceiveInfo; -import com.pikolive.core.gift.bean.SimpleVipInfo; -import com.pikolive.core.gift.event.RoomFreeGiftEvent; -import com.pikolive.core.gift.event.UpdateKnapEvent; -import com.pikolive.core.gift.event.UpdateKnapFreeGiftEvent; -import com.pikolive.core.gift.event.UpdateKnapFreeGiftNumEvent; -import com.pikolive.core.gift.exception.GiftOutOfDateException; -import com.pikolive.core.gift.toolbox.GiftToolbox; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.room.giftvalue.bean.GiftValueCommonUpdate; -import com.pikolive.core.room.giftvalue.helper.GiftValueMrg; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.vip.UserVipInfo; -import com.pikolive.core.gift.bean.GiftFreeInfo; -import com.pikolive.core.gift.bean.GiftInfo; -import com.pikolive.core.gift.bean.GiftListInfo; -import com.pikolive.core.gift.bean.GiftMultiReceiverInfo; -import com.pikolive.core.gift.bean.GiftSendType; -import com.pikolive.core.gift.bean.GiftSource; -import com.pikolive.core.gift.bean.GiftType; -import com.pikolive.core.gift.bean.LuckyBagGifts; -import com.pikolive.core.gift.bean.LuckyBagNoticeInfo; -import com.pikolive.core.gift.bean.MultiGiftReceiveInfo; -import com.pikolive.core.gift.bean.SimpleVipInfo; -import com.pikolive.core.gift.event.RoomFreeGiftEvent; -import com.pikolive.core.gift.event.UpdateKnapEvent; -import com.pikolive.core.gift.event.UpdateKnapFreeGiftEvent; -import com.pikolive.core.gift.event.UpdateKnapFreeGiftNumEvent; -import com.pikolive.core.gift.exception.GiftOutOfDateException; -import com.pikolive.core.gift.toolbox.GiftToolbox; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.room.giftvalue.bean.GiftValueCommonUpdate; -import com.pikolive.core.room.giftvalue.helper.GiftValueMrg; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.vip.UserVipInfo; -import com.pikolive.core.Constants; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.im.custom.bean.GiftAttachment; -import com.pikolive.core.im.custom.bean.GiftBatchAttachment; -import com.pikolive.core.im.custom.bean.MultiGiftAttachment; -import com.pikolive.core.im.custom.bean.MultiLuckyGiftAttachment; -import com.pikolive.core.initial.InitialModel; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.manager.RoomEvent; -import com.pikolive.core.pay.PayModel; -import com.pikolive.core.user.UserModel; -import com.pikolive.core.utils.Logger; -import com.pikolive.core.utils.net.BalanceNotEnoughExeption; -import com.pikolive.core.utils.net.RadishNotEnoughException; -import com.pikolive.core.utils.net.RxHelper; -import com.pikolive.core.utils.net.VipLevelNotEnoughException; +import com.bingchuang.core.gift.bean.GiftFreeInfo; +import com.bingchuang.core.gift.bean.GiftInfo; +import com.bingchuang.core.gift.bean.GiftListInfo; +import com.bingchuang.core.gift.bean.GiftMultiReceiverInfo; +import com.bingchuang.core.gift.bean.GiftSendType; +import com.bingchuang.core.gift.bean.GiftSource; +import com.bingchuang.core.gift.bean.GiftType; +import com.bingchuang.core.gift.bean.LuckyBagGifts; +import com.bingchuang.core.gift.bean.LuckyBagNoticeInfo; +import com.bingchuang.core.gift.bean.MultiGiftReceiveInfo; +import com.bingchuang.core.gift.bean.SimpleVipInfo; +import com.bingchuang.core.gift.event.RoomFreeGiftEvent; +import com.bingchuang.core.gift.event.UpdateKnapEvent; +import com.bingchuang.core.gift.event.UpdateKnapFreeGiftEvent; +import com.bingchuang.core.gift.event.UpdateKnapFreeGiftNumEvent; +import com.bingchuang.core.gift.exception.GiftOutOfDateException; +import com.bingchuang.core.gift.toolbox.GiftToolbox; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.room.giftvalue.bean.GiftValueCommonUpdate; +import com.bingchuang.core.room.giftvalue.helper.GiftValueMrg; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.vip.UserVipInfo; +import com.bingchuang.core.gift.bean.GiftFreeInfo; +import com.bingchuang.core.gift.bean.GiftInfo; +import com.bingchuang.core.gift.bean.GiftListInfo; +import com.bingchuang.core.gift.bean.GiftMultiReceiverInfo; +import com.bingchuang.core.gift.bean.GiftSendType; +import com.bingchuang.core.gift.bean.GiftSource; +import com.bingchuang.core.gift.bean.GiftType; +import com.bingchuang.core.gift.bean.LuckyBagGifts; +import com.bingchuang.core.gift.bean.LuckyBagNoticeInfo; +import com.bingchuang.core.gift.bean.MultiGiftReceiveInfo; +import com.bingchuang.core.gift.bean.SimpleVipInfo; +import com.bingchuang.core.gift.event.RoomFreeGiftEvent; +import com.bingchuang.core.gift.event.UpdateKnapEvent; +import com.bingchuang.core.gift.event.UpdateKnapFreeGiftEvent; +import com.bingchuang.core.gift.event.UpdateKnapFreeGiftNumEvent; +import com.bingchuang.core.gift.exception.GiftOutOfDateException; +import com.bingchuang.core.gift.toolbox.GiftToolbox; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.room.giftvalue.bean.GiftValueCommonUpdate; +import com.bingchuang.core.room.giftvalue.helper.GiftValueMrg; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.vip.UserVipInfo; +import com.bingchuang.core.Constants; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.im.custom.bean.GiftAttachment; +import com.bingchuang.core.im.custom.bean.GiftBatchAttachment; +import com.bingchuang.core.im.custom.bean.MultiGiftAttachment; +import com.bingchuang.core.im.custom.bean.MultiLuckyGiftAttachment; +import com.bingchuang.core.initial.InitialModel; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.manager.RoomEvent; +import com.bingchuang.core.pay.PayModel; +import com.bingchuang.core.user.UserModel; +import com.bingchuang.core.utils.Logger; +import com.bingchuang.core.utils.net.BalanceNotEnoughExeption; +import com.bingchuang.core.utils.net.RadishNotEnoughException; +import com.bingchuang.core.utils.net.RxHelper; +import com.bingchuang.core.utils.net.VipLevelNotEnoughException; import com.bingchuang.library.common.util.SPUtils; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.utils.ListUtils; diff --git a/core/src/main/java/com/pikolive/core/gift/IGiftCore.java b/core/src/main/java/com/bingchuang/core/gift/IGiftCore.java similarity index 86% rename from core/src/main/java/com/pikolive/core/gift/IGiftCore.java rename to core/src/main/java/com/bingchuang/core/gift/IGiftCore.java index 693735446..a8d3661ae 100644 --- a/core/src/main/java/com/pikolive/core/gift/IGiftCore.java +++ b/core/src/main/java/com/bingchuang/core/gift/IGiftCore.java @@ -1,10 +1,10 @@ -package com.pikolive.core.gift; +package com.bingchuang.core.gift; import com.netease.nim.uikit.business.session.module.Container; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.pikolive.core.gift.bean.GiftInfo; -import com.pikolive.core.gift.bean.GiftInfo; -import com.pikolive.core.gift.bean.GiftInfo; +import com.bingchuang.core.gift.bean.GiftInfo; +import com.bingchuang.core.gift.bean.GiftInfo; +import com.bingchuang.core.gift.bean.GiftInfo; import com.bingchuang.library.coremanager.IBaseCore; import java.lang.ref.WeakReference; diff --git a/core/src/main/java/com/pikolive/core/gift/IGiftCoreClient.java b/core/src/main/java/com/bingchuang/core/gift/IGiftCoreClient.java similarity index 73% rename from core/src/main/java/com/pikolive/core/gift/IGiftCoreClient.java rename to core/src/main/java/com/bingchuang/core/gift/IGiftCoreClient.java index b2d28d88b..f88bcf1be 100644 --- a/core/src/main/java/com/pikolive/core/gift/IGiftCoreClient.java +++ b/core/src/main/java/com/bingchuang/core/gift/IGiftCoreClient.java @@ -1,14 +1,14 @@ -package com.pikolive.core.gift; +package com.bingchuang.core.gift; -import com.pikolive.core.gift.bean.GiftInfo; -import com.pikolive.core.gift.bean.GiftReceiveInfo; -import com.pikolive.core.gift.bean.MultiGiftReceiveInfo; -import com.pikolive.core.gift.bean.GiftInfo; -import com.pikolive.core.gift.bean.GiftReceiveInfo; -import com.pikolive.core.gift.bean.MultiGiftReceiveInfo; -import com.pikolive.core.gift.bean.GiftInfo; -import com.pikolive.core.gift.bean.GiftReceiveInfo; -import com.pikolive.core.gift.bean.MultiGiftReceiveInfo; +import com.bingchuang.core.gift.bean.GiftInfo; +import com.bingchuang.core.gift.bean.GiftReceiveInfo; +import com.bingchuang.core.gift.bean.MultiGiftReceiveInfo; +import com.bingchuang.core.gift.bean.GiftInfo; +import com.bingchuang.core.gift.bean.GiftReceiveInfo; +import com.bingchuang.core.gift.bean.MultiGiftReceiveInfo; +import com.bingchuang.core.gift.bean.GiftInfo; +import com.bingchuang.core.gift.bean.GiftReceiveInfo; +import com.bingchuang.core.gift.bean.MultiGiftReceiveInfo; import com.bingchuang.library.coremanager.ICoreClient; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/gift/IGiftModel.java b/core/src/main/java/com/bingchuang/core/gift/IGiftModel.java similarity index 87% rename from core/src/main/java/com/pikolive/core/gift/IGiftModel.java rename to core/src/main/java/com/bingchuang/core/gift/IGiftModel.java index a55bb403e..52995961b 100644 --- a/core/src/main/java/com/pikolive/core/gift/IGiftModel.java +++ b/core/src/main/java/com/bingchuang/core/gift/IGiftModel.java @@ -1,26 +1,26 @@ -package com.pikolive.core.gift; +package com.bingchuang.core.gift; import androidx.annotation.Nullable; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.pikolive.core.gift.bean.GiftFreeInfo; -import com.pikolive.core.gift.bean.GiftInfo; -import com.pikolive.core.gift.bean.GiftListInfo; -import com.pikolive.core.gift.bean.GiftMultiReceiverInfo; -import com.pikolive.core.gift.bean.GiftType; -import com.pikolive.core.gift.bean.LuckyBagNoticeInfo; -import com.pikolive.core.gift.bean.GiftFreeInfo; -import com.pikolive.core.gift.bean.GiftInfo; -import com.pikolive.core.gift.bean.GiftListInfo; -import com.pikolive.core.gift.bean.GiftMultiReceiverInfo; -import com.pikolive.core.gift.bean.GiftType; -import com.pikolive.core.gift.bean.LuckyBagNoticeInfo; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.gift.bean.GiftFreeInfo; -import com.pikolive.core.gift.bean.GiftInfo; -import com.pikolive.core.gift.bean.GiftListInfo; -import com.pikolive.core.gift.bean.GiftMultiReceiverInfo; -import com.pikolive.core.gift.bean.LuckyBagNoticeInfo; +import com.bingchuang.core.gift.bean.GiftFreeInfo; +import com.bingchuang.core.gift.bean.GiftInfo; +import com.bingchuang.core.gift.bean.GiftListInfo; +import com.bingchuang.core.gift.bean.GiftMultiReceiverInfo; +import com.bingchuang.core.gift.bean.GiftType; +import com.bingchuang.core.gift.bean.LuckyBagNoticeInfo; +import com.bingchuang.core.gift.bean.GiftFreeInfo; +import com.bingchuang.core.gift.bean.GiftInfo; +import com.bingchuang.core.gift.bean.GiftListInfo; +import com.bingchuang.core.gift.bean.GiftMultiReceiverInfo; +import com.bingchuang.core.gift.bean.GiftType; +import com.bingchuang.core.gift.bean.LuckyBagNoticeInfo; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.gift.bean.GiftFreeInfo; +import com.bingchuang.core.gift.bean.GiftInfo; +import com.bingchuang.core.gift.bean.GiftListInfo; +import com.bingchuang.core.gift.bean.GiftMultiReceiverInfo; +import com.bingchuang.core.gift.bean.LuckyBagNoticeInfo; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/gift/bean/GiftEffectInfo.java b/core/src/main/java/com/bingchuang/core/gift/bean/GiftEffectInfo.java similarity index 95% rename from core/src/main/java/com/pikolive/core/gift/bean/GiftEffectInfo.java rename to core/src/main/java/com/bingchuang/core/gift/bean/GiftEffectInfo.java index b61de3de5..4e27e9f0e 100644 --- a/core/src/main/java/com/pikolive/core/gift/bean/GiftEffectInfo.java +++ b/core/src/main/java/com/bingchuang/core/gift/bean/GiftEffectInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.gift.bean; +package com.bingchuang.core.gift.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/gift/bean/GiftFileInfo.java b/core/src/main/java/com/bingchuang/core/gift/bean/GiftFileInfo.java similarity index 84% rename from core/src/main/java/com/pikolive/core/gift/bean/GiftFileInfo.java rename to core/src/main/java/com/bingchuang/core/gift/bean/GiftFileInfo.java index dfaa3a96f..977740106 100644 --- a/core/src/main/java/com/pikolive/core/gift/bean/GiftFileInfo.java +++ b/core/src/main/java/com/bingchuang/core/gift/bean/GiftFileInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.gift.bean; +package com.bingchuang.core.gift.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/gift/bean/GiftFreeInfo.java b/core/src/main/java/com/bingchuang/core/gift/bean/GiftFreeInfo.java similarity index 93% rename from core/src/main/java/com/pikolive/core/gift/bean/GiftFreeInfo.java rename to core/src/main/java/com/bingchuang/core/gift/bean/GiftFreeInfo.java index ab96e2010..41591c908 100644 --- a/core/src/main/java/com/pikolive/core/gift/bean/GiftFreeInfo.java +++ b/core/src/main/java/com/bingchuang/core/gift/bean/GiftFreeInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.gift.bean; +package com.bingchuang.core.gift.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/gift/bean/GiftInfo.java b/core/src/main/java/com/bingchuang/core/gift/bean/GiftInfo.java similarity index 98% rename from core/src/main/java/com/pikolive/core/gift/bean/GiftInfo.java rename to core/src/main/java/com/bingchuang/core/gift/bean/GiftInfo.java index 4a536443b..9cb523efc 100644 --- a/core/src/main/java/com/pikolive/core/gift/bean/GiftInfo.java +++ b/core/src/main/java/com/bingchuang/core/gift/bean/GiftInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.gift.bean; +package com.bingchuang.core.gift.bean; import com.google.gson.annotations.SerializedName; diff --git a/core/src/main/java/com/pikolive/core/gift/bean/GiftKnapInfo.java b/core/src/main/java/com/bingchuang/core/gift/bean/GiftKnapInfo.java similarity index 97% rename from core/src/main/java/com/pikolive/core/gift/bean/GiftKnapInfo.java rename to core/src/main/java/com/bingchuang/core/gift/bean/GiftKnapInfo.java index 35d72a9f8..5f04cc902 100644 --- a/core/src/main/java/com/pikolive/core/gift/bean/GiftKnapInfo.java +++ b/core/src/main/java/com/bingchuang/core/gift/bean/GiftKnapInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.gift.bean; +package com.bingchuang.core.gift.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/gift/bean/GiftList.java b/core/src/main/java/com/bingchuang/core/gift/bean/GiftList.java similarity index 86% rename from core/src/main/java/com/pikolive/core/gift/bean/GiftList.java rename to core/src/main/java/com/bingchuang/core/gift/bean/GiftList.java index d4f145f9f..8bf517460 100644 --- a/core/src/main/java/com/pikolive/core/gift/bean/GiftList.java +++ b/core/src/main/java/com/bingchuang/core/gift/bean/GiftList.java @@ -1,4 +1,4 @@ -package com.pikolive.core.gift.bean; +package com.bingchuang.core.gift.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/gift/bean/GiftListInfo.java b/core/src/main/java/com/bingchuang/core/gift/bean/GiftListInfo.java similarity index 91% rename from core/src/main/java/com/pikolive/core/gift/bean/GiftListInfo.java rename to core/src/main/java/com/bingchuang/core/gift/bean/GiftListInfo.java index 568999f56..1a362edd5 100644 --- a/core/src/main/java/com/pikolive/core/gift/bean/GiftListInfo.java +++ b/core/src/main/java/com/bingchuang/core/gift/bean/GiftListInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.gift.bean; +package com.bingchuang.core.gift.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/bingchuang/core/gift/bean/GiftLuckyBag.java b/core/src/main/java/com/bingchuang/core/gift/bean/GiftLuckyBag.java new file mode 100644 index 000000000..5265c847e --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/gift/bean/GiftLuckyBag.java @@ -0,0 +1,5 @@ +package com.bingchuang.core.gift.bean; + +public class GiftLuckyBag { + +} diff --git a/core/src/main/java/com/pikolive/core/gift/bean/GiftMultiReceiverInfo.java b/core/src/main/java/com/bingchuang/core/gift/bean/GiftMultiReceiverInfo.java similarity index 73% rename from core/src/main/java/com/pikolive/core/gift/bean/GiftMultiReceiverInfo.java rename to core/src/main/java/com/bingchuang/core/gift/bean/GiftMultiReceiverInfo.java index 1dd4c1a40..641b181c0 100644 --- a/core/src/main/java/com/pikolive/core/gift/bean/GiftMultiReceiverInfo.java +++ b/core/src/main/java/com/bingchuang/core/gift/bean/GiftMultiReceiverInfo.java @@ -1,8 +1,8 @@ -package com.pikolive.core.gift.bean; +package com.bingchuang.core.gift.bean; -import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; -import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; -import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; +import com.bingchuang.core.room.giftvalue.bean.IndexGiftValue; +import com.bingchuang.core.room.giftvalue.bean.IndexGiftValue; +import com.bingchuang.core.room.giftvalue.bean.IndexGiftValue; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/gift/bean/GiftReceiveInfo.java b/core/src/main/java/com/bingchuang/core/gift/bean/GiftReceiveInfo.java similarity index 73% rename from core/src/main/java/com/pikolive/core/gift/bean/GiftReceiveInfo.java rename to core/src/main/java/com/bingchuang/core/gift/bean/GiftReceiveInfo.java index ef9c2a1d7..17219eca1 100644 --- a/core/src/main/java/com/pikolive/core/gift/bean/GiftReceiveInfo.java +++ b/core/src/main/java/com/bingchuang/core/gift/bean/GiftReceiveInfo.java @@ -1,8 +1,8 @@ -package com.pikolive.core.gift.bean; +package com.bingchuang.core.gift.bean; -import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; -import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; -import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; +import com.bingchuang.core.room.giftvalue.bean.IndexGiftValue; +import com.bingchuang.core.room.giftvalue.bean.IndexGiftValue; +import com.bingchuang.core.room.giftvalue.bean.IndexGiftValue; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/gift/bean/GiftReceiver.java b/core/src/main/java/com/bingchuang/core/gift/bean/GiftReceiver.java similarity index 86% rename from core/src/main/java/com/pikolive/core/gift/bean/GiftReceiver.java rename to core/src/main/java/com/bingchuang/core/gift/bean/GiftReceiver.java index 289b3b260..f17829df1 100644 --- a/core/src/main/java/com/pikolive/core/gift/bean/GiftReceiver.java +++ b/core/src/main/java/com/bingchuang/core/gift/bean/GiftReceiver.java @@ -1,4 +1,4 @@ -package com.pikolive.core.gift.bean; +package com.bingchuang.core.gift.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/gift/bean/GiftSendType.java b/core/src/main/java/com/bingchuang/core/gift/bean/GiftSendType.java similarity index 94% rename from core/src/main/java/com/pikolive/core/gift/bean/GiftSendType.java rename to core/src/main/java/com/bingchuang/core/gift/bean/GiftSendType.java index 0dc7db453..1278607af 100644 --- a/core/src/main/java/com/pikolive/core/gift/bean/GiftSendType.java +++ b/core/src/main/java/com/bingchuang/core/gift/bean/GiftSendType.java @@ -1,4 +1,4 @@ -package com.pikolive.core.gift.bean; +package com.bingchuang.core.gift.bean; /** * 赠送类型 1给主播直接刷礼物,2私聊送个人礼物, diff --git a/core/src/main/java/com/pikolive/core/gift/bean/GiftSource.java b/core/src/main/java/com/bingchuang/core/gift/bean/GiftSource.java similarity index 90% rename from core/src/main/java/com/pikolive/core/gift/bean/GiftSource.java rename to core/src/main/java/com/bingchuang/core/gift/bean/GiftSource.java index 5fe22b274..2d819388e 100644 --- a/core/src/main/java/com/pikolive/core/gift/bean/GiftSource.java +++ b/core/src/main/java/com/bingchuang/core/gift/bean/GiftSource.java @@ -1,4 +1,4 @@ -package com.pikolive.core.gift.bean; +package com.bingchuang.core.gift.bean; /** * 礼物的来源,1:普通,2:背包,3:师徒 diff --git a/core/src/main/java/com/pikolive/core/gift/bean/GiftTab.java b/core/src/main/java/com/bingchuang/core/gift/bean/GiftTab.java similarity index 92% rename from core/src/main/java/com/pikolive/core/gift/bean/GiftTab.java rename to core/src/main/java/com/bingchuang/core/gift/bean/GiftTab.java index 584e7034f..bdbfbaf1e 100644 --- a/core/src/main/java/com/pikolive/core/gift/bean/GiftTab.java +++ b/core/src/main/java/com/bingchuang/core/gift/bean/GiftTab.java @@ -1,4 +1,4 @@ -package com.pikolive.core.gift.bean; +package com.bingchuang.core.gift.bean; import android.view.View; diff --git a/core/src/main/java/com/pikolive/core/gift/bean/GiftType.java b/core/src/main/java/com/bingchuang/core/gift/bean/GiftType.java similarity index 94% rename from core/src/main/java/com/pikolive/core/gift/bean/GiftType.java rename to core/src/main/java/com/bingchuang/core/gift/bean/GiftType.java index a0f51be45..6a60f0076 100644 --- a/core/src/main/java/com/pikolive/core/gift/bean/GiftType.java +++ b/core/src/main/java/com/bingchuang/core/gift/bean/GiftType.java @@ -1,4 +1,4 @@ -package com.pikolive.core.gift.bean; +package com.bingchuang.core.gift.bean; /** * 礼物类型 1轻聊房,2游戏轰趴房,3福袋, 4套卡 diff --git a/core/src/main/java/com/pikolive/core/gift/bean/LuckyBagGifts.java b/core/src/main/java/com/bingchuang/core/gift/bean/LuckyBagGifts.java similarity index 75% rename from core/src/main/java/com/pikolive/core/gift/bean/LuckyBagGifts.java rename to core/src/main/java/com/bingchuang/core/gift/bean/LuckyBagGifts.java index 5fe9ec8c1..c1bf82566 100644 --- a/core/src/main/java/com/pikolive/core/gift/bean/LuckyBagGifts.java +++ b/core/src/main/java/com/bingchuang/core/gift/bean/LuckyBagGifts.java @@ -1,8 +1,8 @@ -package com.pikolive.core.gift.bean; +package com.bingchuang.core.gift.bean; -import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; -import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; -import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; +import com.bingchuang.core.room.giftvalue.bean.IndexGiftValue; +import com.bingchuang.core.room.giftvalue.bean.IndexGiftValue; +import com.bingchuang.core.room.giftvalue.bean.IndexGiftValue; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/gift/bean/LuckyBagNoticeInfo.java b/core/src/main/java/com/bingchuang/core/gift/bean/LuckyBagNoticeInfo.java similarity index 88% rename from core/src/main/java/com/pikolive/core/gift/bean/LuckyBagNoticeInfo.java rename to core/src/main/java/com/bingchuang/core/gift/bean/LuckyBagNoticeInfo.java index 388507fe9..e3ccd8bb7 100644 --- a/core/src/main/java/com/pikolive/core/gift/bean/LuckyBagNoticeInfo.java +++ b/core/src/main/java/com/bingchuang/core/gift/bean/LuckyBagNoticeInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.gift.bean; +package com.bingchuang.core.gift.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/gift/bean/LuckyGiftList.java b/core/src/main/java/com/bingchuang/core/gift/bean/LuckyGiftList.java similarity index 79% rename from core/src/main/java/com/pikolive/core/gift/bean/LuckyGiftList.java rename to core/src/main/java/com/bingchuang/core/gift/bean/LuckyGiftList.java index 199d6d0e9..22f34b84d 100644 --- a/core/src/main/java/com/pikolive/core/gift/bean/LuckyGiftList.java +++ b/core/src/main/java/com/bingchuang/core/gift/bean/LuckyGiftList.java @@ -1,4 +1,4 @@ -package com.pikolive.core.gift.bean; +package com.bingchuang.core.gift.bean; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/gift/bean/MultiGiftReceiveInfo.java b/core/src/main/java/com/bingchuang/core/gift/bean/MultiGiftReceiveInfo.java similarity index 72% rename from core/src/main/java/com/pikolive/core/gift/bean/MultiGiftReceiveInfo.java rename to core/src/main/java/com/bingchuang/core/gift/bean/MultiGiftReceiveInfo.java index 21063b5f6..ce43d09ac 100644 --- a/core/src/main/java/com/pikolive/core/gift/bean/MultiGiftReceiveInfo.java +++ b/core/src/main/java/com/bingchuang/core/gift/bean/MultiGiftReceiveInfo.java @@ -1,8 +1,8 @@ -package com.pikolive.core.gift.bean; +package com.bingchuang.core.gift.bean; -import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; -import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; -import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; +import com.bingchuang.core.room.giftvalue.bean.IndexGiftValue; +import com.bingchuang.core.room.giftvalue.bean.IndexGiftValue; +import com.bingchuang.core.room.giftvalue.bean.IndexGiftValue; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/gift/bean/SendGiftScenes.java b/core/src/main/java/com/bingchuang/core/gift/bean/SendGiftScenes.java similarity index 89% rename from core/src/main/java/com/pikolive/core/gift/bean/SendGiftScenes.java rename to core/src/main/java/com/bingchuang/core/gift/bean/SendGiftScenes.java index 0e5bef8a8..19b93c2c0 100644 --- a/core/src/main/java/com/pikolive/core/gift/bean/SendGiftScenes.java +++ b/core/src/main/java/com/bingchuang/core/gift/bean/SendGiftScenes.java @@ -1,4 +1,4 @@ -package com.pikolive.core.gift.bean; +package com.bingchuang.core.gift.bean; /** * 列举送礼物使用的场景 diff --git a/core/src/main/java/com/pikolive/core/gift/bean/SimpleUserInfo.kt b/core/src/main/java/com/bingchuang/core/gift/bean/SimpleUserInfo.kt similarity index 84% rename from core/src/main/java/com/pikolive/core/gift/bean/SimpleUserInfo.kt rename to core/src/main/java/com/bingchuang/core/gift/bean/SimpleUserInfo.kt index fddd06d5a..8efbd8628 100644 --- a/core/src/main/java/com/pikolive/core/gift/bean/SimpleUserInfo.kt +++ b/core/src/main/java/com/bingchuang/core/gift/bean/SimpleUserInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.gift.bean +package com.bingchuang.core.gift.bean import java.io.Serializable diff --git a/core/src/main/java/com/pikolive/core/gift/bean/SimpleVipInfo.java b/core/src/main/java/com/bingchuang/core/gift/bean/SimpleVipInfo.java similarity index 78% rename from core/src/main/java/com/pikolive/core/gift/bean/SimpleVipInfo.java rename to core/src/main/java/com/bingchuang/core/gift/bean/SimpleVipInfo.java index b7b6641da..5b2b7bce0 100644 --- a/core/src/main/java/com/pikolive/core/gift/bean/SimpleVipInfo.java +++ b/core/src/main/java/com/bingchuang/core/gift/bean/SimpleVipInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.gift.bean; +package com.bingchuang.core.gift.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/gift/event/HideCarEffectEvent.java b/core/src/main/java/com/bingchuang/core/gift/event/HideCarEffectEvent.java similarity index 78% rename from core/src/main/java/com/pikolive/core/gift/event/HideCarEffectEvent.java rename to core/src/main/java/com/bingchuang/core/gift/event/HideCarEffectEvent.java index 41300b75c..781d1fb74 100644 --- a/core/src/main/java/com/pikolive/core/gift/event/HideCarEffectEvent.java +++ b/core/src/main/java/com/bingchuang/core/gift/event/HideCarEffectEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.gift.event; +package com.bingchuang.core.gift.event; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/gift/event/RoomFreeGiftEvent.java b/core/src/main/java/com/bingchuang/core/gift/event/RoomFreeGiftEvent.java similarity index 72% rename from core/src/main/java/com/pikolive/core/gift/event/RoomFreeGiftEvent.java rename to core/src/main/java/com/bingchuang/core/gift/event/RoomFreeGiftEvent.java index 449f4841a..bed0677cc 100644 --- a/core/src/main/java/com/pikolive/core/gift/event/RoomFreeGiftEvent.java +++ b/core/src/main/java/com/bingchuang/core/gift/event/RoomFreeGiftEvent.java @@ -1,6 +1,6 @@ -package com.pikolive.core.gift.event; +package com.bingchuang.core.gift.event; -import com.pikolive.core.gift.bean.GiftFreeInfo; +import com.bingchuang.core.gift.bean.GiftFreeInfo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/gift/event/UpdateKnapEvent.java b/core/src/main/java/com/bingchuang/core/gift/event/UpdateKnapEvent.java similarity index 85% rename from core/src/main/java/com/pikolive/core/gift/event/UpdateKnapEvent.java rename to core/src/main/java/com/bingchuang/core/gift/event/UpdateKnapEvent.java index bede83e2b..144b7a063 100644 --- a/core/src/main/java/com/pikolive/core/gift/event/UpdateKnapEvent.java +++ b/core/src/main/java/com/bingchuang/core/gift/event/UpdateKnapEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.gift.event; +package com.bingchuang.core.gift.event; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/gift/event/UpdateKnapFreeGiftDataEvent.java b/core/src/main/java/com/bingchuang/core/gift/event/UpdateKnapFreeGiftDataEvent.java similarity index 72% rename from core/src/main/java/com/pikolive/core/gift/event/UpdateKnapFreeGiftDataEvent.java rename to core/src/main/java/com/bingchuang/core/gift/event/UpdateKnapFreeGiftDataEvent.java index ff638139f..be90a6636 100644 --- a/core/src/main/java/com/pikolive/core/gift/event/UpdateKnapFreeGiftDataEvent.java +++ b/core/src/main/java/com/bingchuang/core/gift/event/UpdateKnapFreeGiftDataEvent.java @@ -1,6 +1,6 @@ -package com.pikolive.core.gift.event; +package com.bingchuang.core.gift.event; -import com.pikolive.core.im.custom.bean.RoomFreeGiftMsgBean; +import com.bingchuang.core.im.custom.bean.RoomFreeGiftMsgBean; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/gift/event/UpdateKnapFreeGiftEvent.java b/core/src/main/java/com/bingchuang/core/gift/event/UpdateKnapFreeGiftEvent.java similarity index 86% rename from core/src/main/java/com/pikolive/core/gift/event/UpdateKnapFreeGiftEvent.java rename to core/src/main/java/com/bingchuang/core/gift/event/UpdateKnapFreeGiftEvent.java index d9af5473c..4875e1f7f 100644 --- a/core/src/main/java/com/pikolive/core/gift/event/UpdateKnapFreeGiftEvent.java +++ b/core/src/main/java/com/bingchuang/core/gift/event/UpdateKnapFreeGiftEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.gift.event; +package com.bingchuang.core.gift.event; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/gift/event/UpdateKnapFreeGiftNumEvent.java b/core/src/main/java/com/bingchuang/core/gift/event/UpdateKnapFreeGiftNumEvent.java similarity index 86% rename from core/src/main/java/com/pikolive/core/gift/event/UpdateKnapFreeGiftNumEvent.java rename to core/src/main/java/com/bingchuang/core/gift/event/UpdateKnapFreeGiftNumEvent.java index 2358bfb58..98fffdc97 100644 --- a/core/src/main/java/com/pikolive/core/gift/event/UpdateKnapFreeGiftNumEvent.java +++ b/core/src/main/java/com/bingchuang/core/gift/event/UpdateKnapFreeGiftNumEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.gift.event; +package com.bingchuang.core.gift.event; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/gift/exception/GiftOutOfDateException.java b/core/src/main/java/com/bingchuang/core/gift/exception/GiftOutOfDateException.java similarity index 84% rename from core/src/main/java/com/pikolive/core/gift/exception/GiftOutOfDateException.java rename to core/src/main/java/com/bingchuang/core/gift/exception/GiftOutOfDateException.java index 96c18df3d..d156b3e39 100644 --- a/core/src/main/java/com/pikolive/core/gift/exception/GiftOutOfDateException.java +++ b/core/src/main/java/com/bingchuang/core/gift/exception/GiftOutOfDateException.java @@ -1,4 +1,4 @@ -package com.pikolive.core.gift.exception; +package com.bingchuang.core.gift.exception; /** * 礼物过期 diff --git a/core/src/main/java/com/pikolive/core/gift/toolbox/GiftToolbox.java b/core/src/main/java/com/bingchuang/core/gift/toolbox/GiftToolbox.java similarity index 94% rename from core/src/main/java/com/pikolive/core/gift/toolbox/GiftToolbox.java rename to core/src/main/java/com/bingchuang/core/gift/toolbox/GiftToolbox.java index 3a2cb7756..504056e44 100644 --- a/core/src/main/java/com/pikolive/core/gift/toolbox/GiftToolbox.java +++ b/core/src/main/java/com/bingchuang/core/gift/toolbox/GiftToolbox.java @@ -1,4 +1,4 @@ -package com.pikolive.core.gift.toolbox; +package com.bingchuang.core.gift.toolbox; import android.text.TextUtils; @@ -10,32 +10,32 @@ 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.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.gift.GiftModel; -import com.pikolive.core.gift.bean.GiftInfo; -import com.pikolive.core.gift.bean.GiftMultiReceiverInfo; -import com.pikolive.core.gift.bean.GiftReceiveInfo; -import com.pikolive.core.gift.bean.GiftReceiver; -import com.pikolive.core.gift.bean.LuckyBagGifts; -import com.pikolive.core.gift.bean.MultiGiftReceiveInfo; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.im.custom.bean.DrawGiftAttachment; -import com.pikolive.core.im.custom.bean.GiftAttachment; -import com.pikolive.core.im.custom.bean.GiftBatchAttachment; -import com.pikolive.core.im.custom.bean.MultiGiftAttachment; -import com.pikolive.core.im.custom.bean.MultiLuckyGiftAttachment; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.manager.RoomEvent; -import com.pikolive.core.public_chat_hall.manager.PublicChatHallDataManager; -import com.pikolive.core.public_chat_hall.model.PublicChatHallModel; -import com.pikolive.core2.retry.ImRetryManager; -import com.pikolive.core.user.UserModel; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.gift.GiftModel; +import com.bingchuang.core.gift.bean.GiftInfo; +import com.bingchuang.core.gift.bean.GiftMultiReceiverInfo; +import com.bingchuang.core.gift.bean.GiftReceiveInfo; +import com.bingchuang.core.gift.bean.GiftReceiver; +import com.bingchuang.core.gift.bean.LuckyBagGifts; +import com.bingchuang.core.gift.bean.MultiGiftReceiveInfo; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.im.custom.bean.DrawGiftAttachment; +import com.bingchuang.core.im.custom.bean.GiftAttachment; +import com.bingchuang.core.im.custom.bean.GiftBatchAttachment; +import com.bingchuang.core.im.custom.bean.MultiGiftAttachment; +import com.bingchuang.core.im.custom.bean.MultiLuckyGiftAttachment; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.manager.RoomEvent; +import com.bingchuang.core.public_chat_hall.manager.PublicChatHallDataManager; +import com.bingchuang.core.public_chat_hall.model.PublicChatHallModel; +import com.bingchuang.core2.retry.ImRetryManager; +import com.bingchuang.core.user.UserModel; import com.bingchuang.library.utils.ListUtils; import java.util.ArrayList; diff --git a/core/src/main/java/com/pikolive/core/im/CustomNotifyType.java b/core/src/main/java/com/bingchuang/core/im/CustomNotifyType.java similarity index 75% rename from core/src/main/java/com/pikolive/core/im/CustomNotifyType.java rename to core/src/main/java/com/bingchuang/core/im/CustomNotifyType.java index e0f4bc950..36dc9e196 100644 --- a/core/src/main/java/com/pikolive/core/im/CustomNotifyType.java +++ b/core/src/main/java/com/bingchuang/core/im/CustomNotifyType.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im; +package com.bingchuang.core.im; public class CustomNotifyType { //异性匹配 diff --git a/core/src/main/java/com/pikolive/core/im/GreetModel.java b/core/src/main/java/com/bingchuang/core/im/GreetModel.java similarity index 64% rename from core/src/main/java/com/pikolive/core/im/GreetModel.java rename to core/src/main/java/com/bingchuang/core/im/GreetModel.java index 8b65ce901..c07b40413 100644 --- a/core/src/main/java/com/pikolive/core/im/GreetModel.java +++ b/core/src/main/java/com/bingchuang/core/im/GreetModel.java @@ -1,14 +1,14 @@ -package com.pikolive.core.im; +package com.bingchuang.core.im; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.utils.net.RxHelper; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.utils.net.RxHelper; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.utils.net.RxHelper; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.utils.net.RxHelper; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import io.reactivex.Single; diff --git a/core/src/main/java/com/pikolive/core/im/RefreshInRoomListEvent.java b/core/src/main/java/com/bingchuang/core/im/RefreshInRoomListEvent.java similarity index 78% rename from core/src/main/java/com/pikolive/core/im/RefreshInRoomListEvent.java rename to core/src/main/java/com/bingchuang/core/im/RefreshInRoomListEvent.java index 25f3e5332..96ecfb6df 100644 --- a/core/src/main/java/com/pikolive/core/im/RefreshInRoomListEvent.java +++ b/core/src/main/java/com/bingchuang/core/im/RefreshInRoomListEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im; +package com.bingchuang.core.im; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/im/avroom/IAVRoomCoreClient.java b/core/src/main/java/com/bingchuang/core/im/avroom/IAVRoomCoreClient.java similarity index 97% rename from core/src/main/java/com/pikolive/core/im/avroom/IAVRoomCoreClient.java rename to core/src/main/java/com/bingchuang/core/im/avroom/IAVRoomCoreClient.java index fb35c2893..ab4e233c6 100644 --- a/core/src/main/java/com/pikolive/core/im/avroom/IAVRoomCoreClient.java +++ b/core/src/main/java/com/bingchuang/core/im/avroom/IAVRoomCoreClient.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.avroom; +package com.bingchuang.core.im.avroom; import com.bingchuang.library.coremanager.ICoreClient; diff --git a/core/src/main/java/com/pikolive/core/im/chatterbox/CanSendInfo.java b/core/src/main/java/com/bingchuang/core/im/chatterbox/CanSendInfo.java similarity index 72% rename from core/src/main/java/com/pikolive/core/im/chatterbox/CanSendInfo.java rename to core/src/main/java/com/bingchuang/core/im/chatterbox/CanSendInfo.java index 2ae2ac455..3f0ccb9e1 100644 --- a/core/src/main/java/com/pikolive/core/im/chatterbox/CanSendInfo.java +++ b/core/src/main/java/com/bingchuang/core/im/chatterbox/CanSendInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.chatterbox; +package com.bingchuang.core.im.chatterbox; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/im/chatterbox/ChatterBoxHelper.java b/core/src/main/java/com/bingchuang/core/im/chatterbox/ChatterBoxHelper.java similarity index 90% rename from core/src/main/java/com/pikolive/core/im/chatterbox/ChatterBoxHelper.java rename to core/src/main/java/com/bingchuang/core/im/chatterbox/ChatterBoxHelper.java index ac09fd6e7..6d798f2e6 100644 --- a/core/src/main/java/com/pikolive/core/im/chatterbox/ChatterBoxHelper.java +++ b/core/src/main/java/com/bingchuang/core/im/chatterbox/ChatterBoxHelper.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.chatterbox; +package com.bingchuang.core.im.chatterbox; import android.text.TextUtils; @@ -8,16 +8,16 @@ 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.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.R; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.im.custom.bean.ChatterBoxAttachment; -import com.pikolive.core.im.custom.bean.ChatterBoxInitAttachment; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.user.UserModel; -import com.pikolive.core.utils.SharedPreferenceUtils; -import com.pikolive.core.utils.net.BeanObserver; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.R; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.im.custom.bean.ChatterBoxAttachment; +import com.bingchuang.core.im.custom.bean.ChatterBoxInitAttachment; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.user.UserModel; +import com.bingchuang.core.utils.SharedPreferenceUtils; +import com.bingchuang.core.utils.net.BeanObserver; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.SingleToastUtil; diff --git a/core/src/main/java/com/pikolive/core/im/chatterbox/ChatterBoxModel.java b/core/src/main/java/com/bingchuang/core/im/chatterbox/ChatterBoxModel.java similarity index 90% rename from core/src/main/java/com/pikolive/core/im/chatterbox/ChatterBoxModel.java rename to core/src/main/java/com/bingchuang/core/im/chatterbox/ChatterBoxModel.java index 6391e414d..a06583bc3 100644 --- a/core/src/main/java/com/pikolive/core/im/chatterbox/ChatterBoxModel.java +++ b/core/src/main/java/com/bingchuang/core/im/chatterbox/ChatterBoxModel.java @@ -1,11 +1,11 @@ -package com.pikolive.core.im.chatterbox; +package com.bingchuang.core.im.chatterbox; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import java.util.List; diff --git a/core/src/main/java/com/bingchuang/core/im/chatterbox/HideInputEvent.java b/core/src/main/java/com/bingchuang/core/im/chatterbox/HideInputEvent.java new file mode 100644 index 000000000..4d4076f61 --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/im/chatterbox/HideInputEvent.java @@ -0,0 +1,4 @@ +package com.bingchuang.core.im.chatterbox; + +public class HideInputEvent { +} diff --git a/core/src/main/java/com/pikolive/core/im/chatterbox/IChatterBoxModel.java b/core/src/main/java/com/bingchuang/core/im/chatterbox/IChatterBoxModel.java similarity index 64% rename from core/src/main/java/com/pikolive/core/im/chatterbox/IChatterBoxModel.java rename to core/src/main/java/com/bingchuang/core/im/chatterbox/IChatterBoxModel.java index 7780a5e4e..8e88c7c1b 100644 --- a/core/src/main/java/com/pikolive/core/im/chatterbox/IChatterBoxModel.java +++ b/core/src/main/java/com/bingchuang/core/im/chatterbox/IChatterBoxModel.java @@ -1,8 +1,8 @@ -package com.pikolive.core.im.chatterbox; +package com.bingchuang.core.im.chatterbox; -import com.pikolive.core.base.IModel; -import com.pikolive.core.base.IModel; -import com.pikolive.core.base.IModel; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.base.IModel; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/im/chatterbox/TopicBoxItemInfo.java b/core/src/main/java/com/bingchuang/core/im/chatterbox/TopicBoxItemInfo.java similarity index 75% rename from core/src/main/java/com/pikolive/core/im/chatterbox/TopicBoxItemInfo.java rename to core/src/main/java/com/bingchuang/core/im/chatterbox/TopicBoxItemInfo.java index d43fc2203..21f34d75f 100644 --- a/core/src/main/java/com/pikolive/core/im/chatterbox/TopicBoxItemInfo.java +++ b/core/src/main/java/com/bingchuang/core/im/chatterbox/TopicBoxItemInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.chatterbox; +package com.bingchuang.core.im.chatterbox; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/im/custom/AttachManager.java b/core/src/main/java/com/bingchuang/core/im/custom/AttachManager.java similarity index 78% rename from core/src/main/java/com/pikolive/core/im/custom/AttachManager.java rename to core/src/main/java/com/bingchuang/core/im/custom/AttachManager.java index a684a9da3..4dba97ba2 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/AttachManager.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/AttachManager.java @@ -1,10 +1,10 @@ -package com.pikolive.core.im.custom; +package com.bingchuang.core.im.custom; import android.util.SparseArray; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.im.custom.bean.CustomAttachment; /** * diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/ActivityTimerAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/ActivityTimerAttachment.java similarity index 80% rename from core/src/main/java/com/pikolive/core/im/custom/bean/ActivityTimerAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/ActivityTimerAttachment.java index edf52a63b..6858aa542 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/ActivityTimerAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/ActivityTimerAttachment.java @@ -1,10 +1,10 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core.room.activitytimer.TimerBean; -import com.pikolive.core.room.activitytimer.TimerBean; -import com.pikolive.core.room.activitytimer.TimerBean; +import com.bingchuang.core.room.activitytimer.TimerBean; +import com.bingchuang.core.room.activitytimer.TimerBean; +import com.bingchuang.core.room.activitytimer.TimerBean; import lombok.Getter; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/AssistantAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/AssistantAttachment.java similarity index 96% rename from core/src/main/java/com/pikolive/core/im/custom/bean/AssistantAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/AssistantAttachment.java index 223348f8d..052f4bf27 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/AssistantAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/AssistantAttachment.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/AuctionAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/AuctionAttachment.java similarity index 85% rename from core/src/main/java/com/pikolive/core/im/custom/bean/AuctionAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/AuctionAttachment.java index 38aea1462..f18926610 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/AuctionAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/AuctionAttachment.java @@ -1,14 +1,14 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core.room.auction.bean.AuctionInfo; -import com.pikolive.core.room.auction.bean.AuctionUser; -import com.pikolive.core.room.auction.bean.AuctionInfo; -import com.pikolive.core.room.auction.bean.AuctionUser; -import com.pikolive.core.room.auction.bean.AuctionInfo; -import com.pikolive.core.room.auction.bean.AuctionUser; +import com.bingchuang.core.room.auction.bean.AuctionInfo; +import com.bingchuang.core.room.auction.bean.AuctionUser; +import com.bingchuang.core.room.auction.bean.AuctionInfo; +import com.bingchuang.core.room.auction.bean.AuctionUser; +import com.bingchuang.core.room.auction.bean.AuctionInfo; +import com.bingchuang.core.room.auction.bean.AuctionUser; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/CarAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/CarAttachment.java similarity index 97% rename from core/src/main/java/com/pikolive/core/im/custom/bean/CarAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/CarAttachment.java index 9b8ca8c6b..5df99429c 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/CarAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/CarAttachment.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/CarveUpGoldAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/CarveUpGoldAttachment.java similarity index 95% rename from core/src/main/java/com/pikolive/core/im/custom/bean/CarveUpGoldAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/CarveUpGoldAttachment.java index 228967214..743e15199 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/CarveUpGoldAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/CarveUpGoldAttachment.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/CarveUpGoldSecondLevelAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/CarveUpGoldSecondLevelAttachment.java similarity index 85% rename from core/src/main/java/com/pikolive/core/im/custom/bean/CarveUpGoldSecondLevelAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/CarveUpGoldSecondLevelAttachment.java index a5705440e..d502a89f5 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/CarveUpGoldSecondLevelAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/CarveUpGoldSecondLevelAttachment.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; /** * 瓜分钻石,二级,房间公屏 diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/CarveUpGoldThirdLevelAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/CarveUpGoldThirdLevelAttachment.java similarity index 86% rename from core/src/main/java/com/pikolive/core/im/custom/bean/CarveUpGoldThirdLevelAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/CarveUpGoldThirdLevelAttachment.java index 67eefcde7..de4f574f1 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/CarveUpGoldThirdLevelAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/CarveUpGoldThirdLevelAttachment.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; /** * 瓜分钻石,三级,房间公屏+小秘书 diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/ChatHintAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/ChatHintAttachment.java similarity index 93% rename from core/src/main/java/com/pikolive/core/im/custom/bean/ChatHintAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/ChatHintAttachment.java index 0a9227e87..b9b165d13 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/ChatHintAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/ChatHintAttachment.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/ChatterBoxAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/ChatterBoxAttachment.java similarity index 81% rename from core/src/main/java/com/pikolive/core/im/custom/bean/ChatterBoxAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/ChatterBoxAttachment.java index 8252c7801..a3796dae7 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/ChatterBoxAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/ChatterBoxAttachment.java @@ -1,9 +1,9 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; -import com.pikolive.core.im.chatterbox.TopicBoxItemInfo; -import com.pikolive.core.im.chatterbox.TopicBoxItemInfo; -import com.pikolive.core.im.chatterbox.TopicBoxItemInfo; +import com.bingchuang.core.im.chatterbox.TopicBoxItemInfo; +import com.bingchuang.core.im.chatterbox.TopicBoxItemInfo; +import com.bingchuang.core.im.chatterbox.TopicBoxItemInfo; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/ChatterBoxInitAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/ChatterBoxInitAttachment.java similarity index 91% rename from core/src/main/java/com/pikolive/core/im/custom/bean/ChatterBoxInitAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/ChatterBoxInitAttachment.java index 6d591ee7b..3abd0452e 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/ChatterBoxInitAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/ChatterBoxInitAttachment.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/CleanScreenAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/CleanScreenAttachment.java similarity index 95% rename from core/src/main/java/com/pikolive/core/im/custom/bean/CleanScreenAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/CleanScreenAttachment.java index d874405ce..a879aaac5 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/CleanScreenAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/CleanScreenAttachment.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/CpInviteAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/CpInviteAttachment.java similarity index 78% rename from core/src/main/java/com/pikolive/core/im/custom/bean/CpInviteAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/CpInviteAttachment.java index b338a9bac..a90aa6946 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/CpInviteAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/CpInviteAttachment.java @@ -1,13 +1,13 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core.relation.cp.CpInviteInfo; -import com.pikolive.core.relation.cp.CpInviteMessage; -import com.pikolive.core.relation.cp.CpInviteInfo; -import com.pikolive.core.relation.cp.CpInviteMessage; -import com.pikolive.core.relation.cp.CpInviteInfo; -import com.pikolive.core.relation.cp.CpInviteMessage; +import com.bingchuang.core.relation.cp.CpInviteInfo; +import com.bingchuang.core.relation.cp.CpInviteMessage; +import com.bingchuang.core.relation.cp.CpInviteInfo; +import com.bingchuang.core.relation.cp.CpInviteMessage; +import com.bingchuang.core.relation.cp.CpInviteInfo; +import com.bingchuang.core.relation.cp.CpInviteMessage; public class CpInviteAttachment extends CustomAttachment { diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/CustomAttachParser.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/CustomAttachParser.java similarity index 70% rename from core/src/main/java/com/pikolive/core/im/custom/bean/CustomAttachParser.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/CustomAttachParser.java index 736bff573..b7ab35b45 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/CustomAttachParser.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/CustomAttachParser.java @@ -1,139 +1,139 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_DYNAMTC_BAN_DELETE; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_DYNAMTC_PASS; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_DYNAMTC_UNREADCOUNT; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_CAR; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_ROOM_PK; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ASSISTANT_COMMON_MSG; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ASSISTANT_MSG; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_BOX; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CHARM_LEVEL_UP; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CHATTER_BOX; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CHATTER_BOX_ASK; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CHATTER_BOX_DROP; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CHATTER_BOX_INIT; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CLAN; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAGON_BAR; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAW_GIFT_EFFECT; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_EXPER_LEVEL_UP; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_EXPER_LEVEL_UP_NOTICE; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_FAIRY; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_MEMBER_COUNT; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_ROOM_NOTIFY; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_TOPIC; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_ROOM_JOIN_NOTICE; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_COMMON_SYSTEM_MSG; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_KICK_MIC; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_LUCKY_MONEY; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_SEND_MAGIC; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_SHARE_IN_APP; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEAD_SHIFT_OUT; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_IM_TIP; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LEAVE_MODE; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LEAVE_MODE_NOTICE; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LEVEL_UP; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_ROOM_NOTIFY; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_SERVER_NOTIFY; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MENTORING_RELATIONSHIP; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MINI_WORLD; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MODULE_HALL; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_PUBLIC_CHAT_HALL; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_QUEUING_MIC; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RADISH; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RED_PACKAGE; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ROOM_GIFT_VALUE; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_FAMILY; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_MINI_WORLD; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_ROOM; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_TEAM; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SIGN_IN; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_CLANAPPLY; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_CLANNORMAL; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_FAIRY_ASK_FOR; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_FAIRY_SEND; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_APPLY_EXIT; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_APPLY_JOIN; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_MANAGER_INVITE; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_NOTICE; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_TO_BE_OWNER; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_PUBLIC_CHAT_HALL_AIT; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_PUBLIC_CHAT_HALL_AIT_ME; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_PUBLIC_CHAT_HALL_FULL_SCREEN; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_PUBLIC_CHAT_HALL_GIFT; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_RED_PACKAGE_RECEIVE_ALL_DIAMOND; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_RED_PACKAGE_RECEIVE_ROOM_DIAMOND; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_RED_PACKAGE_RECEIVE_ROOM_DIAMOND2; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_RED_PACKAGE_RECEIVE_ROOM_MSG; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_DRAW_GIFT_EFFECT; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_RECEIVE_LUCKY_MONEY; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_ADD_BLACK; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_KICK_ROOM; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_LUCKY_MONEY; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_MULTI_MAGIC; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_SINGLE_MAGIC; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_AUDIO; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_CLEAN_SCREEN; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_CLOSE_REDPACKAGE; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_CLOSE_SCREEN; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_GIFT; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_NOTICE; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VOICE_BOTTLE_HEAD; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VOICE_BOTTLE_SUB_HEART; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VOICE_BOTTLE_SUB_HELLO; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VOICE_BOTTLE_SUB_TO_RECORDING; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VOICE_BOTTLE_SUB_tO_MATCHING; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_NOTI_SUB_GAME_ATTACK; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_NOTI_SUB_GAME_RESULT; -import static com.pikolive.core.im.custom.bean.CustomAttachment.ROOM_FREE_GIFT; -import static com.pikolive.core.im.custom.bean.CustomAttachment.ROOM_FREE_GIFT_CHANGE; -import static com.pikolive.core.im.custom.bean.CustomAttachment.ROOM_FREE_GIFT_REST; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_DYNAMTC_BAN_DELETE; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_DYNAMTC_PASS; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_DYNAMTC_UNREADCOUNT; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_CAR; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_ROOM_PK; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ASSISTANT_COMMON_MSG; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ASSISTANT_MSG; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_BOX; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CHARM_LEVEL_UP; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CHATTER_BOX; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CHATTER_BOX_ASK; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CHATTER_BOX_DROP; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CHATTER_BOX_INIT; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CLAN; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAGON_BAR; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAW_GIFT_EFFECT; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_EXPER_LEVEL_UP; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_EXPER_LEVEL_UP_NOTICE; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_FAIRY; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_MEMBER_COUNT; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_ROOM_NOTIFY; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_TOPIC; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_ROOM_JOIN_NOTICE; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_COMMON_SYSTEM_MSG; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_KICK_MIC; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_LUCKY_MONEY; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_SEND_MAGIC; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_SHARE_IN_APP; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEAD_SHIFT_OUT; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_IM_TIP; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LEAVE_MODE; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LEAVE_MODE_NOTICE; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LEVEL_UP; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_ROOM_NOTIFY; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_SERVER_NOTIFY; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MENTORING_RELATIONSHIP; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MINI_WORLD; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MODULE_HALL; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_PUBLIC_CHAT_HALL; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_QUEUING_MIC; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RADISH; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RED_PACKAGE; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ROOM_GIFT_VALUE; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_FAMILY; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_MINI_WORLD; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_ROOM; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_TEAM; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SIGN_IN; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_CLANAPPLY; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_CLANNORMAL; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_FAIRY_ASK_FOR; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_FAIRY_SEND; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_APPLY_EXIT; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_APPLY_JOIN; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_MANAGER_INVITE; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_NOTICE; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_TO_BE_OWNER; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_PUBLIC_CHAT_HALL_AIT; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_PUBLIC_CHAT_HALL_AIT_ME; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_PUBLIC_CHAT_HALL_FULL_SCREEN; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_PUBLIC_CHAT_HALL_GIFT; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_RED_PACKAGE_RECEIVE_ALL_DIAMOND; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_RED_PACKAGE_RECEIVE_ROOM_DIAMOND; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_RED_PACKAGE_RECEIVE_ROOM_DIAMOND2; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_RED_PACKAGE_RECEIVE_ROOM_MSG; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_DRAW_GIFT_EFFECT; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_RECEIVE_LUCKY_MONEY; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_ADD_BLACK; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_KICK_ROOM; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_LUCKY_MONEY; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_MULTI_MAGIC; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_SINGLE_MAGIC; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_AUDIO; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_CLEAN_SCREEN; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_CLOSE_REDPACKAGE; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_CLOSE_SCREEN; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_GIFT; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_NOTICE; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VOICE_BOTTLE_HEAD; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VOICE_BOTTLE_SUB_HEART; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VOICE_BOTTLE_SUB_HELLO; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VOICE_BOTTLE_SUB_TO_RECORDING; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VOICE_BOTTLE_SUB_tO_MATCHING; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_NOTI_SUB_GAME_ATTACK; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_NOTI_SUB_GAME_RESULT; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.ROOM_FREE_GIFT; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.ROOM_FREE_GIFT_CHANGE; +import static com.bingchuang.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.pikolive.core.bean.attachmsg.RoomQueueMsgAttachment; -import com.pikolive.core.gift.GiftModel; -import com.pikolive.core.room.bean.LeaveModeAttachment; -import com.pikolive.core.room.pk.attachment.RoomPkAttachment; -import com.pikolive.core.room.queuing_mic.attachment.QueuingMicAttachment; -import com.pikolive.core.bean.attachmsg.RoomQueueMsgAttachment; -import com.pikolive.core.gift.GiftModel; -import com.pikolive.core.room.bean.LeaveModeAttachment; -import com.pikolive.core.room.pk.attachment.RoomPkAttachment; -import com.pikolive.core.room.queuing_mic.attachment.QueuingMicAttachment; -import com.pikolive.core.R; -import com.pikolive.core.bean.attachmsg.RoomQueueMsgAttachment; -import com.pikolive.core.community.attachment.DynamicSysAttachment; -import com.pikolive.core.community.attachment.UnReadCountAttachment; -import com.pikolive.core.community.im.WorldDynamicAttachment; -import com.pikolive.core.gift.GiftModel; -import com.pikolive.core.im.custom.AttachManager; -import com.pikolive.core.mentoring_relationship.attachment.MentoringApprenticeMissionFourAttachment; -import com.pikolive.core.mentoring_relationship.attachment.MentoringApprenticeMissionOneAttachment; -import com.pikolive.core.mentoring_relationship.attachment.MentoringApprenticeMissionThreeAttachment; -import com.pikolive.core.mentoring_relationship.attachment.MentoringApprenticeMissionTwoAttachment; -import com.pikolive.core.mentoring_relationship.attachment.MentoringMasterMissionFourAttachment; -import com.pikolive.core.mentoring_relationship.attachment.MentoringMasterMissionOneAttachment; -import com.pikolive.core.mentoring_relationship.attachment.MentoringMasterMissionThreeAttachment; -import com.pikolive.core.mentoring_relationship.attachment.MentoringMasterMissionTwoAttachment; -import com.pikolive.core.mentoring_relationship.attachment.MentoringMissionTipsAttachment; -import com.pikolive.core.mentoring_relationship.attachment.MentoringSharingRoomAttachment; -import com.pikolive.core.miniworld.bean.MWChatMemberCountAttachment; -import com.pikolive.core.miniworld.bean.MWChatTopicAttachment; -import com.pikolive.core.miniworld.bean.OpenAudioPartyAttachment; -import com.pikolive.core.module_hall.im.ClanAttachment; -import com.pikolive.core.public_chat_hall.attachment.AitFriendsAttachment; -import com.pikolive.core.public_chat_hall.attachment.AitMeAttachment; -import com.pikolive.core.room.bean.LeaveModeAttachment; -import com.pikolive.core.room.pk.attachment.RoomPkAttachment; -import com.pikolive.core.room.queuing_mic.attachment.QueuingMicAttachment; -import com.pikolive.core.admin.attachment.SuperAdminOpAttachment; -import com.pikolive.core.admin.util.SaMsgUtil; -import com.pikolive.core.utils.LogUtils; +import com.bingchuang.core.bean.attachmsg.RoomQueueMsgAttachment; +import com.bingchuang.core.gift.GiftModel; +import com.bingchuang.core.room.bean.LeaveModeAttachment; +import com.bingchuang.core.room.pk.attachment.RoomPkAttachment; +import com.bingchuang.core.room.queuing_mic.attachment.QueuingMicAttachment; +import com.bingchuang.core.bean.attachmsg.RoomQueueMsgAttachment; +import com.bingchuang.core.gift.GiftModel; +import com.bingchuang.core.room.bean.LeaveModeAttachment; +import com.bingchuang.core.room.pk.attachment.RoomPkAttachment; +import com.bingchuang.core.room.queuing_mic.attachment.QueuingMicAttachment; +import com.bingchuang.core.R; +import com.bingchuang.core.bean.attachmsg.RoomQueueMsgAttachment; +import com.bingchuang.core.community.attachment.DynamicSysAttachment; +import com.bingchuang.core.community.attachment.UnReadCountAttachment; +import com.bingchuang.core.community.im.WorldDynamicAttachment; +import com.bingchuang.core.gift.GiftModel; +import com.bingchuang.core.im.custom.AttachManager; +import com.bingchuang.core.mentoring_relationship.attachment.MentoringApprenticeMissionFourAttachment; +import com.bingchuang.core.mentoring_relationship.attachment.MentoringApprenticeMissionOneAttachment; +import com.bingchuang.core.mentoring_relationship.attachment.MentoringApprenticeMissionThreeAttachment; +import com.bingchuang.core.mentoring_relationship.attachment.MentoringApprenticeMissionTwoAttachment; +import com.bingchuang.core.mentoring_relationship.attachment.MentoringMasterMissionFourAttachment; +import com.bingchuang.core.mentoring_relationship.attachment.MentoringMasterMissionOneAttachment; +import com.bingchuang.core.mentoring_relationship.attachment.MentoringMasterMissionThreeAttachment; +import com.bingchuang.core.mentoring_relationship.attachment.MentoringMasterMissionTwoAttachment; +import com.bingchuang.core.mentoring_relationship.attachment.MentoringMissionTipsAttachment; +import com.bingchuang.core.mentoring_relationship.attachment.MentoringSharingRoomAttachment; +import com.bingchuang.core.miniworld.bean.MWChatMemberCountAttachment; +import com.bingchuang.core.miniworld.bean.MWChatTopicAttachment; +import com.bingchuang.core.miniworld.bean.OpenAudioPartyAttachment; +import com.bingchuang.core.module_hall.im.ClanAttachment; +import com.bingchuang.core.public_chat_hall.attachment.AitFriendsAttachment; +import com.bingchuang.core.public_chat_hall.attachment.AitMeAttachment; +import com.bingchuang.core.room.bean.LeaveModeAttachment; +import com.bingchuang.core.room.pk.attachment.RoomPkAttachment; +import com.bingchuang.core.room.queuing_mic.attachment.QueuingMicAttachment; +import com.bingchuang.core.admin.attachment.SuperAdminOpAttachment; +import com.bingchuang.core.admin.util.SaMsgUtil; +import com.bingchuang.core.utils.LogUtils; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.log.MLog; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/CustomAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/CustomAttachment.java similarity index 99% rename from core/src/main/java/com/pikolive/core/im/custom/bean/CustomAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/CustomAttachment.java index 060d12442..fc0516deb 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/CustomAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/CustomAttachment.java @@ -1,11 +1,11 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.netease.nimlib.sdk.msg.attachment.MsgAttachment; -import com.pikolive.core.noble.NobleInfo; -import com.pikolive.core.noble.NobleInfo; -import com.pikolive.core.noble.NobleInfo; +import com.bingchuang.core.noble.NobleInfo; +import com.bingchuang.core.noble.NobleInfo; +import com.bingchuang.core.noble.NobleInfo; /** * 先定义一个自定义消息附件的基类,负责解析你的自定义消息的公用字段,比如类型等等。 diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/DatingAllNotifyAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/DatingAllNotifyAttachment.java similarity index 80% rename from core/src/main/java/com/pikolive/core/im/custom/bean/DatingAllNotifyAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/DatingAllNotifyAttachment.java index 06c99266c..be71e11ac 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/DatingAllNotifyAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/DatingAllNotifyAttachment.java @@ -1,10 +1,10 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core.room.bean.DatingAllNotifyInfo; -import com.pikolive.core.room.bean.DatingAllNotifyInfo; -import com.pikolive.core.room.bean.DatingAllNotifyInfo; +import com.bingchuang.core.room.bean.DatingAllNotifyInfo; +import com.bingchuang.core.room.bean.DatingAllNotifyInfo; +import com.bingchuang.core.room.bean.DatingAllNotifyInfo; /** * @author xiaoyu diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/DatingAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/DatingAttachment.java similarity index 80% rename from core/src/main/java/com/pikolive/core/im/custom/bean/DatingAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/DatingAttachment.java index 62365e52a..c93587ecd 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/DatingAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/DatingAttachment.java @@ -1,10 +1,10 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core.room.bean.DatingNotifyInfo; -import com.pikolive.core.room.bean.DatingNotifyInfo; -import com.pikolive.core.room.bean.DatingNotifyInfo; +import com.bingchuang.core.room.bean.DatingNotifyInfo; +import com.bingchuang.core.room.bean.DatingNotifyInfo; +import com.bingchuang.core.room.bean.DatingNotifyInfo; /** * @author xiaoyu diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/DatingPublishAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/DatingPublishAttachment.java similarity index 83% rename from core/src/main/java/com/pikolive/core/im/custom/bean/DatingPublishAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/DatingPublishAttachment.java index b8136f226..930bb3692 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/DatingPublishAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/DatingPublishAttachment.java @@ -1,11 +1,11 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.pikolive.core.room.bean.DatingNotifyInfo; -import com.pikolive.core.room.bean.DatingNotifyInfo; -import com.pikolive.core.room.bean.DatingNotifyInfo; +import com.bingchuang.core.room.bean.DatingNotifyInfo; +import com.bingchuang.core.room.bean.DatingNotifyInfo; +import com.bingchuang.core.room.bean.DatingNotifyInfo; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/DiceThrowAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/DiceThrowAttachment.java similarity index 94% rename from core/src/main/java/com/pikolive/core/im/custom/bean/DiceThrowAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/DiceThrowAttachment.java index 5b5584e2a..876214e31 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/DiceThrowAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/DiceThrowAttachment.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/DrawGiftAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/DrawGiftAttachment.java similarity index 96% rename from core/src/main/java/com/pikolive/core/im/custom/bean/DrawGiftAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/DrawGiftAttachment.java index d4c263583..6e1a6a402 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/DrawGiftAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/DrawGiftAttachment.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/FaceAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/FaceAttachment.java similarity index 89% rename from core/src/main/java/com/pikolive/core/im/custom/bean/FaceAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/FaceAttachment.java index 188af1037..f56ff4495 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/FaceAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/FaceAttachment.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import android.util.Log; @@ -6,9 +6,9 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; -import com.pikolive.core.room.face.FaceReceiveInfo; -import com.pikolive.core.room.face.FaceReceiveInfo; -import com.pikolive.core.room.face.FaceReceiveInfo; +import com.bingchuang.core.room.face.FaceReceiveInfo; +import com.bingchuang.core.room.face.FaceReceiveInfo; +import com.bingchuang.core.room.face.FaceReceiveInfo; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/FairyMsgAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/FairyMsgAttachment.java similarity index 87% rename from core/src/main/java/com/pikolive/core/im/custom/bean/FairyMsgAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/FairyMsgAttachment.java index db46961b7..2845a2920 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/FairyMsgAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/FairyMsgAttachment.java @@ -1,8 +1,8 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core2.treasurefairy.FairyMsgInfoBean; +import com.bingchuang.core2.treasurefairy.FairyMsgInfoBean; /** * Created by chenran on 2017/10/4. diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/FairySendAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/FairySendAttachment.java similarity index 98% rename from core/src/main/java/com/pikolive/core/im/custom/bean/FairySendAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/FairySendAttachment.java index 56c44daf6..8c84dbd2d 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/FairySendAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/FairySendAttachment.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/FansTeamMsgAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/FansTeamMsgAttachment.java similarity index 78% rename from core/src/main/java/com/pikolive/core/im/custom/bean/FansTeamMsgAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/FansTeamMsgAttachment.java index 051844e3f..c779c77b5 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/FansTeamMsgAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/FansTeamMsgAttachment.java @@ -1,10 +1,10 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core.fansteam.FansTeamMsgInfo; -import com.pikolive.core.fansteam.FansTeamMsgInfo; -import com.pikolive.core.fansteam.FansTeamMsgInfo; +import com.bingchuang.core.fansteam.FansTeamMsgInfo; +import com.bingchuang.core.fansteam.FansTeamMsgInfo; +import com.bingchuang.core.fansteam.FansTeamMsgInfo; public class FansTeamMsgAttachment extends CustomAttachment { diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/GiftAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/GiftAttachment.java similarity index 87% rename from core/src/main/java/com/pikolive/core/im/custom/bean/GiftAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/GiftAttachment.java index 1ebea0ea9..208dc6786 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/GiftAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/GiftAttachment.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import android.text.TextUtils; @@ -6,15 +6,15 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.pikolive.core.gift.bean.GiftInfo; -import com.pikolive.core.gift.bean.GiftReceiveInfo; -import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; -import com.pikolive.core.gift.bean.GiftInfo; -import com.pikolive.core.gift.bean.GiftReceiveInfo; -import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; -import com.pikolive.core.gift.bean.GiftInfo; -import com.pikolive.core.gift.bean.GiftReceiveInfo; -import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; +import com.bingchuang.core.gift.bean.GiftInfo; +import com.bingchuang.core.gift.bean.GiftReceiveInfo; +import com.bingchuang.core.room.giftvalue.bean.IndexGiftValue; +import com.bingchuang.core.gift.bean.GiftInfo; +import com.bingchuang.core.gift.bean.GiftReceiveInfo; +import com.bingchuang.core.room.giftvalue.bean.IndexGiftValue; +import com.bingchuang.core.gift.bean.GiftInfo; +import com.bingchuang.core.gift.bean.GiftReceiveInfo; +import com.bingchuang.core.room.giftvalue.bean.IndexGiftValue; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/GiftBatchAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/GiftBatchAttachment.java similarity index 82% rename from core/src/main/java/com/pikolive/core/im/custom/bean/GiftBatchAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/GiftBatchAttachment.java index a4c6b6b59..a3b108db3 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/GiftBatchAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/GiftBatchAttachment.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import android.text.TextUtils; @@ -8,18 +8,18 @@ import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.pikolive.core.gift.bean.GiftInfo; -import com.pikolive.core.gift.bean.GiftMultiReceiverInfo; -import com.pikolive.core.gift.bean.GiftReceiver; -import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; -import com.pikolive.core.gift.bean.GiftInfo; -import com.pikolive.core.gift.bean.GiftMultiReceiverInfo; -import com.pikolive.core.gift.bean.GiftReceiver; -import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; -import com.pikolive.core.gift.bean.GiftInfo; -import com.pikolive.core.gift.bean.GiftMultiReceiverInfo; -import com.pikolive.core.gift.bean.GiftReceiver; -import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; +import com.bingchuang.core.gift.bean.GiftInfo; +import com.bingchuang.core.gift.bean.GiftMultiReceiverInfo; +import com.bingchuang.core.gift.bean.GiftReceiver; +import com.bingchuang.core.room.giftvalue.bean.IndexGiftValue; +import com.bingchuang.core.gift.bean.GiftInfo; +import com.bingchuang.core.gift.bean.GiftMultiReceiverInfo; +import com.bingchuang.core.gift.bean.GiftReceiver; +import com.bingchuang.core.room.giftvalue.bean.IndexGiftValue; +import com.bingchuang.core.gift.bean.GiftInfo; +import com.bingchuang.core.gift.bean.GiftMultiReceiverInfo; +import com.bingchuang.core.gift.bean.GiftReceiver; +import com.bingchuang.core.room.giftvalue.bean.IndexGiftValue; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/GiftCompoundAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/GiftCompoundAttachment.java similarity index 94% rename from core/src/main/java/com/pikolive/core/im/custom/bean/GiftCompoundAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/GiftCompoundAttachment.java index eeef016a5..731fad121 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/GiftCompoundAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/GiftCompoundAttachment.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/GiftCompoundMsgBean.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/GiftCompoundMsgBean.java similarity index 83% rename from core/src/main/java/com/pikolive/core/im/custom/bean/GiftCompoundMsgBean.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/GiftCompoundMsgBean.java index 7d487e5f9..8ab18abb4 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/GiftCompoundMsgBean.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/GiftCompoundMsgBean.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import lombok.Data; import lombok.ToString; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/ImTipAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/ImTipAttachment.java similarity index 93% rename from core/src/main/java/com/pikolive/core/im/custom/bean/ImTipAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/ImTipAttachment.java index eada67172..2eae1b3d1 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/ImTipAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/ImTipAttachment.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/InAppSharingFamilyAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/InAppSharingFamilyAttachment.java similarity index 91% rename from core/src/main/java/com/pikolive/core/im/custom/bean/InAppSharingFamilyAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/InAppSharingFamilyAttachment.java index b33eeb53b..86257f03e 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/InAppSharingFamilyAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/InAppSharingFamilyAttachment.java @@ -1,9 +1,9 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core.share.bean.InAppSharingFamilyInfo; +import com.bingchuang.core.share.bean.InAppSharingFamilyInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/InAppSharingMiniWorldAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/InAppSharingMiniWorldAttachment.java similarity index 90% rename from core/src/main/java/com/pikolive/core/im/custom/bean/InAppSharingMiniWorldAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/InAppSharingMiniWorldAttachment.java index f77b0d3ae..f191e18ea 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/InAppSharingMiniWorldAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/InAppSharingMiniWorldAttachment.java @@ -1,9 +1,9 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core.share.bean.InAppSharingMiniWorldInfo; +import com.bingchuang.core.share.bean.InAppSharingMiniWorldInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/InAppSharingRoomAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/InAppSharingRoomAttachment.java similarity index 91% rename from core/src/main/java/com/pikolive/core/im/custom/bean/InAppSharingRoomAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/InAppSharingRoomAttachment.java index 622a61b54..56dafdb2d 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/InAppSharingRoomAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/InAppSharingRoomAttachment.java @@ -1,9 +1,9 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core.share.bean.InAppSharingRoomInfo; +import com.bingchuang.core.share.bean.InAppSharingRoomInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/InAppSharingTeamAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/InAppSharingTeamAttachment.java similarity index 88% rename from core/src/main/java/com/pikolive/core/im/custom/bean/InAppSharingTeamAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/InAppSharingTeamAttachment.java index be916b7ff..0c46c1f3d 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/InAppSharingTeamAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/InAppSharingTeamAttachment.java @@ -1,9 +1,9 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core.share.bean.InAppSharingTeamInfo; +import com.bingchuang.core.share.bean.InAppSharingTeamInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/JoinMiniWorldAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/JoinMiniWorldAttachment.java similarity index 77% rename from core/src/main/java/com/pikolive/core/im/custom/bean/JoinMiniWorldAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/JoinMiniWorldAttachment.java index 67fd3633a..20061c56b 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/JoinMiniWorldAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/JoinMiniWorldAttachment.java @@ -1,9 +1,9 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; -import com.pikolive.core.miniworld.bean.MiniWorldInWorldInfo; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.user.bean.UserInfo; +import com.bingchuang.core.miniworld.bean.MiniWorldInWorldInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.user.bean.UserInfo; public class JoinMiniWorldAttachment extends CustomAttachment { diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/JoinMiniWorldNoticeAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/JoinMiniWorldNoticeAttachment.java similarity index 97% rename from core/src/main/java/com/pikolive/core/im/custom/bean/JoinMiniWorldNoticeAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/JoinMiniWorldNoticeAttachment.java index dc2b312ff..c9b96dc5b 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/JoinMiniWorldNoticeAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/JoinMiniWorldNoticeAttachment.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/LevelUpAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/LevelUpAttachment.java similarity index 94% rename from core/src/main/java/com/pikolive/core/im/custom/bean/LevelUpAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/LevelUpAttachment.java index 8a5d1e459..63654a81d 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/LevelUpAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/LevelUpAttachment.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/LevelUpNoticeAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/LevelUpNoticeAttachment.java similarity index 96% rename from core/src/main/java/com/pikolive/core/im/custom/bean/LevelUpNoticeAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/LevelUpNoticeAttachment.java index 4b51ef679..e4fb2a984 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/LevelUpNoticeAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/LevelUpNoticeAttachment.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/LotteryAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/LotteryAttachment.java similarity index 85% rename from core/src/main/java/com/pikolive/core/im/custom/bean/LotteryAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/LotteryAttachment.java index 04cf0ff1f..dfb467dd1 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/LotteryAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/LotteryAttachment.java @@ -1,9 +1,9 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; -import com.pikolive.core.activity.bean.LotteryInfo; -import com.pikolive.core.activity.bean.LotteryInfo; -import com.pikolive.core.activity.bean.LotteryInfo; +import com.bingchuang.core.activity.bean.LotteryInfo; +import com.bingchuang.core.activity.bean.LotteryInfo; +import com.bingchuang.core.activity.bean.LotteryInfo; /** * Created by chenran on 2017/12/26. diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/LuckyMoneyAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/LuckyMoneyAttachment.java similarity index 87% rename from core/src/main/java/com/pikolive/core/im/custom/bean/LuckyMoneyAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/LuckyMoneyAttachment.java index f72b2c267..5794b7506 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/LuckyMoneyAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/LuckyMoneyAttachment.java @@ -1,10 +1,10 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core.luckymoney.LuckyMoneyInfo; -import com.pikolive.core.luckymoney.LuckyMoneyInfo; -import com.pikolive.core.luckymoney.LuckyMoneyInfo; +import com.bingchuang.core.luckymoney.LuckyMoneyInfo; +import com.bingchuang.core.luckymoney.LuckyMoneyInfo; +import com.bingchuang.core.luckymoney.LuckyMoneyInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/LuckyMoneyTipsAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/LuckyMoneyTipsAttachment.java similarity index 88% rename from core/src/main/java/com/pikolive/core/im/custom/bean/LuckyMoneyTipsAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/LuckyMoneyTipsAttachment.java index 26d1666d6..51d31dc42 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/LuckyMoneyTipsAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/LuckyMoneyTipsAttachment.java @@ -1,10 +1,10 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core.luckymoney.LuckyMoneyInfo; -import com.pikolive.core.luckymoney.LuckyMoneyInfo; -import com.pikolive.core.luckymoney.LuckyMoneyInfo; +import com.bingchuang.core.luckymoney.LuckyMoneyInfo; +import com.bingchuang.core.luckymoney.LuckyMoneyInfo; +import com.bingchuang.core.luckymoney.LuckyMoneyInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/MagicAllMicAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/MagicAllMicAttachment.java similarity index 80% rename from core/src/main/java/com/pikolive/core/im/custom/bean/MagicAllMicAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/MagicAllMicAttachment.java index f9ccdc480..6be5527a7 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/MagicAllMicAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/MagicAllMicAttachment.java @@ -1,16 +1,16 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.pikolive.core.magic.MagicModel; -import com.pikolive.core.magic.bean.MagicInfo; -import com.pikolive.core.magic.bean.MultiMagicReceivedInfo; -import com.pikolive.core.magic.MagicModel; -import com.pikolive.core.magic.bean.MagicInfo; -import com.pikolive.core.magic.bean.MultiMagicReceivedInfo; -import com.pikolive.core.magic.MagicModel; -import com.pikolive.core.magic.bean.MagicInfo; -import com.pikolive.core.magic.bean.MultiMagicReceivedInfo; +import com.bingchuang.core.magic.MagicModel; +import com.bingchuang.core.magic.bean.MagicInfo; +import com.bingchuang.core.magic.bean.MultiMagicReceivedInfo; +import com.bingchuang.core.magic.MagicModel; +import com.bingchuang.core.magic.bean.MagicInfo; +import com.bingchuang.core.magic.bean.MultiMagicReceivedInfo; +import com.bingchuang.core.magic.MagicModel; +import com.bingchuang.core.magic.bean.MagicInfo; +import com.bingchuang.core.magic.bean.MultiMagicReceivedInfo; /** * @author xiaoyu diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/MagicAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/MagicAttachment.java similarity index 81% rename from core/src/main/java/com/pikolive/core/im/custom/bean/MagicAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/MagicAttachment.java index e6c47f726..f479fb2d2 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/MagicAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/MagicAttachment.java @@ -1,16 +1,16 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.pikolive.core.magic.MagicModel; -import com.pikolive.core.magic.bean.MagicInfo; -import com.pikolive.core.magic.bean.MagicReceivedInfo; -import com.pikolive.core.magic.MagicModel; -import com.pikolive.core.magic.bean.MagicInfo; -import com.pikolive.core.magic.bean.MagicReceivedInfo; -import com.pikolive.core.magic.MagicModel; -import com.pikolive.core.magic.bean.MagicInfo; -import com.pikolive.core.magic.bean.MagicReceivedInfo; +import com.bingchuang.core.magic.MagicModel; +import com.bingchuang.core.magic.bean.MagicInfo; +import com.bingchuang.core.magic.bean.MagicReceivedInfo; +import com.bingchuang.core.magic.MagicModel; +import com.bingchuang.core.magic.bean.MagicInfo; +import com.bingchuang.core.magic.bean.MagicReceivedInfo; +import com.bingchuang.core.magic.MagicModel; +import com.bingchuang.core.magic.bean.MagicInfo; +import com.bingchuang.core.magic.bean.MagicReceivedInfo; /** * @author xiaoyu diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/MagicBatchAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/MagicBatchAttachment.java similarity index 79% rename from core/src/main/java/com/pikolive/core/im/custom/bean/MagicBatchAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/MagicBatchAttachment.java index 4bfddb7d7..76675c671 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/MagicBatchAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/MagicBatchAttachment.java @@ -1,16 +1,16 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.pikolive.core.magic.MagicModel; -import com.pikolive.core.magic.bean.MagicInfo; -import com.pikolive.core.magic.bean.MagicMultiReceiverInfo; -import com.pikolive.core.magic.MagicModel; -import com.pikolive.core.magic.bean.MagicInfo; -import com.pikolive.core.magic.bean.MagicMultiReceiverInfo; -import com.pikolive.core.magic.MagicModel; -import com.pikolive.core.magic.bean.MagicInfo; -import com.pikolive.core.magic.bean.MagicMultiReceiverInfo; +import com.bingchuang.core.magic.MagicModel; +import com.bingchuang.core.magic.bean.MagicInfo; +import com.bingchuang.core.magic.bean.MagicMultiReceiverInfo; +import com.bingchuang.core.magic.MagicModel; +import com.bingchuang.core.magic.bean.MagicInfo; +import com.bingchuang.core.magic.bean.MagicMultiReceiverInfo; +import com.bingchuang.core.magic.MagicModel; +import com.bingchuang.core.magic.bean.MagicInfo; +import com.bingchuang.core.magic.bean.MagicMultiReceiverInfo; /** * @author xiaoyu diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/MatchAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/MatchAttachment.java similarity index 97% rename from core/src/main/java/com/pikolive/core/im/custom/bean/MatchAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/MatchAttachment.java index 0827095ec..c85e66aff 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/MatchAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/MatchAttachment.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/MatchTicketAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/MatchTicketAttachment.java similarity index 94% rename from core/src/main/java/com/pikolive/core/im/custom/bean/MatchTicketAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/MatchTicketAttachment.java index f9e7a5c0d..72c5486b2 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/MatchTicketAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/MatchTicketAttachment.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/MonsterAttackAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/MonsterAttackAttachment.java similarity index 90% rename from core/src/main/java/com/pikolive/core/im/custom/bean/MonsterAttackAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/MonsterAttackAttachment.java index c26ba64e8..ee4672cf1 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/MonsterAttackAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/MonsterAttackAttachment.java @@ -1,10 +1,10 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core.monsterhunting.bean.MonsterAttackInfo; -import com.pikolive.core.monsterhunting.bean.MonsterAttackInfo; -import com.pikolive.core.monsterhunting.bean.MonsterAttackInfo; +import com.bingchuang.core.monsterhunting.bean.MonsterAttackInfo; +import com.bingchuang.core.monsterhunting.bean.MonsterAttackInfo; +import com.bingchuang.core.monsterhunting.bean.MonsterAttackInfo; /** * Created by MadisonRong on 31/03/2018. diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/MonsterHuntingResultAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/MonsterHuntingResultAttachment.java similarity index 81% rename from core/src/main/java/com/pikolive/core/im/custom/bean/MonsterHuntingResultAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/MonsterHuntingResultAttachment.java index df35cb136..ecab5e82b 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/MonsterHuntingResultAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/MonsterHuntingResultAttachment.java @@ -1,11 +1,11 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core.monsterhunting.bean.MonsterHuntingResult; -import com.pikolive.core.monsterhunting.bean.MonsterHuntingResult; -import com.pikolive.core.monsterhunting.bean.MonsterHuntingResult; +import com.bingchuang.core.monsterhunting.bean.MonsterHuntingResult; +import com.bingchuang.core.monsterhunting.bean.MonsterHuntingResult; +import com.bingchuang.core.monsterhunting.bean.MonsterHuntingResult; /** * Created by MadisonRong on 12/04/2018. diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/MonsterStatusAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/MonsterStatusAttachment.java similarity index 91% rename from core/src/main/java/com/pikolive/core/im/custom/bean/MonsterStatusAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/MonsterStatusAttachment.java index 08d18bd8c..a121c9d32 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/MonsterStatusAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/MonsterStatusAttachment.java @@ -1,10 +1,10 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core.monsterhunting.bean.MonsterProtocol; -import com.pikolive.core.monsterhunting.bean.MonsterProtocol; -import com.pikolive.core.monsterhunting.bean.MonsterProtocol; +import com.bingchuang.core.monsterhunting.bean.MonsterProtocol; +import com.bingchuang.core.monsterhunting.bean.MonsterProtocol; +import com.bingchuang.core.monsterhunting.bean.MonsterProtocol; /** * Created by MadisonRong on 11/04/2018. diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/MultiGiftAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/MultiGiftAttachment.java similarity index 86% rename from core/src/main/java/com/pikolive/core/im/custom/bean/MultiGiftAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/MultiGiftAttachment.java index a9ffd52ca..e55845a3d 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/MultiGiftAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/MultiGiftAttachment.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import android.text.TextUtils; @@ -6,15 +6,15 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.pikolive.core.gift.bean.GiftInfo; -import com.pikolive.core.gift.bean.MultiGiftReceiveInfo; -import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; -import com.pikolive.core.gift.bean.GiftInfo; -import com.pikolive.core.gift.bean.MultiGiftReceiveInfo; -import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; -import com.pikolive.core.gift.bean.GiftInfo; -import com.pikolive.core.gift.bean.MultiGiftReceiveInfo; -import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; +import com.bingchuang.core.gift.bean.GiftInfo; +import com.bingchuang.core.gift.bean.MultiGiftReceiveInfo; +import com.bingchuang.core.room.giftvalue.bean.IndexGiftValue; +import com.bingchuang.core.gift.bean.GiftInfo; +import com.bingchuang.core.gift.bean.MultiGiftReceiveInfo; +import com.bingchuang.core.room.giftvalue.bean.IndexGiftValue; +import com.bingchuang.core.gift.bean.GiftInfo; +import com.bingchuang.core.gift.bean.MultiGiftReceiveInfo; +import com.bingchuang.core.room.giftvalue.bean.IndexGiftValue; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/MultiLuckyGiftAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/MultiLuckyGiftAttachment.java similarity index 89% rename from core/src/main/java/com/pikolive/core/im/custom/bean/MultiLuckyGiftAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/MultiLuckyGiftAttachment.java index 3ae6bf621..cf89c25c8 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/MultiLuckyGiftAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/MultiLuckyGiftAttachment.java @@ -1,16 +1,16 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.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.pikolive.core.gift.bean.LuckyBagGifts; -import com.pikolive.core.gift.bean.LuckyGiftList; -import com.pikolive.core.gift.bean.LuckyBagGifts; -import com.pikolive.core.gift.bean.LuckyGiftList; -import com.pikolive.core.gift.bean.LuckyBagGifts; -import com.pikolive.core.gift.bean.LuckyGiftList; +import com.bingchuang.core.gift.bean.LuckyBagGifts; +import com.bingchuang.core.gift.bean.LuckyGiftList; +import com.bingchuang.core.gift.bean.LuckyBagGifts; +import com.bingchuang.core.gift.bean.LuckyGiftList; +import com.bingchuang.core.gift.bean.LuckyBagGifts; +import com.bingchuang.core.gift.bean.LuckyGiftList; /** * Created by chenran on 2017/10/25. diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/NewbieHelloAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/NewbieHelloAttachment.java similarity index 78% rename from core/src/main/java/com/pikolive/core/im/custom/bean/NewbieHelloAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/NewbieHelloAttachment.java index ca00d0912..facad231c 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/NewbieHelloAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/NewbieHelloAttachment.java @@ -1,10 +1,10 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core.newbie.NewbieHelloInfo; -import com.pikolive.core.newbie.NewbieHelloInfo; -import com.pikolive.core.newbie.NewbieHelloInfo; +import com.bingchuang.core.newbie.NewbieHelloInfo; +import com.bingchuang.core.newbie.NewbieHelloInfo; +import com.bingchuang.core.newbie.NewbieHelloInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/NobleAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/NobleAttachment.java similarity index 94% rename from core/src/main/java/com/pikolive/core/im/custom/bean/NobleAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/NobleAttachment.java index 82bcdc87f..412383413 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/NobleAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/NobleAttachment.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.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.pikolive.core.noble.NobleInfo; -import com.pikolive.core.noble.NobleInfo; -import com.pikolive.core.R; -import com.pikolive.core.noble.NobleInfo; -import com.pikolive.core.noble.NobleProtocol; +import com.bingchuang.core.noble.NobleInfo; +import com.bingchuang.core.noble.NobleInfo; +import com.bingchuang.core.R; +import com.bingchuang.core.noble.NobleInfo; +import com.bingchuang.core.noble.NobleProtocol; import com.bingchuang.library.rxbus.RxBusHelper; import com.bingchuang.library.utils.ResUtil; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/NoticeAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/NoticeAttachment.java similarity index 97% rename from core/src/main/java/com/pikolive/core/im/custom/bean/NoticeAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/NoticeAttachment.java index 95ab605bd..fba689c5e 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/NoticeAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/NoticeAttachment.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/NotifyH5Attachment.kt b/core/src/main/java/com/bingchuang/core/im/custom/bean/NotifyH5Attachment.kt similarity index 88% rename from core/src/main/java/com/pikolive/core/im/custom/bean/NotifyH5Attachment.kt rename to core/src/main/java/com/bingchuang/core/im/custom/bean/NotifyH5Attachment.kt index 323cf9acf..799bff765 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/NotifyH5Attachment.kt +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/NotifyH5Attachment.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean +package com.bingchuang.core.im.custom.bean import com.alibaba.fastjson.JSONObject import com.google.gson.Gson diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/NotifyH5Info.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/NotifyH5Info.java similarity index 83% rename from core/src/main/java/com/pikolive/core/im/custom/bean/NotifyH5Info.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/NotifyH5Info.java index 222829c3f..81d750163 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/NotifyH5Info.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/NotifyH5Info.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/OpenRoomNotiAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/OpenRoomNotiAttachment.java similarity index 96% rename from core/src/main/java/com/pikolive/core/im/custom/bean/OpenRoomNotiAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/OpenRoomNotiAttachment.java index 9b43fe57f..57f619e1f 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/OpenRoomNotiAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/OpenRoomNotiAttachment.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/OpenSignInAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/OpenSignInAttachment.java similarity index 79% rename from core/src/main/java/com/pikolive/core/im/custom/bean/OpenSignInAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/OpenSignInAttachment.java index e0dcb72ca..06ac8ae95 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/OpenSignInAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/OpenSignInAttachment.java @@ -1,10 +1,10 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core.radish.signin.bean.ImNotice; -import com.pikolive.core.radish.signin.bean.ImNotice; -import com.pikolive.core.radish.signin.bean.ImNotice; +import com.bingchuang.core.radish.signin.bean.ImNotice; +import com.bingchuang.core.radish.signin.bean.ImNotice; +import com.bingchuang.core.radish.signin.bean.ImNotice; import lombok.Getter; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/P2PContactRechargeAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/P2PContactRechargeAttachment.java similarity index 92% rename from core/src/main/java/com/pikolive/core/im/custom/bean/P2PContactRechargeAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/P2PContactRechargeAttachment.java index c5a5d7623..a0fa9e3f2 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/P2PContactRechargeAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/P2PContactRechargeAttachment.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/PlayEffectInfo.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/PlayEffectInfo.java similarity index 62% rename from core/src/main/java/com/pikolive/core/im/custom/bean/PlayEffectInfo.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/PlayEffectInfo.java index 67c80b316..6e30243b7 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/PlayEffectInfo.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/PlayEffectInfo.java @@ -1,8 +1,8 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; -import com.pikolive.core.gift.bean.LuckyBagNoticeInfo; -import com.pikolive.core.gift.bean.LuckyBagNoticeInfo; -import com.pikolive.core2.treasurefairy.FairyMsgInfoBean; +import com.bingchuang.core.gift.bean.LuckyBagNoticeInfo; +import com.bingchuang.core.gift.bean.LuckyBagNoticeInfo; +import com.bingchuang.core2.treasurefairy.FairyMsgInfoBean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/RedPackageAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/RedPackageAttachment.java similarity index 77% rename from core/src/main/java/com/pikolive/core/im/custom/bean/RedPackageAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/RedPackageAttachment.java index aeb4facac..98038dcf6 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/RedPackageAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/RedPackageAttachment.java @@ -1,10 +1,10 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core.redpackage.RedPackageNotifyInfo; -import com.pikolive.core.redpackage.RedPackageNotifyInfo; -import com.pikolive.core.redpackage.RedPackageNotifyInfo; +import com.bingchuang.core.redpackage.RedPackageNotifyInfo; +import com.bingchuang.core.redpackage.RedPackageNotifyInfo; +import com.bingchuang.core.redpackage.RedPackageNotifyInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/RedPackageRoomMsgAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/RedPackageRoomMsgAttachment.java similarity index 78% rename from core/src/main/java/com/pikolive/core/im/custom/bean/RedPackageRoomMsgAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/RedPackageRoomMsgAttachment.java index a4c5d0efb..938e47533 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/RedPackageRoomMsgAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/RedPackageRoomMsgAttachment.java @@ -1,10 +1,10 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core.redpackage.RedEnvelopeRoomMsg; -import com.pikolive.core.redpackage.RedEnvelopeRoomMsg; -import com.pikolive.core.redpackage.RedEnvelopeRoomMsg; +import com.bingchuang.core.redpackage.RedEnvelopeRoomMsg; +import com.bingchuang.core.redpackage.RedEnvelopeRoomMsg; +import com.bingchuang.core.redpackage.RedEnvelopeRoomMsg; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/RedPacketAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/RedPacketAttachment.java similarity index 86% rename from core/src/main/java/com/pikolive/core/im/custom/bean/RedPacketAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/RedPacketAttachment.java index 91b7e3764..57d8612ec 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/RedPacketAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/RedPacketAttachment.java @@ -1,9 +1,9 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; -import com.pikolive.core.redPacket.bean.RedPacketInfoV2; -import com.pikolive.core.redPacket.bean.RedPacketInfoV2; -import com.pikolive.core.redPacket.bean.RedPacketInfoV2; +import com.bingchuang.core.redPacket.bean.RedPacketInfoV2; +import com.bingchuang.core.redPacket.bean.RedPacketInfoV2; +import com.bingchuang.core.redPacket.bean.RedPacketInfoV2; /** * Created by chenran on 2017/10/4. diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/RequestUpmicAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/RequestUpmicAttachment.java similarity index 82% rename from core/src/main/java/com/pikolive/core/im/custom/bean/RequestUpmicAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/RequestUpmicAttachment.java index 2abf19b75..a5bedbba4 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/RequestUpmicAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/RequestUpmicAttachment.java @@ -1,10 +1,10 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.user.bean.UserInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.user.bean.UserInfo; public class RequestUpmicAttachment extends CustomAttachment { private UserInfo userInfo; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/RewardBean.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/RewardBean.java similarity index 95% rename from core/src/main/java/com/pikolive/core/im/custom/bean/RewardBean.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/RewardBean.java index 8af87eed4..aa17a744b 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/RewardBean.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/RewardBean.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomAlbumAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomAlbumAttachment.java similarity index 91% rename from core/src/main/java/com/pikolive/core/im/custom/bean/RoomAlbumAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/RoomAlbumAttachment.java index 3e7ab78f1..1b416803a 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomAlbumAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomAlbumAttachment.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomAlbumMsgInfo.kt b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomAlbumMsgInfo.kt similarity index 56% rename from core/src/main/java/com/pikolive/core/im/custom/bean/RoomAlbumMsgInfo.kt rename to core/src/main/java/com/bingchuang/core/im/custom/bean/RoomAlbumMsgInfo.kt index ce569f555..74ca99c89 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomAlbumMsgInfo.kt +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomAlbumMsgInfo.kt @@ -1,6 +1,6 @@ -package com.pikolive.core.im.custom.bean +package com.bingchuang.core.im.custom.bean -import com.pikolive.core.level.UserLevelVo +import com.bingchuang.core.level.UserLevelVo data class RoomAlbumMsgInfo( val roomPhoto: RoomPhoto, diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomBoxPrizeAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomBoxPrizeAttachment.java similarity index 97% rename from core/src/main/java/com/pikolive/core/im/custom/bean/RoomBoxPrizeAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/RoomBoxPrizeAttachment.java index f2a508b93..f5eaec59d 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomBoxPrizeAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomBoxPrizeAttachment.java @@ -1,8 +1,8 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.netease.nim.uikit.common.util.string.StringUtil; -import com.pikolive.core.R; +import com.bingchuang.core.R; import com.bingchuang.library.utils.ResUtil; /** diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomBoxPrizeInfo.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomBoxPrizeInfo.java similarity index 85% rename from core/src/main/java/com/pikolive/core/im/custom/bean/RoomBoxPrizeInfo.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/RoomBoxPrizeInfo.java index e6bfb33a0..6aaddac6a 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomBoxPrizeInfo.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomBoxPrizeInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomFollowOwnerAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomFollowOwnerAttachment.java similarity index 81% rename from core/src/main/java/com/pikolive/core/im/custom/bean/RoomFollowOwnerAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/RoomFollowOwnerAttachment.java index 35a16b5d5..fc975c28d 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomFollowOwnerAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomFollowOwnerAttachment.java @@ -1,8 +1,8 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.user.bean.UserInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.user.bean.UserInfo; /** * 聊天室弹出关注房主的提示 diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomFollowOwnerAttachment2.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomFollowOwnerAttachment2.java similarity index 81% rename from core/src/main/java/com/pikolive/core/im/custom/bean/RoomFollowOwnerAttachment2.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/RoomFollowOwnerAttachment2.java index c978259d4..638e68426 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomFollowOwnerAttachment2.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomFollowOwnerAttachment2.java @@ -1,8 +1,8 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.user.bean.UserInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.user.bean.UserInfo; /** * 聊天室弹出关注房主的提示 diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomFreeGiftAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomFreeGiftAttachment.java similarity index 94% rename from core/src/main/java/com/pikolive/core/im/custom/bean/RoomFreeGiftAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/RoomFreeGiftAttachment.java index e0a479119..238045e5d 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomFreeGiftAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomFreeGiftAttachment.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomFreeGiftMsgBean.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomFreeGiftMsgBean.java similarity index 83% rename from core/src/main/java/com/pikolive/core/im/custom/bean/RoomFreeGiftMsgBean.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/RoomFreeGiftMsgBean.java index f5401d582..4c9517771 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomFreeGiftMsgBean.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomFreeGiftMsgBean.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomGiftValueAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomGiftValueAttachment.java similarity index 82% rename from core/src/main/java/com/pikolive/core/im/custom/bean/RoomGiftValueAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/RoomGiftValueAttachment.java index 1bef756f2..61c20a1b9 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomGiftValueAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomGiftValueAttachment.java @@ -1,11 +1,11 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core.room.giftvalue.bean.RoomGiftValue; -import com.pikolive.core.room.giftvalue.bean.RoomGiftValue; -import com.pikolive.core.room.giftvalue.bean.RoomGiftValue; +import com.bingchuang.core.room.giftvalue.bean.RoomGiftValue; +import com.bingchuang.core.room.giftvalue.bean.RoomGiftValue; +import com.bingchuang.core.room.giftvalue.bean.RoomGiftValue; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomInfoAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomInfoAttachment.java similarity index 71% rename from core/src/main/java/com/pikolive/core/im/custom/bean/RoomInfoAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/RoomInfoAttachment.java index 947b28e91..eeb2bc2a3 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomInfoAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomInfoAttachment.java @@ -1,9 +1,9 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.room.bean.RoomInfo; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.room.bean.RoomInfo; /** * Created by huangmeng1 on 2018/6/7. diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomInviteFansAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomInviteFansAttachment.java similarity index 94% rename from core/src/main/java/com/pikolive/core/im/custom/bean/RoomInviteFansAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/RoomInviteFansAttachment.java index a8bd7d87f..1d73b7a79 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomInviteFansAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomInviteFansAttachment.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomInviteFansInfo.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomInviteFansInfo.java similarity index 91% rename from core/src/main/java/com/pikolive/core/im/custom/bean/RoomInviteFansInfo.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/RoomInviteFansInfo.java index c5dccb40f..b3c082058 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomInviteFansInfo.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomInviteFansInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomLuckySeaAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomLuckySeaAttachment.java similarity index 95% rename from core/src/main/java/com/pikolive/core/im/custom/bean/RoomLuckySeaAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/RoomLuckySeaAttachment.java index 5d7199ef9..ce7c61d4d 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomLuckySeaAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomLuckySeaAttachment.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomLuckySeaMsgBean.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomLuckySeaMsgBean.java similarity index 88% rename from core/src/main/java/com/pikolive/core/im/custom/bean/RoomLuckySeaMsgBean.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/RoomLuckySeaMsgBean.java index 475b88395..391ad07cb 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomLuckySeaMsgBean.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomLuckySeaMsgBean.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomNoticeAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomNoticeAttachment.java similarity index 80% rename from core/src/main/java/com/pikolive/core/im/custom/bean/RoomNoticeAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/RoomNoticeAttachment.java index 95e5b60de..fc0ef7b2b 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomNoticeAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomNoticeAttachment.java @@ -1,11 +1,11 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core.room.bean.RoomMessageViewNoticeInfo; -import com.pikolive.core.room.bean.RoomMessageViewNoticeInfo; -import com.pikolive.core.room.bean.RoomMessageViewNoticeInfo; +import com.bingchuang.core.room.bean.RoomMessageViewNoticeInfo; +import com.bingchuang.core.room.bean.RoomMessageViewNoticeInfo; +import com.bingchuang.core.room.bean.RoomMessageViewNoticeInfo; public class RoomNoticeAttachment extends RoomInfoAttachment { diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomPKAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomPKAttachment.java similarity index 93% rename from core/src/main/java/com/pikolive/core/im/custom/bean/RoomPKAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/RoomPKAttachment.java index bb4755fc4..c827407f8 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomPKAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomPKAttachment.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomPhoto.kt b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomPhoto.kt similarity index 87% rename from core/src/main/java/com/pikolive/core/im/custom/bean/RoomPhoto.kt rename to core/src/main/java/com/bingchuang/core/im/custom/bean/RoomPhoto.kt index 51561f35c..97348209f 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomPhoto.kt +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomPhoto.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean +package com.bingchuang.core.im.custom.bean data class RoomPhoto( val createTime: String, diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomPkBean.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomPkBean.java similarity index 98% rename from core/src/main/java/com/pikolive/core/im/custom/bean/RoomPkBean.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/RoomPkBean.java index d8d6b57f4..9129e6d1e 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomPkBean.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomPkBean.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomRankAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomRankAttachment.java similarity index 93% rename from core/src/main/java/com/pikolive/core/im/custom/bean/RoomRankAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/RoomRankAttachment.java index dc04c4298..a5c63d80e 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomRankAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomRankAttachment.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomRankMsgBean.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomRankMsgBean.java similarity index 78% rename from core/src/main/java/com/pikolive/core/im/custom/bean/RoomRankMsgBean.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/RoomRankMsgBean.java index 3bd2d4ae4..3c5cac344 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomRankMsgBean.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomRankMsgBean.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomReceivedLuckyGiftAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomReceivedLuckyGiftAttachment.java similarity index 78% rename from core/src/main/java/com/pikolive/core/im/custom/bean/RoomReceivedLuckyGiftAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/RoomReceivedLuckyGiftAttachment.java index 1c2264188..863245470 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomReceivedLuckyGiftAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomReceivedLuckyGiftAttachment.java @@ -1,10 +1,10 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core.gift.bean.LuckyBagNoticeInfo; -import com.pikolive.core.gift.bean.LuckyBagNoticeInfo; -import com.pikolive.core.gift.bean.LuckyBagNoticeInfo; +import com.bingchuang.core.gift.bean.LuckyBagNoticeInfo; +import com.bingchuang.core.gift.bean.LuckyBagNoticeInfo; +import com.bingchuang.core.gift.bean.LuckyBagNoticeInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomTipAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomTipAttachment.java similarity index 96% rename from core/src/main/java/com/pikolive/core/im/custom/bean/RoomTipAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/RoomTipAttachment.java index 7e399ee7d..e9a066e48 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/RoomTipAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/RoomTipAttachment.java @@ -1,8 +1,8 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.netease.nim.uikit.common.util.string.StringUtil; -import com.pikolive.core.R; +import com.bingchuang.core.R; import com.bingchuang.library.utils.ResUtil; /** diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/RouterType.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/RouterType.java similarity index 99% rename from core/src/main/java/com/pikolive/core/im/custom/bean/RouterType.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/RouterType.java index 1fdd28a4b..a5e76cdd7 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/RouterType.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/RouterType.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; /** * Created by MadisonRong on 08/06/2018. diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/SingleRoomRankAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/SingleRoomRankAttachment.java similarity index 94% rename from core/src/main/java/com/pikolive/core/im/custom/bean/SingleRoomRankAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/SingleRoomRankAttachment.java index acaf15e1e..ded23c6b7 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/SingleRoomRankAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/SingleRoomRankAttachment.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/SingleRoomRankMsgBean.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/SingleRoomRankMsgBean.java similarity index 79% rename from core/src/main/java/com/pikolive/core/im/custom/bean/SingleRoomRankMsgBean.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/SingleRoomRankMsgBean.java index d520b4feb..cd1603a5a 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/SingleRoomRankMsgBean.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/SingleRoomRankMsgBean.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/SkillMsgAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/SkillMsgAttachment.java similarity index 91% rename from core/src/main/java/com/pikolive/core/im/custom/bean/SkillMsgAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/SkillMsgAttachment.java index f96b5eb71..18e79df79 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/SkillMsgAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/SkillMsgAttachment.java @@ -1,8 +1,8 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core.skill.entity.SkillNotifyEntity; +import com.bingchuang.core.skill.entity.SkillNotifyEntity; public class SkillMsgAttachment extends CustomAttachment { private SkillNotifyEntity entity; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/SysMsgAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/SysMsgAttachment.java similarity index 78% rename from core/src/main/java/com/pikolive/core/im/custom/bean/SysMsgAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/SysMsgAttachment.java index ed0bb5af5..5601d73ab 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/SysMsgAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/SysMsgAttachment.java @@ -1,10 +1,10 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core.msg.sys.ErbanSysMsgInfo; -import com.pikolive.core.msg.sys.ErbanSysMsgInfo; -import com.pikolive.core.msg.sys.ErbanSysMsgInfo; +import com.bingchuang.core.msg.sys.ErbanSysMsgInfo; +import com.bingchuang.core.msg.sys.ErbanSysMsgInfo; +import com.bingchuang.core.msg.sys.ErbanSysMsgInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/SysMsgV2Attachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/SysMsgV2Attachment.java similarity index 81% rename from core/src/main/java/com/pikolive/core/im/custom/bean/SysMsgV2Attachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/SysMsgV2Attachment.java index 6b2a5e0bb..95d3b1fbf 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/SysMsgV2Attachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/SysMsgV2Attachment.java @@ -1,10 +1,10 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core.msg.sysv2.ErbanSysMsgV2Info; -import com.pikolive.core.msg.sysv2.ErbanSysMsgV2Info; -import com.pikolive.core.msg.sysv2.ErbanSysMsgV2Info; +import com.bingchuang.core.msg.sysv2.ErbanSysMsgV2Info; +import com.bingchuang.core.msg.sysv2.ErbanSysMsgV2Info; +import com.bingchuang.core.msg.sysv2.ErbanSysMsgV2Info; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/SysMsgVoiceAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/SysMsgVoiceAttachment.java similarity index 77% rename from core/src/main/java/com/pikolive/core/im/custom/bean/SysMsgVoiceAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/SysMsgVoiceAttachment.java index 02a4c1a56..5eb20dd0e 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/SysMsgVoiceAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/SysMsgVoiceAttachment.java @@ -1,12 +1,12 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core.audio.bean.SysMsgVoiceInfo; -import com.pikolive.core.audio.bean.SysMsgVoiceInfo; -import com.pikolive.core.audio.bean.SysMsgVoiceInfo; +import com.bingchuang.core.audio.bean.SysMsgVoiceInfo; +import com.bingchuang.core.audio.bean.SysMsgVoiceInfo; +import com.bingchuang.core.audio.bean.SysMsgVoiceInfo; /** * 声音瓶子审核结果的系统通知 diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/TarotAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/TarotAttachment.java similarity index 96% rename from core/src/main/java/com/pikolive/core/im/custom/bean/TarotAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/TarotAttachment.java index ff0ecd513..ae55553ae 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/TarotAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/TarotAttachment.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/TarotMsgBean.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/TarotMsgBean.java similarity index 92% rename from core/src/main/java/com/pikolive/core/im/custom/bean/TarotMsgBean.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/TarotMsgBean.java index e35298351..32756bcda 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/TarotMsgBean.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/TarotMsgBean.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/User.kt b/core/src/main/java/com/bingchuang/core/im/custom/bean/User.kt similarity index 94% rename from core/src/main/java/com/pikolive/core/im/custom/bean/User.kt rename to core/src/main/java/com/bingchuang/core/im/custom/bean/User.kt index 9650a0374..addeed311 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/User.kt +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/User.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.im.custom.bean +package com.bingchuang.core.im.custom.bean data class User( val avatar: String, diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/VipMessageAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/VipMessageAttachment.java similarity index 79% rename from core/src/main/java/com/pikolive/core/im/custom/bean/VipMessageAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/VipMessageAttachment.java index b3641980b..4c63fbb9f 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/VipMessageAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/VipMessageAttachment.java @@ -1,10 +1,10 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core.vip.VipMessageInfo; -import com.pikolive.core.vip.VipMessageInfo; -import com.pikolive.core.vip.VipMessageInfo; +import com.bingchuang.core.vip.VipMessageInfo; +import com.bingchuang.core.vip.VipMessageInfo; +import com.bingchuang.core.vip.VipMessageInfo; public class VipMessageAttachment extends CustomAttachment { diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/VoiceBottleSayHiAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/VoiceBottleSayHiAttachment.java similarity index 81% rename from core/src/main/java/com/pikolive/core/im/custom/bean/VoiceBottleSayHiAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/VoiceBottleSayHiAttachment.java index 2ff6b7c86..79a12dfe7 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/VoiceBottleSayHiAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/VoiceBottleSayHiAttachment.java @@ -1,11 +1,11 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core.audio.bean.VoiceBottleSayHiInfo; -import com.pikolive.core.audio.bean.VoiceBottleSayHiInfo; -import com.pikolive.core.audio.bean.VoiceBottleSayHiInfo; +import com.bingchuang.core.audio.bean.VoiceBottleSayHiInfo; +import com.bingchuang.core.audio.bean.VoiceBottleSayHiInfo; +import com.bingchuang.core.audio.bean.VoiceBottleSayHiInfo; /** * 声音瓶子打招呼提示信息 diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/VoiceBottleShakeHeartAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/VoiceBottleShakeHeartAttachment.java similarity index 83% rename from core/src/main/java/com/pikolive/core/im/custom/bean/VoiceBottleShakeHeartAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/VoiceBottleShakeHeartAttachment.java index e095580c5..413ca288e 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/VoiceBottleShakeHeartAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/VoiceBottleShakeHeartAttachment.java @@ -1,11 +1,11 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core.audio.bean.VoiceBottleSayHiInfo; -import com.pikolive.core.audio.bean.VoiceBottleSayHiInfo; -import com.pikolive.core.audio.bean.VoiceBottleSayHiInfo; +import com.bingchuang.core.audio.bean.VoiceBottleSayHiInfo; +import com.bingchuang.core.audio.bean.VoiceBottleSayHiInfo; +import com.bingchuang.core.audio.bean.VoiceBottleSayHiInfo; /** * 声音瓶子点击打招呼:发送爱心动画 + 发送固定文本信息 diff --git a/core/src/main/java/com/pikolive/core/im/custom/bean/WelcomeAttachment.java b/core/src/main/java/com/bingchuang/core/im/custom/bean/WelcomeAttachment.java similarity index 80% rename from core/src/main/java/com/pikolive/core/im/custom/bean/WelcomeAttachment.java rename to core/src/main/java/com/bingchuang/core/im/custom/bean/WelcomeAttachment.java index b2108d54a..5d5df0514 100644 --- a/core/src/main/java/com/pikolive/core/im/custom/bean/WelcomeAttachment.java +++ b/core/src/main/java/com/bingchuang/core/im/custom/bean/WelcomeAttachment.java @@ -1,13 +1,13 @@ -package com.pikolive.core.im.custom.bean; +package com.bingchuang.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.room.bean.WelcomeInfo; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.room.bean.WelcomeInfo; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.room.bean.WelcomeInfo; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.room.bean.WelcomeInfo; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.room.bean.WelcomeInfo; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.room.bean.WelcomeInfo; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/com/pikolive/core/im/friend/IIMFriendCore.java b/core/src/main/java/com/bingchuang/core/im/friend/IIMFriendCore.java similarity index 98% rename from core/src/main/java/com/pikolive/core/im/friend/IIMFriendCore.java rename to core/src/main/java/com/bingchuang/core/im/friend/IIMFriendCore.java index 0e5a94e25..dac515291 100644 --- a/core/src/main/java/com/pikolive/core/im/friend/IIMFriendCore.java +++ b/core/src/main/java/com/bingchuang/core/im/friend/IIMFriendCore.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.friend; +package com.bingchuang.core.im.friend; import com.netease.nimlib.sdk.friend.constant.FriendFieldEnum; import com.bingchuang.library.coremanager.IBaseCore; diff --git a/core/src/main/java/com/pikolive/core/im/friend/IMFriendModel.java b/core/src/main/java/com/bingchuang/core/im/friend/IMFriendModel.java similarity index 90% rename from core/src/main/java/com/pikolive/core/im/friend/IMFriendModel.java rename to core/src/main/java/com/bingchuang/core/im/friend/IMFriendModel.java index 9b1bbde73..584778155 100644 --- a/core/src/main/java/com/pikolive/core/im/friend/IMFriendModel.java +++ b/core/src/main/java/com/bingchuang/core/im/friend/IMFriendModel.java @@ -1,22 +1,22 @@ -package com.pikolive.core.im.friend; +package com.bingchuang.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.pikolive.core.bean.response.result.UserListResult; -import com.pikolive.core.manager.BaseMvpModel; -import com.pikolive.core.manager.IMMessageManager; -import com.pikolive.core.manager.RelationShipEvent; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.bean.response.result.UserListResult; -import com.pikolive.core.manager.BaseMvpModel; -import com.pikolive.core.manager.IMMessageManager; -import com.pikolive.core.manager.RelationShipEvent; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.R; -import com.pikolive.core2.manager.IMNetEaseManager; +import com.bingchuang.core.bean.response.result.UserListResult; +import com.bingchuang.core.manager.BaseMvpModel; +import com.bingchuang.core.manager.IMMessageManager; +import com.bingchuang.core.manager.RelationShipEvent; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.bean.response.result.UserListResult; +import com.bingchuang.core.manager.BaseMvpModel; +import com.bingchuang.core.manager.IMMessageManager; +import com.bingchuang.core.manager.RelationShipEvent; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.R; +import com.bingchuang.core2.manager.IMNetEaseManager; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.utils.ResUtil; diff --git a/core/src/main/java/com/pikolive/core/im/login/IIMLoginClient.java b/core/src/main/java/com/bingchuang/core/im/login/IIMLoginClient.java similarity index 95% rename from core/src/main/java/com/pikolive/core/im/login/IIMLoginClient.java rename to core/src/main/java/com/bingchuang/core/im/login/IIMLoginClient.java index 31e8f7c13..760a7ac69 100644 --- a/core/src/main/java/com/pikolive/core/im/login/IIMLoginClient.java +++ b/core/src/main/java/com/bingchuang/core/im/login/IIMLoginClient.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.login; +package com.bingchuang.core.im.login; import com.netease.nimlib.sdk.StatusCode; import com.netease.nimlib.sdk.auth.LoginInfo; diff --git a/core/src/main/java/com/pikolive/core/im/login/IIMLoginCore.java b/core/src/main/java/com/bingchuang/core/im/login/IIMLoginCore.java similarity index 79% rename from core/src/main/java/com/pikolive/core/im/login/IIMLoginCore.java rename to core/src/main/java/com/bingchuang/core/im/login/IIMLoginCore.java index 4c585cfd9..555b9a526 100644 --- a/core/src/main/java/com/pikolive/core/im/login/IIMLoginCore.java +++ b/core/src/main/java/com/bingchuang/core/im/login/IIMLoginCore.java @@ -1,9 +1,9 @@ -package com.pikolive.core.im.login; +package com.bingchuang.core.im.login; import com.netease.nimlib.sdk.auth.OnlineClient; -import com.pikolive.core.base.IModel; -import com.pikolive.core.base.IModel; -import com.pikolive.core.base.IModel; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.base.IModel; /** * Created by chenran on 2017/2/16. diff --git a/core/src/main/java/com/pikolive/core/im/notification/INotificationCore.java b/core/src/main/java/com/bingchuang/core/im/notification/INotificationCore.java similarity index 88% rename from core/src/main/java/com/pikolive/core/im/notification/INotificationCore.java rename to core/src/main/java/com/bingchuang/core/im/notification/INotificationCore.java index d92034c69..209440b53 100644 --- a/core/src/main/java/com/pikolive/core/im/notification/INotificationCore.java +++ b/core/src/main/java/com/bingchuang/core/im/notification/INotificationCore.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.notification; +package com.bingchuang.core.im.notification; import com.netease.nimlib.sdk.msg.model.CustomNotification; import com.bingchuang.library.coremanager.IBaseCore; diff --git a/core/src/main/java/com/pikolive/core/im/notification/INotificationCoreClient.java b/core/src/main/java/com/bingchuang/core/im/notification/INotificationCoreClient.java similarity index 89% rename from core/src/main/java/com/pikolive/core/im/notification/INotificationCoreClient.java rename to core/src/main/java/com/bingchuang/core/im/notification/INotificationCoreClient.java index 9f873be8d..95c504ca7 100644 --- a/core/src/main/java/com/pikolive/core/im/notification/INotificationCoreClient.java +++ b/core/src/main/java/com/bingchuang/core/im/notification/INotificationCoreClient.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.notification; +package com.bingchuang.core.im.notification; import com.alibaba.fastjson.JSONObject; import com.bingchuang.library.coremanager.ICoreClient; diff --git a/core/src/main/java/com/pikolive/core/im/room/IIMRoomCoreClient.java b/core/src/main/java/com/bingchuang/core/im/room/IIMRoomCoreClient.java similarity index 99% rename from core/src/main/java/com/pikolive/core/im/room/IIMRoomCoreClient.java rename to core/src/main/java/com/bingchuang/core/im/room/IIMRoomCoreClient.java index dfbdada27..357f9dd32 100644 --- a/core/src/main/java/com/pikolive/core/im/room/IIMRoomCoreClient.java +++ b/core/src/main/java/com/bingchuang/core/im/room/IIMRoomCoreClient.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.room; +package com.bingchuang.core.im.room; import com.netease.nimlib.sdk.chatroom.model.ChatRoomKickOutEvent; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; diff --git a/core/src/main/java/com/pikolive/core/im/state/IPhoneCallStateModel.java b/core/src/main/java/com/bingchuang/core/im/state/IPhoneCallStateModel.java similarity index 75% rename from core/src/main/java/com/pikolive/core/im/state/IPhoneCallStateModel.java rename to core/src/main/java/com/bingchuang/core/im/state/IPhoneCallStateModel.java index abf4ce77a..b5ef651bb 100644 --- a/core/src/main/java/com/pikolive/core/im/state/IPhoneCallStateModel.java +++ b/core/src/main/java/com/bingchuang/core/im/state/IPhoneCallStateModel.java @@ -1,8 +1,8 @@ -package com.pikolive.core.im.state; +package com.bingchuang.core.im.state; -import com.pikolive.core.base.IModel; -import com.pikolive.core.base.IModel; -import com.pikolive.core.base.IModel; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.base.IModel; public interface IPhoneCallStateModel extends IModel { /** diff --git a/core/src/main/java/com/pikolive/core/im/state/PhoneCallStateModel.java b/core/src/main/java/com/bingchuang/core/im/state/PhoneCallStateModel.java similarity index 94% rename from core/src/main/java/com/pikolive/core/im/state/PhoneCallStateModel.java rename to core/src/main/java/com/bingchuang/core/im/state/PhoneCallStateModel.java index 57d5ba734..94ea5e5f0 100644 --- a/core/src/main/java/com/pikolive/core/im/state/PhoneCallStateModel.java +++ b/core/src/main/java/com/bingchuang/core/im/state/PhoneCallStateModel.java @@ -1,11 +1,11 @@ -package com.pikolive.core.im.state; +package com.bingchuang.core.im.state; import android.telephony.TelephonyManager; import android.util.Log; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.base.BaseModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.base.BaseModel; public class PhoneCallStateModel extends BaseModel implements IPhoneCallStateModel { private static final String TAG = "PhoneCallStateModel"; diff --git a/core/src/main/java/com/pikolive/core/im/sysmsg/ISysMsgCore.java b/core/src/main/java/com/bingchuang/core/im/sysmsg/ISysMsgCore.java similarity index 97% rename from core/src/main/java/com/pikolive/core/im/sysmsg/ISysMsgCore.java rename to core/src/main/java/com/bingchuang/core/im/sysmsg/ISysMsgCore.java index 39a5e684e..665b968d6 100644 --- a/core/src/main/java/com/pikolive/core/im/sysmsg/ISysMsgCore.java +++ b/core/src/main/java/com/bingchuang/core/im/sysmsg/ISysMsgCore.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.sysmsg; +package com.bingchuang.core.im.sysmsg; import com.netease.nimlib.sdk.msg.constant.SystemMessageStatus; import com.netease.nimlib.sdk.msg.constant.SystemMessageType; diff --git a/core/src/main/java/com/pikolive/core/im/sysmsg/ISysMsgCoreClient.java b/core/src/main/java/com/bingchuang/core/im/sysmsg/ISysMsgCoreClient.java similarity index 92% rename from core/src/main/java/com/pikolive/core/im/sysmsg/ISysMsgCoreClient.java rename to core/src/main/java/com/bingchuang/core/im/sysmsg/ISysMsgCoreClient.java index 5fc570244..e289f85a1 100644 --- a/core/src/main/java/com/pikolive/core/im/sysmsg/ISysMsgCoreClient.java +++ b/core/src/main/java/com/bingchuang/core/im/sysmsg/ISysMsgCoreClient.java @@ -1,4 +1,4 @@ -package com.pikolive.core.im.sysmsg; +package com.bingchuang.core.im.sysmsg; import com.netease.nimlib.sdk.msg.model.SystemMessage; import com.bingchuang.library.coremanager.ICoreClient; diff --git a/core/src/main/java/com/pikolive/core/initial/FaceComponent.java b/core/src/main/java/com/bingchuang/core/initial/FaceComponent.java similarity index 97% rename from core/src/main/java/com/pikolive/core/initial/FaceComponent.java rename to core/src/main/java/com/bingchuang/core/initial/FaceComponent.java index 5d3363d3d..48122f739 100644 --- a/core/src/main/java/com/pikolive/core/initial/FaceComponent.java +++ b/core/src/main/java/com/bingchuang/core/initial/FaceComponent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.initial; +package com.bingchuang.core.initial; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/initial/IInitialModel.java b/core/src/main/java/com/bingchuang/core/initial/IInitialModel.java similarity index 60% rename from core/src/main/java/com/pikolive/core/initial/IInitialModel.java rename to core/src/main/java/com/bingchuang/core/initial/IInitialModel.java index 768d86dfb..88bfa1a4c 100644 --- a/core/src/main/java/com/pikolive/core/initial/IInitialModel.java +++ b/core/src/main/java/com/bingchuang/core/initial/IInitialModel.java @@ -1,4 +1,4 @@ -package com.pikolive.core.initial; +package com.bingchuang.core.initial; import android.annotation.SuppressLint; @@ -6,22 +6,22 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.lifecycle.LiveData; -import com.pikolive.core.base.IModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.initial.bean.BoxInfo; -import com.pikolive.core.initial.bean.FairyOpenInfo; -import com.pikolive.core.initial.bean.InitInfo; -import com.pikolive.core.base.IModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.initial.bean.BoxInfo; -import com.pikolive.core.initial.bean.FairyOpenInfo; -import com.pikolive.core.initial.bean.InitInfo; -import com.pikolive.core.base.IModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core2.home.bean.MainTabInfo; -import com.pikolive.core.initial.bean.BoxInfo; -import com.pikolive.core.initial.bean.FairyOpenInfo; -import com.pikolive.core.initial.bean.InitInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.initial.bean.BoxInfo; +import com.bingchuang.core.initial.bean.FairyOpenInfo; +import com.bingchuang.core.initial.bean.InitInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.initial.bean.BoxInfo; +import com.bingchuang.core.initial.bean.FairyOpenInfo; +import com.bingchuang.core.initial.bean.InitInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core2.home.bean.MainTabInfo; +import com.bingchuang.core.initial.bean.BoxInfo; +import com.bingchuang.core.initial.bean.FairyOpenInfo; +import com.bingchuang.core.initial.bean.InitInfo; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/initial/InitialModel.java b/core/src/main/java/com/bingchuang/core/initial/InitialModel.java similarity index 91% rename from core/src/main/java/com/pikolive/core/initial/InitialModel.java rename to core/src/main/java/com/bingchuang/core/initial/InitialModel.java index 3cf0b8601..bf4f618a7 100644 --- a/core/src/main/java/com/pikolive/core/initial/InitialModel.java +++ b/core/src/main/java/com/bingchuang/core/initial/InitialModel.java @@ -1,4 +1,4 @@ -package com.pikolive.core.initial; +package com.bingchuang.core.initial; import android.annotation.SuppressLint; import android.content.BroadcastReceiver; @@ -15,36 +15,36 @@ import androidx.lifecycle.MutableLiveData; import com.bumptech.glide.request.FutureTarget; import com.bumptech.glide.request.target.Target; import com.netease.nim.uikit.support.glide.GlideApp; -import com.pikolive.core.auth.event.LogoutEvent; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.certification.CertificationModel; -import com.pikolive.core.initial.bean.BoxInfo; -import com.pikolive.core.initial.bean.FairyOpenInfo; -import com.pikolive.core.initial.bean.InitInfo; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core.room.face.DynamicFaceModel; -import com.pikolive.core.user.event.LoadLoginUserInfoEvent; -import com.pikolive.core.withdraw.WithdrawModel; -import com.pikolive.core.auth.event.LogoutEvent; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.certification.CertificationModel; -import com.pikolive.core.initial.bean.BoxInfo; -import com.pikolive.core.initial.bean.FairyOpenInfo; -import com.pikolive.core.initial.bean.InitInfo; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core.room.face.DynamicFaceModel; -import com.pikolive.core.user.event.LoadLoginUserInfoEvent; -import com.pikolive.core.withdraw.WithdrawModel; -import com.pikolive.core.R; -import com.pikolive.core.DemoCache; -import com.pikolive.core2.home.bean.MainTabInfo; -import com.pikolive.core2.home.bean.MainTabType; -import com.pikolive.core.noble.NobleDataManager; -import com.pikolive.core.public_chat_hall.manager.PublicChatHallDataManager; -import com.pikolive.core.utils.CurrentTimeUtils; -import com.pikolive.core.utils.SharedPreferenceUtils; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.auth.event.LogoutEvent; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.certification.CertificationModel; +import com.bingchuang.core.initial.bean.BoxInfo; +import com.bingchuang.core.initial.bean.FairyOpenInfo; +import com.bingchuang.core.initial.bean.InitInfo; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core.room.face.DynamicFaceModel; +import com.bingchuang.core.user.event.LoadLoginUserInfoEvent; +import com.bingchuang.core.withdraw.WithdrawModel; +import com.bingchuang.core.auth.event.LogoutEvent; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.certification.CertificationModel; +import com.bingchuang.core.initial.bean.BoxInfo; +import com.bingchuang.core.initial.bean.FairyOpenInfo; +import com.bingchuang.core.initial.bean.InitInfo; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core.room.face.DynamicFaceModel; +import com.bingchuang.core.user.event.LoadLoginUserInfoEvent; +import com.bingchuang.core.withdraw.WithdrawModel; +import com.bingchuang.core.R; +import com.bingchuang.core.DemoCache; +import com.bingchuang.core2.home.bean.MainTabInfo; +import com.bingchuang.core2.home.bean.MainTabType; +import com.bingchuang.core.noble.NobleDataManager; +import com.bingchuang.core.public_chat_hall.manager.PublicChatHallDataManager; +import com.bingchuang.core.utils.CurrentTimeUtils; +import com.bingchuang.core.utils.SharedPreferenceUtils; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.utils.JavaUtil; import com.bingchuang.library.utils.ListUtils; diff --git a/core/src/main/java/com/pikolive/core/initial/NobleResourceComponent.java b/core/src/main/java/com/bingchuang/core/initial/NobleResourceComponent.java similarity index 96% rename from core/src/main/java/com/pikolive/core/initial/NobleResourceComponent.java rename to core/src/main/java/com/bingchuang/core/initial/NobleResourceComponent.java index 6cc3bdbb4..eeb0ad598 100644 --- a/core/src/main/java/com/pikolive/core/initial/NobleResourceComponent.java +++ b/core/src/main/java/com/bingchuang/core/initial/NobleResourceComponent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.initial; +package com.bingchuang.core.initial; import com.google.gson.annotations.SerializedName; diff --git a/core/src/main/java/com/pikolive/core/initial/SplashComponent.java b/core/src/main/java/com/bingchuang/core/initial/SplashComponent.java similarity index 96% rename from core/src/main/java/com/pikolive/core/initial/SplashComponent.java rename to core/src/main/java/com/bingchuang/core/initial/SplashComponent.java index a09a0eed4..f309b9603 100644 --- a/core/src/main/java/com/pikolive/core/initial/SplashComponent.java +++ b/core/src/main/java/com/bingchuang/core/initial/SplashComponent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.initial; +package com.bingchuang.core.initial; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/initial/bean/BoxInfo.java b/core/src/main/java/com/bingchuang/core/initial/bean/BoxInfo.java similarity index 80% rename from core/src/main/java/com/pikolive/core/initial/bean/BoxInfo.java rename to core/src/main/java/com/bingchuang/core/initial/bean/BoxInfo.java index f98279303..771e5743f 100644 --- a/core/src/main/java/com/pikolive/core/initial/bean/BoxInfo.java +++ b/core/src/main/java/com/bingchuang/core/initial/bean/BoxInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.initial.bean; +package com.bingchuang.core.initial.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/initial/bean/FairyOpenInfo.java b/core/src/main/java/com/bingchuang/core/initial/bean/FairyOpenInfo.java similarity index 89% rename from core/src/main/java/com/pikolive/core/initial/bean/FairyOpenInfo.java rename to core/src/main/java/com/bingchuang/core/initial/bean/FairyOpenInfo.java index ccbece6e1..4c1064524 100644 --- a/core/src/main/java/com/pikolive/core/initial/bean/FairyOpenInfo.java +++ b/core/src/main/java/com/bingchuang/core/initial/bean/FairyOpenInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.initial.bean; +package com.bingchuang.core.initial.bean; public class FairyOpenInfo { private int levelLimit; diff --git a/core/src/main/java/com/pikolive/core/initial/bean/InitInfo.java b/core/src/main/java/com/bingchuang/core/initial/bean/InitInfo.java similarity index 88% rename from core/src/main/java/com/pikolive/core/initial/bean/InitInfo.java rename to core/src/main/java/com/bingchuang/core/initial/bean/InitInfo.java index 406e7a01f..86dec64b1 100644 --- a/core/src/main/java/com/pikolive/core/initial/bean/InitInfo.java +++ b/core/src/main/java/com/bingchuang/core/initial/bean/InitInfo.java @@ -1,16 +1,16 @@ -package com.pikolive.core.initial.bean; +package com.bingchuang.core.initial.bean; import com.google.gson.annotations.SerializedName; -import com.pikolive.core.monsterhunting.bean.MonsterInitInfo; -import com.pikolive.core.noble.NobleRight; -import com.pikolive.core.monsterhunting.bean.MonsterInitInfo; -import com.pikolive.core.noble.NobleRight; -import com.pikolive.core.initial.FaceComponent; -import com.pikolive.core.initial.NobleResourceComponent; -import com.pikolive.core.initial.SplashComponent; -import com.pikolive.core.monsterhunting.bean.MonsterInitInfo; -import com.pikolive.core.noble.NobleRight; +import com.bingchuang.core.monsterhunting.bean.MonsterInitInfo; +import com.bingchuang.core.noble.NobleRight; +import com.bingchuang.core.monsterhunting.bean.MonsterInitInfo; +import com.bingchuang.core.noble.NobleRight; +import com.bingchuang.core.initial.FaceComponent; +import com.bingchuang.core.initial.NobleResourceComponent; +import com.bingchuang.core.initial.SplashComponent; +import com.bingchuang.core.monsterhunting.bean.MonsterInitInfo; +import com.bingchuang.core.noble.NobleRight; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/initial/bean/RedEnvelopeConfig.java b/core/src/main/java/com/bingchuang/core/initial/bean/RedEnvelopeConfig.java similarity index 97% rename from core/src/main/java/com/pikolive/core/initial/bean/RedEnvelopeConfig.java rename to core/src/main/java/com/bingchuang/core/initial/bean/RedEnvelopeConfig.java index c7526e53f..7a13e5ac9 100644 --- a/core/src/main/java/com/pikolive/core/initial/bean/RedEnvelopeConfig.java +++ b/core/src/main/java/com/bingchuang/core/initial/bean/RedEnvelopeConfig.java @@ -1,4 +1,4 @@ -package com.pikolive.core.initial.bean; +package com.bingchuang.core.initial.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/initial/bean/TaxInfo.java b/core/src/main/java/com/bingchuang/core/initial/bean/TaxInfo.java similarity index 84% rename from core/src/main/java/com/pikolive/core/initial/bean/TaxInfo.java rename to core/src/main/java/com/bingchuang/core/initial/bean/TaxInfo.java index 10501dd89..4bc53e1c5 100644 --- a/core/src/main/java/com/pikolive/core/initial/bean/TaxInfo.java +++ b/core/src/main/java/com/bingchuang/core/initial/bean/TaxInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.initial.bean; +package com.bingchuang.core.initial.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/interceptor/MyOkHttpRetryInterceptor.java b/core/src/main/java/com/bingchuang/core/interceptor/MyOkHttpRetryInterceptor.java similarity index 95% rename from core/src/main/java/com/pikolive/core/interceptor/MyOkHttpRetryInterceptor.java rename to core/src/main/java/com/bingchuang/core/interceptor/MyOkHttpRetryInterceptor.java index c907bff89..23ab4733c 100644 --- a/core/src/main/java/com/pikolive/core/interceptor/MyOkHttpRetryInterceptor.java +++ b/core/src/main/java/com/bingchuang/core/interceptor/MyOkHttpRetryInterceptor.java @@ -1,6 +1,6 @@ -package com.pikolive.core.interceptor; +package com.bingchuang.core.interceptor; -import com.pikolive.core.utils.Logger; +import com.bingchuang.core.utils.Logger; import java.io.IOException; import java.io.InterruptedIOException; diff --git a/core/src/main/java/com/pikolive/core/interceptor/NoParamsInterceptor.java b/core/src/main/java/com/bingchuang/core/interceptor/NoParamsInterceptor.java similarity index 97% rename from core/src/main/java/com/pikolive/core/interceptor/NoParamsInterceptor.java rename to core/src/main/java/com/bingchuang/core/interceptor/NoParamsInterceptor.java index 75210597e..570742595 100644 --- a/core/src/main/java/com/pikolive/core/interceptor/NoParamsInterceptor.java +++ b/core/src/main/java/com/bingchuang/core/interceptor/NoParamsInterceptor.java @@ -1,4 +1,4 @@ -package com.pikolive.core.interceptor; +package com.bingchuang.core.interceptor; import java.io.IOException; diff --git a/core/src/main/java/com/pikolive/core/interceptor/ParamsInterceptor.java b/core/src/main/java/com/bingchuang/core/interceptor/ParamsInterceptor.java similarity index 97% rename from core/src/main/java/com/pikolive/core/interceptor/ParamsInterceptor.java rename to core/src/main/java/com/bingchuang/core/interceptor/ParamsInterceptor.java index e43abc568..7e2f60886 100644 --- a/core/src/main/java/com/pikolive/core/interceptor/ParamsInterceptor.java +++ b/core/src/main/java/com/bingchuang/core/interceptor/ParamsInterceptor.java @@ -1,13 +1,13 @@ -package com.pikolive.core.interceptor; +package com.bingchuang.core.interceptor; import android.text.TextUtils; import androidx.annotation.NonNull; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.utils.APIEncryptUtil; -import com.pikolive.core.utils.OaidUtil; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.utils.APIEncryptUtil; +import com.bingchuang.core.utils.OaidUtil; import com.bingchuang.library.utils.codec.MD5Utils; import java.io.IOException; diff --git a/core/src/main/java/com/pikolive/core/interceptor/PathFilter.java b/core/src/main/java/com/bingchuang/core/interceptor/PathFilter.java similarity index 95% rename from core/src/main/java/com/pikolive/core/interceptor/PathFilter.java rename to core/src/main/java/com/bingchuang/core/interceptor/PathFilter.java index 50a28dee9..6f5ec45aa 100644 --- a/core/src/main/java/com/pikolive/core/interceptor/PathFilter.java +++ b/core/src/main/java/com/bingchuang/core/interceptor/PathFilter.java @@ -1,4 +1,4 @@ -package com.pikolive.core.interceptor; +package com.bingchuang.core.interceptor; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/interceptor/TimeSyncInterceptor.kt b/core/src/main/java/com/bingchuang/core/interceptor/TimeSyncInterceptor.kt similarity index 95% rename from core/src/main/java/com/pikolive/core/interceptor/TimeSyncInterceptor.kt rename to core/src/main/java/com/bingchuang/core/interceptor/TimeSyncInterceptor.kt index 80f106b36..367a048c3 100644 --- a/core/src/main/java/com/pikolive/core/interceptor/TimeSyncInterceptor.kt +++ b/core/src/main/java/com/bingchuang/core/interceptor/TimeSyncInterceptor.kt @@ -1,8 +1,8 @@ -package com.pikolive.core.interceptor +package com.bingchuang.core.interceptor import com.bingchuang.library.utils.AppUtils import com.bingchuang.library.utils.ServiceTime -import com.pikolive.core.utils.LogUtils +import com.bingchuang.core.utils.LogUtils import com.bingchuang.library.utils.NetworkUtils import okhttp3.Headers import okhttp3.Interceptor diff --git a/core/src/main/java/com/pikolive/core/kick/IKickModel.java b/core/src/main/java/com/bingchuang/core/kick/IKickModel.java similarity index 80% rename from core/src/main/java/com/pikolive/core/kick/IKickModel.java rename to core/src/main/java/com/bingchuang/core/kick/IKickModel.java index 78bc9e8a9..b2a3a08c7 100644 --- a/core/src/main/java/com/pikolive/core/kick/IKickModel.java +++ b/core/src/main/java/com/bingchuang/core/kick/IKickModel.java @@ -1,7 +1,7 @@ -package com.pikolive.core.kick; +package com.bingchuang.core.kick; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.pikolive.core.base.IModel; +import com.bingchuang.core.base.IModel; public interface IKickModel extends IModel { diff --git a/core/src/main/java/com/pikolive/core/kick/KickModel.java b/core/src/main/java/com/bingchuang/core/kick/KickModel.java similarity index 91% rename from core/src/main/java/com/pikolive/core/kick/KickModel.java rename to core/src/main/java/com/bingchuang/core/kick/KickModel.java index e1dd891b5..10931a116 100644 --- a/core/src/main/java/com/pikolive/core/kick/KickModel.java +++ b/core/src/main/java/com/bingchuang/core/kick/KickModel.java @@ -1,4 +1,4 @@ -package com.pikolive.core.kick; +package com.bingchuang.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.pikolive.core.base.BaseModel; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.manager.RoomEvent; -import com.pikolive.core.admin.util.SaMsgUtil; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.manager.RoomEvent; +import com.bingchuang.core.admin.util.SaMsgUtil; +import com.bingchuang.core.utils.net.RxHelper; import java.lang.ref.WeakReference; import java.util.ArrayList; diff --git a/core/src/main/java/com/pikolive/core/level/UserLevelResourceType.java b/core/src/main/java/com/bingchuang/core/level/UserLevelResourceType.java similarity index 88% rename from core/src/main/java/com/pikolive/core/level/UserLevelResourceType.java rename to core/src/main/java/com/bingchuang/core/level/UserLevelResourceType.java index 138529142..6cc55cf87 100644 --- a/core/src/main/java/com/pikolive/core/level/UserLevelResourceType.java +++ b/core/src/main/java/com/bingchuang/core/level/UserLevelResourceType.java @@ -1,4 +1,4 @@ -package com.pikolive.core.level; +package com.bingchuang.core.level; /** * diff --git a/core/src/main/java/com/pikolive/core/level/UserLevelVo.java b/core/src/main/java/com/bingchuang/core/level/UserLevelVo.java similarity index 99% rename from core/src/main/java/com/pikolive/core/level/UserLevelVo.java rename to core/src/main/java/com/bingchuang/core/level/UserLevelVo.java index e3e9dadf4..bb2b975bb 100644 --- a/core/src/main/java/com/pikolive/core/level/UserLevelVo.java +++ b/core/src/main/java/com/bingchuang/core/level/UserLevelVo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.level; +package com.bingchuang.core.level; import java.io.Serializable; import java.util.HashMap; diff --git a/core/src/main/java/com/pikolive/core/level/event/CharmLevelUpEvent.java b/core/src/main/java/com/bingchuang/core/level/event/CharmLevelUpEvent.java similarity index 86% rename from core/src/main/java/com/pikolive/core/level/event/CharmLevelUpEvent.java rename to core/src/main/java/com/bingchuang/core/level/event/CharmLevelUpEvent.java index 8d28d64e2..285b56c50 100644 --- a/core/src/main/java/com/pikolive/core/level/event/CharmLevelUpEvent.java +++ b/core/src/main/java/com/bingchuang/core/level/event/CharmLevelUpEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.level.event; +package com.bingchuang.core.level.event; public class CharmLevelUpEvent { diff --git a/core/src/main/java/com/pikolive/core/level/event/LevelUpEvent.java b/core/src/main/java/com/bingchuang/core/level/event/LevelUpEvent.java similarity index 85% rename from core/src/main/java/com/pikolive/core/level/event/LevelUpEvent.java rename to core/src/main/java/com/bingchuang/core/level/event/LevelUpEvent.java index 91ff7ab3c..1671bbbe4 100644 --- a/core/src/main/java/com/pikolive/core/level/event/LevelUpEvent.java +++ b/core/src/main/java/com/bingchuang/core/level/event/LevelUpEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.level.event; +package com.bingchuang.core.level.event; public class LevelUpEvent { diff --git a/core/src/main/java/com/bingchuang/core/linked/ILinkedModel.java b/core/src/main/java/com/bingchuang/core/linked/ILinkedModel.java new file mode 100644 index 000000000..952b74619 --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/linked/ILinkedModel.java @@ -0,0 +1,17 @@ +package com.bingchuang.core.linked; + +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.linked.bean.LinkedInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.linked.bean.LinkedInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.linked.bean.LinkedInfo; + + +public interface ILinkedModel extends IModel { + + void setLinkedInfo(LinkedInfo linkedInfo); + + LinkedInfo getLinkedInfo(); + +} diff --git a/core/src/main/java/com/pikolive/core/linked/LinkedModel.java b/core/src/main/java/com/bingchuang/core/linked/LinkedModel.java similarity index 70% rename from core/src/main/java/com/pikolive/core/linked/LinkedModel.java rename to core/src/main/java/com/bingchuang/core/linked/LinkedModel.java index 5c7d57f3c..4bbfdca03 100644 --- a/core/src/main/java/com/pikolive/core/linked/LinkedModel.java +++ b/core/src/main/java/com/bingchuang/core/linked/LinkedModel.java @@ -1,10 +1,10 @@ -package com.pikolive.core.linked; +package com.bingchuang.core.linked; -import com.pikolive.core.linked.bean.LinkedInfo; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.linked.bean.LinkedInfo; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.linked.bean.LinkedInfo; +import com.bingchuang.core.linked.bean.LinkedInfo; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.linked.bean.LinkedInfo; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.linked.bean.LinkedInfo; public class LinkedModel extends BaseModel implements ILinkedModel{ diff --git a/core/src/main/java/com/pikolive/core/linked/bean/LinkedInfo.java b/core/src/main/java/com/bingchuang/core/linked/bean/LinkedInfo.java similarity index 92% rename from core/src/main/java/com/pikolive/core/linked/bean/LinkedInfo.java rename to core/src/main/java/com/bingchuang/core/linked/bean/LinkedInfo.java index e41deaec0..efdb260fb 100644 --- a/core/src/main/java/com/pikolive/core/linked/bean/LinkedInfo.java +++ b/core/src/main/java/com/bingchuang/core/linked/bean/LinkedInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.linked.bean; +package com.bingchuang.core.linked.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/linked/event/LinkMeInfoUpdateEvent.java b/core/src/main/java/com/bingchuang/core/linked/event/LinkMeInfoUpdateEvent.java similarity index 74% rename from core/src/main/java/com/pikolive/core/linked/event/LinkMeInfoUpdateEvent.java rename to core/src/main/java/com/bingchuang/core/linked/event/LinkMeInfoUpdateEvent.java index d1fe57583..6912cda09 100644 --- a/core/src/main/java/com/pikolive/core/linked/event/LinkMeInfoUpdateEvent.java +++ b/core/src/main/java/com/bingchuang/core/linked/event/LinkMeInfoUpdateEvent.java @@ -1,6 +1,6 @@ -package com.pikolive.core.linked.event; +package com.bingchuang.core.linked.event; -import com.pikolive.core.linked.bean.LinkedInfo; +import com.bingchuang.core.linked.bean.LinkedInfo; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/luckymoney/LuckyMoneyInfo.java b/core/src/main/java/com/bingchuang/core/luckymoney/LuckyMoneyInfo.java similarity index 99% rename from core/src/main/java/com/pikolive/core/luckymoney/LuckyMoneyInfo.java rename to core/src/main/java/com/bingchuang/core/luckymoney/LuckyMoneyInfo.java index d933ee78d..7fe14d05b 100644 --- a/core/src/main/java/com/pikolive/core/luckymoney/LuckyMoneyInfo.java +++ b/core/src/main/java/com/bingchuang/core/luckymoney/LuckyMoneyInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.luckymoney; +package com.bingchuang.core.luckymoney; import java.io.Serializable; import java.util.HashMap; diff --git a/core/src/main/java/com/pikolive/core/luckymoney/LuckyMoneyRecordsInfo.java b/core/src/main/java/com/bingchuang/core/luckymoney/LuckyMoneyRecordsInfo.java similarity index 84% rename from core/src/main/java/com/pikolive/core/luckymoney/LuckyMoneyRecordsInfo.java rename to core/src/main/java/com/bingchuang/core/luckymoney/LuckyMoneyRecordsInfo.java index 3e718376b..d00632034 100644 --- a/core/src/main/java/com/pikolive/core/luckymoney/LuckyMoneyRecordsInfo.java +++ b/core/src/main/java/com/bingchuang/core/luckymoney/LuckyMoneyRecordsInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.luckymoney; +package com.bingchuang.core.luckymoney; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/luckymoney/LuckyMoneyUserInfo.java b/core/src/main/java/com/bingchuang/core/luckymoney/LuckyMoneyUserInfo.java similarity index 89% rename from core/src/main/java/com/pikolive/core/luckymoney/LuckyMoneyUserInfo.java rename to core/src/main/java/com/bingchuang/core/luckymoney/LuckyMoneyUserInfo.java index e71b56d57..dba420eb1 100644 --- a/core/src/main/java/com/pikolive/core/luckymoney/LuckyMoneyUserInfo.java +++ b/core/src/main/java/com/bingchuang/core/luckymoney/LuckyMoneyUserInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.luckymoney; +package com.bingchuang.core.luckymoney; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/magic/IMagicModel.java b/core/src/main/java/com/bingchuang/core/magic/IMagicModel.java similarity index 70% rename from core/src/main/java/com/pikolive/core/magic/IMagicModel.java rename to core/src/main/java/com/bingchuang/core/magic/IMagicModel.java index d3bd7a59e..65bf169fb 100644 --- a/core/src/main/java/com/pikolive/core/magic/IMagicModel.java +++ b/core/src/main/java/com/bingchuang/core/magic/IMagicModel.java @@ -1,19 +1,19 @@ -package com.pikolive.core.magic; +package com.bingchuang.core.magic; import androidx.annotation.Nullable; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.pikolive.core.magic.bean.MagicInfo; -import com.pikolive.core.magic.bean.MagicMultiReceiverInfo; -import com.pikolive.core.magic.bean.MagicReceivedInfo; -import com.pikolive.core.magic.bean.MagicInfo; -import com.pikolive.core.magic.bean.MagicMultiReceiverInfo; -import com.pikolive.core.magic.bean.MagicReceivedInfo; -import com.pikolive.core.base.IModel; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.magic.bean.MagicInfo; -import com.pikolive.core.magic.bean.MagicMultiReceiverInfo; -import com.pikolive.core.magic.bean.MagicReceivedInfo; +import com.bingchuang.core.magic.bean.MagicInfo; +import com.bingchuang.core.magic.bean.MagicMultiReceiverInfo; +import com.bingchuang.core.magic.bean.MagicReceivedInfo; +import com.bingchuang.core.magic.bean.MagicInfo; +import com.bingchuang.core.magic.bean.MagicMultiReceiverInfo; +import com.bingchuang.core.magic.bean.MagicReceivedInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.magic.bean.MagicInfo; +import com.bingchuang.core.magic.bean.MagicMultiReceiverInfo; +import com.bingchuang.core.magic.bean.MagicReceivedInfo; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/magic/MagicModel.java b/core/src/main/java/com/bingchuang/core/magic/MagicModel.java similarity index 92% rename from core/src/main/java/com/pikolive/core/magic/MagicModel.java rename to core/src/main/java/com/bingchuang/core/magic/MagicModel.java index f29d69837..bf25f8bb1 100644 --- a/core/src/main/java/com/pikolive/core/magic/MagicModel.java +++ b/core/src/main/java/com/bingchuang/core/magic/MagicModel.java @@ -1,4 +1,4 @@ -package com.pikolive.core.magic; +package com.bingchuang.core.magic; import android.annotation.SuppressLint; import android.os.Handler; @@ -9,38 +9,38 @@ 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.pikolive.core.magic.bean.MagicInfo; -import com.pikolive.core.magic.bean.MagicMultiReceiverInfo; -import com.pikolive.core.magic.bean.MagicReceivedInfo; -import com.pikolive.core.magic.bean.MultiMagicReceivedInfo; -import com.pikolive.core.magic.exception.MagicOutOfDateException; -import com.pikolive.core.magic.toolbox.MagicToolbox; -import com.pikolive.core.magic.bean.MagicInfo; -import com.pikolive.core.magic.bean.MagicMultiReceiverInfo; -import com.pikolive.core.magic.bean.MagicReceivedInfo; -import com.pikolive.core.magic.bean.MultiMagicReceivedInfo; -import com.pikolive.core.magic.exception.MagicOutOfDateException; -import com.pikolive.core.magic.toolbox.MagicToolbox; -import com.pikolive.core.R; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.exception.UnKnowException; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.im.custom.bean.MagicAllMicAttachment; -import com.pikolive.core.im.custom.bean.MagicAttachment; -import com.pikolive.core.im.custom.bean.MagicBatchAttachment; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.manager.RoomEvent; -import com.pikolive.core.pay.PayModel; -import com.pikolive.core2.retry.ImRetryManager; -import com.pikolive.core2.retry.RetryChatRoomMessage; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.room.giftvalue.bean.GiftValueCommonUpdate; -import com.pikolive.core.room.giftvalue.helper.GiftValueMrg; -import com.pikolive.core.utils.net.BalanceNotEnoughExeption; -import com.pikolive.core.utils.net.FreezeException; +import com.bingchuang.core.magic.bean.MagicInfo; +import com.bingchuang.core.magic.bean.MagicMultiReceiverInfo; +import com.bingchuang.core.magic.bean.MagicReceivedInfo; +import com.bingchuang.core.magic.bean.MultiMagicReceivedInfo; +import com.bingchuang.core.magic.exception.MagicOutOfDateException; +import com.bingchuang.core.magic.toolbox.MagicToolbox; +import com.bingchuang.core.magic.bean.MagicInfo; +import com.bingchuang.core.magic.bean.MagicMultiReceiverInfo; +import com.bingchuang.core.magic.bean.MagicReceivedInfo; +import com.bingchuang.core.magic.bean.MultiMagicReceivedInfo; +import com.bingchuang.core.magic.exception.MagicOutOfDateException; +import com.bingchuang.core.magic.toolbox.MagicToolbox; +import com.bingchuang.core.R; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.exception.UnKnowException; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.im.custom.bean.MagicAllMicAttachment; +import com.bingchuang.core.im.custom.bean.MagicAttachment; +import com.bingchuang.core.im.custom.bean.MagicBatchAttachment; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.manager.RoomEvent; +import com.bingchuang.core.pay.PayModel; +import com.bingchuang.core2.retry.ImRetryManager; +import com.bingchuang.core2.retry.RetryChatRoomMessage; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.room.giftvalue.bean.GiftValueCommonUpdate; +import com.bingchuang.core.room.giftvalue.helper.GiftValueMrg; +import com.bingchuang.core.utils.net.BalanceNotEnoughExeption; +import com.bingchuang.core.utils.net.FreezeException; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.utils.ListUtils; import com.bingchuang.library.utils.ResUtil; diff --git a/core/src/main/java/com/pikolive/core/magic/ObjectPool.java b/core/src/main/java/com/bingchuang/core/magic/ObjectPool.java similarity index 98% rename from core/src/main/java/com/pikolive/core/magic/ObjectPool.java rename to core/src/main/java/com/bingchuang/core/magic/ObjectPool.java index 9d88767c2..bbd5b79c8 100644 --- a/core/src/main/java/com/pikolive/core/magic/ObjectPool.java +++ b/core/src/main/java/com/bingchuang/core/magic/ObjectPool.java @@ -1,4 +1,4 @@ -package com.pikolive.core.magic; +package com.bingchuang.core.magic; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; diff --git a/core/src/main/java/com/pikolive/core/magic/bean/MagicInfo.java b/core/src/main/java/com/bingchuang/core/magic/bean/MagicInfo.java similarity index 95% rename from core/src/main/java/com/pikolive/core/magic/bean/MagicInfo.java rename to core/src/main/java/com/bingchuang/core/magic/bean/MagicInfo.java index cbd6c2303..d0f6e0e14 100644 --- a/core/src/main/java/com/pikolive/core/magic/bean/MagicInfo.java +++ b/core/src/main/java/com/bingchuang/core/magic/bean/MagicInfo.java @@ -1,7 +1,7 @@ -package com.pikolive.core.magic.bean; +package com.bingchuang.core.magic.bean; import com.google.gson.annotations.SerializedName; -import com.pikolive.core.gift.bean.GiftInfo; +import com.bingchuang.core.gift.bean.GiftInfo; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/magic/bean/MagicMultiReceiverInfo.java b/core/src/main/java/com/bingchuang/core/magic/bean/MagicMultiReceiverInfo.java similarity index 91% rename from core/src/main/java/com/pikolive/core/magic/bean/MagicMultiReceiverInfo.java rename to core/src/main/java/com/bingchuang/core/magic/bean/MagicMultiReceiverInfo.java index 89889e1d0..c911343fd 100644 --- a/core/src/main/java/com/pikolive/core/magic/bean/MagicMultiReceiverInfo.java +++ b/core/src/main/java/com/bingchuang/core/magic/bean/MagicMultiReceiverInfo.java @@ -1,8 +1,8 @@ -package com.pikolive.core.magic.bean; +package com.bingchuang.core.magic.bean; import com.alibaba.fastjson.annotation.JSONField; import com.google.gson.annotations.SerializedName; -import com.pikolive.core.room.giftvalue.bean.RoomGiftValue; +import com.bingchuang.core.room.giftvalue.bean.RoomGiftValue; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/magic/bean/MagicReceivedInfo.java b/core/src/main/java/com/bingchuang/core/magic/bean/MagicReceivedInfo.java similarity index 92% rename from core/src/main/java/com/pikolive/core/magic/bean/MagicReceivedInfo.java rename to core/src/main/java/com/bingchuang/core/magic/bean/MagicReceivedInfo.java index 25531cdf2..be3827911 100644 --- a/core/src/main/java/com/pikolive/core/magic/bean/MagicReceivedInfo.java +++ b/core/src/main/java/com/bingchuang/core/magic/bean/MagicReceivedInfo.java @@ -1,8 +1,8 @@ -package com.pikolive.core.magic.bean; +package com.bingchuang.core.magic.bean; import com.alibaba.fastjson.annotation.JSONField; import com.google.gson.annotations.SerializedName; -import com.pikolive.core.room.giftvalue.bean.RoomGiftValue; +import com.bingchuang.core.room.giftvalue.bean.RoomGiftValue; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/magic/bean/MagicReceiver.java b/core/src/main/java/com/bingchuang/core/magic/bean/MagicReceiver.java similarity index 86% rename from core/src/main/java/com/pikolive/core/magic/bean/MagicReceiver.java rename to core/src/main/java/com/bingchuang/core/magic/bean/MagicReceiver.java index 1b672c88e..784ed8428 100644 --- a/core/src/main/java/com/pikolive/core/magic/bean/MagicReceiver.java +++ b/core/src/main/java/com/bingchuang/core/magic/bean/MagicReceiver.java @@ -1,4 +1,4 @@ -package com.pikolive.core.magic.bean; +package com.bingchuang.core.magic.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/magic/bean/MultiMagicReceivedInfo.java b/core/src/main/java/com/bingchuang/core/magic/bean/MultiMagicReceivedInfo.java similarity index 91% rename from core/src/main/java/com/pikolive/core/magic/bean/MultiMagicReceivedInfo.java rename to core/src/main/java/com/bingchuang/core/magic/bean/MultiMagicReceivedInfo.java index 39463fa6d..bc0fa3bf8 100644 --- a/core/src/main/java/com/pikolive/core/magic/bean/MultiMagicReceivedInfo.java +++ b/core/src/main/java/com/bingchuang/core/magic/bean/MultiMagicReceivedInfo.java @@ -1,8 +1,8 @@ -package com.pikolive.core.magic.bean; +package com.bingchuang.core.magic.bean; import com.alibaba.fastjson.annotation.JSONField; import com.google.gson.annotations.SerializedName; -import com.pikolive.core.room.giftvalue.bean.RoomGiftValue; +import com.bingchuang.core.room.giftvalue.bean.RoomGiftValue; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/magic/exception/MagicOutOfDateException.java b/core/src/main/java/com/bingchuang/core/magic/exception/MagicOutOfDateException.java similarity index 84% rename from core/src/main/java/com/pikolive/core/magic/exception/MagicOutOfDateException.java rename to core/src/main/java/com/bingchuang/core/magic/exception/MagicOutOfDateException.java index 8f4c18244..776ca13c9 100644 --- a/core/src/main/java/com/pikolive/core/magic/exception/MagicOutOfDateException.java +++ b/core/src/main/java/com/bingchuang/core/magic/exception/MagicOutOfDateException.java @@ -1,4 +1,4 @@ -package com.pikolive.core.magic.exception; +package com.bingchuang.core.magic.exception; /** * 魔法礼物过期 diff --git a/core/src/main/java/com/pikolive/core/magic/toolbox/MagicToolbox.java b/core/src/main/java/com/bingchuang/core/magic/toolbox/MagicToolbox.java similarity index 86% rename from core/src/main/java/com/pikolive/core/magic/toolbox/MagicToolbox.java rename to core/src/main/java/com/bingchuang/core/magic/toolbox/MagicToolbox.java index 8f2d1ea1d..9966c7e3f 100644 --- a/core/src/main/java/com/pikolive/core/magic/toolbox/MagicToolbox.java +++ b/core/src/main/java/com/bingchuang/core/magic/toolbox/MagicToolbox.java @@ -1,8 +1,8 @@ -package com.pikolive.core.magic.toolbox; +package com.bingchuang.core.magic.toolbox; -import com.pikolive.core.magic.bean.MagicMultiReceiverInfo; -import com.pikolive.core.magic.bean.MagicReceiver; -import com.pikolive.core.magic.bean.MultiMagicReceivedInfo; +import com.bingchuang.core.magic.bean.MagicMultiReceiverInfo; +import com.bingchuang.core.magic.bean.MagicReceiver; +import com.bingchuang.core.magic.bean.MultiMagicReceivedInfo; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/manager/AvRoomDataManager.java b/core/src/main/java/com/bingchuang/core/manager/AvRoomDataManager.java similarity index 96% rename from core/src/main/java/com/pikolive/core/manager/AvRoomDataManager.java rename to core/src/main/java/com/bingchuang/core/manager/AvRoomDataManager.java index c0c082546..6c4473f8d 100644 --- a/core/src/main/java/com/pikolive/core/manager/AvRoomDataManager.java +++ b/core/src/main/java/com/bingchuang/core/manager/AvRoomDataManager.java @@ -1,4 +1,4 @@ -package com.pikolive.core.manager; +package com.bingchuang.core.manager; import android.annotation.SuppressLint; import android.graphics.Point; @@ -22,40 +22,40 @@ 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.pikolive.core.bean.RoomQueueInfo; -import com.pikolive.core.room.bean.BoxSwitchVo; -import com.pikolive.core.room.bean.FindLoveSwitchVo; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.room.bean.RoomModeType; -import com.pikolive.core.room.bean.SeizeTreasureSwitchVo; -import com.pikolive.core.room.bean.SimplePartyRoomInfo; -import com.pikolive.core.room.event.RoomClearScreenEvent; -import com.pikolive.core.room.game.GameStatus; -import com.pikolive.core.room.giftvalue.helper.GiftValueMrg; -import com.pikolive.core2.manager.AudioEngineManager; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.bean.RoomQueueInfo; -import com.pikolive.core.room.bean.BoxSwitchVo; -import com.pikolive.core.room.bean.FindLoveSwitchVo; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.room.bean.RoomModeType; -import com.pikolive.core.room.bean.SeizeTreasureSwitchVo; -import com.pikolive.core.room.bean.SimplePartyRoomInfo; -import com.pikolive.core.room.event.RoomClearScreenEvent; -import com.pikolive.core.room.game.GameStatus; -import com.pikolive.core.room.giftvalue.helper.GiftValueMrg; -import com.pikolive.core.R; -import com.pikolive.core2.XChatConstants; -import com.pikolive.core.DemoCache; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.im.custom.bean.RoomPkBean; -import com.pikolive.core.admin.SuperAdminDataMrg; -import com.pikolive.core.admin.util.SuperAdminUtil; -import com.pikolive.core.support.room.RoomContext; -import com.pikolive.core.user.UserModel; -import com.pikolive.core.utils.CurrentTimeUtils; -import com.pikolive.core.utils.LogUtils; -import com.pikolive.core.utils.StringUtils; +import com.bingchuang.core.bean.RoomQueueInfo; +import com.bingchuang.core.room.bean.BoxSwitchVo; +import com.bingchuang.core.room.bean.FindLoveSwitchVo; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.room.bean.RoomModeType; +import com.bingchuang.core.room.bean.SeizeTreasureSwitchVo; +import com.bingchuang.core.room.bean.SimplePartyRoomInfo; +import com.bingchuang.core.room.event.RoomClearScreenEvent; +import com.bingchuang.core.room.game.GameStatus; +import com.bingchuang.core.room.giftvalue.helper.GiftValueMrg; +import com.bingchuang.core2.manager.AudioEngineManager; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.bean.RoomQueueInfo; +import com.bingchuang.core.room.bean.BoxSwitchVo; +import com.bingchuang.core.room.bean.FindLoveSwitchVo; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.room.bean.RoomModeType; +import com.bingchuang.core.room.bean.SeizeTreasureSwitchVo; +import com.bingchuang.core.room.bean.SimplePartyRoomInfo; +import com.bingchuang.core.room.event.RoomClearScreenEvent; +import com.bingchuang.core.room.game.GameStatus; +import com.bingchuang.core.room.giftvalue.helper.GiftValueMrg; +import com.bingchuang.core.R; +import com.bingchuang.core2.XChatConstants; +import com.bingchuang.core.DemoCache; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.im.custom.bean.RoomPkBean; +import com.bingchuang.core.admin.SuperAdminDataMrg; +import com.bingchuang.core.admin.util.SuperAdminUtil; +import com.bingchuang.core.support.room.RoomContext; +import com.bingchuang.core.user.UserModel; +import com.bingchuang.core.utils.CurrentTimeUtils; +import com.bingchuang.core.utils.LogUtils; +import com.bingchuang.core.utils.StringUtils; import com.bingchuang.library.utils.ListUtils; import com.bingchuang.library.utils.ResUtil; diff --git a/core/src/main/java/com/pikolive/core/manager/BaseMvpModel.java b/core/src/main/java/com/bingchuang/core/manager/BaseMvpModel.java similarity index 96% rename from core/src/main/java/com/pikolive/core/manager/BaseMvpModel.java rename to core/src/main/java/com/bingchuang/core/manager/BaseMvpModel.java index b7929704f..41eec3be9 100644 --- a/core/src/main/java/com/pikolive/core/manager/BaseMvpModel.java +++ b/core/src/main/java/com/bingchuang/core/manager/BaseMvpModel.java @@ -1,10 +1,10 @@ -package com.pikolive.core.manager; +package com.bingchuang.core.manager; import com.netease.nimlib.sdk.util.api.RequestResult; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.R; -import com.pikolive.core.bean.response.ServiceResult; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.R; +import com.bingchuang.core.bean.response.ServiceResult; import com.bingchuang.library.net.rxnet.callback.CallBack; import com.bingchuang.library.utils.ResUtil; diff --git a/core/src/main/java/com/pikolive/core/manager/IMBroadcastManager.java b/core/src/main/java/com/bingchuang/core/manager/IMBroadcastManager.java similarity index 88% rename from core/src/main/java/com/pikolive/core/manager/IMBroadcastManager.java rename to core/src/main/java/com/bingchuang/core/manager/IMBroadcastManager.java index 2765433dd..3d1b95480 100644 --- a/core/src/main/java/com/pikolive/core/manager/IMBroadcastManager.java +++ b/core/src/main/java/com/bingchuang/core/manager/IMBroadcastManager.java @@ -1,4 +1,4 @@ -package com.pikolive.core.manager; +package com.bingchuang.core.manager; import android.text.TextUtils; @@ -7,12 +7,12 @@ 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.pikolive.core.bean.BaseProtocol; -import com.pikolive.core.bean.BaseProtocol; -import com.pikolive.core.bean.BaseProtocol; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.upgrade.bean.NewestVersionInfo; -import com.pikolive.core.upgrade.event.ImPushUpdateAppEvent; +import com.bingchuang.core.bean.BaseProtocol; +import com.bingchuang.core.bean.BaseProtocol; +import com.bingchuang.core.bean.BaseProtocol; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.upgrade.bean.NewestVersionInfo; +import com.bingchuang.core.upgrade.event.ImPushUpdateAppEvent; import org.greenrobot.eventbus.EventBus; diff --git a/core/src/main/java/com/pikolive/core/manager/IMMessageManager.java b/core/src/main/java/com/bingchuang/core/manager/IMMessageManager.java similarity index 88% rename from core/src/main/java/com/pikolive/core/manager/IMMessageManager.java rename to core/src/main/java/com/bingchuang/core/manager/IMMessageManager.java index 0322c2c8d..82ed6069e 100644 --- a/core/src/main/java/com/pikolive/core/manager/IMMessageManager.java +++ b/core/src/main/java/com/bingchuang/core/manager/IMMessageManager.java @@ -1,14 +1,14 @@ -package com.pikolive.core.manager; +package com.bingchuang.core.manager; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CP_INVITE_MESSAGE; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_LOTTERY; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_PACKET; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LEVEL_UP; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MODULE_HALL; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_NEWBIE; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RECEIV_NEWBIE_HELLO; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_NOTICE; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_TO_BE_OWNER; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CP_INVITE_MESSAGE; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_LOTTERY; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_PACKET; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LEVEL_UP; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MODULE_HALL; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_NEWBIE; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RECEIV_NEWBIE_HELLO; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_NOTICE; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_TO_BE_OWNER; import android.util.Log; @@ -26,37 +26,37 @@ 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.pikolive.core.activity.event.ActivityEvent; -import com.pikolive.core.level.event.CharmLevelUpEvent; -import com.pikolive.core.level.event.LevelUpEvent; -import com.pikolive.core.luckymoney.LuckyMoneyInfo; -import com.pikolive.core.manager.event.HallInfoChangeEvent; -import com.pikolive.core.relation.cp.CpInviteInfo; -import com.pikolive.core.web.event.WebViewRefreshEvent; -import com.pikolive.core.activity.event.ActivityEvent; -import com.pikolive.core.level.event.CharmLevelUpEvent; -import com.pikolive.core.level.event.LevelUpEvent; -import com.pikolive.core.luckymoney.LuckyMoneyInfo; -import com.pikolive.core.manager.event.HallInfoChangeEvent; -import com.pikolive.core.relation.cp.CpInviteInfo; -import com.pikolive.core.web.event.WebViewRefreshEvent; -import com.pikolive.core.activity.event.ActivityEvent; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.im.custom.bean.CpInviteAttachment; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.im.custom.bean.LevelUpAttachment; -import com.pikolive.core.im.custom.bean.LotteryAttachment; -import com.pikolive.core.im.custom.bean.LuckyMoneyTipsAttachment; -import com.pikolive.core.im.custom.bean.NewbieHelloAttachment; -import com.pikolive.core.im.custom.bean.RedPacketAttachment; -import com.pikolive.core.level.event.CharmLevelUpEvent; -import com.pikolive.core.level.event.LevelUpEvent; -import com.pikolive.core.luckymoney.LuckyMoneyInfo; -import com.pikolive.core.manager.event.HallInfoChangeEvent; -import com.pikolive.core.newbie.NewbieHelloInfo; -import com.pikolive.core.newbie.event.NewbieHelloDialogEvent; -import com.pikolive.core.relation.cp.CpInviteInfo; -import com.pikolive.core.web.event.WebViewRefreshEvent; +import com.bingchuang.core.activity.event.ActivityEvent; +import com.bingchuang.core.level.event.CharmLevelUpEvent; +import com.bingchuang.core.level.event.LevelUpEvent; +import com.bingchuang.core.luckymoney.LuckyMoneyInfo; +import com.bingchuang.core.manager.event.HallInfoChangeEvent; +import com.bingchuang.core.relation.cp.CpInviteInfo; +import com.bingchuang.core.web.event.WebViewRefreshEvent; +import com.bingchuang.core.activity.event.ActivityEvent; +import com.bingchuang.core.level.event.CharmLevelUpEvent; +import com.bingchuang.core.level.event.LevelUpEvent; +import com.bingchuang.core.luckymoney.LuckyMoneyInfo; +import com.bingchuang.core.manager.event.HallInfoChangeEvent; +import com.bingchuang.core.relation.cp.CpInviteInfo; +import com.bingchuang.core.web.event.WebViewRefreshEvent; +import com.bingchuang.core.activity.event.ActivityEvent; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.im.custom.bean.CpInviteAttachment; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.im.custom.bean.LevelUpAttachment; +import com.bingchuang.core.im.custom.bean.LotteryAttachment; +import com.bingchuang.core.im.custom.bean.LuckyMoneyTipsAttachment; +import com.bingchuang.core.im.custom.bean.NewbieHelloAttachment; +import com.bingchuang.core.im.custom.bean.RedPacketAttachment; +import com.bingchuang.core.level.event.CharmLevelUpEvent; +import com.bingchuang.core.level.event.LevelUpEvent; +import com.bingchuang.core.luckymoney.LuckyMoneyInfo; +import com.bingchuang.core.manager.event.HallInfoChangeEvent; +import com.bingchuang.core.newbie.NewbieHelloInfo; +import com.bingchuang.core.newbie.event.NewbieHelloDialogEvent; +import com.bingchuang.core.relation.cp.CpInviteInfo; +import com.bingchuang.core.web.event.WebViewRefreshEvent; import org.greenrobot.eventbus.EventBus; diff --git a/core/src/main/java/com/pikolive/core/manager/IMSystemMsgManager.java b/core/src/main/java/com/bingchuang/core/manager/IMSystemMsgManager.java similarity index 79% rename from core/src/main/java/com/pikolive/core/manager/IMSystemMsgManager.java rename to core/src/main/java/com/bingchuang/core/manager/IMSystemMsgManager.java index 6f30f06de..78bfa9b72 100644 --- a/core/src/main/java/com/pikolive/core/manager/IMSystemMsgManager.java +++ b/core/src/main/java/com/bingchuang/core/manager/IMSystemMsgManager.java @@ -1,19 +1,19 @@ -package com.pikolive.core.manager; +package com.bingchuang.core.manager; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_DYNAMTC_UNREADCOUNT; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_MEMBER_COUNT; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_ROOM_NOTIFY; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_TOPIC; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_ACCOUNT; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_VISITOR; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_WORLD_DYNAMIC; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MINI_WORLD; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ROOM_TASK_TIPS; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_ROOM_TASK_TIPS; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_VISITOR_UNREAD; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP_SELF_OPEN; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP_SELF_UPGRADE; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_DYNAMTC_UNREADCOUNT; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_MEMBER_COUNT; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_ROOM_NOTIFY; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_TOPIC; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_ACCOUNT; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_VISITOR; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_WORLD_DYNAMIC; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MINI_WORLD; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ROOM_TASK_TIPS; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_ROOM_TASK_TIPS; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_VISITOR_UNREAD; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP_SELF_OPEN; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP_SELF_UPGRADE; import android.text.TextUtils; import android.util.Log; @@ -28,49 +28,49 @@ 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.pikolive.core.patriarch.bean.LimitNotice; -import com.pikolive.core.patriarch.event.ImPushMsgPmLimitTimeEvent; -import com.pikolive.core.pay.bean.FirstChargeGoods; -import com.pikolive.core.pay.event.ChargeCustomNotificationEvent; -import com.pikolive.core.pay.event.FirstChargeEvent; -import com.pikolive.core.pay.event.FirstRechargeEvent; -import com.pikolive.core.pay.event.NewUserChargeEvent; -import com.pikolive.core.room.event.RoomTaskTipsEvent; -import com.pikolive.core.vip.VipInfo; -import com.pikolive.core.vip.VipOpenEvent; -import com.pikolive.core.vip.VipUpgradeEvent; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.patriarch.bean.LimitNotice; -import com.pikolive.core.patriarch.event.ImPushMsgPmLimitTimeEvent; -import com.pikolive.core.pay.bean.FirstChargeGoods; -import com.pikolive.core.pay.event.ChargeCustomNotificationEvent; -import com.pikolive.core.pay.event.FirstChargeEvent; -import com.pikolive.core.pay.event.FirstRechargeEvent; -import com.pikolive.core.pay.event.NewUserChargeEvent; -import com.pikolive.core.room.event.RoomTaskTipsEvent; -import com.pikolive.core.vip.VipInfo; -import com.pikolive.core.vip.VipOpenEvent; -import com.pikolive.core.vip.VipUpgradeEvent; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.community.attachment.UnReadCountAttachment; -import com.pikolive.core.community.event.UnReadCountEvent; -import com.pikolive.core2.home.event.VisitorUnreadCountEvent; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.im.custom.bean.VoiceBottleSayHiAttachment; -import com.pikolive.core.mentoring_relationship.attachment.MentoringApprenticeMissionFourAttachment; -import com.pikolive.core.mentoring_relationship.attachment.MentoringApprenticeMissionOneAttachment; -import com.pikolive.core.mentoring_relationship.attachment.MentoringApprenticeMissionThreeAttachment; -import com.pikolive.core.mentoring_relationship.attachment.MentoringApprenticeMissionTwoAttachment; -import com.pikolive.core.mentoring_relationship.attachment.MentoringGrabApprenticesAttachment; -import com.pikolive.core.mentoring_relationship.attachment.MentoringMasterMissionFourAttachment; -import com.pikolive.core.mentoring_relationship.attachment.MentoringMasterMissionOneAttachment; -import com.pikolive.core.mentoring_relationship.attachment.MentoringMasterMissionThreeAttachment; -import com.pikolive.core.mentoring_relationship.attachment.MentoringMasterMissionTwoAttachment; -import com.pikolive.core.mentoring_relationship.attachment.MentoringMissionTipsAttachment; -import com.pikolive.core.mentoring_relationship.event.MentoringRelationshipMissionEvent; -import com.pikolive.core.miniworld.event.MWChatTopicEvent; -import com.pikolive.core.miniworld.event.MWGroupChatMemberEvent; -import com.pikolive.core.user.UserModel; +import com.bingchuang.core.patriarch.bean.LimitNotice; +import com.bingchuang.core.patriarch.event.ImPushMsgPmLimitTimeEvent; +import com.bingchuang.core.pay.bean.FirstChargeGoods; +import com.bingchuang.core.pay.event.ChargeCustomNotificationEvent; +import com.bingchuang.core.pay.event.FirstChargeEvent; +import com.bingchuang.core.pay.event.FirstRechargeEvent; +import com.bingchuang.core.pay.event.NewUserChargeEvent; +import com.bingchuang.core.room.event.RoomTaskTipsEvent; +import com.bingchuang.core.vip.VipInfo; +import com.bingchuang.core.vip.VipOpenEvent; +import com.bingchuang.core.vip.VipUpgradeEvent; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.patriarch.bean.LimitNotice; +import com.bingchuang.core.patriarch.event.ImPushMsgPmLimitTimeEvent; +import com.bingchuang.core.pay.bean.FirstChargeGoods; +import com.bingchuang.core.pay.event.ChargeCustomNotificationEvent; +import com.bingchuang.core.pay.event.FirstChargeEvent; +import com.bingchuang.core.pay.event.FirstRechargeEvent; +import com.bingchuang.core.pay.event.NewUserChargeEvent; +import com.bingchuang.core.room.event.RoomTaskTipsEvent; +import com.bingchuang.core.vip.VipInfo; +import com.bingchuang.core.vip.VipOpenEvent; +import com.bingchuang.core.vip.VipUpgradeEvent; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.community.attachment.UnReadCountAttachment; +import com.bingchuang.core.community.event.UnReadCountEvent; +import com.bingchuang.core2.home.event.VisitorUnreadCountEvent; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.im.custom.bean.VoiceBottleSayHiAttachment; +import com.bingchuang.core.mentoring_relationship.attachment.MentoringApprenticeMissionFourAttachment; +import com.bingchuang.core.mentoring_relationship.attachment.MentoringApprenticeMissionOneAttachment; +import com.bingchuang.core.mentoring_relationship.attachment.MentoringApprenticeMissionThreeAttachment; +import com.bingchuang.core.mentoring_relationship.attachment.MentoringApprenticeMissionTwoAttachment; +import com.bingchuang.core.mentoring_relationship.attachment.MentoringGrabApprenticesAttachment; +import com.bingchuang.core.mentoring_relationship.attachment.MentoringMasterMissionFourAttachment; +import com.bingchuang.core.mentoring_relationship.attachment.MentoringMasterMissionOneAttachment; +import com.bingchuang.core.mentoring_relationship.attachment.MentoringMasterMissionThreeAttachment; +import com.bingchuang.core.mentoring_relationship.attachment.MentoringMasterMissionTwoAttachment; +import com.bingchuang.core.mentoring_relationship.attachment.MentoringMissionTipsAttachment; +import com.bingchuang.core.mentoring_relationship.event.MentoringRelationshipMissionEvent; +import com.bingchuang.core.miniworld.event.MWChatTopicEvent; +import com.bingchuang.core.miniworld.event.MWGroupChatMemberEvent; +import com.bingchuang.core.user.UserModel; import org.greenrobot.eventbus.EventBus; diff --git a/core/src/main/java/com/pikolive/core/manager/RelationShipEvent.java b/core/src/main/java/com/bingchuang/core/manager/RelationShipEvent.java similarity index 95% rename from core/src/main/java/com/pikolive/core/manager/RelationShipEvent.java rename to core/src/main/java/com/bingchuang/core/manager/RelationShipEvent.java index 561e84394..4e0e0ce76 100644 --- a/core/src/main/java/com/pikolive/core/manager/RelationShipEvent.java +++ b/core/src/main/java/com/bingchuang/core/manager/RelationShipEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.manager; +package com.bingchuang.core.manager; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/manager/RoomEvent.java b/core/src/main/java/com/bingchuang/core/manager/RoomEvent.java similarity index 85% rename from core/src/main/java/com/pikolive/core/manager/RoomEvent.java rename to core/src/main/java/com/bingchuang/core/manager/RoomEvent.java index e3b9859d0..021a28b77 100644 --- a/core/src/main/java/com/pikolive/core/manager/RoomEvent.java +++ b/core/src/main/java/com/bingchuang/core/manager/RoomEvent.java @@ -1,49 +1,49 @@ -package com.pikolive.core.manager; +package com.bingchuang.core.manager; import com.netease.nimlib.sdk.chatroom.model.ChatRoomKickOutEvent; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.pikolive.core.bean.RoomQueueInfo; -import com.pikolive.core.bean.attachmsg.RoomQueueMsgAttachment; -import com.pikolive.core.gift.bean.GiftMultiReceiverInfo; -import com.pikolive.core.gift.bean.GiftReceiveInfo; -import com.pikolive.core.gift.bean.LuckyBagGifts; -import com.pikolive.core.gift.bean.MultiGiftReceiveInfo; -import com.pikolive.core.magic.bean.MagicReceivedInfo; -import com.pikolive.core.magic.bean.MultiMagicReceivedInfo; -import com.pikolive.core.monsterhunting.bean.MonsterAttackInfo; -import com.pikolive.core.pay.bean.WalletInfo; -import com.pikolive.core.room.auction.bean.AuctionInfo; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.bean.RoomQueueInfo; -import com.pikolive.core.bean.attachmsg.RoomQueueMsgAttachment; -import com.pikolive.core.gift.bean.GiftMultiReceiverInfo; -import com.pikolive.core.gift.bean.GiftReceiveInfo; -import com.pikolive.core.gift.bean.LuckyBagGifts; -import com.pikolive.core.gift.bean.MultiGiftReceiveInfo; -import com.pikolive.core.magic.bean.MagicReceivedInfo; -import com.pikolive.core.magic.bean.MultiMagicReceivedInfo; -import com.pikolive.core.monsterhunting.bean.MonsterAttackInfo; -import com.pikolive.core.pay.bean.WalletInfo; -import com.pikolive.core.room.auction.bean.AuctionInfo; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.bean.RoomQueueInfo; -import com.pikolive.core.bean.attachmsg.RoomQueueMsgAttachment; -import com.pikolive.core.gift.bean.GiftMultiReceiverInfo; -import com.pikolive.core.gift.bean.GiftReceiveInfo; -import com.pikolive.core.gift.bean.LuckyBagGifts; -import com.pikolive.core.gift.bean.MultiGiftReceiveInfo; -import com.pikolive.core.im.custom.bean.AssistantAttachment; -import com.pikolive.core.im.custom.bean.CarAttachment; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.im.custom.bean.MonsterHuntingResultAttachment; -import com.pikolive.core.im.custom.bean.MonsterStatusAttachment; -import com.pikolive.core.im.custom.bean.NobleAttachment; -import com.pikolive.core.magic.bean.MagicReceivedInfo; -import com.pikolive.core.magic.bean.MultiMagicReceivedInfo; -import com.pikolive.core.monsterhunting.bean.MonsterAttackInfo; -import com.pikolive.core.pay.bean.WalletInfo; -import com.pikolive.core.room.auction.bean.AuctionInfo; -import com.pikolive.core.room.bean.RoomInfo; +import com.bingchuang.core.bean.RoomQueueInfo; +import com.bingchuang.core.bean.attachmsg.RoomQueueMsgAttachment; +import com.bingchuang.core.gift.bean.GiftMultiReceiverInfo; +import com.bingchuang.core.gift.bean.GiftReceiveInfo; +import com.bingchuang.core.gift.bean.LuckyBagGifts; +import com.bingchuang.core.gift.bean.MultiGiftReceiveInfo; +import com.bingchuang.core.magic.bean.MagicReceivedInfo; +import com.bingchuang.core.magic.bean.MultiMagicReceivedInfo; +import com.bingchuang.core.monsterhunting.bean.MonsterAttackInfo; +import com.bingchuang.core.pay.bean.WalletInfo; +import com.bingchuang.core.room.auction.bean.AuctionInfo; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.bean.RoomQueueInfo; +import com.bingchuang.core.bean.attachmsg.RoomQueueMsgAttachment; +import com.bingchuang.core.gift.bean.GiftMultiReceiverInfo; +import com.bingchuang.core.gift.bean.GiftReceiveInfo; +import com.bingchuang.core.gift.bean.LuckyBagGifts; +import com.bingchuang.core.gift.bean.MultiGiftReceiveInfo; +import com.bingchuang.core.magic.bean.MagicReceivedInfo; +import com.bingchuang.core.magic.bean.MultiMagicReceivedInfo; +import com.bingchuang.core.monsterhunting.bean.MonsterAttackInfo; +import com.bingchuang.core.pay.bean.WalletInfo; +import com.bingchuang.core.room.auction.bean.AuctionInfo; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.bean.RoomQueueInfo; +import com.bingchuang.core.bean.attachmsg.RoomQueueMsgAttachment; +import com.bingchuang.core.gift.bean.GiftMultiReceiverInfo; +import com.bingchuang.core.gift.bean.GiftReceiveInfo; +import com.bingchuang.core.gift.bean.LuckyBagGifts; +import com.bingchuang.core.gift.bean.MultiGiftReceiveInfo; +import com.bingchuang.core.im.custom.bean.AssistantAttachment; +import com.bingchuang.core.im.custom.bean.CarAttachment; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.im.custom.bean.MonsterHuntingResultAttachment; +import com.bingchuang.core.im.custom.bean.MonsterStatusAttachment; +import com.bingchuang.core.im.custom.bean.NobleAttachment; +import com.bingchuang.core.magic.bean.MagicReceivedInfo; +import com.bingchuang.core.magic.bean.MultiMagicReceivedInfo; +import com.bingchuang.core.monsterhunting.bean.MonsterAttackInfo; +import com.bingchuang.core.pay.bean.WalletInfo; +import com.bingchuang.core.room.auction.bean.AuctionInfo; +import com.bingchuang.core.room.bean.RoomInfo; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/manager/event/HallInfoChangeEvent.java b/core/src/main/java/com/bingchuang/core/manager/event/HallInfoChangeEvent.java similarity index 72% rename from core/src/main/java/com/pikolive/core/manager/event/HallInfoChangeEvent.java rename to core/src/main/java/com/bingchuang/core/manager/event/HallInfoChangeEvent.java index 04fc4f25e..264f672c5 100644 --- a/core/src/main/java/com/pikolive/core/manager/event/HallInfoChangeEvent.java +++ b/core/src/main/java/com/bingchuang/core/manager/event/HallInfoChangeEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.manager.event; +package com.bingchuang.core.manager.event; /** * 模厅信息变更事件 diff --git a/core/src/main/java/com/pikolive/core/manager/event/HistoryMessageEvent.java b/core/src/main/java/com/bingchuang/core/manager/event/HistoryMessageEvent.java similarity index 91% rename from core/src/main/java/com/pikolive/core/manager/event/HistoryMessageEvent.java rename to core/src/main/java/com/bingchuang/core/manager/event/HistoryMessageEvent.java index f8a8514a1..2c4ca2d65 100644 --- a/core/src/main/java/com/pikolive/core/manager/event/HistoryMessageEvent.java +++ b/core/src/main/java/com/bingchuang/core/manager/event/HistoryMessageEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.manager.event; +package com.bingchuang.core.manager.event; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; diff --git a/core/src/main/java/com/pikolive/core/monsterhunting/SimpleAnimationListener.java b/core/src/main/java/com/bingchuang/core/monsterhunting/SimpleAnimationListener.java similarity index 90% rename from core/src/main/java/com/pikolive/core/monsterhunting/SimpleAnimationListener.java rename to core/src/main/java/com/bingchuang/core/monsterhunting/SimpleAnimationListener.java index d15bdaff0..ed2472072 100644 --- a/core/src/main/java/com/pikolive/core/monsterhunting/SimpleAnimationListener.java +++ b/core/src/main/java/com/bingchuang/core/monsterhunting/SimpleAnimationListener.java @@ -1,4 +1,4 @@ -package com.pikolive.core.monsterhunting; +package com.bingchuang.core.monsterhunting; import android.view.animation.Animation; diff --git a/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterAttackInfo.java b/core/src/main/java/com/bingchuang/core/monsterhunting/bean/MonsterAttackInfo.java similarity index 99% rename from core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterAttackInfo.java rename to core/src/main/java/com/bingchuang/core/monsterhunting/bean/MonsterAttackInfo.java index 321cc92bd..2eae14869 100644 --- a/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterAttackInfo.java +++ b/core/src/main/java/com/bingchuang/core/monsterhunting/bean/MonsterAttackInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.monsterhunting.bean; +package com.bingchuang.core.monsterhunting.bean; /** * Created by MadisonRong on 31/03/2018. diff --git a/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterAttackReceiveInfo.java b/core/src/main/java/com/bingchuang/core/monsterhunting/bean/MonsterAttackReceiveInfo.java similarity index 96% rename from core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterAttackReceiveInfo.java rename to core/src/main/java/com/bingchuang/core/monsterhunting/bean/MonsterAttackReceiveInfo.java index 80581fb0e..4c24b42cc 100644 --- a/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterAttackReceiveInfo.java +++ b/core/src/main/java/com/bingchuang/core/monsterhunting/bean/MonsterAttackReceiveInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.monsterhunting.bean; +package com.bingchuang.core.monsterhunting.bean; /** * Created by MadisonRong on 01/04/2018. diff --git a/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterEvent.java b/core/src/main/java/com/bingchuang/core/monsterhunting/bean/MonsterEvent.java similarity index 98% rename from core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterEvent.java rename to core/src/main/java/com/bingchuang/core/monsterhunting/bean/MonsterEvent.java index edcae4e93..fee199c46 100644 --- a/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterEvent.java +++ b/core/src/main/java/com/bingchuang/core/monsterhunting/bean/MonsterEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.monsterhunting.bean; +package com.bingchuang.core.monsterhunting.bean; /** * Created by MadisonRong on 03/04/2018. diff --git a/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterHunter.java b/core/src/main/java/com/bingchuang/core/monsterhunting/bean/MonsterHunter.java similarity index 98% rename from core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterHunter.java rename to core/src/main/java/com/bingchuang/core/monsterhunting/bean/MonsterHunter.java index 0d78df58a..9c0455226 100644 --- a/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterHunter.java +++ b/core/src/main/java/com/bingchuang/core/monsterhunting/bean/MonsterHunter.java @@ -1,4 +1,4 @@ -package com.pikolive.core.monsterhunting.bean; +package com.bingchuang.core.monsterhunting.bean; /** * Created by MadisonRong on 02/04/2018. diff --git a/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterHuntingResult.java b/core/src/main/java/com/bingchuang/core/monsterhunting/bean/MonsterHuntingResult.java similarity index 98% rename from core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterHuntingResult.java rename to core/src/main/java/com/bingchuang/core/monsterhunting/bean/MonsterHuntingResult.java index 8958f71ad..cb9db27d0 100644 --- a/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterHuntingResult.java +++ b/core/src/main/java/com/bingchuang/core/monsterhunting/bean/MonsterHuntingResult.java @@ -1,4 +1,4 @@ -package com.pikolive.core.monsterhunting.bean; +package com.bingchuang.core.monsterhunting.bean; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterHuntingReward.java b/core/src/main/java/com/bingchuang/core/monsterhunting/bean/MonsterHuntingReward.java similarity index 98% rename from core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterHuntingReward.java rename to core/src/main/java/com/bingchuang/core/monsterhunting/bean/MonsterHuntingReward.java index 5057cf9be..76a714318 100644 --- a/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterHuntingReward.java +++ b/core/src/main/java/com/bingchuang/core/monsterhunting/bean/MonsterHuntingReward.java @@ -1,4 +1,4 @@ -package com.pikolive.core.monsterhunting.bean; +package com.bingchuang.core.monsterhunting.bean; /** * Created by MadisonRong on 02/04/2018. diff --git a/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterInfo.java b/core/src/main/java/com/bingchuang/core/monsterhunting/bean/MonsterInfo.java similarity index 93% rename from core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterInfo.java rename to core/src/main/java/com/bingchuang/core/monsterhunting/bean/MonsterInfo.java index 5b7186767..5b2a70e4a 100644 --- a/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterInfo.java +++ b/core/src/main/java/com/bingchuang/core/monsterhunting/bean/MonsterInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.monsterhunting.bean; +package com.bingchuang.core.monsterhunting.bean; import android.os.Parcel; diff --git a/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterInitInfo.java b/core/src/main/java/com/bingchuang/core/monsterhunting/bean/MonsterInitInfo.java similarity index 96% rename from core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterInitInfo.java rename to core/src/main/java/com/bingchuang/core/monsterhunting/bean/MonsterInitInfo.java index 5db562d97..a7d7b07a6 100644 --- a/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterInitInfo.java +++ b/core/src/main/java/com/bingchuang/core/monsterhunting/bean/MonsterInitInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.monsterhunting.bean; +package com.bingchuang.core.monsterhunting.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterListInfo.java b/core/src/main/java/com/bingchuang/core/monsterhunting/bean/MonsterListInfo.java similarity index 98% rename from core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterListInfo.java rename to core/src/main/java/com/bingchuang/core/monsterhunting/bean/MonsterListInfo.java index 13c859d1f..c5f287401 100644 --- a/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterListInfo.java +++ b/core/src/main/java/com/bingchuang/core/monsterhunting/bean/MonsterListInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.monsterhunting.bean; +package com.bingchuang.core.monsterhunting.bean; /** * Created by huangmeng1 on 2018/4/2. diff --git a/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterProtocol.java b/core/src/main/java/com/bingchuang/core/monsterhunting/bean/MonsterProtocol.java similarity index 98% rename from core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterProtocol.java rename to core/src/main/java/com/bingchuang/core/monsterhunting/bean/MonsterProtocol.java index 1a3bf9315..7f70e375c 100644 --- a/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterProtocol.java +++ b/core/src/main/java/com/bingchuang/core/monsterhunting/bean/MonsterProtocol.java @@ -1,11 +1,11 @@ -package com.pikolive.core.monsterhunting.bean; +package com.bingchuang.core.monsterhunting.bean; import android.os.Parcel; import android.os.Parcelable; -import com.pikolive.core.bean.BaseProtocol; -import com.pikolive.core.bean.BaseProtocol; -import com.pikolive.core.bean.BaseProtocol; +import com.bingchuang.core.bean.BaseProtocol; +import com.bingchuang.core.bean.BaseProtocol; +import com.bingchuang.core.bean.BaseProtocol; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/monsterhunting/manager/MonsterDataManager.java b/core/src/main/java/com/bingchuang/core/monsterhunting/manager/MonsterDataManager.java similarity index 85% rename from core/src/main/java/com/pikolive/core/monsterhunting/manager/MonsterDataManager.java rename to core/src/main/java/com/bingchuang/core/monsterhunting/manager/MonsterDataManager.java index 027b6766d..125809593 100644 --- a/core/src/main/java/com/pikolive/core/monsterhunting/manager/MonsterDataManager.java +++ b/core/src/main/java/com/bingchuang/core/monsterhunting/manager/MonsterDataManager.java @@ -1,8 +1,8 @@ -package com.pikolive.core.monsterhunting.manager; +package com.bingchuang.core.monsterhunting.manager; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core.monsterhunting.bean.MonsterInfo; -import com.pikolive.core.monsterhunting.bean.MonsterInitInfo; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core.monsterhunting.bean.MonsterInfo; +import com.bingchuang.core.monsterhunting.bean.MonsterInitInfo; import java.util.Hashtable; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/monsterhunting/model/IMonsterHuntingModel.java b/core/src/main/java/com/bingchuang/core/monsterhunting/model/IMonsterHuntingModel.java similarity index 66% rename from core/src/main/java/com/pikolive/core/monsterhunting/model/IMonsterHuntingModel.java rename to core/src/main/java/com/bingchuang/core/monsterhunting/model/IMonsterHuntingModel.java index c499949eb..835e4f6e8 100644 --- a/core/src/main/java/com/pikolive/core/monsterhunting/model/IMonsterHuntingModel.java +++ b/core/src/main/java/com/bingchuang/core/monsterhunting/model/IMonsterHuntingModel.java @@ -1,13 +1,13 @@ -package com.pikolive.core.monsterhunting.model; +package com.bingchuang.core.monsterhunting.model; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.base.IModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.monsterhunting.bean.MonsterAttackInfo; -import com.pikolive.core.monsterhunting.bean.MonsterHuntingResult; -import com.pikolive.core.monsterhunting.bean.MonsterInfo; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.monsterhunting.bean.MonsterAttackInfo; +import com.bingchuang.core.monsterhunting.bean.MonsterHuntingResult; +import com.bingchuang.core.monsterhunting.bean.MonsterInfo; import io.reactivex.Single; diff --git a/core/src/main/java/com/pikolive/core/monsterhunting/model/MonsterHuntingModel.java b/core/src/main/java/com/bingchuang/core/monsterhunting/model/MonsterHuntingModel.java similarity index 92% rename from core/src/main/java/com/pikolive/core/monsterhunting/model/MonsterHuntingModel.java rename to core/src/main/java/com/bingchuang/core/monsterhunting/model/MonsterHuntingModel.java index feb99e9d4..4c918dd96 100644 --- a/core/src/main/java/com/pikolive/core/monsterhunting/model/MonsterHuntingModel.java +++ b/core/src/main/java/com/bingchuang/core/monsterhunting/model/MonsterHuntingModel.java @@ -1,9 +1,9 @@ -package com.pikolive.core.monsterhunting.model; +package com.bingchuang.core.monsterhunting.model; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_MONSTER_HUNTING; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_MONSTER_HUNTING; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_NOTI_SUB_GAME_END; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_NOTI_SUB_GAME_RESULT; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_MONSTER_HUNTING; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_MONSTER_HUNTING; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_NOTI_SUB_GAME_END; +import static com.bingchuang.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.pikolive.core.bean.BaseProtocol; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.monsterhunting.rxevent.MonsterUpdateEvent; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.bean.BaseProtocol; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.monsterhunting.rxevent.MonsterUpdateEvent; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.R; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.im.custom.bean.MonsterAttackAttachment; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.manager.RoomEvent; -import com.pikolive.core.monsterhunting.bean.MonsterAttackInfo; -import com.pikolive.core.monsterhunting.bean.MonsterHuntingResult; -import com.pikolive.core.monsterhunting.bean.MonsterInfo; -import com.pikolive.core.monsterhunting.bean.MonsterProtocol; +import com.bingchuang.core.bean.BaseProtocol; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.monsterhunting.rxevent.MonsterUpdateEvent; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.bean.BaseProtocol; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.monsterhunting.rxevent.MonsterUpdateEvent; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.R; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.im.custom.bean.MonsterAttackAttachment; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.manager.RoomEvent; +import com.bingchuang.core.monsterhunting.bean.MonsterAttackInfo; +import com.bingchuang.core.monsterhunting.bean.MonsterHuntingResult; +import com.bingchuang.core.monsterhunting.bean.MonsterInfo; +import com.bingchuang.core.monsterhunting.bean.MonsterProtocol; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.rxbus.RxBusHelper; import com.bingchuang.library.utils.ListUtils; diff --git a/core/src/main/java/com/pikolive/core/monsterhunting/rxevent/MonsterUpdateEvent.java b/core/src/main/java/com/bingchuang/core/monsterhunting/rxevent/MonsterUpdateEvent.java similarity index 76% rename from core/src/main/java/com/pikolive/core/monsterhunting/rxevent/MonsterUpdateEvent.java rename to core/src/main/java/com/bingchuang/core/monsterhunting/rxevent/MonsterUpdateEvent.java index 84fef89ee..be2d78008 100644 --- a/core/src/main/java/com/pikolive/core/monsterhunting/rxevent/MonsterUpdateEvent.java +++ b/core/src/main/java/com/bingchuang/core/monsterhunting/rxevent/MonsterUpdateEvent.java @@ -1,6 +1,6 @@ -package com.pikolive.core.monsterhunting.rxevent; +package com.bingchuang.core.monsterhunting.rxevent; -import com.pikolive.core.monsterhunting.bean.MonsterProtocol; +import com.bingchuang.core.monsterhunting.bean.MonsterProtocol; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/msg/ImsgClient.java b/core/src/main/java/com/bingchuang/core/msg/ImsgClient.java similarity index 88% rename from core/src/main/java/com/pikolive/core/msg/ImsgClient.java rename to core/src/main/java/com/bingchuang/core/msg/ImsgClient.java index afe6cf1e0..fcebaf17e 100644 --- a/core/src/main/java/com/pikolive/core/msg/ImsgClient.java +++ b/core/src/main/java/com/bingchuang/core/msg/ImsgClient.java @@ -1,4 +1,4 @@ -package com.pikolive.core.msg; +package com.bingchuang.core.msg; import com.bingchuang.library.coremanager.ICoreClient; diff --git a/core/src/main/java/com/pikolive/core/msg/sys/ApproveMsgInfo.java b/core/src/main/java/com/bingchuang/core/msg/sys/ApproveMsgInfo.java similarity index 88% rename from core/src/main/java/com/pikolive/core/msg/sys/ApproveMsgInfo.java rename to core/src/main/java/com/bingchuang/core/msg/sys/ApproveMsgInfo.java index 00df78561..7639e6cfe 100644 --- a/core/src/main/java/com/pikolive/core/msg/sys/ApproveMsgInfo.java +++ b/core/src/main/java/com/bingchuang/core/msg/sys/ApproveMsgInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.msg.sys; +package com.bingchuang.core.msg.sys; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/msg/sys/ErbanSysMsgComponent.java b/core/src/main/java/com/bingchuang/core/msg/sys/ErbanSysMsgComponent.java similarity index 88% rename from core/src/main/java/com/pikolive/core/msg/sys/ErbanSysMsgComponent.java rename to core/src/main/java/com/bingchuang/core/msg/sys/ErbanSysMsgComponent.java index 40ff2c910..7368affc4 100644 --- a/core/src/main/java/com/pikolive/core/msg/sys/ErbanSysMsgComponent.java +++ b/core/src/main/java/com/bingchuang/core/msg/sys/ErbanSysMsgComponent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.msg.sys; +package com.bingchuang.core.msg.sys; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/msg/sys/ErbanSysMsgInfo.java b/core/src/main/java/com/bingchuang/core/msg/sys/ErbanSysMsgInfo.java similarity index 98% rename from core/src/main/java/com/pikolive/core/msg/sys/ErbanSysMsgInfo.java rename to core/src/main/java/com/bingchuang/core/msg/sys/ErbanSysMsgInfo.java index 0fe7aa1ec..588600903 100644 --- a/core/src/main/java/com/pikolive/core/msg/sys/ErbanSysMsgInfo.java +++ b/core/src/main/java/com/bingchuang/core/msg/sys/ErbanSysMsgInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.msg.sys; +package com.bingchuang.core.msg.sys; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; diff --git a/core/src/main/java/com/pikolive/core/msg/sys/ErbanSysMsgLayout.java b/core/src/main/java/com/bingchuang/core/msg/sys/ErbanSysMsgLayout.java similarity index 87% rename from core/src/main/java/com/pikolive/core/msg/sys/ErbanSysMsgLayout.java rename to core/src/main/java/com/bingchuang/core/msg/sys/ErbanSysMsgLayout.java index 7de4b80e3..080fe9675 100644 --- a/core/src/main/java/com/pikolive/core/msg/sys/ErbanSysMsgLayout.java +++ b/core/src/main/java/com/bingchuang/core/msg/sys/ErbanSysMsgLayout.java @@ -1,4 +1,4 @@ -package com.pikolive.core.msg.sys; +package com.bingchuang.core.msg.sys; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/msg/sys/ErbanSysMsgModel.java b/core/src/main/java/com/bingchuang/core/msg/sys/ErbanSysMsgModel.java similarity index 83% rename from core/src/main/java/com/pikolive/core/msg/sys/ErbanSysMsgModel.java rename to core/src/main/java/com/bingchuang/core/msg/sys/ErbanSysMsgModel.java index 7507e8933..1ae9e4ca0 100644 --- a/core/src/main/java/com/pikolive/core/msg/sys/ErbanSysMsgModel.java +++ b/core/src/main/java/com/bingchuang/core/msg/sys/ErbanSysMsgModel.java @@ -1,8 +1,8 @@ -package com.pikolive.core.msg.sys; +package com.bingchuang.core.msg.sys; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.bean.response.ServiceResult; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.bean.response.ServiceResult; import java.util.Map; diff --git a/core/src/main/java/com/pikolive/core/msg/sys/ErbanSysMsgParamKey.java b/core/src/main/java/com/bingchuang/core/msg/sys/ErbanSysMsgParamKey.java similarity index 89% rename from core/src/main/java/com/pikolive/core/msg/sys/ErbanSysMsgParamKey.java rename to core/src/main/java/com/bingchuang/core/msg/sys/ErbanSysMsgParamKey.java index 39588995e..1ea61727c 100644 --- a/core/src/main/java/com/pikolive/core/msg/sys/ErbanSysMsgParamKey.java +++ b/core/src/main/java/com/bingchuang/core/msg/sys/ErbanSysMsgParamKey.java @@ -1,4 +1,4 @@ -package com.pikolive.core.msg.sys; +package com.bingchuang.core.msg.sys; /** * Created by MadisonRong on 05/07/2018. diff --git a/core/src/main/java/com/pikolive/core/msg/sysv2/ErbanSysMsgV2Component.java b/core/src/main/java/com/bingchuang/core/msg/sysv2/ErbanSysMsgV2Component.java similarity index 88% rename from core/src/main/java/com/pikolive/core/msg/sysv2/ErbanSysMsgV2Component.java rename to core/src/main/java/com/bingchuang/core/msg/sysv2/ErbanSysMsgV2Component.java index 3947834cb..c46e32c2d 100644 --- a/core/src/main/java/com/pikolive/core/msg/sysv2/ErbanSysMsgV2Component.java +++ b/core/src/main/java/com/bingchuang/core/msg/sysv2/ErbanSysMsgV2Component.java @@ -1,4 +1,4 @@ -package com.pikolive.core.msg.sysv2; +package com.bingchuang.core.msg.sysv2; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/msg/sysv2/ErbanSysMsgV2Info.java b/core/src/main/java/com/bingchuang/core/msg/sysv2/ErbanSysMsgV2Info.java similarity index 98% rename from core/src/main/java/com/pikolive/core/msg/sysv2/ErbanSysMsgV2Info.java rename to core/src/main/java/com/bingchuang/core/msg/sysv2/ErbanSysMsgV2Info.java index 1fe5eac3f..a412eb1f4 100644 --- a/core/src/main/java/com/pikolive/core/msg/sysv2/ErbanSysMsgV2Info.java +++ b/core/src/main/java/com/bingchuang/core/msg/sysv2/ErbanSysMsgV2Info.java @@ -1,4 +1,4 @@ -package com.pikolive.core.msg.sysv2; +package com.bingchuang.core.msg.sysv2; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; diff --git a/core/src/main/java/com/pikolive/core/msg/sysv2/ErbanSysMsgV2Layout.java b/core/src/main/java/com/bingchuang/core/msg/sysv2/ErbanSysMsgV2Layout.java similarity index 87% rename from core/src/main/java/com/pikolive/core/msg/sysv2/ErbanSysMsgV2Layout.java rename to core/src/main/java/com/bingchuang/core/msg/sysv2/ErbanSysMsgV2Layout.java index 9517fb28e..3a6b65f50 100644 --- a/core/src/main/java/com/pikolive/core/msg/sysv2/ErbanSysMsgV2Layout.java +++ b/core/src/main/java/com/bingchuang/core/msg/sysv2/ErbanSysMsgV2Layout.java @@ -1,4 +1,4 @@ -package com.pikolive.core.msg.sysv2; +package com.bingchuang.core.msg.sysv2; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/newbie/NewbieHelloInfo.java b/core/src/main/java/com/bingchuang/core/newbie/NewbieHelloInfo.java similarity index 88% rename from core/src/main/java/com/pikolive/core/newbie/NewbieHelloInfo.java rename to core/src/main/java/com/bingchuang/core/newbie/NewbieHelloInfo.java index ffb9669b0..d31521d94 100644 --- a/core/src/main/java/com/pikolive/core/newbie/NewbieHelloInfo.java +++ b/core/src/main/java/com/bingchuang/core/newbie/NewbieHelloInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.newbie; +package com.bingchuang.core.newbie; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/newbie/event/NewbieHelloDialogEvent.java b/core/src/main/java/com/bingchuang/core/newbie/event/NewbieHelloDialogEvent.java similarity index 69% rename from core/src/main/java/com/pikolive/core/newbie/event/NewbieHelloDialogEvent.java rename to core/src/main/java/com/bingchuang/core/newbie/event/NewbieHelloDialogEvent.java index 0365ed2ea..52be685ee 100644 --- a/core/src/main/java/com/pikolive/core/newbie/event/NewbieHelloDialogEvent.java +++ b/core/src/main/java/com/bingchuang/core/newbie/event/NewbieHelloDialogEvent.java @@ -1,6 +1,6 @@ -package com.pikolive.core.newbie.event; +package com.bingchuang.core.newbie.event; -import com.pikolive.core.newbie.NewbieHelloInfo; +import com.bingchuang.core.newbie.NewbieHelloInfo; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/noble/AllServiceGiftProtocol.java b/core/src/main/java/com/bingchuang/core/noble/AllServiceGiftProtocol.java similarity index 97% rename from core/src/main/java/com/pikolive/core/noble/AllServiceGiftProtocol.java rename to core/src/main/java/com/bingchuang/core/noble/AllServiceGiftProtocol.java index 96a2cd048..ccb0c313f 100644 --- a/core/src/main/java/com/pikolive/core/noble/AllServiceGiftProtocol.java +++ b/core/src/main/java/com/bingchuang/core/noble/AllServiceGiftProtocol.java @@ -1,8 +1,8 @@ -package com.pikolive.core.noble; +package com.bingchuang.core.noble; -import com.pikolive.core.bean.BaseProtocol; -import com.pikolive.core.bean.BaseProtocol; -import com.pikolive.core.bean.BaseProtocol; +import com.bingchuang.core.bean.BaseProtocol; +import com.bingchuang.core.bean.BaseProtocol; +import com.bingchuang.core.bean.BaseProtocol; /** * Created by MadisonRong on 09/04/2018. diff --git a/core/src/main/java/com/pikolive/core/noble/NobleConfig.java b/core/src/main/java/com/bingchuang/core/noble/NobleConfig.java similarity index 98% rename from core/src/main/java/com/pikolive/core/noble/NobleConfig.java rename to core/src/main/java/com/bingchuang/core/noble/NobleConfig.java index a73326de3..4ffd3955f 100644 --- a/core/src/main/java/com/pikolive/core/noble/NobleConfig.java +++ b/core/src/main/java/com/bingchuang/core/noble/NobleConfig.java @@ -1,4 +1,4 @@ -package com.pikolive.core.noble; +package com.bingchuang.core.noble; import com.google.gson.annotations.SerializedName; diff --git a/core/src/main/java/com/pikolive/core/noble/NobleConfig.txt b/core/src/main/java/com/bingchuang/core/noble/NobleConfig.txt similarity index 100% rename from core/src/main/java/com/pikolive/core/noble/NobleConfig.txt rename to core/src/main/java/com/bingchuang/core/noble/NobleConfig.txt diff --git a/core/src/main/java/com/pikolive/core/noble/NobleDataManager.java b/core/src/main/java/com/bingchuang/core/noble/NobleDataManager.java similarity index 96% rename from core/src/main/java/com/pikolive/core/noble/NobleDataManager.java rename to core/src/main/java/com/bingchuang/core/noble/NobleDataManager.java index 47636e915..6d3d3ee69 100644 --- a/core/src/main/java/com/pikolive/core/noble/NobleDataManager.java +++ b/core/src/main/java/com/bingchuang/core/noble/NobleDataManager.java @@ -1,4 +1,4 @@ -package com.pikolive.core.noble; +package com.bingchuang.core.noble; import android.text.TextUtils; import android.util.Log; @@ -7,18 +7,18 @@ import androidx.collection.LongSparseArray; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.pikolive.core.DemoCache; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.initial.InitialModel; -import com.pikolive.core.initial.NobleResourceComponent; -import com.pikolive.core.manager.RoomEvent; -import com.pikolive.core.DemoCache; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.initial.InitialModel; -import com.pikolive.core.initial.NobleResourceComponent; -import com.pikolive.core.manager.RoomEvent; -import com.pikolive.core.R; -import com.pikolive.core2.manager.IMNetEaseManager; +import com.bingchuang.core.DemoCache; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.initial.InitialModel; +import com.bingchuang.core.initial.NobleResourceComponent; +import com.bingchuang.core.manager.RoomEvent; +import com.bingchuang.core.DemoCache; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.initial.InitialModel; +import com.bingchuang.core.initial.NobleResourceComponent; +import com.bingchuang.core.manager.RoomEvent; +import com.bingchuang.core.R; +import com.bingchuang.core2.manager.IMNetEaseManager; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.utils.ListUtils; import com.bingchuang.library.utils.ResUtil; diff --git a/core/src/main/java/com/pikolive/core/noble/NobleInfo.java b/core/src/main/java/com/bingchuang/core/noble/NobleInfo.java similarity index 99% rename from core/src/main/java/com/pikolive/core/noble/NobleInfo.java rename to core/src/main/java/com/bingchuang/core/noble/NobleInfo.java index df7420521..dd81e82b9 100644 --- a/core/src/main/java/com/pikolive/core/noble/NobleInfo.java +++ b/core/src/main/java/com/bingchuang/core/noble/NobleInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.noble; +package com.bingchuang.core.noble; import android.text.TextUtils; diff --git a/core/src/main/java/com/pikolive/core/noble/NobleProtocol.java b/core/src/main/java/com/bingchuang/core/noble/NobleProtocol.java similarity index 93% rename from core/src/main/java/com/pikolive/core/noble/NobleProtocol.java rename to core/src/main/java/com/bingchuang/core/noble/NobleProtocol.java index 4c91ca192..dc4894354 100644 --- a/core/src/main/java/com/pikolive/core/noble/NobleProtocol.java +++ b/core/src/main/java/com/bingchuang/core/noble/NobleProtocol.java @@ -1,8 +1,8 @@ -package com.pikolive.core.noble; +package com.bingchuang.core.noble; -import com.pikolive.core.bean.BaseProtocol; -import com.pikolive.core.bean.BaseProtocol; -import com.pikolive.core.bean.BaseProtocol; +import com.bingchuang.core.bean.BaseProtocol; +import com.bingchuang.core.bean.BaseProtocol; +import com.bingchuang.core.bean.BaseProtocol; /** *
贵族协议
diff --git a/core/src/main/java/com/pikolive/core/noble/NobleResourceType.java b/core/src/main/java/com/bingchuang/core/noble/NobleResourceType.java similarity index 95% rename from core/src/main/java/com/pikolive/core/noble/NobleResourceType.java rename to core/src/main/java/com/bingchuang/core/noble/NobleResourceType.java index 67f24075c..262a07f0b 100644 --- a/core/src/main/java/com/pikolive/core/noble/NobleResourceType.java +++ b/core/src/main/java/com/bingchuang/core/noble/NobleResourceType.java @@ -1,4 +1,4 @@ -package com.pikolive.core.noble; +package com.bingchuang.core.noble; /** * 所有资源的类型 diff --git a/core/src/main/java/com/pikolive/core/noble/NobleRight.java b/core/src/main/java/com/bingchuang/core/noble/NobleRight.java similarity index 99% rename from core/src/main/java/com/pikolive/core/noble/NobleRight.java rename to core/src/main/java/com/bingchuang/core/noble/NobleRight.java index eb306660d..60554cff9 100644 --- a/core/src/main/java/com/pikolive/core/noble/NobleRight.java +++ b/core/src/main/java/com/bingchuang/core/noble/NobleRight.java @@ -1,4 +1,4 @@ -package com.pikolive.core.noble; +package com.bingchuang.core.noble; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/noble/NobleUtil.java b/core/src/main/java/com/bingchuang/core/noble/NobleUtil.java similarity index 99% rename from core/src/main/java/com/pikolive/core/noble/NobleUtil.java rename to core/src/main/java/com/bingchuang/core/noble/NobleUtil.java index 47c36f65e..061b0fcac 100644 --- a/core/src/main/java/com/pikolive/core/noble/NobleUtil.java +++ b/core/src/main/java/com/bingchuang/core/noble/NobleUtil.java @@ -1,4 +1,4 @@ -package com.pikolive.core.noble; +package com.bingchuang.core.noble; import android.app.Activity; import android.content.Context; @@ -28,10 +28,10 @@ import com.bumptech.glide.request.transition.Transition; import com.netease.nim.uikit.support.glide.GlideApp; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.pikolive.core.room.queue.bean.MicMemberInfo; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.utils.ExtensionUtil; -import com.pikolive.core.utils.ImageSplitter; +import com.bingchuang.core.room.queue.bean.MicMemberInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.utils.ExtensionUtil; +import com.bingchuang.core.utils.ImageSplitter; import com.bingchuang.library.utils.ListUtils; import com.bingchuang.library.utils.config.BasicConfig; diff --git a/core/src/main/java/com/pikolive/core/patriarch/bean/LimitNotice.java b/core/src/main/java/com/bingchuang/core/patriarch/bean/LimitNotice.java similarity index 82% rename from core/src/main/java/com/pikolive/core/patriarch/bean/LimitNotice.java rename to core/src/main/java/com/bingchuang/core/patriarch/bean/LimitNotice.java index 0b9a0eb67..0dc914243 100644 --- a/core/src/main/java/com/pikolive/core/patriarch/bean/LimitNotice.java +++ b/core/src/main/java/com/bingchuang/core/patriarch/bean/LimitNotice.java @@ -1,4 +1,4 @@ -package com.pikolive.core.patriarch.bean; +package com.bingchuang.core.patriarch.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/patriarch/event/CloseMinRoomEvent.java b/core/src/main/java/com/bingchuang/core/patriarch/event/CloseMinRoomEvent.java similarity index 74% rename from core/src/main/java/com/pikolive/core/patriarch/event/CloseMinRoomEvent.java rename to core/src/main/java/com/bingchuang/core/patriarch/event/CloseMinRoomEvent.java index 2cf14c47d..4319adca4 100644 --- a/core/src/main/java/com/pikolive/core/patriarch/event/CloseMinRoomEvent.java +++ b/core/src/main/java/com/bingchuang/core/patriarch/event/CloseMinRoomEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.patriarch.event; +package com.bingchuang.core.patriarch.event; /** * 关闭最小化房间(如果房间存在的话) diff --git a/core/src/main/java/com/pikolive/core/patriarch/event/ImPushMsgPmLimitTimeEvent.java b/core/src/main/java/com/bingchuang/core/patriarch/event/ImPushMsgPmLimitTimeEvent.java similarity index 58% rename from core/src/main/java/com/pikolive/core/patriarch/event/ImPushMsgPmLimitTimeEvent.java rename to core/src/main/java/com/bingchuang/core/patriarch/event/ImPushMsgPmLimitTimeEvent.java index bbc640c63..4b5f64f04 100644 --- a/core/src/main/java/com/pikolive/core/patriarch/event/ImPushMsgPmLimitTimeEvent.java +++ b/core/src/main/java/com/bingchuang/core/patriarch/event/ImPushMsgPmLimitTimeEvent.java @@ -1,8 +1,8 @@ -package com.pikolive.core.patriarch.event; +package com.bingchuang.core.patriarch.event; -import com.pikolive.core.base.BaseBusEvent; -import com.pikolive.core.base.BaseBusEvent; -import com.pikolive.core.base.BaseBusEvent; +import com.bingchuang.core.base.BaseBusEvent; +import com.bingchuang.core.base.BaseBusEvent; +import com.bingchuang.core.base.BaseBusEvent; /** * im推送消息 青少年模式禁止进房事件通知 diff --git a/core/src/main/java/com/pikolive/core/patriarch/event/PmDismissAllLimitDialogEvent.java b/core/src/main/java/com/bingchuang/core/patriarch/event/PmDismissAllLimitDialogEvent.java similarity index 82% rename from core/src/main/java/com/pikolive/core/patriarch/event/PmDismissAllLimitDialogEvent.java rename to core/src/main/java/com/bingchuang/core/patriarch/event/PmDismissAllLimitDialogEvent.java index 2fd48e8c9..b2ddd2295 100644 --- a/core/src/main/java/com/pikolive/core/patriarch/event/PmDismissAllLimitDialogEvent.java +++ b/core/src/main/java/com/bingchuang/core/patriarch/event/PmDismissAllLimitDialogEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.patriarch.event; +package com.bingchuang.core.patriarch.event; /** * 因为有可能存在,多个限制时长弹窗的存在, diff --git a/core/src/main/java/com/pikolive/core/patriarch/exception/PmRoomLimitException.java b/core/src/main/java/com/bingchuang/core/patriarch/exception/PmRoomLimitException.java similarity index 56% rename from core/src/main/java/com/pikolive/core/patriarch/exception/PmRoomLimitException.java rename to core/src/main/java/com/bingchuang/core/patriarch/exception/PmRoomLimitException.java index cb9b7b9c9..e69c1c91a 100644 --- a/core/src/main/java/com/pikolive/core/patriarch/exception/PmRoomLimitException.java +++ b/core/src/main/java/com/bingchuang/core/patriarch/exception/PmRoomLimitException.java @@ -1,9 +1,9 @@ -package com.pikolive.core.patriarch.exception; +package com.bingchuang.core.patriarch.exception; -import com.pikolive.core.base.BaseErrorException; -import com.pikolive.core.base.BaseErrorException; -import com.pikolive.core.base.BaseErrorException; +import com.bingchuang.core.base.BaseErrorException; +import com.bingchuang.core.base.BaseErrorException; +import com.bingchuang.core.base.BaseErrorException; /** * 青少年模式 限制进房/开房 diff --git a/core/src/main/java/com/pikolive/core/pay/GoldGiveModel.java b/core/src/main/java/com/bingchuang/core/pay/GoldGiveModel.java similarity index 71% rename from core/src/main/java/com/pikolive/core/pay/GoldGiveModel.java rename to core/src/main/java/com/bingchuang/core/pay/GoldGiveModel.java index 91c434200..7fdd40c33 100644 --- a/core/src/main/java/com/pikolive/core/pay/GoldGiveModel.java +++ b/core/src/main/java/com/bingchuang/core/pay/GoldGiveModel.java @@ -1,18 +1,18 @@ -package com.pikolive.core.pay; +package com.bingchuang.core.pay; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.pay.bean.GiveInfo; -import com.pikolive.core.pay.event.SendGoldSuccessEvent; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.pay.bean.GiveInfo; -import com.pikolive.core.pay.event.SendGoldSuccessEvent; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.pay.bean.GiveInfo; -import com.pikolive.core.pay.event.SendGoldSuccessEvent; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.pay.bean.GiveInfo; +import com.bingchuang.core.pay.event.SendGoldSuccessEvent; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.pay.bean.GiveInfo; +import com.bingchuang.core.pay.event.SendGoldSuccessEvent; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.pay.bean.GiveInfo; +import com.bingchuang.core.pay.event.SendGoldSuccessEvent; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import org.greenrobot.eventbus.EventBus; diff --git a/core/src/main/java/com/pikolive/core/pay/IGoldGiveModel.java b/core/src/main/java/com/bingchuang/core/pay/IGoldGiveModel.java similarity index 60% rename from core/src/main/java/com/pikolive/core/pay/IGoldGiveModel.java rename to core/src/main/java/com/bingchuang/core/pay/IGoldGiveModel.java index 3a9fac6e1..61ef6a896 100644 --- a/core/src/main/java/com/pikolive/core/pay/IGoldGiveModel.java +++ b/core/src/main/java/com/bingchuang/core/pay/IGoldGiveModel.java @@ -1,8 +1,8 @@ -package com.pikolive.core.pay; +package com.bingchuang.core.pay; -import com.pikolive.core.pay.bean.GiveInfo; -import com.pikolive.core.pay.bean.GiveInfo; -import com.pikolive.core.pay.bean.GiveInfo; +import com.bingchuang.core.pay.bean.GiveInfo; +import com.bingchuang.core.pay.bean.GiveInfo; +import com.bingchuang.core.pay.bean.GiveInfo; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/pay/IPayModel.java b/core/src/main/java/com/bingchuang/core/pay/IPayModel.java similarity index 67% rename from core/src/main/java/com/pikolive/core/pay/IPayModel.java rename to core/src/main/java/com/bingchuang/core/pay/IPayModel.java index fdb91fedc..e58a48301 100644 --- a/core/src/main/java/com/pikolive/core/pay/IPayModel.java +++ b/core/src/main/java/com/bingchuang/core/pay/IPayModel.java @@ -1,35 +1,35 @@ -package com.pikolive.core.pay; +package com.bingchuang.core.pay; import android.content.Context; import com.google.gson.JsonObject; -import com.pikolive.core.base.IModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.bean.response.result.ChargeListResult; -import com.pikolive.core.pay.bean.Banner; -import com.pikolive.core.pay.bean.ChargeChannelInfo; -import com.pikolive.core.pay.bean.FirstChargeGoods; -import com.pikolive.core.pay.bean.NewUserChargeInfo; -import com.pikolive.core.pay.bean.PayRecordId; -import com.pikolive.core.pay.bean.WalletInfo; -import com.pikolive.core.base.IModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.bean.response.result.ChargeListResult; -import com.pikolive.core.pay.bean.Banner; -import com.pikolive.core.pay.bean.ChargeChannelInfo; -import com.pikolive.core.pay.bean.FirstChargeGoods; -import com.pikolive.core.pay.bean.NewUserChargeInfo; -import com.pikolive.core.pay.bean.PayRecordId; -import com.pikolive.core.pay.bean.WalletInfo; -import com.pikolive.core.base.IModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.bean.response.result.ChargeListResult; -import com.pikolive.core.pay.bean.Banner; -import com.pikolive.core.pay.bean.ChargeChannelInfo; -import com.pikolive.core.pay.bean.FirstChargeGoods; -import com.pikolive.core.pay.bean.NewUserChargeInfo; -import com.pikolive.core.pay.bean.PayRecordId; -import com.pikolive.core.pay.bean.WalletInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.bean.response.result.ChargeListResult; +import com.bingchuang.core.pay.bean.Banner; +import com.bingchuang.core.pay.bean.ChargeChannelInfo; +import com.bingchuang.core.pay.bean.FirstChargeGoods; +import com.bingchuang.core.pay.bean.NewUserChargeInfo; +import com.bingchuang.core.pay.bean.PayRecordId; +import com.bingchuang.core.pay.bean.WalletInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.bean.response.result.ChargeListResult; +import com.bingchuang.core.pay.bean.Banner; +import com.bingchuang.core.pay.bean.ChargeChannelInfo; +import com.bingchuang.core.pay.bean.FirstChargeGoods; +import com.bingchuang.core.pay.bean.NewUserChargeInfo; +import com.bingchuang.core.pay.bean.PayRecordId; +import com.bingchuang.core.pay.bean.WalletInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.bean.response.result.ChargeListResult; +import com.bingchuang.core.pay.bean.Banner; +import com.bingchuang.core.pay.bean.ChargeChannelInfo; +import com.bingchuang.core.pay.bean.FirstChargeGoods; +import com.bingchuang.core.pay.bean.NewUserChargeInfo; +import com.bingchuang.core.pay.bean.PayRecordId; +import com.bingchuang.core.pay.bean.WalletInfo; import java.util.List; import io.reactivex.Single; diff --git a/core/src/main/java/com/pikolive/core/pay/PayModel.java b/core/src/main/java/com/bingchuang/core/pay/PayModel.java similarity index 91% rename from core/src/main/java/com/pikolive/core/pay/PayModel.java rename to core/src/main/java/com/bingchuang/core/pay/PayModel.java index de45f9b99..3335e1cad 100644 --- a/core/src/main/java/com/pikolive/core/pay/PayModel.java +++ b/core/src/main/java/com/bingchuang/core/pay/PayModel.java @@ -1,50 +1,50 @@ -package com.pikolive.core.pay; +package com.bingchuang.core.pay; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_ACCOUNT; +import static com.bingchuang.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.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.bean.response.result.ChargeListResult; -import com.pikolive.core.bean.response.result.WalletInfoResult; -import com.pikolive.core.manager.RoomEvent; -import com.pikolive.core.pay.bean.Banner; -import com.pikolive.core.pay.bean.ChargeBannerInfo; -import com.pikolive.core.pay.bean.ChargeChannelInfo; -import com.pikolive.core.pay.bean.FirstChargeGoods; -import com.pikolive.core.pay.bean.NewUserChargeInfo; -import com.pikolive.core.pay.bean.PayRecordId; -import com.pikolive.core.pay.bean.WalletInfo; -import com.pikolive.core.pay.event.ChargeCustomNotificationEvent; -import com.pikolive.core.pay.event.FirstRechargeEvent; -import com.pikolive.core.pay.event.GetWalletInfoEvent; -import com.pikolive.core.pay.event.UpdateWalletInfoEvent; -import com.pikolive.core.user.event.LoginUserInfoUpdateEvent; -import com.pikolive.core2.XChatConstants; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.bean.response.result.ChargeListResult; -import com.pikolive.core.bean.response.result.WalletInfoResult; -import com.pikolive.core.manager.RoomEvent; -import com.pikolive.core.pay.bean.Banner; -import com.pikolive.core.pay.bean.ChargeBannerInfo; -import com.pikolive.core.pay.bean.ChargeChannelInfo; -import com.pikolive.core.pay.bean.FirstChargeGoods; -import com.pikolive.core.pay.bean.NewUserChargeInfo; -import com.pikolive.core.pay.bean.PayRecordId; -import com.pikolive.core.pay.bean.WalletInfo; -import com.pikolive.core.pay.event.ChargeCustomNotificationEvent; -import com.pikolive.core.pay.event.FirstRechargeEvent; -import com.pikolive.core.pay.event.GetWalletInfoEvent; -import com.pikolive.core.pay.event.UpdateWalletInfoEvent; -import com.pikolive.core.user.event.LoginUserInfoUpdateEvent; -import com.pikolive.core.R; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.utils.net.IgnoreException; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.bean.response.result.ChargeListResult; +import com.bingchuang.core.bean.response.result.WalletInfoResult; +import com.bingchuang.core.manager.RoomEvent; +import com.bingchuang.core.pay.bean.Banner; +import com.bingchuang.core.pay.bean.ChargeBannerInfo; +import com.bingchuang.core.pay.bean.ChargeChannelInfo; +import com.bingchuang.core.pay.bean.FirstChargeGoods; +import com.bingchuang.core.pay.bean.NewUserChargeInfo; +import com.bingchuang.core.pay.bean.PayRecordId; +import com.bingchuang.core.pay.bean.WalletInfo; +import com.bingchuang.core.pay.event.ChargeCustomNotificationEvent; +import com.bingchuang.core.pay.event.FirstRechargeEvent; +import com.bingchuang.core.pay.event.GetWalletInfoEvent; +import com.bingchuang.core.pay.event.UpdateWalletInfoEvent; +import com.bingchuang.core.user.event.LoginUserInfoUpdateEvent; +import com.bingchuang.core2.XChatConstants; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.bean.response.result.ChargeListResult; +import com.bingchuang.core.bean.response.result.WalletInfoResult; +import com.bingchuang.core.manager.RoomEvent; +import com.bingchuang.core.pay.bean.Banner; +import com.bingchuang.core.pay.bean.ChargeBannerInfo; +import com.bingchuang.core.pay.bean.ChargeChannelInfo; +import com.bingchuang.core.pay.bean.FirstChargeGoods; +import com.bingchuang.core.pay.bean.NewUserChargeInfo; +import com.bingchuang.core.pay.bean.PayRecordId; +import com.bingchuang.core.pay.bean.WalletInfo; +import com.bingchuang.core.pay.event.ChargeCustomNotificationEvent; +import com.bingchuang.core.pay.event.FirstRechargeEvent; +import com.bingchuang.core.pay.event.GetWalletInfoEvent; +import com.bingchuang.core.pay.event.UpdateWalletInfoEvent; +import com.bingchuang.core.user.event.LoginUserInfoUpdateEvent; +import com.bingchuang.core.R; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.utils.net.IgnoreException; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.utils.NetworkUtils; import com.bingchuang.library.utils.ResUtil; diff --git a/core/src/main/java/com/pikolive/core/pay/bean/Banner.kt b/core/src/main/java/com/bingchuang/core/pay/bean/Banner.kt similarity index 66% rename from core/src/main/java/com/pikolive/core/pay/bean/Banner.kt rename to core/src/main/java/com/bingchuang/core/pay/bean/Banner.kt index 3e72ff84a..ae32b3a1d 100644 --- a/core/src/main/java/com/pikolive/core/pay/bean/Banner.kt +++ b/core/src/main/java/com/bingchuang/core/pay/bean/Banner.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.pay.bean +package com.bingchuang.core.pay.bean data class Banner( val bannerUrl: String, diff --git a/core/src/main/java/com/pikolive/core/pay/bean/ChargeBannerInfo.kt b/core/src/main/java/com/bingchuang/core/pay/bean/ChargeBannerInfo.kt similarity index 70% rename from core/src/main/java/com/pikolive/core/pay/bean/ChargeBannerInfo.kt rename to core/src/main/java/com/bingchuang/core/pay/bean/ChargeBannerInfo.kt index b79eaac1c..3057459b9 100644 --- a/core/src/main/java/com/pikolive/core/pay/bean/ChargeBannerInfo.kt +++ b/core/src/main/java/com/bingchuang/core/pay/bean/ChargeBannerInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.pay.bean +package com.bingchuang.core.pay.bean data class ChargeBannerInfo( val banners: List, diff --git a/core/src/main/java/com/pikolive/core/pay/bean/ChargeBean.java b/core/src/main/java/com/bingchuang/core/pay/bean/ChargeBean.java similarity index 98% rename from core/src/main/java/com/pikolive/core/pay/bean/ChargeBean.java rename to core/src/main/java/com/bingchuang/core/pay/bean/ChargeBean.java index 00a4bf5b1..74516d2c7 100644 --- a/core/src/main/java/com/pikolive/core/pay/bean/ChargeBean.java +++ b/core/src/main/java/com/bingchuang/core/pay/bean/ChargeBean.java @@ -1,4 +1,4 @@ -package com.pikolive.core.pay.bean; +package com.bingchuang.core.pay.bean; import com.android.billingclient.api.ProductDetails; diff --git a/core/src/main/java/com/pikolive/core/pay/bean/ChargeChannelInfo.kt b/core/src/main/java/com/bingchuang/core/pay/bean/ChargeChannelInfo.kt similarity index 61% rename from core/src/main/java/com/pikolive/core/pay/bean/ChargeChannelInfo.kt rename to core/src/main/java/com/bingchuang/core/pay/bean/ChargeChannelInfo.kt index 2d5c78bd9..5d6045397 100644 --- a/core/src/main/java/com/pikolive/core/pay/bean/ChargeChannelInfo.kt +++ b/core/src/main/java/com/bingchuang/core/pay/bean/ChargeChannelInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.pay.bean +package com.bingchuang.core.pay.bean data class ChargeChannelInfo( val isNative: Boolean diff --git a/core/src/main/java/com/pikolive/core/pay/bean/FirstChargeGoods.java b/core/src/main/java/com/bingchuang/core/pay/bean/FirstChargeGoods.java similarity index 92% rename from core/src/main/java/com/pikolive/core/pay/bean/FirstChargeGoods.java rename to core/src/main/java/com/bingchuang/core/pay/bean/FirstChargeGoods.java index f9aa99977..8ab8a9428 100644 --- a/core/src/main/java/com/pikolive/core/pay/bean/FirstChargeGoods.java +++ b/core/src/main/java/com/bingchuang/core/pay/bean/FirstChargeGoods.java @@ -1,4 +1,4 @@ -package com.pikolive.core.pay.bean; +package com.bingchuang.core.pay.bean; import com.android.billingclient.api.ProductDetails; diff --git a/core/src/main/java/com/pikolive/core/pay/bean/FirstChargeReward.java b/core/src/main/java/com/bingchuang/core/pay/bean/FirstChargeReward.java similarity index 97% rename from core/src/main/java/com/pikolive/core/pay/bean/FirstChargeReward.java rename to core/src/main/java/com/bingchuang/core/pay/bean/FirstChargeReward.java index fc3e718e7..5026546a5 100644 --- a/core/src/main/java/com/pikolive/core/pay/bean/FirstChargeReward.java +++ b/core/src/main/java/com/bingchuang/core/pay/bean/FirstChargeReward.java @@ -1,4 +1,4 @@ -package com.pikolive.core.pay.bean; +package com.bingchuang.core.pay.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/main/java/com/pikolive/core/pay/bean/GiveGoldResult.java b/core/src/main/java/com/bingchuang/core/pay/bean/GiveGoldResult.java similarity index 77% rename from core/src/main/java/com/pikolive/core/pay/bean/GiveGoldResult.java rename to core/src/main/java/com/bingchuang/core/pay/bean/GiveGoldResult.java index 7b2c66470..e6b9467b3 100644 --- a/core/src/main/java/com/pikolive/core/pay/bean/GiveGoldResult.java +++ b/core/src/main/java/com/bingchuang/core/pay/bean/GiveGoldResult.java @@ -1,4 +1,4 @@ -package com.pikolive.core.pay.bean; +package com.bingchuang.core.pay.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/pay/bean/GiveInfo.java b/core/src/main/java/com/bingchuang/core/pay/bean/GiveInfo.java similarity index 84% rename from core/src/main/java/com/pikolive/core/pay/bean/GiveInfo.java rename to core/src/main/java/com/bingchuang/core/pay/bean/GiveInfo.java index 992c846bc..d33b811a8 100644 --- a/core/src/main/java/com/pikolive/core/pay/bean/GiveInfo.java +++ b/core/src/main/java/com/bingchuang/core/pay/bean/GiveInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.pay.bean; +package com.bingchuang.core.pay.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/pay/bean/NewUserChargeInfo.java b/core/src/main/java/com/bingchuang/core/pay/bean/NewUserChargeInfo.java similarity index 85% rename from core/src/main/java/com/pikolive/core/pay/bean/NewUserChargeInfo.java rename to core/src/main/java/com/bingchuang/core/pay/bean/NewUserChargeInfo.java index d5e179db2..5d1bf6637 100644 --- a/core/src/main/java/com/pikolive/core/pay/bean/NewUserChargeInfo.java +++ b/core/src/main/java/com/bingchuang/core/pay/bean/NewUserChargeInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.pay.bean; +package com.bingchuang.core.pay.bean; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/pay/bean/PayRecordId.java b/core/src/main/java/com/bingchuang/core/pay/bean/PayRecordId.java similarity index 84% rename from core/src/main/java/com/pikolive/core/pay/bean/PayRecordId.java rename to core/src/main/java/com/bingchuang/core/pay/bean/PayRecordId.java index ba909d5cf..febcfd498 100644 --- a/core/src/main/java/com/pikolive/core/pay/bean/PayRecordId.java +++ b/core/src/main/java/com/bingchuang/core/pay/bean/PayRecordId.java @@ -1,4 +1,4 @@ -package com.pikolive.core.pay.bean; +package com.bingchuang.core.pay.bean; public class PayRecordId { diff --git a/core/src/main/java/com/pikolive/core/pay/bean/WalletInfo.java b/core/src/main/java/com/bingchuang/core/pay/bean/WalletInfo.java similarity index 99% rename from core/src/main/java/com/pikolive/core/pay/bean/WalletInfo.java rename to core/src/main/java/com/bingchuang/core/pay/bean/WalletInfo.java index ac803afc4..d9244a870 100644 --- a/core/src/main/java/com/pikolive/core/pay/bean/WalletInfo.java +++ b/core/src/main/java/com/bingchuang/core/pay/bean/WalletInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.pay.bean; +package com.bingchuang.core.pay.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/main/java/com/pikolive/core/pay/event/ChargeCustomNotificationEvent.java b/core/src/main/java/com/bingchuang/core/pay/event/ChargeCustomNotificationEvent.java similarity index 90% rename from core/src/main/java/com/pikolive/core/pay/event/ChargeCustomNotificationEvent.java rename to core/src/main/java/com/bingchuang/core/pay/event/ChargeCustomNotificationEvent.java index add675696..52ee1fa70 100644 --- a/core/src/main/java/com/pikolive/core/pay/event/ChargeCustomNotificationEvent.java +++ b/core/src/main/java/com/bingchuang/core/pay/event/ChargeCustomNotificationEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.pay.event; +package com.bingchuang.core.pay.event; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/pikolive/core/pay/event/FirstChargeEvent.java b/core/src/main/java/com/bingchuang/core/pay/event/FirstChargeEvent.java similarity index 67% rename from core/src/main/java/com/pikolive/core/pay/event/FirstChargeEvent.java rename to core/src/main/java/com/bingchuang/core/pay/event/FirstChargeEvent.java index 3a21b8fb3..de6f70ed3 100644 --- a/core/src/main/java/com/pikolive/core/pay/event/FirstChargeEvent.java +++ b/core/src/main/java/com/bingchuang/core/pay/event/FirstChargeEvent.java @@ -1,7 +1,7 @@ -package com.pikolive.core.pay.event; +package com.bingchuang.core.pay.event; -import com.pikolive.core.pay.bean.FirstChargeReward; +import com.bingchuang.core.pay.bean.FirstChargeReward; import java.util.ArrayList; diff --git a/core/src/main/java/com/pikolive/core/pay/event/FirstRechargeEvent.java b/core/src/main/java/com/bingchuang/core/pay/event/FirstRechargeEvent.java similarity index 66% rename from core/src/main/java/com/pikolive/core/pay/event/FirstRechargeEvent.java rename to core/src/main/java/com/bingchuang/core/pay/event/FirstRechargeEvent.java index 8e17a687f..ade4b11e6 100644 --- a/core/src/main/java/com/pikolive/core/pay/event/FirstRechargeEvent.java +++ b/core/src/main/java/com/bingchuang/core/pay/event/FirstRechargeEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.pay.event; +package com.bingchuang.core.pay.event; /** * create by lvzebiao @2020/3/23 diff --git a/core/src/main/java/com/pikolive/core/pay/event/GetWalletInfoEvent.java b/core/src/main/java/com/bingchuang/core/pay/event/GetWalletInfoEvent.java similarity index 67% rename from core/src/main/java/com/pikolive/core/pay/event/GetWalletInfoEvent.java rename to core/src/main/java/com/bingchuang/core/pay/event/GetWalletInfoEvent.java index afb9632ee..f55b328b1 100644 --- a/core/src/main/java/com/pikolive/core/pay/event/GetWalletInfoEvent.java +++ b/core/src/main/java/com/bingchuang/core/pay/event/GetWalletInfoEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.pay.event; +package com.bingchuang.core.pay.event; /** * create by lvzebiao on 2018/8/29 diff --git a/core/src/main/java/com/pikolive/core/pay/event/NewUserChargeEvent.java b/core/src/main/java/com/bingchuang/core/pay/event/NewUserChargeEvent.java similarity index 67% rename from core/src/main/java/com/pikolive/core/pay/event/NewUserChargeEvent.java rename to core/src/main/java/com/bingchuang/core/pay/event/NewUserChargeEvent.java index 43558e7a1..0838004bc 100644 --- a/core/src/main/java/com/pikolive/core/pay/event/NewUserChargeEvent.java +++ b/core/src/main/java/com/bingchuang/core/pay/event/NewUserChargeEvent.java @@ -1,7 +1,7 @@ -package com.pikolive.core.pay.event; +package com.bingchuang.core.pay.event; -import com.pikolive.core.pay.bean.FirstChargeReward; +import com.bingchuang.core.pay.bean.FirstChargeReward; import java.util.ArrayList; diff --git a/core/src/main/java/com/pikolive/core/pay/event/SendGoldSuccessEvent.java b/core/src/main/java/com/bingchuang/core/pay/event/SendGoldSuccessEvent.java similarity index 55% rename from core/src/main/java/com/pikolive/core/pay/event/SendGoldSuccessEvent.java rename to core/src/main/java/com/bingchuang/core/pay/event/SendGoldSuccessEvent.java index 73a8a2e61..653b9df70 100644 --- a/core/src/main/java/com/pikolive/core/pay/event/SendGoldSuccessEvent.java +++ b/core/src/main/java/com/bingchuang/core/pay/event/SendGoldSuccessEvent.java @@ -1,8 +1,8 @@ -package com.pikolive.core.pay.event; +package com.bingchuang.core.pay.event; -import com.pikolive.core.base.BaseBusEvent; -import com.pikolive.core.base.BaseBusEvent; -import com.pikolive.core.base.BaseBusEvent; +import com.bingchuang.core.base.BaseBusEvent; +import com.bingchuang.core.base.BaseBusEvent; +import com.bingchuang.core.base.BaseBusEvent; /** * 赠送钻石成功的事件 diff --git a/core/src/main/java/com/pikolive/core/pay/event/UpdateWalletInfoEvent.java b/core/src/main/java/com/bingchuang/core/pay/event/UpdateWalletInfoEvent.java similarity index 68% rename from core/src/main/java/com/pikolive/core/pay/event/UpdateWalletInfoEvent.java rename to core/src/main/java/com/bingchuang/core/pay/event/UpdateWalletInfoEvent.java index 54df0baf9..6bd104352 100644 --- a/core/src/main/java/com/pikolive/core/pay/event/UpdateWalletInfoEvent.java +++ b/core/src/main/java/com/bingchuang/core/pay/event/UpdateWalletInfoEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.pay.event; +package com.bingchuang.core.pay.event; /** * create by lvzebiao on 2018/8/29 diff --git a/core/src/main/java/com/pikolive/core/praise/IPraiseModel.java b/core/src/main/java/com/bingchuang/core/praise/IPraiseModel.java similarity index 84% rename from core/src/main/java/com/pikolive/core/praise/IPraiseModel.java rename to core/src/main/java/com/bingchuang/core/praise/IPraiseModel.java index 7daa52cb4..0d1126c6c 100644 --- a/core/src/main/java/com/pikolive/core/praise/IPraiseModel.java +++ b/core/src/main/java/com/bingchuang/core/praise/IPraiseModel.java @@ -1,8 +1,8 @@ -package com.pikolive.core.praise; +package com.bingchuang.core.praise; -import com.pikolive.core.base.IModel; -import com.pikolive.core.base.IModel; -import com.pikolive.core.base.IModel; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.base.IModel; import io.reactivex.Single; diff --git a/core/src/main/java/com/pikolive/core/praise/PraiseModel.java b/core/src/main/java/com/bingchuang/core/praise/PraiseModel.java similarity index 90% rename from core/src/main/java/com/pikolive/core/praise/PraiseModel.java rename to core/src/main/java/com/bingchuang/core/praise/PraiseModel.java index 09a3bee7c..3274c0053 100644 --- a/core/src/main/java/com/pikolive/core/praise/PraiseModel.java +++ b/core/src/main/java/com/bingchuang/core/praise/PraiseModel.java @@ -1,33 +1,33 @@ -package com.pikolive.core.praise; +package com.bingchuang.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.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.bean.response.result.BooleanResult; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core.praise.event.IsLikedEvent; -import com.pikolive.core.praise.event.PraiseEvent; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.bean.response.result.BooleanResult; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core.praise.event.IsLikedEvent; -import com.pikolive.core.praise.event.PraiseEvent; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.R; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.im.custom.bean.RoomTipAttachment; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.admin.util.SuperAdminUtil; -import com.pikolive.core.user.UserModel; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.bean.response.result.BooleanResult; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core.praise.event.IsLikedEvent; +import com.bingchuang.core.praise.event.PraiseEvent; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.bean.response.result.BooleanResult; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core.praise.event.IsLikedEvent; +import com.bingchuang.core.praise.event.PraiseEvent; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.R; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.im.custom.bean.RoomTipAttachment; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.admin.util.SuperAdminUtil; +import com.bingchuang.core.user.UserModel; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.utils.ResUtil; diff --git a/core/src/main/java/com/pikolive/core/praise/event/IsLikedEvent.java b/core/src/main/java/com/bingchuang/core/praise/event/IsLikedEvent.java similarity index 85% rename from core/src/main/java/com/pikolive/core/praise/event/IsLikedEvent.java rename to core/src/main/java/com/bingchuang/core/praise/event/IsLikedEvent.java index ae859d7f9..6708dc74f 100644 --- a/core/src/main/java/com/pikolive/core/praise/event/IsLikedEvent.java +++ b/core/src/main/java/com/bingchuang/core/praise/event/IsLikedEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.praise.event; +package com.bingchuang.core.praise.event; /** * create by lvzebiao on 2018/9/3 diff --git a/core/src/main/java/com/pikolive/core/praise/event/PraiseEvent.java b/core/src/main/java/com/bingchuang/core/praise/event/PraiseEvent.java similarity index 92% rename from core/src/main/java/com/pikolive/core/praise/event/PraiseEvent.java rename to core/src/main/java/com/bingchuang/core/praise/event/PraiseEvent.java index dc032d57e..d01dc480f 100644 --- a/core/src/main/java/com/pikolive/core/praise/event/PraiseEvent.java +++ b/core/src/main/java/com/bingchuang/core/praise/event/PraiseEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.praise.event; +package com.bingchuang.core.praise.event; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/radish/IRadishModel.java b/core/src/main/java/com/bingchuang/core/radish/IRadishModel.java similarity index 66% rename from core/src/main/java/com/pikolive/core/radish/IRadishModel.java rename to core/src/main/java/com/bingchuang/core/radish/IRadishModel.java index c00082c93..3242843f1 100644 --- a/core/src/main/java/com/pikolive/core/radish/IRadishModel.java +++ b/core/src/main/java/com/bingchuang/core/radish/IRadishModel.java @@ -1,8 +1,8 @@ -package com.pikolive.core.radish; +package com.bingchuang.core.radish; -import com.pikolive.core.base.IModel; -import com.pikolive.core.base.IModel; -import com.pikolive.core.base.IModel; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.base.IModel; import io.reactivex.Single; diff --git a/core/src/main/java/com/pikolive/core/radish/RadishModel.java b/core/src/main/java/com/bingchuang/core/radish/RadishModel.java similarity index 82% rename from core/src/main/java/com/pikolive/core/radish/RadishModel.java rename to core/src/main/java/com/bingchuang/core/radish/RadishModel.java index c9b0ffbab..737f31e63 100644 --- a/core/src/main/java/com/pikolive/core/radish/RadishModel.java +++ b/core/src/main/java/com/bingchuang/core/radish/RadishModel.java @@ -1,20 +1,20 @@ -package com.pikolive.core.radish; +package com.bingchuang.core.radish; import com.google.gson.Gson; import com.google.gson.JsonElement; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.radish.event.RadishWalletInfoUpdateEvent; -import com.pikolive.core.user.event.LoadLoginUserInfoEvent; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.radish.event.RadishWalletInfoUpdateEvent; -import com.pikolive.core.user.event.LoadLoginUserInfoEvent; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.radish.event.RadishWalletInfoUpdateEvent; -import com.pikolive.core.user.event.LoadLoginUserInfoEvent; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.radish.event.RadishWalletInfoUpdateEvent; +import com.bingchuang.core.user.event.LoadLoginUserInfoEvent; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.radish.event.RadishWalletInfoUpdateEvent; +import com.bingchuang.core.user.event.LoadLoginUserInfoEvent; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.radish.event.RadishWalletInfoUpdateEvent; +import com.bingchuang.core.user.event.LoadLoginUserInfoEvent; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import org.greenrobot.eventbus.EventBus; diff --git a/core/src/main/java/com/bingchuang/core/radish/RadishRecordResult.java b/core/src/main/java/com/bingchuang/core/radish/RadishRecordResult.java new file mode 100644 index 000000000..d12812125 --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/radish/RadishRecordResult.java @@ -0,0 +1,11 @@ +package com.bingchuang.core.radish; + +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.bills.bean.RadishRecordListInfo; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.bills.bean.RadishRecordListInfo; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.bills.bean.RadishRecordListInfo; + +public class RadishRecordResult extends ServiceResult { +} diff --git a/core/src/main/java/com/pikolive/core/radish/RadishWalletInfo.java b/core/src/main/java/com/bingchuang/core/radish/RadishWalletInfo.java similarity index 84% rename from core/src/main/java/com/pikolive/core/radish/RadishWalletInfo.java rename to core/src/main/java/com/bingchuang/core/radish/RadishWalletInfo.java index 7831356f3..ca7464cee 100644 --- a/core/src/main/java/com/pikolive/core/radish/RadishWalletInfo.java +++ b/core/src/main/java/com/bingchuang/core/radish/RadishWalletInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.radish; +package com.bingchuang.core.radish; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/radish/event/RadishWalletInfoUpdateEvent.java b/core/src/main/java/com/bingchuang/core/radish/event/RadishWalletInfoUpdateEvent.java similarity index 72% rename from core/src/main/java/com/pikolive/core/radish/event/RadishWalletInfoUpdateEvent.java rename to core/src/main/java/com/bingchuang/core/radish/event/RadishWalletInfoUpdateEvent.java index 6220ffa22..27e020a79 100644 --- a/core/src/main/java/com/pikolive/core/radish/event/RadishWalletInfoUpdateEvent.java +++ b/core/src/main/java/com/bingchuang/core/radish/event/RadishWalletInfoUpdateEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.radish.event; +package com.bingchuang.core.radish.event; /** * 萝卜钱包变更 diff --git a/core/src/main/java/com/pikolive/core/radish/event/ReceivePrizeEvent.java b/core/src/main/java/com/bingchuang/core/radish/event/ReceivePrizeEvent.java similarity index 70% rename from core/src/main/java/com/pikolive/core/radish/event/ReceivePrizeEvent.java rename to core/src/main/java/com/bingchuang/core/radish/event/ReceivePrizeEvent.java index 2232d3094..563ff4b8a 100644 --- a/core/src/main/java/com/pikolive/core/radish/event/ReceivePrizeEvent.java +++ b/core/src/main/java/com/bingchuang/core/radish/event/ReceivePrizeEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.radish.event; +package com.bingchuang.core.radish.event; /** * 领取奖励事件 diff --git a/core/src/main/java/com/pikolive/core/radish/event/SignInSuccessEvent.java b/core/src/main/java/com/bingchuang/core/radish/event/SignInSuccessEvent.java similarity index 69% rename from core/src/main/java/com/pikolive/core/radish/event/SignInSuccessEvent.java rename to core/src/main/java/com/bingchuang/core/radish/event/SignInSuccessEvent.java index ca83342eb..48d95b74f 100644 --- a/core/src/main/java/com/pikolive/core/radish/event/SignInSuccessEvent.java +++ b/core/src/main/java/com/bingchuang/core/radish/event/SignInSuccessEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.radish.event; +package com.bingchuang.core.radish.event; /** * 签到成功 diff --git a/core/src/main/java/com/bingchuang/core/radish/signin/ISignInModel.java b/core/src/main/java/com/bingchuang/core/radish/signin/ISignInModel.java new file mode 100644 index 000000000..570d9231e --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/radish/signin/ISignInModel.java @@ -0,0 +1,66 @@ +package com.bingchuang.core.radish.signin; + +import com.bingchuang.core.radish.signin.bean.DrawNoticeInfo; +import com.bingchuang.core.radish.signin.bean.ReceiveTotalRewardInfo; +import com.bingchuang.core.radish.signin.bean.ReplenishSignInfo; +import com.bingchuang.core.radish.signin.bean.RewardNoticeInfo; +import com.bingchuang.core.radish.signin.bean.SignDetailInfo; +import com.bingchuang.core.radish.signin.bean.SignDrawInfo; +import com.bingchuang.core.radish.signin.bean.SignInfo; +import com.bingchuang.core.radish.signin.bean.DrawNoticeInfo; +import com.bingchuang.core.radish.signin.bean.ReceiveTotalRewardInfo; +import com.bingchuang.core.radish.signin.bean.ReplenishSignInfo; +import com.bingchuang.core.radish.signin.bean.RewardNoticeInfo; +import com.bingchuang.core.radish.signin.bean.SignDetailInfo; +import com.bingchuang.core.radish.signin.bean.SignDrawInfo; +import com.bingchuang.core.radish.signin.bean.SignInfo; +import com.bingchuang.core.radish.signin.bean.DrawNoticeInfo; +import com.bingchuang.core.radish.signin.bean.ReceiveTotalRewardInfo; +import com.bingchuang.core.radish.signin.bean.ReplenishSignInfo; +import com.bingchuang.core.radish.signin.bean.RewardNoticeInfo; +import com.bingchuang.core.radish.signin.bean.SignDetailInfo; +import com.bingchuang.core.radish.signin.bean.SignDrawInfo; +import com.bingchuang.core.radish.signin.bean.SignInfo; + +import java.util.List; + +import io.reactivex.Single; + +/** + * create by lvzebiao @2019/3/14 + */ +public interface ISignInModel { + + Single sign(); + + Single signDetail(); + + Single signDraw(); + + Single signRemind(); + + Single > drawNotice(); + + Single
> getRewardTotalNotice(); + + Single
> getRewardTodayNotice(); + + Single
getShareImage(int shareType, String day, String reward); + + Single receiveTotalReward(long configId); + + void signShare(); + + Single insertSignDay(int signDay); + + /** + * 获取补签信息 + */ + Single getReplenishSignInfo(int signDay); + + /** + * 补签 + */ + Single replenishSign(int signDay); + +} diff --git a/core/src/main/java/com/pikolive/core/radish/signin/SignInModel.java b/core/src/main/java/com/bingchuang/core/radish/signin/SignInModel.java similarity index 80% rename from core/src/main/java/com/pikolive/core/radish/signin/SignInModel.java rename to core/src/main/java/com/bingchuang/core/radish/signin/SignInModel.java index bb7d8f2b0..b7372742d 100644 --- a/core/src/main/java/com/pikolive/core/radish/signin/SignInModel.java +++ b/core/src/main/java/com/bingchuang/core/radish/signin/SignInModel.java @@ -1,38 +1,38 @@ -package com.pikolive.core.radish.signin; +package com.bingchuang.core.radish.signin; import android.util.Log; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.radish.signin.bean.DrawNoticeInfo; -import com.pikolive.core.radish.signin.bean.ReceiveTotalRewardInfo; -import com.pikolive.core.radish.signin.bean.ReplenishSignInfo; -import com.pikolive.core.radish.signin.bean.RewardNoticeInfo; -import com.pikolive.core.radish.signin.bean.SignDetailInfo; -import com.pikolive.core.radish.signin.bean.SignDrawInfo; -import com.pikolive.core.radish.signin.bean.SignInfo; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.radish.signin.bean.DrawNoticeInfo; -import com.pikolive.core.radish.signin.bean.ReceiveTotalRewardInfo; -import com.pikolive.core.radish.signin.bean.ReplenishSignInfo; -import com.pikolive.core.radish.signin.bean.RewardNoticeInfo; -import com.pikolive.core.radish.signin.bean.SignDetailInfo; -import com.pikolive.core.radish.signin.bean.SignDrawInfo; -import com.pikolive.core.radish.signin.bean.SignInfo; -import com.pikolive.core.BuildConfig; -import com.pikolive.core.R; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.radish.event.SignInSuccessEvent; -import com.pikolive.core.radish.signin.bean.DrawNoticeInfo; -import com.pikolive.core.radish.signin.bean.ReceiveTotalRewardInfo; -import com.pikolive.core.radish.signin.bean.ReplenishSignInfo; -import com.pikolive.core.radish.signin.bean.RewardNoticeInfo; -import com.pikolive.core.radish.signin.bean.SignDetailInfo; -import com.pikolive.core.radish.signin.bean.SignDrawInfo; -import com.pikolive.core.radish.signin.bean.SignInfo; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.radish.signin.bean.DrawNoticeInfo; +import com.bingchuang.core.radish.signin.bean.ReceiveTotalRewardInfo; +import com.bingchuang.core.radish.signin.bean.ReplenishSignInfo; +import com.bingchuang.core.radish.signin.bean.RewardNoticeInfo; +import com.bingchuang.core.radish.signin.bean.SignDetailInfo; +import com.bingchuang.core.radish.signin.bean.SignDrawInfo; +import com.bingchuang.core.radish.signin.bean.SignInfo; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.radish.signin.bean.DrawNoticeInfo; +import com.bingchuang.core.radish.signin.bean.ReceiveTotalRewardInfo; +import com.bingchuang.core.radish.signin.bean.ReplenishSignInfo; +import com.bingchuang.core.radish.signin.bean.RewardNoticeInfo; +import com.bingchuang.core.radish.signin.bean.SignDetailInfo; +import com.bingchuang.core.radish.signin.bean.SignDrawInfo; +import com.bingchuang.core.radish.signin.bean.SignInfo; +import com.bingchuang.core.BuildConfig; +import com.bingchuang.core.R; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.radish.event.SignInSuccessEvent; +import com.bingchuang.core.radish.signin.bean.DrawNoticeInfo; +import com.bingchuang.core.radish.signin.bean.ReceiveTotalRewardInfo; +import com.bingchuang.core.radish.signin.bean.ReplenishSignInfo; +import com.bingchuang.core.radish.signin.bean.RewardNoticeInfo; +import com.bingchuang.core.radish.signin.bean.SignDetailInfo; +import com.bingchuang.core.radish.signin.bean.SignDrawInfo; +import com.bingchuang.core.radish.signin.bean.SignInfo; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.utils.ResUtil; diff --git a/core/src/main/java/com/pikolive/core/radish/signin/bean/DrawNoticeInfo.java b/core/src/main/java/com/bingchuang/core/radish/signin/bean/DrawNoticeInfo.java similarity index 73% rename from core/src/main/java/com/pikolive/core/radish/signin/bean/DrawNoticeInfo.java rename to core/src/main/java/com/bingchuang/core/radish/signin/bean/DrawNoticeInfo.java index 9697f36dc..961349302 100644 --- a/core/src/main/java/com/pikolive/core/radish/signin/bean/DrawNoticeInfo.java +++ b/core/src/main/java/com/bingchuang/core/radish/signin/bean/DrawNoticeInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.radish.signin.bean; +package com.bingchuang.core.radish.signin.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/radish/signin/bean/ImNotice.java b/core/src/main/java/com/bingchuang/core/radish/signin/bean/ImNotice.java similarity index 68% rename from core/src/main/java/com/pikolive/core/radish/signin/bean/ImNotice.java rename to core/src/main/java/com/bingchuang/core/radish/signin/bean/ImNotice.java index f6eaff844..2435ee110 100644 --- a/core/src/main/java/com/pikolive/core/radish/signin/bean/ImNotice.java +++ b/core/src/main/java/com/bingchuang/core/radish/signin/bean/ImNotice.java @@ -1,6 +1,6 @@ -package com.pikolive.core.radish.signin.bean; +package com.bingchuang.core.radish.signin.bean; -import com.pikolive.core.im.custom.bean.OpenSignInAttachment; +import com.bingchuang.core.im.custom.bean.OpenSignInAttachment; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/radish/signin/bean/ReceiveTotalRewardInfo.java b/core/src/main/java/com/bingchuang/core/radish/signin/bean/ReceiveTotalRewardInfo.java similarity index 89% rename from core/src/main/java/com/pikolive/core/radish/signin/bean/ReceiveTotalRewardInfo.java rename to core/src/main/java/com/bingchuang/core/radish/signin/bean/ReceiveTotalRewardInfo.java index f266bb8c7..cfcf6a242 100644 --- a/core/src/main/java/com/pikolive/core/radish/signin/bean/ReceiveTotalRewardInfo.java +++ b/core/src/main/java/com/bingchuang/core/radish/signin/bean/ReceiveTotalRewardInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.radish.signin.bean; +package com.bingchuang.core.radish.signin.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/radish/signin/bean/ReplenishSignInfo.java b/core/src/main/java/com/bingchuang/core/radish/signin/bean/ReplenishSignInfo.java similarity index 86% rename from core/src/main/java/com/pikolive/core/radish/signin/bean/ReplenishSignInfo.java rename to core/src/main/java/com/bingchuang/core/radish/signin/bean/ReplenishSignInfo.java index abfc01744..a07c03c14 100644 --- a/core/src/main/java/com/pikolive/core/radish/signin/bean/ReplenishSignInfo.java +++ b/core/src/main/java/com/bingchuang/core/radish/signin/bean/ReplenishSignInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.radish.signin.bean; +package com.bingchuang.core.radish.signin.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/radish/signin/bean/Reward.java b/core/src/main/java/com/bingchuang/core/radish/signin/bean/Reward.java similarity index 68% rename from core/src/main/java/com/pikolive/core/radish/signin/bean/Reward.java rename to core/src/main/java/com/bingchuang/core/radish/signin/bean/Reward.java index 49b99a8d4..cbdfd6276 100644 --- a/core/src/main/java/com/pikolive/core/radish/signin/bean/Reward.java +++ b/core/src/main/java/com/bingchuang/core/radish/signin/bean/Reward.java @@ -1,4 +1,4 @@ -package com.pikolive.core.radish.signin.bean; +package com.bingchuang.core.radish.signin.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/radish/signin/bean/RewardNoticeInfo.java b/core/src/main/java/com/bingchuang/core/radish/signin/bean/RewardNoticeInfo.java similarity index 95% rename from core/src/main/java/com/pikolive/core/radish/signin/bean/RewardNoticeInfo.java rename to core/src/main/java/com/bingchuang/core/radish/signin/bean/RewardNoticeInfo.java index d6fbda60e..e35de0579 100644 --- a/core/src/main/java/com/pikolive/core/radish/signin/bean/RewardNoticeInfo.java +++ b/core/src/main/java/com/bingchuang/core/radish/signin/bean/RewardNoticeInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.radish.signin.bean; +package com.bingchuang.core.radish.signin.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/radish/signin/bean/RsPlatformType.java b/core/src/main/java/com/bingchuang/core/radish/signin/bean/RsPlatformType.java similarity index 84% rename from core/src/main/java/com/pikolive/core/radish/signin/bean/RsPlatformType.java rename to core/src/main/java/com/bingchuang/core/radish/signin/bean/RsPlatformType.java index eee0bff5a..b7dd9489e 100644 --- a/core/src/main/java/com/pikolive/core/radish/signin/bean/RsPlatformType.java +++ b/core/src/main/java/com/bingchuang/core/radish/signin/bean/RsPlatformType.java @@ -1,4 +1,4 @@ -package com.pikolive.core.radish.signin.bean; +package com.bingchuang.core.radish.signin.bean; import cn.sharesdk.framework.Platform; import lombok.AllArgsConstructor; diff --git a/core/src/main/java/com/pikolive/core/radish/signin/bean/SignDetailInfo.java b/core/src/main/java/com/bingchuang/core/radish/signin/bean/SignDetailInfo.java similarity index 97% rename from core/src/main/java/com/pikolive/core/radish/signin/bean/SignDetailInfo.java rename to core/src/main/java/com/bingchuang/core/radish/signin/bean/SignDetailInfo.java index daf213033..d3ca36af9 100644 --- a/core/src/main/java/com/pikolive/core/radish/signin/bean/SignDetailInfo.java +++ b/core/src/main/java/com/bingchuang/core/radish/signin/bean/SignDetailInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.radish.signin.bean; +package com.bingchuang.core.radish.signin.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/radish/signin/bean/SignDrawInfo.java b/core/src/main/java/com/bingchuang/core/radish/signin/bean/SignDrawInfo.java similarity index 92% rename from core/src/main/java/com/pikolive/core/radish/signin/bean/SignDrawInfo.java rename to core/src/main/java/com/bingchuang/core/radish/signin/bean/SignDrawInfo.java index 7b439c9b3..a6b989bad 100644 --- a/core/src/main/java/com/pikolive/core/radish/signin/bean/SignDrawInfo.java +++ b/core/src/main/java/com/bingchuang/core/radish/signin/bean/SignDrawInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.radish.signin.bean; +package com.bingchuang.core.radish.signin.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/radish/signin/bean/SignInfo.java b/core/src/main/java/com/bingchuang/core/radish/signin/bean/SignInfo.java similarity index 79% rename from core/src/main/java/com/pikolive/core/radish/signin/bean/SignInfo.java rename to core/src/main/java/com/bingchuang/core/radish/signin/bean/SignInfo.java index c635a093c..5e8046990 100644 --- a/core/src/main/java/com/pikolive/core/radish/signin/bean/SignInfo.java +++ b/core/src/main/java/com/bingchuang/core/radish/signin/bean/SignInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.radish.signin.bean; +package com.bingchuang.core.radish.signin.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/radish/task/ITaskModel.java b/core/src/main/java/com/bingchuang/core/radish/task/ITaskModel.java similarity index 59% rename from core/src/main/java/com/pikolive/core/radish/task/ITaskModel.java rename to core/src/main/java/com/bingchuang/core/radish/task/ITaskModel.java index 42c2b28b5..62b1e8d54 100644 --- a/core/src/main/java/com/pikolive/core/radish/task/ITaskModel.java +++ b/core/src/main/java/com/bingchuang/core/radish/task/ITaskModel.java @@ -1,11 +1,11 @@ -package com.pikolive.core.radish.task; +package com.bingchuang.core.radish.task; -import com.pikolive.core.radish.task.bean.CheckNewUserTaskInfo; -import com.pikolive.core.radish.task.bean.TaskInfo; -import com.pikolive.core.radish.task.bean.CheckNewUserTaskInfo; -import com.pikolive.core.radish.task.bean.TaskInfo; -import com.pikolive.core.radish.task.bean.CheckNewUserTaskInfo; -import com.pikolive.core.radish.task.bean.TaskInfo; +import com.bingchuang.core.radish.task.bean.CheckNewUserTaskInfo; +import com.bingchuang.core.radish.task.bean.TaskInfo; +import com.bingchuang.core.radish.task.bean.CheckNewUserTaskInfo; +import com.bingchuang.core.radish.task.bean.TaskInfo; +import com.bingchuang.core.radish.task.bean.CheckNewUserTaskInfo; +import com.bingchuang.core.radish.task.bean.TaskInfo; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/radish/task/TaskModel.java b/core/src/main/java/com/bingchuang/core/radish/task/TaskModel.java similarity index 72% rename from core/src/main/java/com/pikolive/core/radish/task/TaskModel.java rename to core/src/main/java/com/bingchuang/core/radish/task/TaskModel.java index 5a2bb6a99..65f72f4af 100644 --- a/core/src/main/java/com/pikolive/core/radish/task/TaskModel.java +++ b/core/src/main/java/com/bingchuang/core/radish/task/TaskModel.java @@ -1,27 +1,27 @@ -package com.pikolive.core.radish.task; +package com.bingchuang.core.radish.task; import com.google.gson.JsonElement; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.radish.event.ReceivePrizeEvent; -import com.pikolive.core.radish.task.bean.CheckNewUserTaskInfo; -import com.pikolive.core.radish.task.bean.PrizeType; -import com.pikolive.core.radish.task.bean.TaskInfo; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.radish.event.ReceivePrizeEvent; -import com.pikolive.core.radish.task.bean.CheckNewUserTaskInfo; -import com.pikolive.core.radish.task.bean.PrizeType; -import com.pikolive.core.radish.task.bean.TaskInfo; -import com.pikolive.core.R; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.radish.RadishModel; -import com.pikolive.core.radish.event.ReceivePrizeEvent; -import com.pikolive.core.radish.task.bean.CheckNewUserTaskInfo; -import com.pikolive.core.radish.task.bean.PrizeType; -import com.pikolive.core.radish.task.bean.TaskInfo; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.radish.event.ReceivePrizeEvent; +import com.bingchuang.core.radish.task.bean.CheckNewUserTaskInfo; +import com.bingchuang.core.radish.task.bean.PrizeType; +import com.bingchuang.core.radish.task.bean.TaskInfo; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.radish.event.ReceivePrizeEvent; +import com.bingchuang.core.radish.task.bean.CheckNewUserTaskInfo; +import com.bingchuang.core.radish.task.bean.PrizeType; +import com.bingchuang.core.radish.task.bean.TaskInfo; +import com.bingchuang.core.R; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.radish.RadishModel; +import com.bingchuang.core.radish.event.ReceivePrizeEvent; +import com.bingchuang.core.radish.task.bean.CheckNewUserTaskInfo; +import com.bingchuang.core.radish.task.bean.PrizeType; +import com.bingchuang.core.radish.task.bean.TaskInfo; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.utils.ResUtil; diff --git a/core/src/main/java/com/pikolive/core/radish/task/bean/CheckNewUserTaskInfo.java b/core/src/main/java/com/bingchuang/core/radish/task/bean/CheckNewUserTaskInfo.java similarity index 81% rename from core/src/main/java/com/pikolive/core/radish/task/bean/CheckNewUserTaskInfo.java rename to core/src/main/java/com/bingchuang/core/radish/task/bean/CheckNewUserTaskInfo.java index ce4c7d718..844695d27 100644 --- a/core/src/main/java/com/pikolive/core/radish/task/bean/CheckNewUserTaskInfo.java +++ b/core/src/main/java/com/bingchuang/core/radish/task/bean/CheckNewUserTaskInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.radish.task.bean; +package com.bingchuang.core.radish.task.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/radish/task/bean/PrizeAnim.java b/core/src/main/java/com/bingchuang/core/radish/task/bean/PrizeAnim.java similarity index 77% rename from core/src/main/java/com/pikolive/core/radish/task/bean/PrizeAnim.java rename to core/src/main/java/com/bingchuang/core/radish/task/bean/PrizeAnim.java index 06d1968f7..ab5063860 100644 --- a/core/src/main/java/com/pikolive/core/radish/task/bean/PrizeAnim.java +++ b/core/src/main/java/com/bingchuang/core/radish/task/bean/PrizeAnim.java @@ -1,12 +1,12 @@ -package com.pikolive.core.radish.task.bean; +package com.bingchuang.core.radish.task.bean; -import com.pikolive.core.radish.signin.bean.ReceiveTotalRewardInfo; -import com.pikolive.core.radish.signin.bean.SignDrawInfo; -import com.pikolive.core.radish.signin.bean.ReceiveTotalRewardInfo; -import com.pikolive.core.radish.signin.bean.SignDrawInfo; -import com.pikolive.core.R; -import com.pikolive.core.radish.signin.bean.ReceiveTotalRewardInfo; -import com.pikolive.core.radish.signin.bean.SignDrawInfo; +import com.bingchuang.core.radish.signin.bean.ReceiveTotalRewardInfo; +import com.bingchuang.core.radish.signin.bean.SignDrawInfo; +import com.bingchuang.core.radish.signin.bean.ReceiveTotalRewardInfo; +import com.bingchuang.core.radish.signin.bean.SignDrawInfo; +import com.bingchuang.core.R; +import com.bingchuang.core.radish.signin.bean.ReceiveTotalRewardInfo; +import com.bingchuang.core.radish.signin.bean.SignDrawInfo; import com.bingchuang.library.utils.ResUtil; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/radish/task/bean/PrizeType.java b/core/src/main/java/com/bingchuang/core/radish/task/bean/PrizeType.java similarity index 73% rename from core/src/main/java/com/pikolive/core/radish/task/bean/PrizeType.java rename to core/src/main/java/com/bingchuang/core/radish/task/bean/PrizeType.java index 44755c48e..bcede2503 100644 --- a/core/src/main/java/com/pikolive/core/radish/task/bean/PrizeType.java +++ b/core/src/main/java/com/bingchuang/core/radish/task/bean/PrizeType.java @@ -1,4 +1,4 @@ -package com.pikolive.core.radish.task.bean; +package com.bingchuang.core.radish.task.bean; /** * create by lvzebiao @2019/3/29 diff --git a/core/src/main/java/com/pikolive/core/radish/task/bean/TaskInfo.java b/core/src/main/java/com/bingchuang/core/radish/task/bean/TaskInfo.java similarity index 97% rename from core/src/main/java/com/pikolive/core/radish/task/bean/TaskInfo.java rename to core/src/main/java/com/bingchuang/core/radish/task/bean/TaskInfo.java index 72a167c99..05b35490d 100644 --- a/core/src/main/java/com/pikolive/core/radish/task/bean/TaskInfo.java +++ b/core/src/main/java/com/bingchuang/core/radish/task/bean/TaskInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.radish.task.bean; +package com.bingchuang.core.radish.task.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/realm/IRealmCore.java b/core/src/main/java/com/bingchuang/core/realm/IRealmCore.java similarity index 84% rename from core/src/main/java/com/pikolive/core/realm/IRealmCore.java rename to core/src/main/java/com/bingchuang/core/realm/IRealmCore.java index 3b780cf97..cc7fe6dd3 100644 --- a/core/src/main/java/com/pikolive/core/realm/IRealmCore.java +++ b/core/src/main/java/com/bingchuang/core/realm/IRealmCore.java @@ -1,4 +1,4 @@ -package com.pikolive.core.realm; +package com.bingchuang.core.realm; import com.bingchuang.library.coremanager.IBaseCore; diff --git a/core/src/main/java/com/bingchuang/core/recall/IRecallModel.java b/core/src/main/java/com/bingchuang/core/recall/IRecallModel.java new file mode 100644 index 000000000..ce90dd310 --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/recall/IRecallModel.java @@ -0,0 +1,18 @@ +package com.bingchuang.core.recall; + +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.recall.bean.CheckLostUserInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.recall.bean.CheckLostUserInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.recall.bean.CheckLostUserInfo; + +import io.reactivex.Single; + +public interface IRecallModel extends IModel { + + // 查询是否是回归状态 + Single checkLostUser(long uid); + // 接收回归礼物 + void goBack(String uid, String inviteCode); +} diff --git a/core/src/main/java/com/pikolive/core/recall/RecallModel.java b/core/src/main/java/com/bingchuang/core/recall/RecallModel.java similarity index 71% rename from core/src/main/java/com/pikolive/core/recall/RecallModel.java rename to core/src/main/java/com/bingchuang/core/recall/RecallModel.java index febcdd41f..cafe53a4d 100644 --- a/core/src/main/java/com/pikolive/core/recall/RecallModel.java +++ b/core/src/main/java/com/bingchuang/core/recall/RecallModel.java @@ -1,27 +1,27 @@ -package com.pikolive.core.recall; +package com.bingchuang.core.recall; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.bean.response.result.CheckLostUserResult; -import com.pikolive.core.recall.bean.CheckLostUserInfo; -import com.pikolive.core.recall.bean.GoBackInfo; -import com.pikolive.core.recall.event.CheckLostUserEvent; -import com.pikolive.core.recall.event.GoBackEvent; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.bean.response.result.CheckLostUserResult; -import com.pikolive.core.recall.bean.CheckLostUserInfo; -import com.pikolive.core.recall.bean.GoBackInfo; -import com.pikolive.core.recall.event.CheckLostUserEvent; -import com.pikolive.core.recall.event.GoBackEvent; -import com.pikolive.core.R; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.bean.response.result.CheckLostUserResult; -import com.pikolive.core.recall.bean.CheckLostUserInfo; -import com.pikolive.core.recall.bean.GoBackInfo; -import com.pikolive.core.recall.event.CheckLostUserEvent; -import com.pikolive.core.recall.event.GoBackEvent; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.bean.response.result.CheckLostUserResult; +import com.bingchuang.core.recall.bean.CheckLostUserInfo; +import com.bingchuang.core.recall.bean.GoBackInfo; +import com.bingchuang.core.recall.event.CheckLostUserEvent; +import com.bingchuang.core.recall.event.GoBackEvent; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.bean.response.result.CheckLostUserResult; +import com.bingchuang.core.recall.bean.CheckLostUserInfo; +import com.bingchuang.core.recall.bean.GoBackInfo; +import com.bingchuang.core.recall.event.CheckLostUserEvent; +import com.bingchuang.core.recall.event.GoBackEvent; +import com.bingchuang.core.R; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.bean.response.result.CheckLostUserResult; +import com.bingchuang.core.recall.bean.CheckLostUserInfo; +import com.bingchuang.core.recall.bean.GoBackInfo; +import com.bingchuang.core.recall.event.CheckLostUserEvent; +import com.bingchuang.core.recall.event.GoBackEvent; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.utils.ResUtil; diff --git a/core/src/main/java/com/pikolive/core/recall/bean/CheckLostUserInfo.java b/core/src/main/java/com/bingchuang/core/recall/bean/CheckLostUserInfo.java similarity index 93% rename from core/src/main/java/com/pikolive/core/recall/bean/CheckLostUserInfo.java rename to core/src/main/java/com/bingchuang/core/recall/bean/CheckLostUserInfo.java index 4ce953c2a..8ca3fd2f9 100644 --- a/core/src/main/java/com/pikolive/core/recall/bean/CheckLostUserInfo.java +++ b/core/src/main/java/com/bingchuang/core/recall/bean/CheckLostUserInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.recall.bean; +package com.bingchuang.core.recall.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/recall/bean/GoBackInfo.java b/core/src/main/java/com/bingchuang/core/recall/bean/GoBackInfo.java similarity index 91% rename from core/src/main/java/com/pikolive/core/recall/bean/GoBackInfo.java rename to core/src/main/java/com/bingchuang/core/recall/bean/GoBackInfo.java index 22f0d2999..0d8272aca 100644 --- a/core/src/main/java/com/pikolive/core/recall/bean/GoBackInfo.java +++ b/core/src/main/java/com/bingchuang/core/recall/bean/GoBackInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.recall.bean; +package com.bingchuang.core.recall.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/bingchuang/core/recall/event/CheckLostUserEvent.java b/core/src/main/java/com/bingchuang/core/recall/event/CheckLostUserEvent.java new file mode 100644 index 000000000..41a2f667b --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/recall/event/CheckLostUserEvent.java @@ -0,0 +1,12 @@ +package com.bingchuang.core.recall.event; + +import com.bingchuang.core.base.BaseDataEvent; +import com.bingchuang.core.base.BaseDataEvent; +import com.bingchuang.core.base.BaseDataEvent; +import com.bingchuang.core.recall.bean.CheckLostUserInfo; + +public class CheckLostUserEvent extends BaseDataEvent { + + public CheckLostUserEvent(CheckLostUserInfo checkLostUserInfo){ super(checkLostUserInfo); } + public CheckLostUserEvent(String error){ super(error); } +} diff --git a/core/src/main/java/com/bingchuang/core/recall/event/GoBackEvent.java b/core/src/main/java/com/bingchuang/core/recall/event/GoBackEvent.java new file mode 100644 index 000000000..65d8e37d1 --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/recall/event/GoBackEvent.java @@ -0,0 +1,17 @@ +package com.bingchuang.core.recall.event; + +import com.bingchuang.core.base.BaseDataEvent; +import com.bingchuang.core.base.BaseDataEvent; +import com.bingchuang.core.base.BaseDataEvent; +import com.bingchuang.core.recall.bean.GoBackInfo; + +public class GoBackEvent extends BaseDataEvent { + + public GoBackEvent(GoBackInfo goBackInfo) { + super(goBackInfo); + } + + public GoBackEvent(String error) { + super(error); + } +} diff --git a/core/src/main/java/com/bingchuang/core/redPacket/IRedPacketModel.java b/core/src/main/java/com/bingchuang/core/redPacket/IRedPacketModel.java new file mode 100644 index 000000000..d403a276d --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/redPacket/IRedPacketModel.java @@ -0,0 +1,41 @@ +package com.bingchuang.core.redPacket; + +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.redPacket.bean.ActionDialogInfo; +import com.bingchuang.core.redPacket.bean.RedDrawListInfo; +import com.bingchuang.core.redPacket.bean.RedPacketInfo; +import com.bingchuang.core.redPacket.bean.WithdrawRedListInfo; +import com.bingchuang.core.redPacket.bean.WithdrawRedSucceedInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.redPacket.bean.ActionDialogInfo; +import com.bingchuang.core.redPacket.bean.RedDrawListInfo; +import com.bingchuang.core.redPacket.bean.RedPacketInfo; +import com.bingchuang.core.redPacket.bean.WithdrawRedListInfo; +import com.bingchuang.core.redPacket.bean.WithdrawRedSucceedInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.redPacket.bean.ActionDialogInfo; +import com.bingchuang.core.redPacket.bean.RedDrawListInfo; +import com.bingchuang.core.redPacket.bean.RedPacketInfo; +import com.bingchuang.core.redPacket.bean.WithdrawRedListInfo; +import com.bingchuang.core.redPacket.bean.WithdrawRedSucceedInfo; + +import java.util.List; + +import io.reactivex.Single; + +/** + * Created by ${Seven} on 2017/9/20. + */ + +public interface IRedPacketModel extends IModel { + //获取红包页面信息 + Single getRedPacketInfo(); + //进入主界面有红包后设置弹窗类型 1,首页 2直播间 + Single > getActionDialog(int type); + //获取红包提现列表 + Single
> getRedList(); + //发起红包提现 + Single
getRedWithdraw(long uid, int packetId, String pwd); + //获取红包提现列表 + Single > getRedDrawList(); +} diff --git a/core/src/main/java/com/pikolive/core/redPacket/RedPacketModel.java b/core/src/main/java/com/bingchuang/core/redPacket/RedPacketModel.java similarity index 71% rename from core/src/main/java/com/pikolive/core/redPacket/RedPacketModel.java rename to core/src/main/java/com/bingchuang/core/redPacket/RedPacketModel.java index 1ffe4760a..05ff8ebbb 100644 --- a/core/src/main/java/com/pikolive/core/redPacket/RedPacketModel.java +++ b/core/src/main/java/com/bingchuang/core/redPacket/RedPacketModel.java @@ -1,42 +1,42 @@ -package com.pikolive.core.redPacket; +package com.bingchuang.core.redPacket; -import com.pikolive.core.bean.response.result.ActionDialogResult; -import com.pikolive.core.bean.response.result.RedDrawListInfoResult; -import com.pikolive.core.bean.response.result.RedPacketResult; -import com.pikolive.core.bean.response.result.WithdrawRedListResult; -import com.pikolive.core.bean.response.result.WithdrawRedSucceedResult; -import com.pikolive.core.redPacket.bean.ActionDialogInfo; -import com.pikolive.core.redPacket.bean.RedDrawListInfo; -import com.pikolive.core.redPacket.bean.RedPacketInfo; -import com.pikolive.core.redPacket.bean.WithdrawRedListInfo; -import com.pikolive.core.redPacket.bean.WithdrawRedSucceedInfo; -import com.pikolive.core.redPacket.event.GetRedInfoEvent; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.result.ActionDialogResult; -import com.pikolive.core.bean.response.result.RedDrawListInfoResult; -import com.pikolive.core.bean.response.result.RedPacketResult; -import com.pikolive.core.bean.response.result.WithdrawRedListResult; -import com.pikolive.core.bean.response.result.WithdrawRedSucceedResult; -import com.pikolive.core.redPacket.bean.ActionDialogInfo; -import com.pikolive.core.redPacket.bean.RedDrawListInfo; -import com.pikolive.core.redPacket.bean.RedPacketInfo; -import com.pikolive.core.redPacket.bean.WithdrawRedListInfo; -import com.pikolive.core.redPacket.bean.WithdrawRedSucceedInfo; -import com.pikolive.core.redPacket.event.GetRedInfoEvent; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.result.ActionDialogResult; -import com.pikolive.core.bean.response.result.RedDrawListInfoResult; -import com.pikolive.core.bean.response.result.RedPacketResult; -import com.pikolive.core.bean.response.result.WithdrawRedListResult; -import com.pikolive.core.bean.response.result.WithdrawRedSucceedResult; -import com.pikolive.core.redPacket.bean.ActionDialogInfo; -import com.pikolive.core.redPacket.bean.RedDrawListInfo; -import com.pikolive.core.redPacket.bean.RedPacketInfo; -import com.pikolive.core.redPacket.bean.WithdrawRedListInfo; -import com.pikolive.core.redPacket.bean.WithdrawRedSucceedInfo; -import com.pikolive.core.redPacket.event.GetRedInfoEvent; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.bean.response.result.ActionDialogResult; +import com.bingchuang.core.bean.response.result.RedDrawListInfoResult; +import com.bingchuang.core.bean.response.result.RedPacketResult; +import com.bingchuang.core.bean.response.result.WithdrawRedListResult; +import com.bingchuang.core.bean.response.result.WithdrawRedSucceedResult; +import com.bingchuang.core.redPacket.bean.ActionDialogInfo; +import com.bingchuang.core.redPacket.bean.RedDrawListInfo; +import com.bingchuang.core.redPacket.bean.RedPacketInfo; +import com.bingchuang.core.redPacket.bean.WithdrawRedListInfo; +import com.bingchuang.core.redPacket.bean.WithdrawRedSucceedInfo; +import com.bingchuang.core.redPacket.event.GetRedInfoEvent; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.result.ActionDialogResult; +import com.bingchuang.core.bean.response.result.RedDrawListInfoResult; +import com.bingchuang.core.bean.response.result.RedPacketResult; +import com.bingchuang.core.bean.response.result.WithdrawRedListResult; +import com.bingchuang.core.bean.response.result.WithdrawRedSucceedResult; +import com.bingchuang.core.redPacket.bean.ActionDialogInfo; +import com.bingchuang.core.redPacket.bean.RedDrawListInfo; +import com.bingchuang.core.redPacket.bean.RedPacketInfo; +import com.bingchuang.core.redPacket.bean.WithdrawRedListInfo; +import com.bingchuang.core.redPacket.bean.WithdrawRedSucceedInfo; +import com.bingchuang.core.redPacket.event.GetRedInfoEvent; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.result.ActionDialogResult; +import com.bingchuang.core.bean.response.result.RedDrawListInfoResult; +import com.bingchuang.core.bean.response.result.RedPacketResult; +import com.bingchuang.core.bean.response.result.WithdrawRedListResult; +import com.bingchuang.core.bean.response.result.WithdrawRedSucceedResult; +import com.bingchuang.core.redPacket.bean.ActionDialogInfo; +import com.bingchuang.core.redPacket.bean.RedDrawListInfo; +import com.bingchuang.core.redPacket.bean.RedPacketInfo; +import com.bingchuang.core.redPacket.bean.WithdrawRedListInfo; +import com.bingchuang.core.redPacket.bean.WithdrawRedSucceedInfo; +import com.bingchuang.core.redPacket.event.GetRedInfoEvent; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import org.greenrobot.eventbus.EventBus; diff --git a/core/src/main/java/com/pikolive/core/redPacket/bean/ActionDialogInfo.java b/core/src/main/java/com/bingchuang/core/redPacket/bean/ActionDialogInfo.java similarity index 96% rename from core/src/main/java/com/pikolive/core/redPacket/bean/ActionDialogInfo.java rename to core/src/main/java/com/bingchuang/core/redPacket/bean/ActionDialogInfo.java index dfb785590..9bdb77376 100644 --- a/core/src/main/java/com/pikolive/core/redPacket/bean/ActionDialogInfo.java +++ b/core/src/main/java/com/bingchuang/core/redPacket/bean/ActionDialogInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.redPacket.bean; +package com.bingchuang.core.redPacket.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/redPacket/bean/RedDrawListInfo.java b/core/src/main/java/com/bingchuang/core/redPacket/bean/RedDrawListInfo.java similarity index 96% rename from core/src/main/java/com/pikolive/core/redPacket/bean/RedDrawListInfo.java rename to core/src/main/java/com/bingchuang/core/redPacket/bean/RedDrawListInfo.java index b78097047..01318b0e5 100644 --- a/core/src/main/java/com/pikolive/core/redPacket/bean/RedDrawListInfo.java +++ b/core/src/main/java/com/bingchuang/core/redPacket/bean/RedDrawListInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.redPacket.bean; +package com.bingchuang.core.redPacket.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/redPacket/bean/RedPacketInfo.java b/core/src/main/java/com/bingchuang/core/redPacket/bean/RedPacketInfo.java similarity index 97% rename from core/src/main/java/com/pikolive/core/redPacket/bean/RedPacketInfo.java rename to core/src/main/java/com/bingchuang/core/redPacket/bean/RedPacketInfo.java index 55251b475..52ef702d3 100644 --- a/core/src/main/java/com/pikolive/core/redPacket/bean/RedPacketInfo.java +++ b/core/src/main/java/com/bingchuang/core/redPacket/bean/RedPacketInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.redPacket.bean; +package com.bingchuang.core.redPacket.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/redPacket/bean/RedPacketInfoV2.java b/core/src/main/java/com/bingchuang/core/redPacket/bean/RedPacketInfoV2.java similarity index 95% rename from core/src/main/java/com/pikolive/core/redPacket/bean/RedPacketInfoV2.java rename to core/src/main/java/com/bingchuang/core/redPacket/bean/RedPacketInfoV2.java index 49f132a00..c117ef1ec 100644 --- a/core/src/main/java/com/pikolive/core/redPacket/bean/RedPacketInfoV2.java +++ b/core/src/main/java/com/bingchuang/core/redPacket/bean/RedPacketInfoV2.java @@ -1,4 +1,4 @@ -package com.pikolive.core.redPacket.bean; +package com.bingchuang.core.redPacket.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/redPacket/bean/ShareRedBagInfo.java b/core/src/main/java/com/bingchuang/core/redPacket/bean/ShareRedBagInfo.java similarity index 92% rename from core/src/main/java/com/pikolive/core/redPacket/bean/ShareRedBagInfo.java rename to core/src/main/java/com/bingchuang/core/redPacket/bean/ShareRedBagInfo.java index 2b750a11e..5afdcb748 100644 --- a/core/src/main/java/com/pikolive/core/redPacket/bean/ShareRedBagInfo.java +++ b/core/src/main/java/com/bingchuang/core/redPacket/bean/ShareRedBagInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.redPacket.bean; +package com.bingchuang.core.redPacket.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/redPacket/bean/WithdrawRedListInfo.java b/core/src/main/java/com/bingchuang/core/redPacket/bean/WithdrawRedListInfo.java similarity index 95% rename from core/src/main/java/com/pikolive/core/redPacket/bean/WithdrawRedListInfo.java rename to core/src/main/java/com/bingchuang/core/redPacket/bean/WithdrawRedListInfo.java index 92b1aa959..1b530c6b2 100644 --- a/core/src/main/java/com/pikolive/core/redPacket/bean/WithdrawRedListInfo.java +++ b/core/src/main/java/com/bingchuang/core/redPacket/bean/WithdrawRedListInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.redPacket.bean; +package com.bingchuang.core.redPacket.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/redPacket/bean/WithdrawRedSucceedInfo.java b/core/src/main/java/com/bingchuang/core/redPacket/bean/WithdrawRedSucceedInfo.java similarity index 91% rename from core/src/main/java/com/pikolive/core/redPacket/bean/WithdrawRedSucceedInfo.java rename to core/src/main/java/com/bingchuang/core/redPacket/bean/WithdrawRedSucceedInfo.java index e7e2529a4..2e73877a7 100644 --- a/core/src/main/java/com/pikolive/core/redPacket/bean/WithdrawRedSucceedInfo.java +++ b/core/src/main/java/com/bingchuang/core/redPacket/bean/WithdrawRedSucceedInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.redPacket.bean; +package com.bingchuang.core.redPacket.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/redPacket/event/GetRedInfoEvent.java b/core/src/main/java/com/bingchuang/core/redPacket/event/GetRedInfoEvent.java similarity index 51% rename from core/src/main/java/com/pikolive/core/redPacket/event/GetRedInfoEvent.java rename to core/src/main/java/com/bingchuang/core/redPacket/event/GetRedInfoEvent.java index 512fa78cc..890b2b793 100644 --- a/core/src/main/java/com/pikolive/core/redPacket/event/GetRedInfoEvent.java +++ b/core/src/main/java/com/bingchuang/core/redPacket/event/GetRedInfoEvent.java @@ -1,9 +1,9 @@ -package com.pikolive.core.redPacket.event; +package com.bingchuang.core.redPacket.event; -import com.pikolive.core.base.BaseDataEvent; -import com.pikolive.core.base.BaseDataEvent; -import com.pikolive.core.base.BaseDataEvent; -import com.pikolive.core.redPacket.bean.RedPacketInfo; +import com.bingchuang.core.base.BaseDataEvent; +import com.bingchuang.core.base.BaseDataEvent; +import com.bingchuang.core.base.BaseDataEvent; +import com.bingchuang.core.redPacket.bean.RedPacketInfo; /** * create by lvzebiao on 2018/9/5 diff --git a/core/src/main/java/com/pikolive/core/redpackage/RedEnvelopeGiftItemVO.kt b/core/src/main/java/com/bingchuang/core/redpackage/RedEnvelopeGiftItemVO.kt similarity index 55% rename from core/src/main/java/com/pikolive/core/redpackage/RedEnvelopeGiftItemVO.kt rename to core/src/main/java/com/bingchuang/core/redpackage/RedEnvelopeGiftItemVO.kt index 249126782..ec26b2f32 100644 --- a/core/src/main/java/com/pikolive/core/redpackage/RedEnvelopeGiftItemVO.kt +++ b/core/src/main/java/com/bingchuang/core/redpackage/RedEnvelopeGiftItemVO.kt @@ -1,6 +1,6 @@ -package com.pikolive.core.redpackage +package com.bingchuang.core.redpackage -import com.pikolive.core.gift.bean.GiftInfo +import com.bingchuang.core.gift.bean.GiftInfo data class RedEnvelopeGiftItemVO( diff --git a/core/src/main/java/com/pikolive/core/redpackage/RedEnvelopeItemVO.kt b/core/src/main/java/com/bingchuang/core/redpackage/RedEnvelopeItemVO.kt similarity index 69% rename from core/src/main/java/com/pikolive/core/redpackage/RedEnvelopeItemVO.kt rename to core/src/main/java/com/bingchuang/core/redpackage/RedEnvelopeItemVO.kt index 80953cd2c..b394de16f 100644 --- a/core/src/main/java/com/pikolive/core/redpackage/RedEnvelopeItemVO.kt +++ b/core/src/main/java/com/bingchuang/core/redpackage/RedEnvelopeItemVO.kt @@ -1,6 +1,6 @@ -package com.pikolive.core.redpackage +package com.bingchuang.core.redpackage -import com.pikolive.core.community.UserVo +import com.bingchuang.core.community.UserVo class RedEnvelopeItemVO( diff --git a/core/src/main/java/com/pikolive/core/redpackage/RedEnvelopeRoomMsg.kt b/core/src/main/java/com/bingchuang/core/redpackage/RedEnvelopeRoomMsg.kt similarity index 94% rename from core/src/main/java/com/pikolive/core/redpackage/RedEnvelopeRoomMsg.kt rename to core/src/main/java/com/bingchuang/core/redpackage/RedEnvelopeRoomMsg.kt index 02f0322e1..b98c125e9 100644 --- a/core/src/main/java/com/pikolive/core/redpackage/RedEnvelopeRoomMsg.kt +++ b/core/src/main/java/com/bingchuang/core/redpackage/RedEnvelopeRoomMsg.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.redpackage +package com.bingchuang.core.redpackage import java.io.Serializable diff --git a/core/src/main/java/com/pikolive/core/redpackage/RedEnvelopeState.kt b/core/src/main/java/com/bingchuang/core/redpackage/RedEnvelopeState.kt similarity index 93% rename from core/src/main/java/com/pikolive/core/redpackage/RedEnvelopeState.kt rename to core/src/main/java/com/bingchuang/core/redpackage/RedEnvelopeState.kt index fd6335592..6988085c1 100644 --- a/core/src/main/java/com/pikolive/core/redpackage/RedEnvelopeState.kt +++ b/core/src/main/java/com/bingchuang/core/redpackage/RedEnvelopeState.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.redpackage +package com.bingchuang.core.redpackage /** * 红包状态 diff --git a/core/src/main/java/com/pikolive/core/redpackage/RedEnvelopeVO.kt b/core/src/main/java/com/bingchuang/core/redpackage/RedEnvelopeVO.kt similarity index 91% rename from core/src/main/java/com/pikolive/core/redpackage/RedEnvelopeVO.kt rename to core/src/main/java/com/bingchuang/core/redpackage/RedEnvelopeVO.kt index 0014ac15a..7ce41b540 100644 --- a/core/src/main/java/com/pikolive/core/redpackage/RedEnvelopeVO.kt +++ b/core/src/main/java/com/bingchuang/core/redpackage/RedEnvelopeVO.kt @@ -1,6 +1,6 @@ -package com.pikolive.core.redpackage +package com.bingchuang.core.redpackage -import com.pikolive.core.community.UserVo +import com.bingchuang.core.community.UserVo data class RedEnvelopeVO( diff --git a/core/src/main/java/com/pikolive/core/redpackage/RedPackageData.kt b/core/src/main/java/com/bingchuang/core/redpackage/RedPackageData.kt similarity index 95% rename from core/src/main/java/com/pikolive/core/redpackage/RedPackageData.kt rename to core/src/main/java/com/bingchuang/core/redpackage/RedPackageData.kt index cc1912cab..03b14e58f 100644 --- a/core/src/main/java/com/pikolive/core/redpackage/RedPackageData.kt +++ b/core/src/main/java/com/bingchuang/core/redpackage/RedPackageData.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.redpackage +package com.bingchuang.core.redpackage import java.io.Serializable diff --git a/core/src/main/java/com/pikolive/core/redpackage/RedPackageInfo.kt b/core/src/main/java/com/bingchuang/core/redpackage/RedPackageInfo.kt similarity index 92% rename from core/src/main/java/com/pikolive/core/redpackage/RedPackageInfo.kt rename to core/src/main/java/com/bingchuang/core/redpackage/RedPackageInfo.kt index 663f81947..21d28e5c8 100644 --- a/core/src/main/java/com/pikolive/core/redpackage/RedPackageInfo.kt +++ b/core/src/main/java/com/bingchuang/core/redpackage/RedPackageInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.redpackage +package com.bingchuang.core.redpackage data class RedPackageInfo( diff --git a/core/src/main/java/com/pikolive/core/redpackage/RedPackageModel.kt b/core/src/main/java/com/bingchuang/core/redpackage/RedPackageModel.kt similarity index 94% rename from core/src/main/java/com/pikolive/core/redpackage/RedPackageModel.kt rename to core/src/main/java/com/bingchuang/core/redpackage/RedPackageModel.kt index 5901258aa..4d5d280fa 100644 --- a/core/src/main/java/com/pikolive/core/redpackage/RedPackageModel.kt +++ b/core/src/main/java/com/bingchuang/core/redpackage/RedPackageModel.kt @@ -1,10 +1,10 @@ -package com.pikolive.core.redpackage +package com.bingchuang.core.redpackage -import com.pikolive.core.bean.response.ServiceResult -import com.pikolive.core.utils.net.handleBeanData -import com.pikolive.core.utils.net.handleStringData -import com.pikolive.core.utils.net.io2main +import com.bingchuang.core.bean.response.ServiceResult +import com.bingchuang.core.utils.net.handleBeanData +import com.bingchuang.core.utils.net.handleStringData +import com.bingchuang.core.utils.net.io2main import com.bingchuang.library.net.rxnet.RxNet import io.reactivex.Observable import io.reactivex.Single diff --git a/core/src/main/java/com/pikolive/core/redpackage/RedPackageNotifyInfo.kt b/core/src/main/java/com/bingchuang/core/redpackage/RedPackageNotifyInfo.kt similarity index 96% rename from core/src/main/java/com/pikolive/core/redpackage/RedPackageNotifyInfo.kt rename to core/src/main/java/com/bingchuang/core/redpackage/RedPackageNotifyInfo.kt index fe7b06101..45a127966 100644 --- a/core/src/main/java/com/pikolive/core/redpackage/RedPackageNotifyInfo.kt +++ b/core/src/main/java/com/bingchuang/core/redpackage/RedPackageNotifyInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.redpackage +package com.bingchuang.core.redpackage import java.io.Serializable diff --git a/core/src/main/java/com/pikolive/core/redpackage/RedPackageType.kt b/core/src/main/java/com/bingchuang/core/redpackage/RedPackageType.kt similarity index 72% rename from core/src/main/java/com/pikolive/core/redpackage/RedPackageType.kt rename to core/src/main/java/com/bingchuang/core/redpackage/RedPackageType.kt index 7c3ed92f5..60023a654 100644 --- a/core/src/main/java/com/pikolive/core/redpackage/RedPackageType.kt +++ b/core/src/main/java/com/bingchuang/core/redpackage/RedPackageType.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.redpackage +package com.bingchuang.core.redpackage const val ROOM_DIAMOND = 1 const val ROOM_GIFT = 3 diff --git a/core/src/main/java/com/bingchuang/core/relation/cp/CpBindUnbindEvent.java b/core/src/main/java/com/bingchuang/core/relation/cp/CpBindUnbindEvent.java new file mode 100644 index 000000000..30c6ad8c2 --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/relation/cp/CpBindUnbindEvent.java @@ -0,0 +1,4 @@ +package com.bingchuang.core.relation.cp; + +public class CpBindUnbindEvent { +} diff --git a/core/src/main/java/com/pikolive/core/relation/cp/CpInviteDetailEntity.kt b/core/src/main/java/com/bingchuang/core/relation/cp/CpInviteDetailEntity.kt similarity index 93% rename from core/src/main/java/com/pikolive/core/relation/cp/CpInviteDetailEntity.kt rename to core/src/main/java/com/bingchuang/core/relation/cp/CpInviteDetailEntity.kt index 70e38ecdb..7c7dc0928 100644 --- a/core/src/main/java/com/pikolive/core/relation/cp/CpInviteDetailEntity.kt +++ b/core/src/main/java/com/bingchuang/core/relation/cp/CpInviteDetailEntity.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.relation.cp +package com.bingchuang.core.relation.cp data class CpInviteDetailEntity( val acceptAvatar: String? = "", diff --git a/core/src/main/java/com/pikolive/core/relation/cp/CpInviteInfo.kt b/core/src/main/java/com/bingchuang/core/relation/cp/CpInviteInfo.kt similarity index 94% rename from core/src/main/java/com/pikolive/core/relation/cp/CpInviteInfo.kt rename to core/src/main/java/com/bingchuang/core/relation/cp/CpInviteInfo.kt index 814f9fa94..3b934d4bb 100644 --- a/core/src/main/java/com/pikolive/core/relation/cp/CpInviteInfo.kt +++ b/core/src/main/java/com/bingchuang/core/relation/cp/CpInviteInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.relation.cp +package com.bingchuang.core.relation.cp data class CpInviteMessage( val msg: String = "", diff --git a/core/src/main/java/com/pikolive/core/relation/cp/CpInvitePageEntity.kt b/core/src/main/java/com/bingchuang/core/relation/cp/CpInvitePageEntity.kt similarity index 93% rename from core/src/main/java/com/pikolive/core/relation/cp/CpInvitePageEntity.kt rename to core/src/main/java/com/bingchuang/core/relation/cp/CpInvitePageEntity.kt index 7bee0ca76..7f68b5b48 100644 --- a/core/src/main/java/com/pikolive/core/relation/cp/CpInvitePageEntity.kt +++ b/core/src/main/java/com/bingchuang/core/relation/cp/CpInvitePageEntity.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.relation.cp +package com.bingchuang.core.relation.cp /** * 邀请CP弹窗信息 diff --git a/core/src/main/java/com/pikolive/core/relation/cp/CpMpApplyListEntity.kt b/core/src/main/java/com/bingchuang/core/relation/cp/CpMpApplyListEntity.kt similarity index 88% rename from core/src/main/java/com/pikolive/core/relation/cp/CpMpApplyListEntity.kt rename to core/src/main/java/com/bingchuang/core/relation/cp/CpMpApplyListEntity.kt index a694b0824..644d024f0 100644 --- a/core/src/main/java/com/pikolive/core/relation/cp/CpMpApplyListEntity.kt +++ b/core/src/main/java/com/bingchuang/core/relation/cp/CpMpApplyListEntity.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.relation.cp +package com.bingchuang.core.relation.cp /** * diff --git a/core/src/main/java/com/pikolive/core/relation/cp/CpRelation.kt b/core/src/main/java/com/bingchuang/core/relation/cp/CpRelation.kt similarity index 94% rename from core/src/main/java/com/pikolive/core/relation/cp/CpRelation.kt rename to core/src/main/java/com/bingchuang/core/relation/cp/CpRelation.kt index 3fda7f802..21dedd9f0 100644 --- a/core/src/main/java/com/pikolive/core/relation/cp/CpRelation.kt +++ b/core/src/main/java/com/bingchuang/core/relation/cp/CpRelation.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.relation.cp +package com.bingchuang.core.relation.cp data class CpRelation( /** diff --git a/core/src/main/java/com/pikolive/core/relation/cp/CpTaskEntity.kt b/core/src/main/java/com/bingchuang/core/relation/cp/CpTaskEntity.kt similarity index 96% rename from core/src/main/java/com/pikolive/core/relation/cp/CpTaskEntity.kt rename to core/src/main/java/com/bingchuang/core/relation/cp/CpTaskEntity.kt index a9c253be9..dc962f055 100644 --- a/core/src/main/java/com/pikolive/core/relation/cp/CpTaskEntity.kt +++ b/core/src/main/java/com/bingchuang/core/relation/cp/CpTaskEntity.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.relation.cp +package com.bingchuang.core.relation.cp data class CpTaskEntity( val avatar: String = "", diff --git a/core/src/main/java/com/pikolive/core/relation/cp/UserCpLevelMpEntity.kt b/core/src/main/java/com/bingchuang/core/relation/cp/UserCpLevelMpEntity.kt similarity index 88% rename from core/src/main/java/com/pikolive/core/relation/cp/UserCpLevelMpEntity.kt rename to core/src/main/java/com/bingchuang/core/relation/cp/UserCpLevelMpEntity.kt index d6b1b7371..0166f972e 100644 --- a/core/src/main/java/com/pikolive/core/relation/cp/UserCpLevelMpEntity.kt +++ b/core/src/main/java/com/bingchuang/core/relation/cp/UserCpLevelMpEntity.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.relation.cp +package com.bingchuang.core.relation.cp data class UserCpLevelMpRootEntity( val haveCp: Boolean = false, diff --git a/core/src/main/java/com/pikolive/core/relation/cp/UserCpListEntity.kt b/core/src/main/java/com/bingchuang/core/relation/cp/UserCpListEntity.kt similarity index 95% rename from core/src/main/java/com/pikolive/core/relation/cp/UserCpListEntity.kt rename to core/src/main/java/com/bingchuang/core/relation/cp/UserCpListEntity.kt index 4488acbaa..9cd0a7397 100644 --- a/core/src/main/java/com/pikolive/core/relation/cp/UserCpListEntity.kt +++ b/core/src/main/java/com/bingchuang/core/relation/cp/UserCpListEntity.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.relation.cp +package com.bingchuang.core.relation.cp data class UserCpListEntity( val acceptUid: Long = 0, diff --git a/core/src/main/java/com/pikolive/core/room/IRoomCoreClient.java b/core/src/main/java/com/bingchuang/core/room/IRoomCoreClient.java similarity index 86% rename from core/src/main/java/com/pikolive/core/room/IRoomCoreClient.java rename to core/src/main/java/com/bingchuang/core/room/IRoomCoreClient.java index c086f3d11..99aa7c971 100644 --- a/core/src/main/java/com/pikolive/core/room/IRoomCoreClient.java +++ b/core/src/main/java/com/bingchuang/core/room/IRoomCoreClient.java @@ -1,16 +1,16 @@ -package com.pikolive.core.room; +package com.bingchuang.core.room; import com.netease.nimlib.sdk.chatroom.model.ChatRoomKickOutEvent; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.room.bean.SearchRoomInfo; -import com.pikolive.core.room.queue.bean.RoomConsumeInfo; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.room.bean.SearchRoomInfo; -import com.pikolive.core.room.queue.bean.RoomConsumeInfo; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.room.bean.SearchRoomInfo; -import com.pikolive.core.room.queue.bean.RoomConsumeInfo; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.room.bean.SearchRoomInfo; +import com.bingchuang.core.room.queue.bean.RoomConsumeInfo; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.room.bean.SearchRoomInfo; +import com.bingchuang.core.room.queue.bean.RoomConsumeInfo; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.room.bean.SearchRoomInfo; +import com.bingchuang.core.room.queue.bean.RoomConsumeInfo; import com.bingchuang.library.coremanager.ICoreClient; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/room/activitytimer/ActivityTimerEvent.java b/core/src/main/java/com/bingchuang/core/room/activitytimer/ActivityTimerEvent.java similarity index 66% rename from core/src/main/java/com/pikolive/core/room/activitytimer/ActivityTimerEvent.java rename to core/src/main/java/com/bingchuang/core/room/activitytimer/ActivityTimerEvent.java index 5d773a4b5..b0dfb1fc0 100644 --- a/core/src/main/java/com/pikolive/core/room/activitytimer/ActivityTimerEvent.java +++ b/core/src/main/java/com/bingchuang/core/room/activitytimer/ActivityTimerEvent.java @@ -1,6 +1,6 @@ -package com.pikolive.core.room.activitytimer; +package com.bingchuang.core.room.activitytimer; -import com.pikolive.core.base.BaseBusEvent; +import com.bingchuang.core.base.BaseBusEvent; /** * create by lvzebiao @2020/2/24 diff --git a/core/src/main/java/com/pikolive/core/room/activitytimer/TimerBean.java b/core/src/main/java/com/bingchuang/core/room/activitytimer/TimerBean.java similarity index 85% rename from core/src/main/java/com/pikolive/core/room/activitytimer/TimerBean.java rename to core/src/main/java/com/bingchuang/core/room/activitytimer/TimerBean.java index 6782fce04..cf9c2e694 100644 --- a/core/src/main/java/com/pikolive/core/room/activitytimer/TimerBean.java +++ b/core/src/main/java/com/bingchuang/core/room/activitytimer/TimerBean.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.activitytimer; +package com.bingchuang.core.room.activitytimer; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/room/anotherroompk/RoomPKModel.kt b/core/src/main/java/com/bingchuang/core/room/anotherroompk/RoomPKModel.kt similarity index 94% rename from core/src/main/java/com/pikolive/core/room/anotherroompk/RoomPKModel.kt rename to core/src/main/java/com/bingchuang/core/room/anotherroompk/RoomPKModel.kt index 973f22620..97c004f64 100644 --- a/core/src/main/java/com/pikolive/core/room/anotherroompk/RoomPKModel.kt +++ b/core/src/main/java/com/bingchuang/core/room/anotherroompk/RoomPKModel.kt @@ -1,8 +1,8 @@ -package com.pikolive.core.room.anotherroompk +package com.bingchuang.core.room.anotherroompk -import com.pikolive.core.bean.response.ServiceResult -import com.pikolive.core.im.custom.bean.RoomPkBean -import com.pikolive.core.utils.net.RxHelper +import com.bingchuang.core.bean.response.ServiceResult +import com.bingchuang.core.im.custom.bean.RoomPkBean +import com.bingchuang.core.utils.net.RxHelper import com.bingchuang.library.net.rxnet.RxNet import io.reactivex.Single import retrofit2.http.* diff --git a/core/src/main/java/com/pikolive/core/room/anotherroompk/ShowGiftDialogEvent.java b/core/src/main/java/com/bingchuang/core/room/anotherroompk/ShowGiftDialogEvent.java similarity index 82% rename from core/src/main/java/com/pikolive/core/room/anotherroompk/ShowGiftDialogEvent.java rename to core/src/main/java/com/bingchuang/core/room/anotherroompk/ShowGiftDialogEvent.java index c353dcedf..a4b6f8a8e 100644 --- a/core/src/main/java/com/pikolive/core/room/anotherroompk/ShowGiftDialogEvent.java +++ b/core/src/main/java/com/bingchuang/core/room/anotherroompk/ShowGiftDialogEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.anotherroompk; +package com.bingchuang.core.room.anotherroompk; public class ShowGiftDialogEvent { private int giftId; diff --git a/core/src/main/java/com/pikolive/core/room/anotherroompk/ShowUserInfoDialogEvent.java b/core/src/main/java/com/bingchuang/core/room/anotherroompk/ShowUserInfoDialogEvent.java similarity index 75% rename from core/src/main/java/com/pikolive/core/room/anotherroompk/ShowUserInfoDialogEvent.java rename to core/src/main/java/com/bingchuang/core/room/anotherroompk/ShowUserInfoDialogEvent.java index 3bcd558a2..2bdaeeaa3 100644 --- a/core/src/main/java/com/pikolive/core/room/anotherroompk/ShowUserInfoDialogEvent.java +++ b/core/src/main/java/com/bingchuang/core/room/anotherroompk/ShowUserInfoDialogEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.anotherroompk; +package com.bingchuang.core.room.anotherroompk; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/room/anotherroompk/SimpleRoomInfo.kt b/core/src/main/java/com/bingchuang/core/room/anotherroompk/SimpleRoomInfo.kt similarity index 87% rename from core/src/main/java/com/pikolive/core/room/anotherroompk/SimpleRoomInfo.kt rename to core/src/main/java/com/bingchuang/core/room/anotherroompk/SimpleRoomInfo.kt index 38f0916ae..2ba33847b 100644 --- a/core/src/main/java/com/pikolive/core/room/anotherroompk/SimpleRoomInfo.kt +++ b/core/src/main/java/com/bingchuang/core/room/anotherroompk/SimpleRoomInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.room.anotherroompk +package com.bingchuang.core.room.anotherroompk import java.io.Serializable diff --git a/core/src/main/java/com/pikolive/core/room/anotherroompk/SingleRoomPKModel.kt b/core/src/main/java/com/bingchuang/core/room/anotherroompk/SingleRoomPKModel.kt similarity index 95% rename from core/src/main/java/com/pikolive/core/room/anotherroompk/SingleRoomPKModel.kt rename to core/src/main/java/com/bingchuang/core/room/anotherroompk/SingleRoomPKModel.kt index 4cbc86eef..5a73c50cd 100644 --- a/core/src/main/java/com/pikolive/core/room/anotherroompk/SingleRoomPKModel.kt +++ b/core/src/main/java/com/bingchuang/core/room/anotherroompk/SingleRoomPKModel.kt @@ -1,8 +1,8 @@ -package com.pikolive.core.room.anotherroompk +package com.bingchuang.core.room.anotherroompk -import com.pikolive.core.bean.response.ServiceResult -import com.pikolive.core.manager.AvRoomDataManager -import com.pikolive.core.utils.net.RxHelper +import com.bingchuang.core.bean.response.ServiceResult +import com.bingchuang.core.manager.AvRoomDataManager +import com.bingchuang.core.utils.net.RxHelper import com.bingchuang.library.net.rxnet.RxNet import io.reactivex.Single import retrofit2.http.* diff --git a/core/src/main/java/com/pikolive/core/room/auction/IAuctionCore.java b/core/src/main/java/com/bingchuang/core/room/auction/IAuctionCore.java similarity index 86% rename from core/src/main/java/com/pikolive/core/room/auction/IAuctionCore.java rename to core/src/main/java/com/bingchuang/core/room/auction/IAuctionCore.java index dad7066e8..968b6a661 100644 --- a/core/src/main/java/com/pikolive/core/room/auction/IAuctionCore.java +++ b/core/src/main/java/com/bingchuang/core/room/auction/IAuctionCore.java @@ -1,8 +1,8 @@ -package com.pikolive.core.room.auction; +package com.bingchuang.core.room.auction; -import com.pikolive.core.room.auction.bean.AuctionInfo; -import com.pikolive.core.room.auction.bean.AuctionInfo; -import com.pikolive.core.room.auction.bean.AuctionInfo; +import com.bingchuang.core.room.auction.bean.AuctionInfo; +import com.bingchuang.core.room.auction.bean.AuctionInfo; +import com.bingchuang.core.room.auction.bean.AuctionInfo; import com.bingchuang.library.coremanager.IBaseCore; /** diff --git a/core/src/main/java/com/pikolive/core/room/auction/IAuctionCoreClient.java b/core/src/main/java/com/bingchuang/core/room/auction/IAuctionCoreClient.java similarity index 79% rename from core/src/main/java/com/pikolive/core/room/auction/IAuctionCoreClient.java rename to core/src/main/java/com/bingchuang/core/room/auction/IAuctionCoreClient.java index 7ba6529c8..93e6f2edb 100644 --- a/core/src/main/java/com/pikolive/core/room/auction/IAuctionCoreClient.java +++ b/core/src/main/java/com/bingchuang/core/room/auction/IAuctionCoreClient.java @@ -1,11 +1,11 @@ -package com.pikolive.core.room.auction; +package com.bingchuang.core.room.auction; -import com.pikolive.core.room.auction.bean.AuctionInfo; -import com.pikolive.core.room.auction.bean.AuctionListUserInfo; -import com.pikolive.core.room.auction.bean.AuctionInfo; -import com.pikolive.core.room.auction.bean.AuctionListUserInfo; -import com.pikolive.core.room.auction.bean.AuctionInfo; -import com.pikolive.core.room.auction.bean.AuctionListUserInfo; +import com.bingchuang.core.room.auction.bean.AuctionInfo; +import com.bingchuang.core.room.auction.bean.AuctionListUserInfo; +import com.bingchuang.core.room.auction.bean.AuctionInfo; +import com.bingchuang.core.room.auction.bean.AuctionListUserInfo; +import com.bingchuang.core.room.auction.bean.AuctionInfo; +import com.bingchuang.core.room.auction.bean.AuctionListUserInfo; import com.bingchuang.library.coremanager.ICoreClient; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/room/auction/bean/AuctionInfo.java b/core/src/main/java/com/bingchuang/core/room/auction/bean/AuctionInfo.java similarity index 98% rename from core/src/main/java/com/pikolive/core/room/auction/bean/AuctionInfo.java rename to core/src/main/java/com/bingchuang/core/room/auction/bean/AuctionInfo.java index 136674ef3..b5c60cf1c 100644 --- a/core/src/main/java/com/pikolive/core/room/auction/bean/AuctionInfo.java +++ b/core/src/main/java/com/bingchuang/core/room/auction/bean/AuctionInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.auction.bean; +package com.bingchuang.core.room.auction.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/room/auction/bean/AuctionListUserInfo.java b/core/src/main/java/com/bingchuang/core/room/auction/bean/AuctionListUserInfo.java similarity index 96% rename from core/src/main/java/com/pikolive/core/room/auction/bean/AuctionListUserInfo.java rename to core/src/main/java/com/bingchuang/core/room/auction/bean/AuctionListUserInfo.java index fd2125a11..f4331bdfe 100644 --- a/core/src/main/java/com/pikolive/core/room/auction/bean/AuctionListUserInfo.java +++ b/core/src/main/java/com/bingchuang/core/room/auction/bean/AuctionListUserInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.auction.bean; +package com.bingchuang.core.room.auction.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/room/auction/bean/AuctionUser.java b/core/src/main/java/com/bingchuang/core/room/auction/bean/AuctionUser.java similarity index 95% rename from core/src/main/java/com/pikolive/core/room/auction/bean/AuctionUser.java rename to core/src/main/java/com/bingchuang/core/room/auction/bean/AuctionUser.java index 5be70cdcf..4f6251611 100644 --- a/core/src/main/java/com/pikolive/core/room/auction/bean/AuctionUser.java +++ b/core/src/main/java/com/bingchuang/core/room/auction/bean/AuctionUser.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.auction.bean; +package com.bingchuang.core.room.auction.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/room/bean/AnchorInfo.kt b/core/src/main/java/com/bingchuang/core/room/bean/AnchorInfo.kt similarity index 76% rename from core/src/main/java/com/pikolive/core/room/bean/AnchorInfo.kt rename to core/src/main/java/com/bingchuang/core/room/bean/AnchorInfo.kt index 5770e469d..05bd883ef 100644 --- a/core/src/main/java/com/pikolive/core/room/bean/AnchorInfo.kt +++ b/core/src/main/java/com/bingchuang/core/room/bean/AnchorInfo.kt @@ -1,6 +1,6 @@ -package com.pikolive.core.room.bean +package com.bingchuang.core.room.bean -import com.pikolive.core.user.bean.UserInfoSkillEntity +import com.bingchuang.core.user.bean.UserInfoSkillEntity data class AnchorInfo( val absCardPics: List
? = null, diff --git a/core/src/main/java/com/pikolive/core/room/bean/BoxSwitchVo.java b/core/src/main/java/com/bingchuang/core/room/bean/BoxSwitchVo.java similarity index 98% rename from core/src/main/java/com/pikolive/core/room/bean/BoxSwitchVo.java rename to core/src/main/java/com/bingchuang/core/room/bean/BoxSwitchVo.java index 26e3cc1ad..95508d8f5 100644 --- a/core/src/main/java/com/pikolive/core/room/bean/BoxSwitchVo.java +++ b/core/src/main/java/com/bingchuang/core/room/bean/BoxSwitchVo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.bean; +package com.bingchuang.core.room.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/main/java/com/pikolive/core/room/bean/BroadcastInfo.kt b/core/src/main/java/com/bingchuang/core/room/bean/BroadcastInfo.kt similarity index 85% rename from core/src/main/java/com/pikolive/core/room/bean/BroadcastInfo.kt rename to core/src/main/java/com/bingchuang/core/room/bean/BroadcastInfo.kt index 4aa954a30..863abf93a 100644 --- a/core/src/main/java/com/pikolive/core/room/bean/BroadcastInfo.kt +++ b/core/src/main/java/com/bingchuang/core/room/bean/BroadcastInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.room.bean +package com.bingchuang.core.room.bean data class BroadcastInfo( val availableTimes: Long = 0, diff --git a/core/src/main/java/com/pikolive/core/room/bean/DatingAllNotifyInfo.kt b/core/src/main/java/com/bingchuang/core/room/bean/DatingAllNotifyInfo.kt similarity index 94% rename from core/src/main/java/com/pikolive/core/room/bean/DatingAllNotifyInfo.kt rename to core/src/main/java/com/bingchuang/core/room/bean/DatingAllNotifyInfo.kt index 2eb8ce4a9..e6cee03d8 100644 --- a/core/src/main/java/com/pikolive/core/room/bean/DatingAllNotifyInfo.kt +++ b/core/src/main/java/com/bingchuang/core/room/bean/DatingAllNotifyInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.room.bean +package com.bingchuang.core.room.bean import java.io.Serializable diff --git a/core/src/main/java/com/pikolive/core/room/bean/DatingNotifyInfo.kt b/core/src/main/java/com/bingchuang/core/room/bean/DatingNotifyInfo.kt similarity index 96% rename from core/src/main/java/com/pikolive/core/room/bean/DatingNotifyInfo.kt rename to core/src/main/java/com/bingchuang/core/room/bean/DatingNotifyInfo.kt index dd1eb65b4..fef141a83 100644 --- a/core/src/main/java/com/pikolive/core/room/bean/DatingNotifyInfo.kt +++ b/core/src/main/java/com/bingchuang/core/room/bean/DatingNotifyInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.room.bean +package com.bingchuang.core.room.bean import java.io.Serializable diff --git a/core/src/main/java/com/pikolive/core/room/bean/DragonBarInfo.java b/core/src/main/java/com/bingchuang/core/room/bean/DragonBarInfo.java similarity index 92% rename from core/src/main/java/com/pikolive/core/room/bean/DragonBarInfo.java rename to core/src/main/java/com/bingchuang/core/room/bean/DragonBarInfo.java index c3f260370..774450308 100644 --- a/core/src/main/java/com/pikolive/core/room/bean/DragonBarInfo.java +++ b/core/src/main/java/com/bingchuang/core/room/bean/DragonBarInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.bean; +package com.bingchuang.core.room.bean; /** * Created by huangmeng1 on 2018/7/12. diff --git a/core/src/main/java/com/pikolive/core/room/bean/FindLoveSwitchVo.java b/core/src/main/java/com/bingchuang/core/room/bean/FindLoveSwitchVo.java similarity index 98% rename from core/src/main/java/com/pikolive/core/room/bean/FindLoveSwitchVo.java rename to core/src/main/java/com/bingchuang/core/room/bean/FindLoveSwitchVo.java index e72da1ea9..b8228779d 100644 --- a/core/src/main/java/com/pikolive/core/room/bean/FindLoveSwitchVo.java +++ b/core/src/main/java/com/bingchuang/core/room/bean/FindLoveSwitchVo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.bean; +package com.bingchuang.core.room.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/main/java/com/pikolive/core/room/bean/HomeLiveTopInfo.kt b/core/src/main/java/com/bingchuang/core/room/bean/HomeLiveTopInfo.kt similarity index 89% rename from core/src/main/java/com/pikolive/core/room/bean/HomeLiveTopInfo.kt rename to core/src/main/java/com/bingchuang/core/room/bean/HomeLiveTopInfo.kt index b65522c8e..b58a99cf2 100644 --- a/core/src/main/java/com/pikolive/core/room/bean/HomeLiveTopInfo.kt +++ b/core/src/main/java/com/bingchuang/core/room/bean/HomeLiveTopInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.room.bean +package com.bingchuang.core.room.bean data class HomeLiveTopInfo( val onceLookStatus: Boolean = false, diff --git a/core/src/main/java/com/pikolive/core/room/bean/LeaveModeAttachment.java b/core/src/main/java/com/bingchuang/core/room/bean/LeaveModeAttachment.java similarity index 91% rename from core/src/main/java/com/pikolive/core/room/bean/LeaveModeAttachment.java rename to core/src/main/java/com/bingchuang/core/room/bean/LeaveModeAttachment.java index 629c65ea5..18b287666 100644 --- a/core/src/main/java/com/pikolive/core/room/bean/LeaveModeAttachment.java +++ b/core/src/main/java/com/bingchuang/core/room/bean/LeaveModeAttachment.java @@ -1,7 +1,7 @@ -package com.pikolive.core.room.bean; +package com.bingchuang.core.room.bean; import com.alibaba.fastjson.JSONObject; -import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.im.custom.bean.CustomAttachment; public class LeaveModeAttachment extends CustomAttachment { diff --git a/core/src/main/java/com/pikolive/core/room/bean/MeCenterInfo.kt b/core/src/main/java/com/bingchuang/core/room/bean/MeCenterInfo.kt similarity index 87% rename from core/src/main/java/com/pikolive/core/room/bean/MeCenterInfo.kt rename to core/src/main/java/com/bingchuang/core/room/bean/MeCenterInfo.kt index 152e4d3da..88040aeb1 100644 --- a/core/src/main/java/com/pikolive/core/room/bean/MeCenterInfo.kt +++ b/core/src/main/java/com/bingchuang/core/room/bean/MeCenterInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.room.bean +package com.bingchuang.core.room.bean data class MeCenterInfo( val centerBadge: String?= null, diff --git a/core/src/main/java/com/pikolive/core/room/bean/OnlineChatMember.java b/core/src/main/java/com/bingchuang/core/room/bean/OnlineChatMember.java similarity index 89% rename from core/src/main/java/com/pikolive/core/room/bean/OnlineChatMember.java rename to core/src/main/java/com/bingchuang/core/room/bean/OnlineChatMember.java index 1c3162584..35a4fec63 100644 --- a/core/src/main/java/com/pikolive/core/room/bean/OnlineChatMember.java +++ b/core/src/main/java/com/bingchuang/core/room/bean/OnlineChatMember.java @@ -1,18 +1,18 @@ -package com.pikolive.core.room.bean; +package com.bingchuang.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.pikolive.core.noble.NobleResourceType; -import com.pikolive.core.noble.NobleUtil; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.noble.NobleResourceType; -import com.pikolive.core.noble.NobleUtil; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.noble.NobleResourceType; -import com.pikolive.core.noble.NobleUtil; -import com.pikolive.core.user.bean.UserInfo; +import com.bingchuang.core.noble.NobleResourceType; +import com.bingchuang.core.noble.NobleUtil; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.noble.NobleResourceType; +import com.bingchuang.core.noble.NobleUtil; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.noble.NobleResourceType; +import com.bingchuang.core.noble.NobleUtil; +import com.bingchuang.core.user.bean.UserInfo; import com.bingchuang.library.utils.ListUtils; import java.util.ArrayList; diff --git a/core/src/main/java/com/pikolive/core/room/bean/RoomAudioSdkType.java b/core/src/main/java/com/bingchuang/core/room/bean/RoomAudioSdkType.java similarity index 79% rename from core/src/main/java/com/pikolive/core/room/bean/RoomAudioSdkType.java rename to core/src/main/java/com/bingchuang/core/room/bean/RoomAudioSdkType.java index 080481671..d846e11af 100644 --- a/core/src/main/java/com/pikolive/core/room/bean/RoomAudioSdkType.java +++ b/core/src/main/java/com/bingchuang/core/room/bean/RoomAudioSdkType.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.bean; +package com.bingchuang.core.room.bean; /** *房间语音SDK类型 diff --git a/core/src/main/java/com/pikolive/core/room/bean/RoomContributeDataInfo.java b/core/src/main/java/com/bingchuang/core/room/bean/RoomContributeDataInfo.java similarity index 99% rename from core/src/main/java/com/pikolive/core/room/bean/RoomContributeDataInfo.java rename to core/src/main/java/com/bingchuang/core/room/bean/RoomContributeDataInfo.java index 47b9e3b16..cd2a36512 100644 --- a/core/src/main/java/com/pikolive/core/room/bean/RoomContributeDataInfo.java +++ b/core/src/main/java/com/bingchuang/core/room/bean/RoomContributeDataInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.bean; +package com.bingchuang.core.room.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/main/java/com/pikolive/core/room/bean/RoomContributeRoomInfo.java b/core/src/main/java/com/bingchuang/core/room/bean/RoomContributeRoomInfo.java similarity index 98% rename from core/src/main/java/com/pikolive/core/room/bean/RoomContributeRoomInfo.java rename to core/src/main/java/com/bingchuang/core/room/bean/RoomContributeRoomInfo.java index 9566e02ea..1705ce51d 100644 --- a/core/src/main/java/com/pikolive/core/room/bean/RoomContributeRoomInfo.java +++ b/core/src/main/java/com/bingchuang/core/room/bean/RoomContributeRoomInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.bean; +package com.bingchuang.core.room.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/main/java/com/pikolive/core/room/bean/RoomContributeUserInfo.java b/core/src/main/java/com/bingchuang/core/room/bean/RoomContributeUserInfo.java similarity index 99% rename from core/src/main/java/com/pikolive/core/room/bean/RoomContributeUserInfo.java rename to core/src/main/java/com/bingchuang/core/room/bean/RoomContributeUserInfo.java index 49c769a17..d9a542a90 100644 --- a/core/src/main/java/com/pikolive/core/room/bean/RoomContributeUserInfo.java +++ b/core/src/main/java/com/bingchuang/core/room/bean/RoomContributeUserInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.bean; +package com.bingchuang.core.room.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/main/java/com/pikolive/core/room/bean/RoomInfo.java b/core/src/main/java/com/bingchuang/core/room/bean/RoomInfo.java similarity index 99% rename from core/src/main/java/com/pikolive/core/room/bean/RoomInfo.java rename to core/src/main/java/com/bingchuang/core/room/bean/RoomInfo.java index 61195dd14..88973da47 100644 --- a/core/src/main/java/com/pikolive/core/room/bean/RoomInfo.java +++ b/core/src/main/java/com/bingchuang/core/room/bean/RoomInfo.java @@ -1,9 +1,9 @@ -package com.pikolive.core.room.bean; +package com.bingchuang.core.room.bean; import android.os.Parcel; import android.os.Parcelable; -import com.pikolive.core.R; +import com.bingchuang.core.R; import com.bingchuang.library.utils.ResUtil; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/room/bean/RoomInviteFansInfo.kt b/core/src/main/java/com/bingchuang/core/room/bean/RoomInviteFansInfo.kt similarity index 83% rename from core/src/main/java/com/pikolive/core/room/bean/RoomInviteFansInfo.kt rename to core/src/main/java/com/bingchuang/core/room/bean/RoomInviteFansInfo.kt index 24b37e96c..30471e658 100644 --- a/core/src/main/java/com/pikolive/core/room/bean/RoomInviteFansInfo.kt +++ b/core/src/main/java/com/bingchuang/core/room/bean/RoomInviteFansInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.room.bean +package com.bingchuang.core.room.bean data class RoomInviteFansInfo( diff --git a/core/src/main/java/com/pikolive/core/room/bean/RoomListResult.java b/core/src/main/java/com/bingchuang/core/room/bean/RoomListResult.java similarity index 61% rename from core/src/main/java/com/pikolive/core/room/bean/RoomListResult.java rename to core/src/main/java/com/bingchuang/core/room/bean/RoomListResult.java index 4bdd0c674..35673d9e0 100644 --- a/core/src/main/java/com/pikolive/core/room/bean/RoomListResult.java +++ b/core/src/main/java/com/bingchuang/core/room/bean/RoomListResult.java @@ -1,6 +1,6 @@ -package com.pikolive.core.room.bean; +package com.bingchuang.core.room.bean; -import com.pikolive.core.bean.response.ServiceResult; +import com.bingchuang.core.bean.response.ServiceResult; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/room/bean/RoomMessageViewNoticeInfo.java b/core/src/main/java/com/bingchuang/core/room/bean/RoomMessageViewNoticeInfo.java similarity index 79% rename from core/src/main/java/com/pikolive/core/room/bean/RoomMessageViewNoticeInfo.java rename to core/src/main/java/com/bingchuang/core/room/bean/RoomMessageViewNoticeInfo.java index 5a9b5a4b4..c587269a7 100644 --- a/core/src/main/java/com/pikolive/core/room/bean/RoomMessageViewNoticeInfo.java +++ b/core/src/main/java/com/bingchuang/core/room/bean/RoomMessageViewNoticeInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.bean; +package com.bingchuang.core.room.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/room/bean/RoomModeType.java b/core/src/main/java/com/bingchuang/core/room/bean/RoomModeType.java similarity index 88% rename from core/src/main/java/com/pikolive/core/room/bean/RoomModeType.java rename to core/src/main/java/com/bingchuang/core/room/bean/RoomModeType.java index 456d54c87..802df57a5 100644 --- a/core/src/main/java/com/pikolive/core/room/bean/RoomModeType.java +++ b/core/src/main/java/com/bingchuang/core/room/bean/RoomModeType.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.bean; +package com.bingchuang.core.room.bean; /** * 房间各种模式的设定 diff --git a/core/src/main/java/com/pikolive/core/room/bean/RoomRankHalfHourDataInfo.java b/core/src/main/java/com/bingchuang/core/room/bean/RoomRankHalfHourDataInfo.java similarity index 97% rename from core/src/main/java/com/pikolive/core/room/bean/RoomRankHalfHourDataInfo.java rename to core/src/main/java/com/bingchuang/core/room/bean/RoomRankHalfHourDataInfo.java index d4086faf6..14852b29c 100644 --- a/core/src/main/java/com/pikolive/core/room/bean/RoomRankHalfHourDataInfo.java +++ b/core/src/main/java/com/bingchuang/core/room/bean/RoomRankHalfHourDataInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.bean; +package com.bingchuang.core.room.bean; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/room/bean/RoomRankHalfHourMeInfo.java b/core/src/main/java/com/bingchuang/core/room/bean/RoomRankHalfHourMeInfo.java similarity index 98% rename from core/src/main/java/com/pikolive/core/room/bean/RoomRankHalfHourMeInfo.java rename to core/src/main/java/com/bingchuang/core/room/bean/RoomRankHalfHourMeInfo.java index 7165c4b7e..0cdd5744c 100644 --- a/core/src/main/java/com/pikolive/core/room/bean/RoomRankHalfHourMeInfo.java +++ b/core/src/main/java/com/bingchuang/core/room/bean/RoomRankHalfHourMeInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.bean; +package com.bingchuang.core.room.bean; public class RoomRankHalfHourMeInfo { diff --git a/core/src/main/java/com/pikolive/core/room/bean/RoomRankHalfHourRankInfo.java b/core/src/main/java/com/bingchuang/core/room/bean/RoomRankHalfHourRankInfo.java similarity index 98% rename from core/src/main/java/com/pikolive/core/room/bean/RoomRankHalfHourRankInfo.java rename to core/src/main/java/com/bingchuang/core/room/bean/RoomRankHalfHourRankInfo.java index 9e6498852..a7f2087c3 100644 --- a/core/src/main/java/com/pikolive/core/room/bean/RoomRankHalfHourRankInfo.java +++ b/core/src/main/java/com/bingchuang/core/room/bean/RoomRankHalfHourRankInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.bean; +package com.bingchuang.core.room.bean; public class RoomRankHalfHourRankInfo { diff --git a/core/src/main/java/com/pikolive/core/room/bean/RoomRankMultiItem.java b/core/src/main/java/com/bingchuang/core/room/bean/RoomRankMultiItem.java similarity index 94% rename from core/src/main/java/com/pikolive/core/room/bean/RoomRankMultiItem.java rename to core/src/main/java/com/bingchuang/core/room/bean/RoomRankMultiItem.java index 9725df29b..c0b409cf3 100644 --- a/core/src/main/java/com/pikolive/core/room/bean/RoomRankMultiItem.java +++ b/core/src/main/java/com/bingchuang/core/room/bean/RoomRankMultiItem.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.bean; +package com.bingchuang.core.room.bean; import com.chad.library.adapter.base.entity.MultiItemEntity; diff --git a/core/src/main/java/com/pikolive/core/room/bean/RoomResult.java b/core/src/main/java/com/bingchuang/core/room/bean/RoomResult.java similarity index 54% rename from core/src/main/java/com/pikolive/core/room/bean/RoomResult.java rename to core/src/main/java/com/bingchuang/core/room/bean/RoomResult.java index 04427df29..09d0683b2 100644 --- a/core/src/main/java/com/pikolive/core/room/bean/RoomResult.java +++ b/core/src/main/java/com/bingchuang/core/room/bean/RoomResult.java @@ -1,6 +1,6 @@ -package com.pikolive.core.room.bean; +package com.bingchuang.core.room.bean; -import com.pikolive.core.bean.response.ServiceResult; +import com.bingchuang.core.bean.response.ServiceResult; /** * Created by zhouxiangfeng on 2017/5/4. diff --git a/core/src/main/java/com/pikolive/core/room/bean/RoomSettingTabInfo.java b/core/src/main/java/com/bingchuang/core/room/bean/RoomSettingTabInfo.java similarity index 98% rename from core/src/main/java/com/pikolive/core/room/bean/RoomSettingTabInfo.java rename to core/src/main/java/com/bingchuang/core/room/bean/RoomSettingTabInfo.java index 3488ebe58..0f4975079 100644 --- a/core/src/main/java/com/pikolive/core/room/bean/RoomSettingTabInfo.java +++ b/core/src/main/java/com/bingchuang/core/room/bean/RoomSettingTabInfo.java @@ -1,9 +1,9 @@ -package com.pikolive.core.room.bean; +package com.bingchuang.core.room.bean; import android.os.Parcel; import android.os.Parcelable; -import com.pikolive.core.R; +import com.bingchuang.core.R; import com.bingchuang.library.utils.ResUtil; import java.util.ArrayList; diff --git a/core/src/main/java/com/pikolive/core/room/bean/RoomWelcomeConfig.java b/core/src/main/java/com/bingchuang/core/room/bean/RoomWelcomeConfig.java similarity index 87% rename from core/src/main/java/com/pikolive/core/room/bean/RoomWelcomeConfig.java rename to core/src/main/java/com/bingchuang/core/room/bean/RoomWelcomeConfig.java index cad8f41fa..7151ddaed 100644 --- a/core/src/main/java/com/pikolive/core/room/bean/RoomWelcomeConfig.java +++ b/core/src/main/java/com/bingchuang/core/room/bean/RoomWelcomeConfig.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.bean; +package com.bingchuang.core.room.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/room/bean/SearchRoomInfo.java b/core/src/main/java/com/bingchuang/core/room/bean/SearchRoomInfo.java similarity index 91% rename from core/src/main/java/com/pikolive/core/room/bean/SearchRoomInfo.java rename to core/src/main/java/com/bingchuang/core/room/bean/SearchRoomInfo.java index ab1c33327..5cfe79e12 100644 --- a/core/src/main/java/com/pikolive/core/room/bean/SearchRoomInfo.java +++ b/core/src/main/java/com/bingchuang/core/room/bean/SearchRoomInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.bean; +package com.bingchuang.core.room.bean; import android.graphics.Color; import android.os.Parcel; @@ -9,13 +9,13 @@ import android.text.TextUtils; import android.text.style.ForegroundColorSpan; import com.chad.library.adapter.base.entity.MultiItemEntity; -import com.pikolive.core.level.UserLevelVo; -import com.pikolive.core.noble.NobleInfo; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core2.home.bean.BannerInfo; -import com.pikolive.core.level.UserLevelVo; -import com.pikolive.core.noble.NobleInfo; -import com.pikolive.core.user.bean.UserInfo; +import com.bingchuang.core.level.UserLevelVo; +import com.bingchuang.core.noble.NobleInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core2.home.bean.BannerInfo; +import com.bingchuang.core.level.UserLevelVo; +import com.bingchuang.core.noble.NobleInfo; +import com.bingchuang.core.user.bean.UserInfo; import com.bingchuang.library.utils.ListUtils; import java.util.ArrayList; diff --git a/core/src/main/java/com/pikolive/core/room/bean/SeizeTreasureSwitchVo.kt b/core/src/main/java/com/bingchuang/core/room/bean/SeizeTreasureSwitchVo.kt similarity index 82% rename from core/src/main/java/com/pikolive/core/room/bean/SeizeTreasureSwitchVo.kt rename to core/src/main/java/com/bingchuang/core/room/bean/SeizeTreasureSwitchVo.kt index 2e69b7c2b..7dee399a0 100644 --- a/core/src/main/java/com/pikolive/core/room/bean/SeizeTreasureSwitchVo.kt +++ b/core/src/main/java/com/bingchuang/core/room/bean/SeizeTreasureSwitchVo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.room.bean +package com.bingchuang.core.room.bean import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/src/main/java/com/pikolive/core/room/bean/ShowUserInfoDialog.java b/core/src/main/java/com/bingchuang/core/room/bean/ShowUserInfoDialog.java similarity index 92% rename from core/src/main/java/com/pikolive/core/room/bean/ShowUserInfoDialog.java rename to core/src/main/java/com/bingchuang/core/room/bean/ShowUserInfoDialog.java index c8c676541..10500ecfe 100644 --- a/core/src/main/java/com/pikolive/core/room/bean/ShowUserInfoDialog.java +++ b/core/src/main/java/com/bingchuang/core/room/bean/ShowUserInfoDialog.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.bean; +package com.bingchuang.core.room.bean; /** * Created by huangmeng1 on 2018/8/6. diff --git a/core/src/main/java/com/pikolive/core/room/bean/SimplePartyRoomInfo.java b/core/src/main/java/com/bingchuang/core/room/bean/SimplePartyRoomInfo.java similarity index 78% rename from core/src/main/java/com/pikolive/core/room/bean/SimplePartyRoomInfo.java rename to core/src/main/java/com/bingchuang/core/room/bean/SimplePartyRoomInfo.java index 12a9f25de..0ccaea4e9 100644 --- a/core/src/main/java/com/pikolive/core/room/bean/SimplePartyRoomInfo.java +++ b/core/src/main/java/com/bingchuang/core/room/bean/SimplePartyRoomInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.bean; +package com.bingchuang.core.room.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/room/bean/SingleRoomSortInfo.kt b/core/src/main/java/com/bingchuang/core/room/bean/SingleRoomSortInfo.kt similarity index 69% rename from core/src/main/java/com/pikolive/core/room/bean/SingleRoomSortInfo.kt rename to core/src/main/java/com/bingchuang/core/room/bean/SingleRoomSortInfo.kt index 9c4eb2770..30899e68b 100644 --- a/core/src/main/java/com/pikolive/core/room/bean/SingleRoomSortInfo.kt +++ b/core/src/main/java/com/bingchuang/core/room/bean/SingleRoomSortInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.room.bean +package com.bingchuang.core.room.bean data class SingleRoomSortInfo( val id: Long? = 0, diff --git a/core/src/main/java/com/pikolive/core/room/bean/UpMic.java b/core/src/main/java/com/bingchuang/core/room/bean/UpMic.java similarity index 81% rename from core/src/main/java/com/pikolive/core/room/bean/UpMic.java rename to core/src/main/java/com/bingchuang/core/room/bean/UpMic.java index 598f7b46e..987c99cfd 100644 --- a/core/src/main/java/com/pikolive/core/room/bean/UpMic.java +++ b/core/src/main/java/com/bingchuang/core/room/bean/UpMic.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.bean; +package com.bingchuang.core.room.bean; /** * Created by huangmeng1 on 2018/7/27. diff --git a/core/src/main/java/com/pikolive/core/room/bean/WelcomeInfo.java b/core/src/main/java/com/bingchuang/core/room/bean/WelcomeInfo.java similarity index 96% rename from core/src/main/java/com/pikolive/core/room/bean/WelcomeInfo.java rename to core/src/main/java/com/bingchuang/core/room/bean/WelcomeInfo.java index 6764502c4..9c4e42501 100644 --- a/core/src/main/java/com/pikolive/core/room/bean/WelcomeInfo.java +++ b/core/src/main/java/com/bingchuang/core/room/bean/WelcomeInfo.java @@ -1,9 +1,9 @@ -package com.pikolive.core.room.bean; +package com.bingchuang.core.room.bean; import android.text.TextUtils; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.pikolive.core.R; +import com.bingchuang.core.R; import com.bingchuang.library.utils.ResUtil; import lombok.Getter; diff --git a/core/src/main/java/com/pikolive/core/room/core/RoomDataService.kt b/core/src/main/java/com/bingchuang/core/room/core/RoomDataService.kt similarity index 56% rename from core/src/main/java/com/pikolive/core/room/core/RoomDataService.kt rename to core/src/main/java/com/bingchuang/core/room/core/RoomDataService.kt index 4a7b6484b..49512a0b9 100644 --- a/core/src/main/java/com/pikolive/core/room/core/RoomDataService.kt +++ b/core/src/main/java/com/bingchuang/core/room/core/RoomDataService.kt @@ -1,6 +1,6 @@ -package com.pikolive.core.room.core +package com.bingchuang.core.room.core -import com.pikolive.core.support.room.RoomService +import com.bingchuang.core.support.room.RoomService /** * Created by Max on 2023/10/26 12:36 diff --git a/core/src/main/java/com/pikolive/core/room/dragonball/DragonBallModel.java b/core/src/main/java/com/bingchuang/core/room/dragonball/DragonBallModel.java similarity index 87% rename from core/src/main/java/com/pikolive/core/room/dragonball/DragonBallModel.java rename to core/src/main/java/com/bingchuang/core/room/dragonball/DragonBallModel.java index 8fe9b26c3..3572f0448 100644 --- a/core/src/main/java/com/pikolive/core/room/dragonball/DragonBallModel.java +++ b/core/src/main/java/com/bingchuang/core/room/dragonball/DragonBallModel.java @@ -1,12 +1,12 @@ -package com.pikolive.core.room.dragonball; +package com.bingchuang.core.room.dragonball; -import com.pikolive.core.R; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core.room.bean.DragonBarInfo; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.R; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core.room.bean.DragonBarInfo; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.utils.ResUtil; diff --git a/core/src/main/java/com/pikolive/core/room/dragonball/IDragonBallModel.java b/core/src/main/java/com/bingchuang/core/room/dragonball/IDragonBallModel.java similarity index 66% rename from core/src/main/java/com/pikolive/core/room/dragonball/IDragonBallModel.java rename to core/src/main/java/com/bingchuang/core/room/dragonball/IDragonBallModel.java index 35b2855c0..8277d20b2 100644 --- a/core/src/main/java/com/pikolive/core/room/dragonball/IDragonBallModel.java +++ b/core/src/main/java/com/bingchuang/core/room/dragonball/IDragonBallModel.java @@ -1,7 +1,7 @@ -package com.pikolive.core.room.dragonball; +package com.bingchuang.core.room.dragonball; -import com.pikolive.core.base.IModel; -import com.pikolive.core.room.bean.DragonBarInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.room.bean.DragonBarInfo; import io.reactivex.Single; diff --git a/core/src/main/java/com/pikolive/core/room/event/DatingSelectUserEvent.java b/core/src/main/java/com/bingchuang/core/room/event/DatingSelectUserEvent.java similarity index 93% rename from core/src/main/java/com/pikolive/core/room/event/DatingSelectUserEvent.java rename to core/src/main/java/com/bingchuang/core/room/event/DatingSelectUserEvent.java index 5b699433f..ba93c6415 100644 --- a/core/src/main/java/com/pikolive/core/room/event/DatingSelectUserEvent.java +++ b/core/src/main/java/com/bingchuang/core/room/event/DatingSelectUserEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.event; +package com.bingchuang.core.room.event; public class DatingSelectUserEvent { diff --git a/core/src/main/java/com/bingchuang/core/room/event/EixtCountDownEvent.java b/core/src/main/java/com/bingchuang/core/room/event/EixtCountDownEvent.java new file mode 100644 index 000000000..41ca86a2e --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/room/event/EixtCountDownEvent.java @@ -0,0 +1,4 @@ +package com.bingchuang.core.room.event; + +public class EixtCountDownEvent { +} diff --git a/core/src/main/java/com/bingchuang/core/room/event/FaceIsReadyEvent.java b/core/src/main/java/com/bingchuang/core/room/event/FaceIsReadyEvent.java new file mode 100644 index 000000000..e4155f81b --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/room/event/FaceIsReadyEvent.java @@ -0,0 +1,4 @@ +package com.bingchuang.core.room.event; + +public class FaceIsReadyEvent { +} diff --git a/core/src/main/java/com/bingchuang/core/room/event/FinishAvRoomEvent.java b/core/src/main/java/com/bingchuang/core/room/event/FinishAvRoomEvent.java new file mode 100644 index 000000000..40d2fbf79 --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/room/event/FinishAvRoomEvent.java @@ -0,0 +1,4 @@ +package com.bingchuang.core.room.event; + +public class FinishAvRoomEvent { +} diff --git a/core/src/main/java/com/pikolive/core/room/event/MessageSizeEvent.java b/core/src/main/java/com/bingchuang/core/room/event/MessageSizeEvent.java similarity index 88% rename from core/src/main/java/com/pikolive/core/room/event/MessageSizeEvent.java rename to core/src/main/java/com/bingchuang/core/room/event/MessageSizeEvent.java index 820214e1a..18d5281c0 100644 --- a/core/src/main/java/com/pikolive/core/room/event/MessageSizeEvent.java +++ b/core/src/main/java/com/bingchuang/core/room/event/MessageSizeEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.event; +package com.bingchuang.core.room.event; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/room/event/ReceiveFaceEvent.java b/core/src/main/java/com/bingchuang/core/room/event/ReceiveFaceEvent.java similarity index 73% rename from core/src/main/java/com/pikolive/core/room/event/ReceiveFaceEvent.java rename to core/src/main/java/com/bingchuang/core/room/event/ReceiveFaceEvent.java index 3707a97ad..27bb19eaf 100644 --- a/core/src/main/java/com/pikolive/core/room/event/ReceiveFaceEvent.java +++ b/core/src/main/java/com/bingchuang/core/room/event/ReceiveFaceEvent.java @@ -1,6 +1,6 @@ -package com.pikolive.core.room.event; +package com.bingchuang.core.room.event; -import com.pikolive.core.room.face.FaceReceiveInfo; +import com.bingchuang.core.room.face.FaceReceiveInfo; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/room/event/RoomAtEvent.java b/core/src/main/java/com/bingchuang/core/room/event/RoomAtEvent.java similarity index 80% rename from core/src/main/java/com/pikolive/core/room/event/RoomAtEvent.java rename to core/src/main/java/com/bingchuang/core/room/event/RoomAtEvent.java index 9c33d9bec..f9ca8d15b 100644 --- a/core/src/main/java/com/pikolive/core/room/event/RoomAtEvent.java +++ b/core/src/main/java/com/bingchuang/core/room/event/RoomAtEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.event; +package com.bingchuang.core.room.event; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/src/main/java/com/bingchuang/core/room/event/RoomClearScreenEvent.java b/core/src/main/java/com/bingchuang/core/room/event/RoomClearScreenEvent.java new file mode 100644 index 000000000..d6e4dc507 --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/room/event/RoomClearScreenEvent.java @@ -0,0 +1,4 @@ +package com.bingchuang.core.room.event; + +public class RoomClearScreenEvent { +} diff --git a/core/src/main/java/com/pikolive/core/room/event/RoomExitEvent.java b/core/src/main/java/com/bingchuang/core/room/event/RoomExitEvent.java similarity index 60% rename from core/src/main/java/com/pikolive/core/room/event/RoomExitEvent.java rename to core/src/main/java/com/bingchuang/core/room/event/RoomExitEvent.java index 06956f330..4dd3773ce 100644 --- a/core/src/main/java/com/pikolive/core/room/event/RoomExitEvent.java +++ b/core/src/main/java/com/bingchuang/core/room/event/RoomExitEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.event; +package com.bingchuang.core.room.event; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/room/event/RoomInfoEvent.java b/core/src/main/java/com/bingchuang/core/room/event/RoomInfoEvent.java similarity index 67% rename from core/src/main/java/com/pikolive/core/room/event/RoomInfoEvent.java rename to core/src/main/java/com/bingchuang/core/room/event/RoomInfoEvent.java index 80db76347..2da1aa73e 100644 --- a/core/src/main/java/com/pikolive/core/room/event/RoomInfoEvent.java +++ b/core/src/main/java/com/bingchuang/core/room/event/RoomInfoEvent.java @@ -1,7 +1,7 @@ -package com.pikolive.core.room.event; +package com.bingchuang.core.room.event; -import com.pikolive.core.Constants; -import com.pikolive.core.room.bean.RoomInfo; +import com.bingchuang.core.Constants; +import com.bingchuang.core.room.bean.RoomInfo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/room/event/RoomShieldEvent.java b/core/src/main/java/com/bingchuang/core/room/event/RoomShieldEvent.java similarity index 60% rename from core/src/main/java/com/pikolive/core/room/event/RoomShieldEvent.java rename to core/src/main/java/com/bingchuang/core/room/event/RoomShieldEvent.java index 3aef07f45..e865e2e00 100644 --- a/core/src/main/java/com/pikolive/core/room/event/RoomShieldEvent.java +++ b/core/src/main/java/com/bingchuang/core/room/event/RoomShieldEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.event; +package com.bingchuang.core.room.event; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/room/event/RoomTaskTipsEvent.java b/core/src/main/java/com/bingchuang/core/room/event/RoomTaskTipsEvent.java similarity index 76% rename from core/src/main/java/com/pikolive/core/room/event/RoomTaskTipsEvent.java rename to core/src/main/java/com/bingchuang/core/room/event/RoomTaskTipsEvent.java index 5ef2369cc..c05121e2d 100644 --- a/core/src/main/java/com/pikolive/core/room/event/RoomTaskTipsEvent.java +++ b/core/src/main/java/com/bingchuang/core/room/event/RoomTaskTipsEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.event; +package com.bingchuang.core.room.event; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/room/event/SwitchRoomEvent.java b/core/src/main/java/com/bingchuang/core/room/event/SwitchRoomEvent.java similarity index 62% rename from core/src/main/java/com/pikolive/core/room/event/SwitchRoomEvent.java rename to core/src/main/java/com/bingchuang/core/room/event/SwitchRoomEvent.java index fb45ad21c..e39898293 100644 --- a/core/src/main/java/com/pikolive/core/room/event/SwitchRoomEvent.java +++ b/core/src/main/java/com/bingchuang/core/room/event/SwitchRoomEvent.java @@ -1,6 +1,6 @@ -package com.pikolive.core.room.event; +package com.bingchuang.core.room.event; -import com.pikolive.core.room.bean.RoomInfo; +import com.bingchuang.core.room.bean.RoomInfo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/room/exception/AntiSpamHitException.java b/core/src/main/java/com/bingchuang/core/room/exception/AntiSpamHitException.java similarity index 75% rename from core/src/main/java/com/pikolive/core/room/exception/AntiSpamHitException.java rename to core/src/main/java/com/bingchuang/core/room/exception/AntiSpamHitException.java index 9773636a4..63bd231c5 100644 --- a/core/src/main/java/com/pikolive/core/room/exception/AntiSpamHitException.java +++ b/core/src/main/java/com/bingchuang/core/room/exception/AntiSpamHitException.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.exception; +package com.bingchuang.core.room.exception; public class AntiSpamHitException extends Exception { diff --git a/core/src/main/java/com/pikolive/core/room/face/DynamicFaceModel.java b/core/src/main/java/com/bingchuang/core/room/face/DynamicFaceModel.java similarity index 95% rename from core/src/main/java/com/pikolive/core/room/face/DynamicFaceModel.java rename to core/src/main/java/com/bingchuang/core/room/face/DynamicFaceModel.java index 3b2d60065..6faf349ea 100644 --- a/core/src/main/java/com/pikolive/core/room/face/DynamicFaceModel.java +++ b/core/src/main/java/com/bingchuang/core/room/face/DynamicFaceModel.java @@ -1,7 +1,7 @@ -package com.pikolive.core.room.face; +package com.bingchuang.core.room.face; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_FACE; -import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_FACE_SEND; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_FACE; +import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_FACE_SEND; import android.annotation.SuppressLint; import android.text.TextUtils; @@ -19,30 +19,30 @@ 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.pikolive.core.room.event.FaceIsReadyEvent; -import com.pikolive.core.room.event.ReceiveFaceEvent; -import com.pikolive.core.room.queue.bean.MicMemberInfo; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.room.event.FaceIsReadyEvent; -import com.pikolive.core.room.event.ReceiveFaceEvent; -import com.pikolive.core.room.queue.bean.MicMemberInfo; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.DemoCache; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.RoomQueueInfo; -import com.pikolive.core.gift.bean.SimpleVipInfo; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.im.custom.bean.FaceAttachment; -import com.pikolive.core.initial.InitialModel; -import com.pikolive.core.initial.bean.InitInfo; -import com.pikolive.core.interceptor.NoParamsInterceptor; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core.vip.UserVipInfo; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.user.UserModel; -import com.pikolive.core.utils.LogUtils; +import com.bingchuang.core.room.event.FaceIsReadyEvent; +import com.bingchuang.core.room.event.ReceiveFaceEvent; +import com.bingchuang.core.room.queue.bean.MicMemberInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.room.event.FaceIsReadyEvent; +import com.bingchuang.core.room.event.ReceiveFaceEvent; +import com.bingchuang.core.room.queue.bean.MicMemberInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.DemoCache; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.RoomQueueInfo; +import com.bingchuang.core.gift.bean.SimpleVipInfo; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.im.custom.bean.FaceAttachment; +import com.bingchuang.core.initial.InitialModel; +import com.bingchuang.core.initial.bean.InitInfo; +import com.bingchuang.core.interceptor.NoParamsInterceptor; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core.vip.UserVipInfo; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.user.UserModel; +import com.bingchuang.core.utils.LogUtils; import com.bingchuang.library.utils.ListUtils; import com.bingchuang.library.utils.NetworkUtils; import com.bingchuang.library.utils.codec.DESUtils; diff --git a/core/src/main/java/com/pikolive/core/room/face/FaceInfo.java b/core/src/main/java/com/bingchuang/core/room/face/FaceInfo.java similarity index 98% rename from core/src/main/java/com/pikolive/core/room/face/FaceInfo.java rename to core/src/main/java/com/bingchuang/core/room/face/FaceInfo.java index 95d10bccb..50dfb649f 100644 --- a/core/src/main/java/com/pikolive/core/room/face/FaceInfo.java +++ b/core/src/main/java/com/bingchuang/core/room/face/FaceInfo.java @@ -1,7 +1,7 @@ -package com.pikolive.core.room.face; +package com.bingchuang.core.room.face; import com.google.gson.annotations.SerializedName; -import com.pikolive.core.gift.bean.SimpleVipInfo; +import com.bingchuang.core.gift.bean.SimpleVipInfo; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/room/face/FaceListInfo.java b/core/src/main/java/com/bingchuang/core/room/face/FaceListInfo.java similarity index 97% rename from core/src/main/java/com/pikolive/core/room/face/FaceListInfo.java rename to core/src/main/java/com/bingchuang/core/room/face/FaceListInfo.java index af9096924..46ef34423 100644 --- a/core/src/main/java/com/pikolive/core/room/face/FaceListInfo.java +++ b/core/src/main/java/com/bingchuang/core/room/face/FaceListInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.face; +package com.bingchuang.core.room.face; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/room/face/FaceReceiveInfo.java b/core/src/main/java/com/bingchuang/core/room/face/FaceReceiveInfo.java similarity index 96% rename from core/src/main/java/com/pikolive/core/room/face/FaceReceiveInfo.java rename to core/src/main/java/com/bingchuang/core/room/face/FaceReceiveInfo.java index c4b2f0b1e..6b3e7dc27 100644 --- a/core/src/main/java/com/pikolive/core/room/face/FaceReceiveInfo.java +++ b/core/src/main/java/com/bingchuang/core/room/face/FaceReceiveInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.face; +package com.bingchuang.core.room.face; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/room/face/IDynamicFaceModel.java b/core/src/main/java/com/bingchuang/core/room/face/IDynamicFaceModel.java similarity index 95% rename from core/src/main/java/com/pikolive/core/room/face/IDynamicFaceModel.java rename to core/src/main/java/com/bingchuang/core/room/face/IDynamicFaceModel.java index de0ba1773..cbe0bdf71 100644 --- a/core/src/main/java/com/pikolive/core/room/face/IDynamicFaceModel.java +++ b/core/src/main/java/com/bingchuang/core/room/face/IDynamicFaceModel.java @@ -1,7 +1,7 @@ -package com.pikolive.core.room.face; +package com.bingchuang.core.room.face; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.pikolive.core.base.IModel; +import com.bingchuang.core.base.IModel; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/room/face/IFaceCore.java b/core/src/main/java/com/bingchuang/core/room/face/IFaceCore.java similarity index 98% rename from core/src/main/java/com/pikolive/core/room/face/IFaceCore.java rename to core/src/main/java/com/bingchuang/core/room/face/IFaceCore.java index 58979b529..253dd0381 100644 --- a/core/src/main/java/com/pikolive/core/room/face/IFaceCore.java +++ b/core/src/main/java/com/bingchuang/core/room/face/IFaceCore.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.face; +package com.bingchuang.core.room.face; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.bingchuang.library.coremanager.IBaseCore; diff --git a/core/src/main/java/com/pikolive/core/room/face/IFaceCoreClient.java b/core/src/main/java/com/bingchuang/core/room/face/IFaceCoreClient.java similarity index 93% rename from core/src/main/java/com/pikolive/core/room/face/IFaceCoreClient.java rename to core/src/main/java/com/bingchuang/core/room/face/IFaceCoreClient.java index 074599d0a..c89cf35f6 100644 --- a/core/src/main/java/com/pikolive/core/room/face/IFaceCoreClient.java +++ b/core/src/main/java/com/bingchuang/core/room/face/IFaceCoreClient.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.face; +package com.bingchuang.core.room.face; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.bingchuang.library.coremanager.ICoreClient; diff --git a/core/src/main/java/com/pikolive/core/room/game/GameCfg.kt b/core/src/main/java/com/bingchuang/core/room/game/GameCfg.kt similarity index 98% rename from core/src/main/java/com/pikolive/core/room/game/GameCfg.kt rename to core/src/main/java/com/bingchuang/core/room/game/GameCfg.kt index c160984a6..5226d72c9 100644 --- a/core/src/main/java/com/pikolive/core/room/game/GameCfg.kt +++ b/core/src/main/java/com/bingchuang/core/room/game/GameCfg.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.room.game +package com.bingchuang.core.room.game /*** * diff --git a/core/src/main/java/com/pikolive/core/room/game/GameCodeInfo.kt b/core/src/main/java/com/bingchuang/core/room/game/GameCodeInfo.kt similarity index 66% rename from core/src/main/java/com/pikolive/core/room/game/GameCodeInfo.kt rename to core/src/main/java/com/bingchuang/core/room/game/GameCodeInfo.kt index af876bf06..20d04d696 100644 --- a/core/src/main/java/com/pikolive/core/room/game/GameCodeInfo.kt +++ b/core/src/main/java/com/bingchuang/core/room/game/GameCodeInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.room.game +package com.bingchuang.core.room.game data class GameCodeInfo( val code: String, diff --git a/core/src/main/java/com/pikolive/core/room/game/GameInfo.kt b/core/src/main/java/com/bingchuang/core/room/game/GameInfo.kt similarity index 85% rename from core/src/main/java/com/pikolive/core/room/game/GameInfo.kt rename to core/src/main/java/com/bingchuang/core/room/game/GameInfo.kt index 161c751f1..2984e260c 100644 --- a/core/src/main/java/com/pikolive/core/room/game/GameInfo.kt +++ b/core/src/main/java/com/bingchuang/core/room/game/GameInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.room.game +package com.bingchuang.core.room.game data class GameInfo( val isShow: Boolean = false, diff --git a/core/src/main/java/com/pikolive/core/room/game/GameModel.kt b/core/src/main/java/com/bingchuang/core/room/game/GameModel.kt similarity index 82% rename from core/src/main/java/com/pikolive/core/room/game/GameModel.kt rename to core/src/main/java/com/bingchuang/core/room/game/GameModel.kt index 47bbac49a..8fedce2e2 100644 --- a/core/src/main/java/com/pikolive/core/room/game/GameModel.kt +++ b/core/src/main/java/com/bingchuang/core/room/game/GameModel.kt @@ -1,9 +1,9 @@ -package com.pikolive.core.room.game +package com.bingchuang.core.room.game -import com.pikolive.core.auth.AuthModel -import com.pikolive.core.base.BaseModel -import com.pikolive.core.bean.response.ServiceResult -import com.pikolive.core.utils.net.RxHelper +import com.bingchuang.core.auth.AuthModel +import com.bingchuang.core.base.BaseModel +import com.bingchuang.core.bean.response.ServiceResult +import com.bingchuang.core.utils.net.RxHelper import com.bingchuang.library.net.rxnet.RxNet import io.reactivex.Single import retrofit2.http.* diff --git a/core/src/main/java/com/pikolive/core/room/game/GameStatus.java b/core/src/main/java/com/bingchuang/core/room/game/GameStatus.java similarity index 78% rename from core/src/main/java/com/pikolive/core/room/game/GameStatus.java rename to core/src/main/java/com/bingchuang/core/room/game/GameStatus.java index 96a05a815..2be8f44da 100644 --- a/core/src/main/java/com/pikolive/core/room/game/GameStatus.java +++ b/core/src/main/java/com/bingchuang/core/room/game/GameStatus.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.game; +package com.bingchuang.core.room.game; public interface GameStatus { int STATUS_NOT_JOIN = 0; diff --git a/core/src/main/java/com/pikolive/core/room/giftvalue/GiftValueModel.java b/core/src/main/java/com/bingchuang/core/room/giftvalue/GiftValueModel.java similarity index 90% rename from core/src/main/java/com/pikolive/core/room/giftvalue/GiftValueModel.java rename to core/src/main/java/com/bingchuang/core/room/giftvalue/GiftValueModel.java index 10dfb70d8..91302276c 100644 --- a/core/src/main/java/com/pikolive/core/room/giftvalue/GiftValueModel.java +++ b/core/src/main/java/com/bingchuang/core/room/giftvalue/GiftValueModel.java @@ -1,13 +1,13 @@ -package com.pikolive.core.room.giftvalue; +package com.bingchuang.core.room.giftvalue; import com.google.gson.JsonElement; -import com.pikolive.core.room.giftvalue.bean.RoomGiftValue; -import com.pikolive.core.room.giftvalue.bean.RoomGiftValue; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core.room.giftvalue.bean.RoomGiftValue; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.room.giftvalue.bean.RoomGiftValue; +import com.bingchuang.core.room.giftvalue.bean.RoomGiftValue; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core.room.giftvalue.bean.RoomGiftValue; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.utils.JavaUtil; diff --git a/core/src/main/java/com/pikolive/core/room/giftvalue/IGiftValueModel.java b/core/src/main/java/com/bingchuang/core/room/giftvalue/IGiftValueModel.java similarity index 75% rename from core/src/main/java/com/pikolive/core/room/giftvalue/IGiftValueModel.java rename to core/src/main/java/com/bingchuang/core/room/giftvalue/IGiftValueModel.java index c718be408..ff6110b3f 100644 --- a/core/src/main/java/com/pikolive/core/room/giftvalue/IGiftValueModel.java +++ b/core/src/main/java/com/bingchuang/core/room/giftvalue/IGiftValueModel.java @@ -1,8 +1,8 @@ -package com.pikolive.core.room.giftvalue; +package com.bingchuang.core.room.giftvalue; -import com.pikolive.core.room.giftvalue.bean.RoomGiftValue; -import com.pikolive.core.room.giftvalue.bean.RoomGiftValue; -import com.pikolive.core.room.giftvalue.bean.RoomGiftValue; +import com.bingchuang.core.room.giftvalue.bean.RoomGiftValue; +import com.bingchuang.core.room.giftvalue.bean.RoomGiftValue; +import com.bingchuang.core.room.giftvalue.bean.RoomGiftValue; import io.reactivex.Single; diff --git a/core/src/main/java/com/pikolive/core/room/giftvalue/bean/GiftValueCommonUpdate.java b/core/src/main/java/com/bingchuang/core/room/giftvalue/bean/GiftValueCommonUpdate.java similarity index 92% rename from core/src/main/java/com/pikolive/core/room/giftvalue/bean/GiftValueCommonUpdate.java rename to core/src/main/java/com/bingchuang/core/room/giftvalue/bean/GiftValueCommonUpdate.java index a56babc84..096db11c7 100644 --- a/core/src/main/java/com/pikolive/core/room/giftvalue/bean/GiftValueCommonUpdate.java +++ b/core/src/main/java/com/bingchuang/core/room/giftvalue/bean/GiftValueCommonUpdate.java @@ -1,11 +1,11 @@ -package com.pikolive.core.room.giftvalue.bean; +package com.bingchuang.core.room.giftvalue.bean; -import com.pikolive.core.gift.GiftModel; -import com.pikolive.core.gift.bean.GiftInfo; -import com.pikolive.core.gift.bean.GiftMultiReceiverInfo; -import com.pikolive.core.gift.bean.GiftReceiveInfo; -import com.pikolive.core.gift.bean.LuckyBagGifts; -import com.pikolive.core.gift.bean.MultiGiftReceiveInfo; +import com.bingchuang.core.gift.GiftModel; +import com.bingchuang.core.gift.bean.GiftInfo; +import com.bingchuang.core.gift.bean.GiftMultiReceiverInfo; +import com.bingchuang.core.gift.bean.GiftReceiveInfo; +import com.bingchuang.core.gift.bean.LuckyBagGifts; +import com.bingchuang.core.gift.bean.MultiGiftReceiveInfo; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/room/giftvalue/bean/GiftValueData.java b/core/src/main/java/com/bingchuang/core/room/giftvalue/bean/GiftValueData.java similarity index 95% rename from core/src/main/java/com/pikolive/core/room/giftvalue/bean/GiftValueData.java rename to core/src/main/java/com/bingchuang/core/room/giftvalue/bean/GiftValueData.java index 90d823862..9af6816f0 100644 --- a/core/src/main/java/com/pikolive/core/room/giftvalue/bean/GiftValueData.java +++ b/core/src/main/java/com/bingchuang/core/room/giftvalue/bean/GiftValueData.java @@ -1,9 +1,9 @@ -package com.pikolive.core.room.giftvalue.bean; +package com.bingchuang.core.room.giftvalue.bean; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.Observer; -import com.pikolive.core.manager.AvRoomDataManager; +import com.bingchuang.core.manager.AvRoomDataManager; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/room/giftvalue/bean/GiftValueNetData.java b/core/src/main/java/com/bingchuang/core/room/giftvalue/bean/GiftValueNetData.java similarity index 72% rename from core/src/main/java/com/pikolive/core/room/giftvalue/bean/GiftValueNetData.java rename to core/src/main/java/com/bingchuang/core/room/giftvalue/bean/GiftValueNetData.java index 19267680a..440137a19 100644 --- a/core/src/main/java/com/pikolive/core/room/giftvalue/bean/GiftValueNetData.java +++ b/core/src/main/java/com/bingchuang/core/room/giftvalue/bean/GiftValueNetData.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.giftvalue.bean; +package com.bingchuang.core.room.giftvalue.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/room/giftvalue/bean/IndexGiftValue.java b/core/src/main/java/com/bingchuang/core/room/giftvalue/bean/IndexGiftValue.java similarity index 81% rename from core/src/main/java/com/pikolive/core/room/giftvalue/bean/IndexGiftValue.java rename to core/src/main/java/com/bingchuang/core/room/giftvalue/bean/IndexGiftValue.java index a87346213..9c444406d 100644 --- a/core/src/main/java/com/pikolive/core/room/giftvalue/bean/IndexGiftValue.java +++ b/core/src/main/java/com/bingchuang/core/room/giftvalue/bean/IndexGiftValue.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.giftvalue.bean; +package com.bingchuang.core.room.giftvalue.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/room/giftvalue/bean/RoomGiftValue.java b/core/src/main/java/com/bingchuang/core/room/giftvalue/bean/RoomGiftValue.java similarity index 88% rename from core/src/main/java/com/pikolive/core/room/giftvalue/bean/RoomGiftValue.java rename to core/src/main/java/com/bingchuang/core/room/giftvalue/bean/RoomGiftValue.java index b713ec068..008ec44e6 100644 --- a/core/src/main/java/com/pikolive/core/room/giftvalue/bean/RoomGiftValue.java +++ b/core/src/main/java/com/bingchuang/core/room/giftvalue/bean/RoomGiftValue.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.giftvalue.bean; +package com.bingchuang.core.room.giftvalue.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/room/giftvalue/helper/GiftValueFormat.java b/core/src/main/java/com/bingchuang/core/room/giftvalue/helper/GiftValueFormat.java similarity index 86% rename from core/src/main/java/com/pikolive/core/room/giftvalue/helper/GiftValueFormat.java rename to core/src/main/java/com/bingchuang/core/room/giftvalue/helper/GiftValueFormat.java index bf7ff83fd..b00649b7c 100644 --- a/core/src/main/java/com/pikolive/core/room/giftvalue/helper/GiftValueFormat.java +++ b/core/src/main/java/com/bingchuang/core/room/giftvalue/helper/GiftValueFormat.java @@ -1,5 +1,5 @@ -package com.pikolive.core.room.giftvalue.helper; -import com.pikolive.core.R; +package com.bingchuang.core.room.giftvalue.helper; +import com.bingchuang.core.R; import com.bingchuang.library.utils.ResUtil; /** diff --git a/core/src/main/java/com/pikolive/core/room/giftvalue/helper/GiftValueMrg.java b/core/src/main/java/com/bingchuang/core/room/giftvalue/helper/GiftValueMrg.java similarity index 97% rename from core/src/main/java/com/pikolive/core/room/giftvalue/helper/GiftValueMrg.java rename to core/src/main/java/com/bingchuang/core/room/giftvalue/helper/GiftValueMrg.java index 0647f2bd7..ea497743c 100644 --- a/core/src/main/java/com/pikolive/core/room/giftvalue/helper/GiftValueMrg.java +++ b/core/src/main/java/com/bingchuang/core/room/giftvalue/helper/GiftValueMrg.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.giftvalue.helper; +package com.bingchuang.core.room.giftvalue.helper; import android.annotation.SuppressLint; import android.os.Handler; @@ -9,17 +9,17 @@ 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.pikolive.core.auth.AuthModel; -import com.pikolive.core.bean.RoomQueueInfo; -import com.pikolive.core.im.custom.bean.RoomGiftValueAttachment; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.room.giftvalue.GiftValueModel; -import com.pikolive.core.room.giftvalue.bean.GiftValueCommonUpdate; -import com.pikolive.core.room.giftvalue.bean.GiftValueData; -import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; -import com.pikolive.core.room.giftvalue.bean.RoomGiftValue; -import com.pikolive.core.utils.net.DontWarnObserver; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.bean.RoomQueueInfo; +import com.bingchuang.core.im.custom.bean.RoomGiftValueAttachment; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.room.giftvalue.GiftValueModel; +import com.bingchuang.core.room.giftvalue.bean.GiftValueCommonUpdate; +import com.bingchuang.core.room.giftvalue.bean.GiftValueData; +import com.bingchuang.core.room.giftvalue.bean.IndexGiftValue; +import com.bingchuang.core.room.giftvalue.bean.RoomGiftValue; +import com.bingchuang.core.utils.net.DontWarnObserver; import com.bingchuang.library.net.rxnet.callback.CallBack; import com.bingchuang.library.utils.JavaUtil; import com.bingchuang.library.utils.ListUtils; diff --git a/core/src/main/java/com/pikolive/core/room/model/AvRoomModel.java b/core/src/main/java/com/bingchuang/core/room/model/AvRoomModel.java similarity index 89% rename from core/src/main/java/com/pikolive/core/room/model/AvRoomModel.java rename to core/src/main/java/com/bingchuang/core/room/model/AvRoomModel.java index c86148955..40f5f6d41 100644 --- a/core/src/main/java/com/pikolive/core/room/model/AvRoomModel.java +++ b/core/src/main/java/com/bingchuang/core/room/model/AvRoomModel.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.model; +package com.bingchuang.core.room.model; import android.annotation.SuppressLint; import android.text.TextUtils; @@ -22,69 +22,69 @@ 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.pikolive.core.auth.AuthModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.decoration.car.bean.CarInfo; -import com.pikolive.core.decoration.headwear.bean.HeadWearInfo; -import com.pikolive.core.gift.bean.GiftInfo; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.initial.InitialModel; -import com.pikolive.core.initial.bean.InitInfo; -import com.pikolive.core.level.UserLevelVo; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core.manager.RoomEvent; -import com.pikolive.core.noble.NobleInfo; -import com.pikolive.core.patriarch.exception.PmRoomLimitException; -import com.pikolive.core.room.activitytimer.ActivityTimerEvent; -import com.pikolive.core.room.activitytimer.TimerBean; -import com.pikolive.core.room.bean.BroadcastInfo; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.room.bean.RoomResult; -import com.pikolive.core.room.bean.RoomWelcomeConfig; -import com.pikolive.core.room.bean.SearchRoomInfo; -import com.pikolive.core.room.bean.SimplePartyRoomInfo; -import com.pikolive.core.room.event.RoomInfoEvent; -import com.pikolive.core.room.giftvalue.helper.GiftValueMrg; -import com.pikolive.core.room.model.inteface.IAvRoomModel; -import com.pikolive.core.room.pk.model.PkModel; -import com.pikolive.core.user.UserModel; -import com.pikolive.core.user.bean.FirstChargeInfo; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.utils.net.RxHelper; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.decoration.car.bean.CarInfo; -import com.pikolive.core.decoration.headwear.bean.HeadWearInfo; -import com.pikolive.core.gift.bean.GiftInfo; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.initial.InitialModel; -import com.pikolive.core.initial.bean.InitInfo; -import com.pikolive.core.level.UserLevelVo; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core.manager.RoomEvent; -import com.pikolive.core.noble.NobleInfo; -import com.pikolive.core.patriarch.exception.PmRoomLimitException; -import com.pikolive.core.room.activitytimer.ActivityTimerEvent; -import com.pikolive.core.room.activitytimer.TimerBean; -import com.pikolive.core.room.bean.BroadcastInfo; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.room.bean.RoomResult; -import com.pikolive.core.room.bean.RoomWelcomeConfig; -import com.pikolive.core.room.bean.SearchRoomInfo; -import com.pikolive.core.room.bean.SimplePartyRoomInfo; -import com.pikolive.core.room.event.RoomInfoEvent; -import com.pikolive.core.room.giftvalue.helper.GiftValueMrg; -import com.pikolive.core.room.model.inteface.IAvRoomModel; -import com.pikolive.core.room.pk.model.PkModel; -import com.pikolive.core.user.UserModel; -import com.pikolive.core.user.bean.FirstChargeInfo; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.utils.net.RxHelper; -import com.pikolive.core.R; -import com.pikolive.core2.home.bean.HomeRoomInfo; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.admin.bean.KickOutExtBean; -import com.pikolive.core.admin.util.SuperAdminUtil; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.decoration.car.bean.CarInfo; +import com.bingchuang.core.decoration.headwear.bean.HeadWearInfo; +import com.bingchuang.core.gift.bean.GiftInfo; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.initial.InitialModel; +import com.bingchuang.core.initial.bean.InitInfo; +import com.bingchuang.core.level.UserLevelVo; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core.manager.RoomEvent; +import com.bingchuang.core.noble.NobleInfo; +import com.bingchuang.core.patriarch.exception.PmRoomLimitException; +import com.bingchuang.core.room.activitytimer.ActivityTimerEvent; +import com.bingchuang.core.room.activitytimer.TimerBean; +import com.bingchuang.core.room.bean.BroadcastInfo; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.room.bean.RoomResult; +import com.bingchuang.core.room.bean.RoomWelcomeConfig; +import com.bingchuang.core.room.bean.SearchRoomInfo; +import com.bingchuang.core.room.bean.SimplePartyRoomInfo; +import com.bingchuang.core.room.event.RoomInfoEvent; +import com.bingchuang.core.room.giftvalue.helper.GiftValueMrg; +import com.bingchuang.core.room.model.inteface.IAvRoomModel; +import com.bingchuang.core.room.pk.model.PkModel; +import com.bingchuang.core.user.UserModel; +import com.bingchuang.core.user.bean.FirstChargeInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.utils.net.RxHelper; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.decoration.car.bean.CarInfo; +import com.bingchuang.core.decoration.headwear.bean.HeadWearInfo; +import com.bingchuang.core.gift.bean.GiftInfo; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.initial.InitialModel; +import com.bingchuang.core.initial.bean.InitInfo; +import com.bingchuang.core.level.UserLevelVo; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core.manager.RoomEvent; +import com.bingchuang.core.noble.NobleInfo; +import com.bingchuang.core.patriarch.exception.PmRoomLimitException; +import com.bingchuang.core.room.activitytimer.ActivityTimerEvent; +import com.bingchuang.core.room.activitytimer.TimerBean; +import com.bingchuang.core.room.bean.BroadcastInfo; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.room.bean.RoomResult; +import com.bingchuang.core.room.bean.RoomWelcomeConfig; +import com.bingchuang.core.room.bean.SearchRoomInfo; +import com.bingchuang.core.room.bean.SimplePartyRoomInfo; +import com.bingchuang.core.room.event.RoomInfoEvent; +import com.bingchuang.core.room.giftvalue.helper.GiftValueMrg; +import com.bingchuang.core.room.model.inteface.IAvRoomModel; +import com.bingchuang.core.room.pk.model.PkModel; +import com.bingchuang.core.user.UserModel; +import com.bingchuang.core.user.bean.FirstChargeInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.utils.net.RxHelper; +import com.bingchuang.core.R; +import com.bingchuang.core2.home.bean.HomeRoomInfo; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.admin.bean.KickOutExtBean; +import com.bingchuang.core.admin.util.SuperAdminUtil; import com.bingchuang.library.net.rxnet.callback.CallBack; import com.bingchuang.library.utils.JavaUtil; import com.bingchuang.library.utils.ListUtils; diff --git a/core/src/main/java/com/pikolive/core/room/model/HomePartyModel.java b/core/src/main/java/com/bingchuang/core/room/model/HomePartyModel.java similarity index 93% rename from core/src/main/java/com/pikolive/core/room/model/HomePartyModel.java rename to core/src/main/java/com/bingchuang/core/room/model/HomePartyModel.java index 221b4a343..45a5d288c 100644 --- a/core/src/main/java/com/pikolive/core/room/model/HomePartyModel.java +++ b/core/src/main/java/com/bingchuang/core/room/model/HomePartyModel.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.model; +package com.bingchuang.core.room.model; import android.text.TextUtils; import android.util.SparseArray; @@ -9,21 +9,21 @@ 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.pikolive.core.noble.NobleResourceType; -import com.pikolive.core.noble.NobleUtil; -import com.pikolive.core.room.model.inteface.IHomePartyModel; -import com.pikolive.core.noble.NobleResourceType; -import com.pikolive.core.noble.NobleUtil; -import com.pikolive.core.room.model.inteface.IHomePartyModel; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.bean.RoomQueueInfo; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.kick.KickModel; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.admin.util.SaAttachmentFactory; -import com.pikolive.core.admin.util.SuperAdminUtil; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.noble.NobleResourceType; +import com.bingchuang.core.noble.NobleUtil; +import com.bingchuang.core.room.model.inteface.IHomePartyModel; +import com.bingchuang.core.noble.NobleResourceType; +import com.bingchuang.core.noble.NobleUtil; +import com.bingchuang.core.room.model.inteface.IHomePartyModel; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.bean.RoomQueueInfo; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.kick.KickModel; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.admin.util.SaAttachmentFactory; +import com.bingchuang.core.admin.util.SuperAdminUtil; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.net.rxnet.callback.CallBack; import com.bingchuang.library.utils.ListUtils; diff --git a/core/src/main/java/com/pikolive/core/room/model/HomePartyUserListModel.java b/core/src/main/java/com/bingchuang/core/room/model/HomePartyUserListModel.java similarity index 94% rename from core/src/main/java/com/pikolive/core/room/model/HomePartyUserListModel.java rename to core/src/main/java/com/bingchuang/core/room/model/HomePartyUserListModel.java index 7c279f387..54dc937f3 100644 --- a/core/src/main/java/com/pikolive/core/room/model/HomePartyUserListModel.java +++ b/core/src/main/java/com/bingchuang/core/room/model/HomePartyUserListModel.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.model; +package com.bingchuang.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.pikolive.core.room.model.inteface.IHomePartyUserListModel; -import com.pikolive.core.room.model.inteface.IHomePartyUserListModel; -import com.pikolive.core.R; -import com.pikolive.core.Constants; -import com.pikolive.core.bean.RoomQueueInfo; -import com.pikolive.core.exception.ErrorThrowable; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core.room.bean.OnlineChatMember; -import com.pikolive.core.room.model.inteface.IHomePartyUserListModel; +import com.bingchuang.core.room.model.inteface.IHomePartyUserListModel; +import com.bingchuang.core.room.model.inteface.IHomePartyUserListModel; +import com.bingchuang.core.R; +import com.bingchuang.core.Constants; +import com.bingchuang.core.bean.RoomQueueInfo; +import com.bingchuang.core.exception.ErrorThrowable; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core.room.bean.OnlineChatMember; +import com.bingchuang.core.room.model.inteface.IHomePartyUserListModel; import com.bingchuang.library.utils.ListUtils; import com.bingchuang.library.utils.ResUtil; diff --git a/core/src/main/java/com/pikolive/core/room/model/MicQueueModel.java b/core/src/main/java/com/bingchuang/core/room/model/MicQueueModel.java similarity index 91% rename from core/src/main/java/com/pikolive/core/room/model/MicQueueModel.java rename to core/src/main/java/com/bingchuang/core/room/model/MicQueueModel.java index 504f677bd..309c9dcfb 100644 --- a/core/src/main/java/com/pikolive/core/room/model/MicQueueModel.java +++ b/core/src/main/java/com/bingchuang/core/room/model/MicQueueModel.java @@ -1,16 +1,16 @@ -package com.pikolive.core.room.model; +package com.bingchuang.core.room.model; -import com.pikolive.core.room.model.inteface.IMicQueueModel; -import com.pikolive.core.room.queuing_mic.bean.RespQueuingMicListInfo; -import com.pikolive.core.room.model.inteface.IMicQueueModel; -import com.pikolive.core.room.queuing_mic.bean.RespQueuingMicListInfo; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core.room.model.inteface.IMicQueueModel; -import com.pikolive.core.room.queuing_mic.bean.RespQueuingMicListInfo; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.room.model.inteface.IMicQueueModel; +import com.bingchuang.core.room.queuing_mic.bean.RespQueuingMicListInfo; +import com.bingchuang.core.room.model.inteface.IMicQueueModel; +import com.bingchuang.core.room.queuing_mic.bean.RespQueuingMicListInfo; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core.room.model.inteface.IMicQueueModel; +import com.bingchuang.core.room.queuing_mic.bean.RespQueuingMicListInfo; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import io.reactivex.Single; diff --git a/core/src/main/java/com/pikolive/core/room/model/RoomBaseModel.java b/core/src/main/java/com/bingchuang/core/room/model/RoomBaseModel.java similarity index 95% rename from core/src/main/java/com/pikolive/core/room/model/RoomBaseModel.java rename to core/src/main/java/com/bingchuang/core/room/model/RoomBaseModel.java index 146080025..62411e455 100644 --- a/core/src/main/java/com/pikolive/core/room/model/RoomBaseModel.java +++ b/core/src/main/java/com/bingchuang/core/room/model/RoomBaseModel.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.model; +package com.bingchuang.core.room.model; import android.annotation.SuppressLint; import android.text.TextUtils; @@ -21,47 +21,47 @@ 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.pikolive.core.room.activitytimer.TimerBean; -import com.pikolive.core.room.giftvalue.helper.GiftValueMrg; -import com.pikolive.core.room.model.inteface.IRoomBaseModel; -import com.pikolive.core.room.queue.bean.MicMemberInfo; -import com.pikolive.core.user.bean.BaseInfo; -import com.pikolive.core.user.bean.FirstChargeInfo; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.room.activitytimer.TimerBean; -import com.pikolive.core.room.giftvalue.helper.GiftValueMrg; -import com.pikolive.core.room.model.inteface.IRoomBaseModel; -import com.pikolive.core.room.queue.bean.MicMemberInfo; -import com.pikolive.core.user.bean.BaseInfo; -import com.pikolive.core.user.bean.FirstChargeInfo; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.vip.UserVipInfo; +import com.bingchuang.core.room.activitytimer.TimerBean; +import com.bingchuang.core.room.giftvalue.helper.GiftValueMrg; +import com.bingchuang.core.room.model.inteface.IRoomBaseModel; +import com.bingchuang.core.room.queue.bean.MicMemberInfo; +import com.bingchuang.core.user.bean.BaseInfo; +import com.bingchuang.core.user.bean.FirstChargeInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.room.activitytimer.TimerBean; +import com.bingchuang.core.room.giftvalue.helper.GiftValueMrg; +import com.bingchuang.core.room.model.inteface.IRoomBaseModel; +import com.bingchuang.core.room.queue.bean.MicMemberInfo; +import com.bingchuang.core.user.bean.BaseInfo; +import com.bingchuang.core.user.bean.FirstChargeInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.vip.UserVipInfo; -import com.pikolive.core.R; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.RoomMicInfo; -import com.pikolive.core.bean.RoomQueueInfo; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.decoration.headwear.bean.HeadWearInfo; -import com.pikolive.core.exception.ErrorThrowable; -import com.pikolive.core.gift.bean.GiftFreeInfo; -import com.pikolive.core.gift.bean.GiftInfo; -import com.pikolive.core2.home.bean.BannerInfo; -import com.pikolive.core2.home.bean.HomeRoomInfo; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.room.bean.BroadcastInfo; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.room.bean.RoomResult; -import com.pikolive.core.room.bean.RoomSettingTabInfo; -import com.pikolive.core.room.bean.RoomWelcomeConfig; -import com.pikolive.core.room.bean.SearchRoomInfo; -import com.pikolive.core.room.bean.SimplePartyRoomInfo; -import com.pikolive.core.room.pk.bean.RoomPKInvitedUpMicMember; -import com.pikolive.core.room.pk.model.PkModel; -import com.pikolive.core.user.UserModel; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.R; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.RoomMicInfo; +import com.bingchuang.core.bean.RoomQueueInfo; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.decoration.headwear.bean.HeadWearInfo; +import com.bingchuang.core.exception.ErrorThrowable; +import com.bingchuang.core.gift.bean.GiftFreeInfo; +import com.bingchuang.core.gift.bean.GiftInfo; +import com.bingchuang.core2.home.bean.BannerInfo; +import com.bingchuang.core2.home.bean.HomeRoomInfo; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.room.bean.BroadcastInfo; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.room.bean.RoomResult; +import com.bingchuang.core.room.bean.RoomSettingTabInfo; +import com.bingchuang.core.room.bean.RoomWelcomeConfig; +import com.bingchuang.core.room.bean.SearchRoomInfo; +import com.bingchuang.core.room.bean.SimplePartyRoomInfo; +import com.bingchuang.core.room.pk.bean.RoomPKInvitedUpMicMember; +import com.bingchuang.core.room.pk.model.PkModel; +import com.bingchuang.core.user.UserModel; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.net.rxnet.callback.CallBack; import com.bingchuang.library.utils.JavaUtil; diff --git a/core/src/main/java/com/pikolive/core/room/model/RoomCharmModel.java b/core/src/main/java/com/bingchuang/core/room/model/RoomCharmModel.java similarity index 83% rename from core/src/main/java/com/pikolive/core/room/model/RoomCharmModel.java rename to core/src/main/java/com/bingchuang/core/room/model/RoomCharmModel.java index 01ac420d6..16ad8997f 100644 --- a/core/src/main/java/com/pikolive/core/room/model/RoomCharmModel.java +++ b/core/src/main/java/com/bingchuang/core/room/model/RoomCharmModel.java @@ -1,12 +1,12 @@ -package com.pikolive.core.room.model; +package com.bingchuang.core.room.model; -import com.pikolive.core.room.model.inteface.IRoomCharmModel; -import com.pikolive.core.room.model.inteface.IRoomCharmModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.room.bean.RoomContributeDataInfo; -import com.pikolive.core.room.model.inteface.IRoomCharmModel; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.room.model.inteface.IRoomCharmModel; +import com.bingchuang.core.room.model.inteface.IRoomCharmModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.room.bean.RoomContributeDataInfo; +import com.bingchuang.core.room.model.inteface.IRoomCharmModel; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import io.reactivex.Single; diff --git a/core/src/main/java/com/pikolive/core/room/model/RoomContributeListModel.java b/core/src/main/java/com/bingchuang/core/room/model/RoomContributeListModel.java similarity index 83% rename from core/src/main/java/com/pikolive/core/room/model/RoomContributeListModel.java rename to core/src/main/java/com/bingchuang/core/room/model/RoomContributeListModel.java index 6ff85768c..da8eb588f 100644 --- a/core/src/main/java/com/pikolive/core/room/model/RoomContributeListModel.java +++ b/core/src/main/java/com/bingchuang/core/room/model/RoomContributeListModel.java @@ -1,15 +1,15 @@ -package com.pikolive.core.room.model; +package com.bingchuang.core.room.model; -import com.pikolive.core.room.model.inteface.IRoomContributeListModel; -import com.pikolive.core.room.model.inteface.IRoomContributeListModel; -import com.pikolive.core.R; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core.room.bean.RoomContributeDataInfo; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.room.model.inteface.IRoomContributeListModel; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.room.model.inteface.IRoomContributeListModel; +import com.bingchuang.core.room.model.inteface.IRoomContributeListModel; +import com.bingchuang.core.R; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core.room.bean.RoomContributeDataInfo; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.room.model.inteface.IRoomContributeListModel; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.utils.ResUtil; diff --git a/core/src/main/java/com/pikolive/core/room/model/RoomInviteFansModel.kt b/core/src/main/java/com/bingchuang/core/room/model/RoomInviteFansModel.kt similarity index 81% rename from core/src/main/java/com/pikolive/core/room/model/RoomInviteFansModel.kt rename to core/src/main/java/com/bingchuang/core/room/model/RoomInviteFansModel.kt index 80659a69e..089a6cbb7 100644 --- a/core/src/main/java/com/pikolive/core/room/model/RoomInviteFansModel.kt +++ b/core/src/main/java/com/bingchuang/core/room/model/RoomInviteFansModel.kt @@ -1,11 +1,11 @@ -package com.pikolive.core.room.model +package com.bingchuang.core.room.model -import com.pikolive.core.bean.response.ServiceResult -import com.pikolive.core.room.bean.RoomInviteFansInfo -import com.pikolive.core.utils.net.handleBeanData -import com.pikolive.core.utils.net.io2main +import com.bingchuang.core.bean.response.ServiceResult +import com.bingchuang.core.room.bean.RoomInviteFansInfo +import com.bingchuang.core.utils.net.handleBeanData +import com.bingchuang.core.utils.net.io2main import com.bingchuang.library.net.rxnet.RxNet import io.reactivex.Single import retrofit2.http.GET diff --git a/core/src/main/java/com/pikolive/core/room/model/RoomInviteModel.java b/core/src/main/java/com/bingchuang/core/room/model/RoomInviteModel.java similarity index 88% rename from core/src/main/java/com/pikolive/core/room/model/RoomInviteModel.java rename to core/src/main/java/com/bingchuang/core/room/model/RoomInviteModel.java index c6503b1f3..f293e2bc6 100644 --- a/core/src/main/java/com/pikolive/core/room/model/RoomInviteModel.java +++ b/core/src/main/java/com/bingchuang/core/room/model/RoomInviteModel.java @@ -1,10 +1,10 @@ -package com.pikolive.core.room.model; +package com.bingchuang.core.room.model; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; -import com.pikolive.core.room.model.inteface.IRoomInviteModel; -import com.pikolive.core.room.model.inteface.IRoomInviteModel; -import com.pikolive.core.Constants; -import com.pikolive.core.room.model.inteface.IRoomInviteModel; +import com.bingchuang.core.room.model.inteface.IRoomInviteModel; +import com.bingchuang.core.room.model.inteface.IRoomInviteModel; +import com.bingchuang.core.Constants; +import com.bingchuang.core.room.model.inteface.IRoomInviteModel; import com.bingchuang.library.utils.ListUtils; import java.util.ArrayList; diff --git a/core/src/main/java/com/pikolive/core/room/model/RoomRankModel.java b/core/src/main/java/com/bingchuang/core/room/model/RoomRankModel.java similarity index 79% rename from core/src/main/java/com/pikolive/core/room/model/RoomRankModel.java rename to core/src/main/java/com/bingchuang/core/room/model/RoomRankModel.java index ecf57bed6..1db31fb99 100644 --- a/core/src/main/java/com/pikolive/core/room/model/RoomRankModel.java +++ b/core/src/main/java/com/bingchuang/core/room/model/RoomRankModel.java @@ -1,12 +1,12 @@ -package com.pikolive.core.room.model; +package com.bingchuang.core.room.model; -import com.pikolive.core.room.model.inteface.IRoomRankModel; -import com.pikolive.core.room.model.inteface.IRoomRankModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.room.bean.RoomRankHalfHourDataInfo; -import com.pikolive.core.room.model.inteface.IRoomRankModel; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.room.model.inteface.IRoomRankModel; +import com.bingchuang.core.room.model.inteface.IRoomRankModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.room.bean.RoomRankHalfHourDataInfo; +import com.bingchuang.core.room.model.inteface.IRoomRankModel; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import io.reactivex.Single; diff --git a/core/src/main/java/com/pikolive/core/room/model/RoomSettingModel.java b/core/src/main/java/com/bingchuang/core/room/model/RoomSettingModel.java similarity index 93% rename from core/src/main/java/com/pikolive/core/room/model/RoomSettingModel.java rename to core/src/main/java/com/bingchuang/core/room/model/RoomSettingModel.java index 32e19ee7d..c197574e8 100644 --- a/core/src/main/java/com/pikolive/core/room/model/RoomSettingModel.java +++ b/core/src/main/java/com/bingchuang/core/room/model/RoomSettingModel.java @@ -1,28 +1,28 @@ -package com.pikolive.core.room.model; +package com.bingchuang.core.room.model; import android.text.TextUtils; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core.manager.BaseMvpModel; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.room.bean.RoomSettingTabInfo; -import com.pikolive.core.room.bean.SingleRoomSortInfo; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core.manager.BaseMvpModel; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.room.bean.RoomSettingTabInfo; -import com.pikolive.core.room.bean.SingleRoomSortInfo; -import com.pikolive.core.R; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core.manager.BaseMvpModel; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.room.bean.RoomSettingTabInfo; -import com.pikolive.core.room.bean.SingleRoomSortInfo; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core.manager.BaseMvpModel; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.room.bean.RoomSettingTabInfo; +import com.bingchuang.core.room.bean.SingleRoomSortInfo; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core.manager.BaseMvpModel; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.room.bean.RoomSettingTabInfo; +import com.bingchuang.core.room.bean.SingleRoomSortInfo; +import com.bingchuang.core.R; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core.manager.BaseMvpModel; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.room.bean.RoomSettingTabInfo; +import com.bingchuang.core.room.bean.SingleRoomSortInfo; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.net.rxnet.callback.CallBack; import com.bingchuang.library.utils.ResUtil; @@ -324,7 +324,7 @@ public class RoomSettingModel extends BaseMvpModel { /** * 更新房间设置信息 - * Peko项目-打开关闭房间纯净模式-房主修改 + * Peki项目-打开关闭房间纯净模式-房主修改 * * @param title * @param desc @@ -348,7 +348,7 @@ public class RoomSettingModel extends BaseMvpModel { /** * 更新房间设置信息 - * Peko项目-打开关闭房间纯净模式 + * Peki项目-打开关闭房间纯净模式 * * @param title * @param desc diff --git a/core/src/main/java/com/pikolive/core/room/model/inteface/IAvRoomModel.java b/core/src/main/java/com/bingchuang/core/room/model/inteface/IAvRoomModel.java similarity index 84% rename from core/src/main/java/com/pikolive/core/room/model/inteface/IAvRoomModel.java rename to core/src/main/java/com/bingchuang/core/room/model/inteface/IAvRoomModel.java index 3df82ea12..e659e7f9f 100644 --- a/core/src/main/java/com/pikolive/core/room/model/inteface/IAvRoomModel.java +++ b/core/src/main/java/com/bingchuang/core/room/model/inteface/IAvRoomModel.java @@ -1,21 +1,21 @@ -package com.pikolive.core.room.model.inteface; +package com.bingchuang.core.room.model.inteface; import com.google.gson.JsonElement; import com.netease.nimlib.sdk.chatroom.model.EnterChatRoomResultData; -import com.pikolive.core.room.activitytimer.TimerBean; -import com.pikolive.core.user.bean.FirstChargeInfo; -import com.pikolive.core.room.activitytimer.TimerBean; -import com.pikolive.core.user.bean.FirstChargeInfo; -import com.pikolive.core.base.IModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.gift.bean.GiftInfo; -import com.pikolive.core2.home.bean.HomeRoomInfo; -import com.pikolive.core.room.bean.BroadcastInfo; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.room.bean.RoomResult; -import com.pikolive.core.room.bean.RoomWelcomeConfig; -import com.pikolive.core.room.bean.SearchRoomInfo; -import com.pikolive.core.room.bean.SimplePartyRoomInfo; +import com.bingchuang.core.room.activitytimer.TimerBean; +import com.bingchuang.core.user.bean.FirstChargeInfo; +import com.bingchuang.core.room.activitytimer.TimerBean; +import com.bingchuang.core.user.bean.FirstChargeInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.gift.bean.GiftInfo; +import com.bingchuang.core2.home.bean.HomeRoomInfo; +import com.bingchuang.core.room.bean.BroadcastInfo; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.room.bean.RoomResult; +import com.bingchuang.core.room.bean.RoomWelcomeConfig; +import com.bingchuang.core.room.bean.SearchRoomInfo; +import com.bingchuang.core.room.bean.SimplePartyRoomInfo; import com.bingchuang.library.net.rxnet.callback.CallBack; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/room/model/inteface/IHomePartyModel.java b/core/src/main/java/com/bingchuang/core/room/model/inteface/IHomePartyModel.java similarity index 95% rename from core/src/main/java/com/pikolive/core/room/model/inteface/IHomePartyModel.java rename to core/src/main/java/com/bingchuang/core/room/model/inteface/IHomePartyModel.java index 908ab0c53..a459b8f72 100644 --- a/core/src/main/java/com/pikolive/core/room/model/inteface/IHomePartyModel.java +++ b/core/src/main/java/com/bingchuang/core/room/model/inteface/IHomePartyModel.java @@ -1,7 +1,7 @@ -package com.pikolive.core.room.model.inteface; +package com.bingchuang.core.room.model.inteface; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; -import com.pikolive.core.base.IModel; +import com.bingchuang.core.base.IModel; import com.bingchuang.library.net.rxnet.callback.CallBack; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/room/model/inteface/IHomePartyUserListModel.java b/core/src/main/java/com/bingchuang/core/room/model/inteface/IHomePartyUserListModel.java similarity index 89% rename from core/src/main/java/com/pikolive/core/room/model/inteface/IHomePartyUserListModel.java rename to core/src/main/java/com/bingchuang/core/room/model/inteface/IHomePartyUserListModel.java index 3f6043645..62f31d076 100644 --- a/core/src/main/java/com/pikolive/core/room/model/inteface/IHomePartyUserListModel.java +++ b/core/src/main/java/com/bingchuang/core/room/model/inteface/IHomePartyUserListModel.java @@ -1,7 +1,7 @@ -package com.pikolive.core.room.model.inteface; +package com.bingchuang.core.room.model.inteface; -import com.pikolive.core.base.IModel; -import com.pikolive.core.room.bean.OnlineChatMember; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.room.bean.OnlineChatMember; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/room/model/inteface/IMicQueueModel.java b/core/src/main/java/com/bingchuang/core/room/model/inteface/IMicQueueModel.java similarity index 80% rename from core/src/main/java/com/pikolive/core/room/model/inteface/IMicQueueModel.java rename to core/src/main/java/com/bingchuang/core/room/model/inteface/IMicQueueModel.java index c6cbf03f2..b9aacb1bf 100644 --- a/core/src/main/java/com/pikolive/core/room/model/inteface/IMicQueueModel.java +++ b/core/src/main/java/com/bingchuang/core/room/model/inteface/IMicQueueModel.java @@ -1,8 +1,8 @@ -package com.pikolive.core.room.model.inteface; +package com.bingchuang.core.room.model.inteface; -import com.pikolive.core.room.queuing_mic.bean.RespQueuingMicListInfo; -import com.pikolive.core.room.queuing_mic.bean.RespQueuingMicListInfo; -import com.pikolive.core.room.queuing_mic.bean.RespQueuingMicListInfo; +import com.bingchuang.core.room.queuing_mic.bean.RespQueuingMicListInfo; +import com.bingchuang.core.room.queuing_mic.bean.RespQueuingMicListInfo; +import com.bingchuang.core.room.queuing_mic.bean.RespQueuingMicListInfo; import io.reactivex.Single; diff --git a/core/src/main/java/com/pikolive/core/room/model/inteface/IRoomBaseModel.java b/core/src/main/java/com/bingchuang/core/room/model/inteface/IRoomBaseModel.java similarity index 90% rename from core/src/main/java/com/pikolive/core/room/model/inteface/IRoomBaseModel.java rename to core/src/main/java/com/bingchuang/core/room/model/inteface/IRoomBaseModel.java index 2972f685f..064059c6e 100644 --- a/core/src/main/java/com/pikolive/core/room/model/inteface/IRoomBaseModel.java +++ b/core/src/main/java/com/bingchuang/core/room/model/inteface/IRoomBaseModel.java @@ -1,19 +1,19 @@ -package com.pikolive.core.room.model.inteface; +package com.bingchuang.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.pikolive.core.user.bean.BaseInfo; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.user.bean.BaseInfo; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.base.IModel; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.room.bean.RoomResult; -import com.pikolive.core.room.pk.bean.RoomPKInvitedUpMicMember; -import com.pikolive.core.user.bean.BaseInfo; -import com.pikolive.core.user.bean.UserInfo; +import com.bingchuang.core.user.bean.BaseInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.user.bean.BaseInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.room.bean.RoomResult; +import com.bingchuang.core.room.pk.bean.RoomPKInvitedUpMicMember; +import com.bingchuang.core.user.bean.BaseInfo; +import com.bingchuang.core.user.bean.UserInfo; import com.bingchuang.library.net.rxnet.callback.CallBack; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/room/model/inteface/IRoomCharmModel.java b/core/src/main/java/com/bingchuang/core/room/model/inteface/IRoomCharmModel.java similarity index 73% rename from core/src/main/java/com/pikolive/core/room/model/inteface/IRoomCharmModel.java rename to core/src/main/java/com/bingchuang/core/room/model/inteface/IRoomCharmModel.java index f45d4e565..cde3e1cfa 100644 --- a/core/src/main/java/com/pikolive/core/room/model/inteface/IRoomCharmModel.java +++ b/core/src/main/java/com/bingchuang/core/room/model/inteface/IRoomCharmModel.java @@ -1,8 +1,8 @@ -package com.pikolive.core.room.model.inteface; +package com.bingchuang.core.room.model.inteface; -import com.pikolive.core.base.IModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.room.bean.RoomContributeDataInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.room.bean.RoomContributeDataInfo; import io.reactivex.Single; diff --git a/core/src/main/java/com/pikolive/core/room/model/inteface/IRoomContributeListModel.java b/core/src/main/java/com/bingchuang/core/room/model/inteface/IRoomContributeListModel.java similarity index 76% rename from core/src/main/java/com/pikolive/core/room/model/inteface/IRoomContributeListModel.java rename to core/src/main/java/com/bingchuang/core/room/model/inteface/IRoomContributeListModel.java index bf4c2f17c..fa9c92715 100644 --- a/core/src/main/java/com/pikolive/core/room/model/inteface/IRoomContributeListModel.java +++ b/core/src/main/java/com/bingchuang/core/room/model/inteface/IRoomContributeListModel.java @@ -1,8 +1,8 @@ -package com.pikolive.core.room.model.inteface; +package com.bingchuang.core.room.model.inteface; -import com.pikolive.core.base.IModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.room.bean.RoomContributeDataInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.room.bean.RoomContributeDataInfo; import io.reactivex.Single; diff --git a/core/src/main/java/com/pikolive/core/room/model/inteface/IRoomInviteModel.java b/core/src/main/java/com/bingchuang/core/room/model/inteface/IRoomInviteModel.java similarity index 87% rename from core/src/main/java/com/pikolive/core/room/model/inteface/IRoomInviteModel.java rename to core/src/main/java/com/bingchuang/core/room/model/inteface/IRoomInviteModel.java index ac058231b..4b5722088 100644 --- a/core/src/main/java/com/pikolive/core/room/model/inteface/IRoomInviteModel.java +++ b/core/src/main/java/com/bingchuang/core/room/model/inteface/IRoomInviteModel.java @@ -1,7 +1,7 @@ -package com.pikolive.core.room.model.inteface; +package com.bingchuang.core.room.model.inteface; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; -import com.pikolive.core.base.IModel; +import com.bingchuang.core.base.IModel; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/room/model/inteface/IRoomRankModel.java b/core/src/main/java/com/bingchuang/core/room/model/inteface/IRoomRankModel.java similarity index 73% rename from core/src/main/java/com/pikolive/core/room/model/inteface/IRoomRankModel.java rename to core/src/main/java/com/bingchuang/core/room/model/inteface/IRoomRankModel.java index 615fae368..90e2da981 100644 --- a/core/src/main/java/com/pikolive/core/room/model/inteface/IRoomRankModel.java +++ b/core/src/main/java/com/bingchuang/core/room/model/inteface/IRoomRankModel.java @@ -1,7 +1,7 @@ -package com.pikolive.core.room.model.inteface; +package com.bingchuang.core.room.model.inteface; -import com.pikolive.core.base.IModel; -import com.pikolive.core.room.bean.RoomRankHalfHourDataInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.room.bean.RoomRankHalfHourDataInfo; import io.reactivex.Single; diff --git a/core/src/main/java/com/pikolive/core/room/model/inteface/IRoomSettingModel.java b/core/src/main/java/com/bingchuang/core/room/model/inteface/IRoomSettingModel.java similarity index 84% rename from core/src/main/java/com/pikolive/core/room/model/inteface/IRoomSettingModel.java rename to core/src/main/java/com/bingchuang/core/room/model/inteface/IRoomSettingModel.java index 2d23e17d1..e52db797e 100644 --- a/core/src/main/java/com/pikolive/core/room/model/inteface/IRoomSettingModel.java +++ b/core/src/main/java/com/bingchuang/core/room/model/inteface/IRoomSettingModel.java @@ -1,8 +1,8 @@ -package com.pikolive.core.room.model.inteface; +package com.bingchuang.core.room.model.inteface; -import com.pikolive.core.base.IModel; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.room.bean.RoomSettingTabInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.room.bean.RoomSettingTabInfo; import com.bingchuang.library.net.rxnet.callback.CallBack; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/room/pk/attachment/RoomPkAttachment.java b/core/src/main/java/com/bingchuang/core/room/pk/attachment/RoomPkAttachment.java similarity index 87% rename from core/src/main/java/com/pikolive/core/room/pk/attachment/RoomPkAttachment.java rename to core/src/main/java/com/bingchuang/core/room/pk/attachment/RoomPkAttachment.java index dd45f263e..55ffa48ac 100644 --- a/core/src/main/java/com/pikolive/core/room/pk/attachment/RoomPkAttachment.java +++ b/core/src/main/java/com/bingchuang/core/room/pk/attachment/RoomPkAttachment.java @@ -1,12 +1,12 @@ -package com.pikolive.core.room.pk.attachment; +package com.bingchuang.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.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.room.pk.bean.RoomPKInvitedUpMicMember; -import com.pikolive.core.room.pk.bean.RoomPkData; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.room.pk.bean.RoomPKInvitedUpMicMember; +import com.bingchuang.core.room.pk.bean.RoomPkData; import java.util.Map; diff --git a/core/src/main/java/com/bingchuang/core/room/pk/bean/PKMemberInfo.java b/core/src/main/java/com/bingchuang/core/room/pk/bean/PKMemberInfo.java new file mode 100644 index 000000000..16d7e5a09 --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/room/pk/bean/PKMemberInfo.java @@ -0,0 +1,18 @@ +package com.bingchuang.core.room.pk.bean; + +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.user.bean.UserInfo; + +import lombok.Data; + +/** + * @author jack + * @Description + * @Date 2019/1/8 + */ +@Data +public class PKMemberInfo { + private int teamId; + private UserInfo userInfo; +} diff --git a/core/src/main/java/com/pikolive/core/room/pk/bean/PKQueuingMicMemberInfo.java b/core/src/main/java/com/bingchuang/core/room/pk/bean/PKQueuingMicMemberInfo.java similarity index 91% rename from core/src/main/java/com/pikolive/core/room/pk/bean/PKQueuingMicMemberInfo.java rename to core/src/main/java/com/bingchuang/core/room/pk/bean/PKQueuingMicMemberInfo.java index a20a3fff6..455d042de 100644 --- a/core/src/main/java/com/pikolive/core/room/pk/bean/PKQueuingMicMemberInfo.java +++ b/core/src/main/java/com/bingchuang/core/room/pk/bean/PKQueuingMicMemberInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.pk.bean; +package com.bingchuang.core.room.pk.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/room/pk/bean/PKRecordInfo.java b/core/src/main/java/com/bingchuang/core/room/pk/bean/PKRecordInfo.java similarity index 94% rename from core/src/main/java/com/pikolive/core/room/pk/bean/PKRecordInfo.java rename to core/src/main/java/com/bingchuang/core/room/pk/bean/PKRecordInfo.java index 5126cf454..e1cbe1cdf 100644 --- a/core/src/main/java/com/pikolive/core/room/pk/bean/PKRecordInfo.java +++ b/core/src/main/java/com/bingchuang/core/room/pk/bean/PKRecordInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.pk.bean; +package com.bingchuang.core.room.pk.bean; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/room/pk/bean/PKRecordListInfo.java b/core/src/main/java/com/bingchuang/core/room/pk/bean/PKRecordListInfo.java similarity index 83% rename from core/src/main/java/com/pikolive/core/room/pk/bean/PKRecordListInfo.java rename to core/src/main/java/com/bingchuang/core/room/pk/bean/PKRecordListInfo.java index c8197f95f..b9ca2ae5e 100644 --- a/core/src/main/java/com/pikolive/core/room/pk/bean/PKRecordListInfo.java +++ b/core/src/main/java/com/bingchuang/core/room/pk/bean/PKRecordListInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.pk.bean; +package com.bingchuang.core.room.pk.bean; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/room/pk/bean/PKRespQueuingMicListInfo.java b/core/src/main/java/com/bingchuang/core/room/pk/bean/PKRespQueuingMicListInfo.java similarity index 86% rename from core/src/main/java/com/pikolive/core/room/pk/bean/PKRespQueuingMicListInfo.java rename to core/src/main/java/com/bingchuang/core/room/pk/bean/PKRespQueuingMicListInfo.java index 67aba50a0..6445038a8 100644 --- a/core/src/main/java/com/pikolive/core/room/pk/bean/PKRespQueuingMicListInfo.java +++ b/core/src/main/java/com/bingchuang/core/room/pk/bean/PKRespQueuingMicListInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.pk.bean; +package com.bingchuang.core.room.pk.bean; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/room/pk/bean/PKTeamInfo.java b/core/src/main/java/com/bingchuang/core/room/pk/bean/PKTeamInfo.java similarity index 76% rename from core/src/main/java/com/pikolive/core/room/pk/bean/PKTeamInfo.java rename to core/src/main/java/com/bingchuang/core/room/pk/bean/PKTeamInfo.java index ece807adc..e54a610e2 100644 --- a/core/src/main/java/com/pikolive/core/room/pk/bean/PKTeamInfo.java +++ b/core/src/main/java/com/bingchuang/core/room/pk/bean/PKTeamInfo.java @@ -1,8 +1,8 @@ -package com.pikolive.core.room.pk.bean; +package com.bingchuang.core.room.pk.bean; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.user.bean.UserInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.user.bean.UserInfo; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/room/pk/bean/PKTeamMember.java b/core/src/main/java/com/bingchuang/core/room/pk/bean/PKTeamMember.java similarity index 78% rename from core/src/main/java/com/pikolive/core/room/pk/bean/PKTeamMember.java rename to core/src/main/java/com/bingchuang/core/room/pk/bean/PKTeamMember.java index f56e26d43..ded55a7cb 100644 --- a/core/src/main/java/com/pikolive/core/room/pk/bean/PKTeamMember.java +++ b/core/src/main/java/com/bingchuang/core/room/pk/bean/PKTeamMember.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.pk.bean; +package com.bingchuang.core.room.pk.bean; import lombok.Data; @@ -10,7 +10,7 @@ import lombok.Data; @Data public class PKTeamMember { private String uid;//用户uid - private String erbanNo;//Peko号 + private String erbanNo;//Peki号 private String nick;//昵称 private int gender;//性别 private String avatar;//头像 diff --git a/core/src/main/java/com/pikolive/core/room/pk/bean/RoomPKInvitedUpMicMember.java b/core/src/main/java/com/bingchuang/core/room/pk/bean/RoomPKInvitedUpMicMember.java similarity index 80% rename from core/src/main/java/com/pikolive/core/room/pk/bean/RoomPKInvitedUpMicMember.java rename to core/src/main/java/com/bingchuang/core/room/pk/bean/RoomPKInvitedUpMicMember.java index 3da81b35c..a2c026d90 100644 --- a/core/src/main/java/com/pikolive/core/room/pk/bean/RoomPKInvitedUpMicMember.java +++ b/core/src/main/java/com/bingchuang/core/room/pk/bean/RoomPKInvitedUpMicMember.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.pk.bean; +package com.bingchuang.core.room.pk.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/room/pk/bean/RoomPkData.java b/core/src/main/java/com/bingchuang/core/room/pk/bean/RoomPkData.java similarity index 98% rename from core/src/main/java/com/pikolive/core/room/pk/bean/RoomPkData.java rename to core/src/main/java/com/bingchuang/core/room/pk/bean/RoomPkData.java index 2efe57f27..b41b38a17 100644 --- a/core/src/main/java/com/pikolive/core/room/pk/bean/RoomPkData.java +++ b/core/src/main/java/com/bingchuang/core/room/pk/bean/RoomPkData.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.pk.bean; +package com.bingchuang.core.room.pk.bean; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/com/pikolive/core/room/pk/bean/request/CreatePKMember.java b/core/src/main/java/com/bingchuang/core/room/pk/bean/request/CreatePKMember.java similarity index 86% rename from core/src/main/java/com/pikolive/core/room/pk/bean/request/CreatePKMember.java rename to core/src/main/java/com/bingchuang/core/room/pk/bean/request/CreatePKMember.java index aaf7ad2aa..6b4d229b0 100644 --- a/core/src/main/java/com/pikolive/core/room/pk/bean/request/CreatePKMember.java +++ b/core/src/main/java/com/bingchuang/core/room/pk/bean/request/CreatePKMember.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.pk.bean.request; +package com.bingchuang.core.room.pk.bean.request; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/room/pk/bean/response/RespPKData.java b/core/src/main/java/com/bingchuang/core/room/pk/bean/response/RespPKData.java similarity index 61% rename from core/src/main/java/com/pikolive/core/room/pk/bean/response/RespPKData.java rename to core/src/main/java/com/bingchuang/core/room/pk/bean/response/RespPKData.java index 9015497d2..a2f0b12d9 100644 --- a/core/src/main/java/com/pikolive/core/room/pk/bean/response/RespPKData.java +++ b/core/src/main/java/com/bingchuang/core/room/pk/bean/response/RespPKData.java @@ -1,6 +1,6 @@ -package com.pikolive.core.room.pk.bean.response; +package com.bingchuang.core.room.pk.bean.response; -import com.pikolive.core.room.pk.bean.RoomPkData; +import com.bingchuang.core.room.pk.bean.RoomPkData; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/room/pk/event/PKDataUpdateEvent.java b/core/src/main/java/com/bingchuang/core/room/pk/event/PKDataUpdateEvent.java similarity index 74% rename from core/src/main/java/com/pikolive/core/room/pk/event/PKDataUpdateEvent.java rename to core/src/main/java/com/bingchuang/core/room/pk/event/PKDataUpdateEvent.java index ebdbedcec..4eca0a737 100644 --- a/core/src/main/java/com/pikolive/core/room/pk/event/PKDataUpdateEvent.java +++ b/core/src/main/java/com/bingchuang/core/room/pk/event/PKDataUpdateEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.pk.event; +package com.bingchuang.core.room.pk.event; /** * @author jack diff --git a/core/src/main/java/com/pikolive/core/room/pk/event/PKStateEvent.java b/core/src/main/java/com/bingchuang/core/room/pk/event/PKStateEvent.java similarity index 74% rename from core/src/main/java/com/pikolive/core/room/pk/event/PKStateEvent.java rename to core/src/main/java/com/bingchuang/core/room/pk/event/PKStateEvent.java index c00d724ff..d7e2d8a3e 100644 --- a/core/src/main/java/com/pikolive/core/room/pk/event/PKStateEvent.java +++ b/core/src/main/java/com/bingchuang/core/room/pk/event/PKStateEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.pk.event; +package com.bingchuang.core.room.pk.event; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/room/pk/event/PKTimeFinishEvent.java b/core/src/main/java/com/bingchuang/core/room/pk/event/PKTimeFinishEvent.java similarity index 68% rename from core/src/main/java/com/pikolive/core/room/pk/event/PKTimeFinishEvent.java rename to core/src/main/java/com/bingchuang/core/room/pk/event/PKTimeFinishEvent.java index e7d21c7d9..32e9cf95f 100644 --- a/core/src/main/java/com/pikolive/core/room/pk/event/PKTimeFinishEvent.java +++ b/core/src/main/java/com/bingchuang/core/room/pk/event/PKTimeFinishEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.pk.event; +package com.bingchuang.core.room.pk.event; /** * @author jack diff --git a/core/src/main/java/com/pikolive/core/room/pk/event/PKTimeTickEvent.java b/core/src/main/java/com/bingchuang/core/room/pk/event/PKTimeTickEvent.java similarity index 84% rename from core/src/main/java/com/pikolive/core/room/pk/event/PKTimeTickEvent.java rename to core/src/main/java/com/bingchuang/core/room/pk/event/PKTimeTickEvent.java index 690967ca8..38465b431 100644 --- a/core/src/main/java/com/pikolive/core/room/pk/event/PKTimeTickEvent.java +++ b/core/src/main/java/com/bingchuang/core/room/pk/event/PKTimeTickEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.pk.event; +package com.bingchuang.core.room.pk.event; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/room/pk/model/IPkModel.java b/core/src/main/java/com/bingchuang/core/room/pk/model/IPkModel.java similarity index 86% rename from core/src/main/java/com/pikolive/core/room/pk/model/IPkModel.java rename to core/src/main/java/com/bingchuang/core/room/pk/model/IPkModel.java index f1dc268ef..fceda3178 100644 --- a/core/src/main/java/com/pikolive/core/room/pk/model/IPkModel.java +++ b/core/src/main/java/com/bingchuang/core/room/pk/model/IPkModel.java @@ -1,17 +1,17 @@ -package com.pikolive.core.room.pk.model; +package com.bingchuang.core.room.pk.model; import androidx.annotation.Nullable; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.base.IModel; -import com.pikolive.core.room.pk.bean.PKMemberInfo; -import com.pikolive.core.room.pk.bean.PKRecordListInfo; -import com.pikolive.core.room.pk.bean.PKRespQueuingMicListInfo; -import com.pikolive.core.room.pk.bean.PKTeamInfo; -import com.pikolive.core.room.pk.bean.RoomPKInvitedUpMicMember; -import com.pikolive.core.room.pk.bean.RoomPkData; -import com.pikolive.core.user.bean.UserInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.room.pk.bean.PKMemberInfo; +import com.bingchuang.core.room.pk.bean.PKRecordListInfo; +import com.bingchuang.core.room.pk.bean.PKRespQueuingMicListInfo; +import com.bingchuang.core.room.pk.bean.PKTeamInfo; +import com.bingchuang.core.room.pk.bean.RoomPKInvitedUpMicMember; +import com.bingchuang.core.room.pk.bean.RoomPkData; +import com.bingchuang.core.user.bean.UserInfo; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/room/pk/model/PkModel.java b/core/src/main/java/com/bingchuang/core/room/pk/model/PkModel.java similarity index 95% rename from core/src/main/java/com/pikolive/core/room/pk/model/PkModel.java rename to core/src/main/java/com/bingchuang/core/room/pk/model/PkModel.java index 1a5bc75c7..6fd629bfd 100644 --- a/core/src/main/java/com/pikolive/core/room/pk/model/PkModel.java +++ b/core/src/main/java/com/bingchuang/core/room/pk/model/PkModel.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.pk.model; +package com.bingchuang.core.room.pk.model; import android.annotation.SuppressLint; import android.os.CountDownTimer; @@ -10,51 +10,51 @@ 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.pikolive.core.magic.MagicModel; -import com.pikolive.core.magic.bean.MagicInfo; -import com.pikolive.core.magic.bean.MagicReceivedInfo; -import com.pikolive.core.magic.bean.MultiMagicReceivedInfo; -import com.pikolive.core.room.pk.attachment.RoomPkAttachment; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.magic.MagicModel; -import com.pikolive.core.magic.bean.MagicInfo; -import com.pikolive.core.magic.bean.MagicReceivedInfo; -import com.pikolive.core.magic.bean.MultiMagicReceivedInfo; -import com.pikolive.core.room.pk.attachment.RoomPkAttachment; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.R; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.RoomQueueInfo; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.gift.GiftModel; -import com.pikolive.core.gift.bean.GiftInfo; -import com.pikolive.core.gift.bean.GiftList; -import com.pikolive.core.gift.bean.GiftMultiReceiverInfo; -import com.pikolive.core.gift.bean.GiftReceiveInfo; -import com.pikolive.core.gift.bean.GiftReceiver; -import com.pikolive.core.gift.bean.LuckyBagGifts; -import com.pikolive.core.gift.bean.MultiGiftReceiveInfo; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core2.manager.AudioEngineManager; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.manager.RoomEvent; -import com.pikolive.core.room.model.AvRoomModel; -import com.pikolive.core.room.pk.bean.PKMemberInfo; -import com.pikolive.core.room.pk.bean.PKRecordListInfo; -import com.pikolive.core.room.pk.bean.PKRespQueuingMicListInfo; -import com.pikolive.core.room.pk.bean.PKTeamInfo; -import com.pikolive.core.room.pk.bean.PKTeamMember; -import com.pikolive.core.room.pk.bean.RoomPKInvitedUpMicMember; -import com.pikolive.core.room.pk.bean.RoomPkData; -import com.pikolive.core.room.pk.bean.request.CreatePKMember; -import com.pikolive.core.room.pk.bean.response.RespPKData; -import com.pikolive.core.room.pk.event.PKDataUpdateEvent; -import com.pikolive.core.room.pk.event.PKTimeFinishEvent; -import com.pikolive.core.room.pk.event.PKTimeTickEvent; -import com.pikolive.core.user.UserModel; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.magic.MagicModel; +import com.bingchuang.core.magic.bean.MagicInfo; +import com.bingchuang.core.magic.bean.MagicReceivedInfo; +import com.bingchuang.core.magic.bean.MultiMagicReceivedInfo; +import com.bingchuang.core.room.pk.attachment.RoomPkAttachment; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.magic.MagicModel; +import com.bingchuang.core.magic.bean.MagicInfo; +import com.bingchuang.core.magic.bean.MagicReceivedInfo; +import com.bingchuang.core.magic.bean.MultiMagicReceivedInfo; +import com.bingchuang.core.room.pk.attachment.RoomPkAttachment; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.R; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.RoomQueueInfo; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.gift.GiftModel; +import com.bingchuang.core.gift.bean.GiftInfo; +import com.bingchuang.core.gift.bean.GiftList; +import com.bingchuang.core.gift.bean.GiftMultiReceiverInfo; +import com.bingchuang.core.gift.bean.GiftReceiveInfo; +import com.bingchuang.core.gift.bean.GiftReceiver; +import com.bingchuang.core.gift.bean.LuckyBagGifts; +import com.bingchuang.core.gift.bean.MultiGiftReceiveInfo; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core2.manager.AudioEngineManager; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.manager.RoomEvent; +import com.bingchuang.core.room.model.AvRoomModel; +import com.bingchuang.core.room.pk.bean.PKMemberInfo; +import com.bingchuang.core.room.pk.bean.PKRecordListInfo; +import com.bingchuang.core.room.pk.bean.PKRespQueuingMicListInfo; +import com.bingchuang.core.room.pk.bean.PKTeamInfo; +import com.bingchuang.core.room.pk.bean.PKTeamMember; +import com.bingchuang.core.room.pk.bean.RoomPKInvitedUpMicMember; +import com.bingchuang.core.room.pk.bean.RoomPkData; +import com.bingchuang.core.room.pk.bean.request.CreatePKMember; +import com.bingchuang.core.room.pk.bean.response.RespPKData; +import com.bingchuang.core.room.pk.event.PKDataUpdateEvent; +import com.bingchuang.core.room.pk.event.PKTimeFinishEvent; +import com.bingchuang.core.room.pk.event.PKTimeTickEvent; +import com.bingchuang.core.user.UserModel; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.SingleToastUtil; diff --git a/core/src/main/java/com/pikolive/core/room/queue/bean/ConsumeInfo.java b/core/src/main/java/com/bingchuang/core/room/queue/bean/ConsumeInfo.java similarity index 99% rename from core/src/main/java/com/pikolive/core/room/queue/bean/ConsumeInfo.java rename to core/src/main/java/com/bingchuang/core/room/queue/bean/ConsumeInfo.java index 7015c3f92..807156f2b 100644 --- a/core/src/main/java/com/pikolive/core/room/queue/bean/ConsumeInfo.java +++ b/core/src/main/java/com/bingchuang/core/room/queue/bean/ConsumeInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.queue.bean; +package com.bingchuang.core.room.queue.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/room/queue/bean/MicMemberInfo.java b/core/src/main/java/com/bingchuang/core/room/queue/bean/MicMemberInfo.java similarity index 97% rename from core/src/main/java/com/pikolive/core/room/queue/bean/MicMemberInfo.java rename to core/src/main/java/com/bingchuang/core/room/queue/bean/MicMemberInfo.java index 91a4df475..2262692cb 100644 --- a/core/src/main/java/com/pikolive/core/room/queue/bean/MicMemberInfo.java +++ b/core/src/main/java/com/bingchuang/core/room/queue/bean/MicMemberInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.queue.bean; +package com.bingchuang.core.room.queue.bean; import com.google.gson.annotations.SerializedName; diff --git a/core/src/main/java/com/pikolive/core/room/queue/bean/RoomConsumeInfo.java b/core/src/main/java/com/bingchuang/core/room/queue/bean/RoomConsumeInfo.java similarity index 81% rename from core/src/main/java/com/pikolive/core/room/queue/bean/RoomConsumeInfo.java rename to core/src/main/java/com/bingchuang/core/room/queue/bean/RoomConsumeInfo.java index 726a66066..fb1245ccf 100644 --- a/core/src/main/java/com/pikolive/core/room/queue/bean/RoomConsumeInfo.java +++ b/core/src/main/java/com/bingchuang/core/room/queue/bean/RoomConsumeInfo.java @@ -1,11 +1,11 @@ -package com.pikolive.core.room.queue.bean; +package com.bingchuang.core.room.queue.bean; -import com.pikolive.core.level.UserLevelVo; -import com.pikolive.core.noble.NobleInfo; -import com.pikolive.core.level.UserLevelVo; -import com.pikolive.core.noble.NobleInfo; -import com.pikolive.core.level.UserLevelVo; -import com.pikolive.core.noble.NobleInfo; +import com.bingchuang.core.level.UserLevelVo; +import com.bingchuang.core.noble.NobleInfo; +import com.bingchuang.core.level.UserLevelVo; +import com.bingchuang.core.noble.NobleInfo; +import com.bingchuang.core.level.UserLevelVo; +import com.bingchuang.core.noble.NobleInfo; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/room/queuing_mic/attachment/QueuingMicAttachment.java b/core/src/main/java/com/bingchuang/core/room/queuing_mic/attachment/QueuingMicAttachment.java similarity index 79% rename from core/src/main/java/com/pikolive/core/room/queuing_mic/attachment/QueuingMicAttachment.java rename to core/src/main/java/com/bingchuang/core/room/queuing_mic/attachment/QueuingMicAttachment.java index dbd7d3485..15337bbff 100644 --- a/core/src/main/java/com/pikolive/core/room/queuing_mic/attachment/QueuingMicAttachment.java +++ b/core/src/main/java/com/bingchuang/core/room/queuing_mic/attachment/QueuingMicAttachment.java @@ -1,10 +1,10 @@ -package com.pikolive.core.room.queuing_mic.attachment; +package com.bingchuang.core.room.queuing_mic.attachment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.room.queuing_mic.bean.QueuingMicInfo; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.room.queuing_mic.bean.QueuingMicInfo; public class QueuingMicAttachment extends CustomAttachment { diff --git a/core/src/main/java/com/pikolive/core/room/queuing_mic/bean/GroupType.java b/core/src/main/java/com/bingchuang/core/room/queuing_mic/bean/GroupType.java similarity index 63% rename from core/src/main/java/com/pikolive/core/room/queuing_mic/bean/GroupType.java rename to core/src/main/java/com/bingchuang/core/room/queuing_mic/bean/GroupType.java index 591f273d7..da996191d 100644 --- a/core/src/main/java/com/pikolive/core/room/queuing_mic/bean/GroupType.java +++ b/core/src/main/java/com/bingchuang/core/room/queuing_mic/bean/GroupType.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.queuing_mic.bean; +package com.bingchuang.core.room.queuing_mic.bean; public interface GroupType { int NORMAL = 1; diff --git a/core/src/main/java/com/pikolive/core/room/queuing_mic/bean/QueuingMicInfo.java b/core/src/main/java/com/bingchuang/core/room/queuing_mic/bean/QueuingMicInfo.java similarity index 91% rename from core/src/main/java/com/pikolive/core/room/queuing_mic/bean/QueuingMicInfo.java rename to core/src/main/java/com/bingchuang/core/room/queuing_mic/bean/QueuingMicInfo.java index e5c5c1cf6..c77964aca 100644 --- a/core/src/main/java/com/pikolive/core/room/queuing_mic/bean/QueuingMicInfo.java +++ b/core/src/main/java/com/bingchuang/core/room/queuing_mic/bean/QueuingMicInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.queuing_mic.bean; +package com.bingchuang.core.room.queuing_mic.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/room/queuing_mic/bean/QueuingMicMemeberInfo.java b/core/src/main/java/com/bingchuang/core/room/queuing_mic/bean/QueuingMicMemeberInfo.java similarity index 90% rename from core/src/main/java/com/pikolive/core/room/queuing_mic/bean/QueuingMicMemeberInfo.java rename to core/src/main/java/com/bingchuang/core/room/queuing_mic/bean/QueuingMicMemeberInfo.java index 064f1ab8e..f1cbc8609 100644 --- a/core/src/main/java/com/pikolive/core/room/queuing_mic/bean/QueuingMicMemeberInfo.java +++ b/core/src/main/java/com/bingchuang/core/room/queuing_mic/bean/QueuingMicMemeberInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.queuing_mic.bean; +package com.bingchuang.core.room.queuing_mic.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/room/queuing_mic/bean/RespQueuingMicListInfo.java b/core/src/main/java/com/bingchuang/core/room/queuing_mic/bean/RespQueuingMicListInfo.java similarity index 83% rename from core/src/main/java/com/pikolive/core/room/queuing_mic/bean/RespQueuingMicListInfo.java rename to core/src/main/java/com/bingchuang/core/room/queuing_mic/bean/RespQueuingMicListInfo.java index aee725c7a..0c10c88ed 100644 --- a/core/src/main/java/com/pikolive/core/room/queuing_mic/bean/RespQueuingMicListInfo.java +++ b/core/src/main/java/com/bingchuang/core/room/queuing_mic/bean/RespQueuingMicListInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.queuing_mic.bean; +package com.bingchuang.core.room.queuing_mic.bean; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/room/queuing_mic/event/HasAnimationEffect.java b/core/src/main/java/com/bingchuang/core/room/queuing_mic/event/HasAnimationEffect.java similarity index 64% rename from core/src/main/java/com/pikolive/core/room/queuing_mic/event/HasAnimationEffect.java rename to core/src/main/java/com/bingchuang/core/room/queuing_mic/event/HasAnimationEffect.java index cf27ad4ed..a2b77ea89 100644 --- a/core/src/main/java/com/pikolive/core/room/queuing_mic/event/HasAnimationEffect.java +++ b/core/src/main/java/com/bingchuang/core/room/queuing_mic/event/HasAnimationEffect.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.queuing_mic.event; +package com.bingchuang.core.room.queuing_mic.event; /** * 房间内更新头部开关特效图标事件 diff --git a/core/src/main/java/com/bingchuang/core/room/queuing_mic/event/QueuingMicEmptyEvent.java b/core/src/main/java/com/bingchuang/core/room/queuing_mic/event/QueuingMicEmptyEvent.java new file mode 100644 index 000000000..88548a37f --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/room/queuing_mic/event/QueuingMicEmptyEvent.java @@ -0,0 +1,4 @@ +package com.bingchuang.core.room.queuing_mic.event; + +public class QueuingMicEmptyEvent { +} diff --git a/core/src/main/java/com/bingchuang/core/room/queuing_mic/event/QueuingMicNotEmptyEvent.java b/core/src/main/java/com/bingchuang/core/room/queuing_mic/event/QueuingMicNotEmptyEvent.java new file mode 100644 index 000000000..acd10552b --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/room/queuing_mic/event/QueuingMicNotEmptyEvent.java @@ -0,0 +1,4 @@ +package com.bingchuang.core.room.queuing_mic.event; + +public class QueuingMicNotEmptyEvent { +} diff --git a/core/src/main/java/com/bingchuang/core/room/recommendpos/IRecommendCardModel.java b/core/src/main/java/com/bingchuang/core/room/recommendpos/IRecommendCardModel.java new file mode 100644 index 000000000..58d41f39e --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/room/recommendpos/IRecommendCardModel.java @@ -0,0 +1,27 @@ +package com.bingchuang.core.room.recommendpos; + +import com.bingchuang.core.room.recommendpos.bean.RcmdCardType; +import com.bingchuang.core.room.recommendpos.bean.RecommendCard; +import com.bingchuang.core.room.recommendpos.bean.RcmdCardType; +import com.bingchuang.core.room.recommendpos.bean.RecommendCard; +import com.bingchuang.core.room.recommendpos.bean.RecommendCard; + +import java.util.List; + +import io.reactivex.Single; + +/** + * Created by lvzebiao on 2019/1/30. + */ + +public interface IRecommendCardModel { + + /** + * 我的推荐卡接口 + * + * @param status {@link RcmdCardType} + * @return list + */ + Single > getBagList(int status, int page, int pageSize); + +} diff --git a/core/src/main/java/com/pikolive/core/room/recommendpos/RecommendCardModel.java b/core/src/main/java/com/bingchuang/core/room/recommendpos/RecommendCardModel.java similarity index 72% rename from core/src/main/java/com/pikolive/core/room/recommendpos/RecommendCardModel.java rename to core/src/main/java/com/bingchuang/core/room/recommendpos/RecommendCardModel.java index 37b0d9c58..7771c89fa 100644 --- a/core/src/main/java/com/pikolive/core/room/recommendpos/RecommendCardModel.java +++ b/core/src/main/java/com/bingchuang/core/room/recommendpos/RecommendCardModel.java @@ -1,14 +1,14 @@ -package com.pikolive.core.room.recommendpos; +package com.bingchuang.core.room.recommendpos; -import com.pikolive.core.room.recommendpos.bean.RcmdCardType; -import com.pikolive.core.room.recommendpos.bean.RecommendCard; -import com.pikolive.core.room.recommendpos.bean.RcmdCardType; -import com.pikolive.core.room.recommendpos.bean.RecommendCard; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.room.recommendpos.bean.RecommendCard; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.room.recommendpos.bean.RcmdCardType; +import com.bingchuang.core.room.recommendpos.bean.RecommendCard; +import com.bingchuang.core.room.recommendpos.bean.RcmdCardType; +import com.bingchuang.core.room.recommendpos.bean.RecommendCard; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.room.recommendpos.bean.RecommendCard; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import java.util.ArrayList; diff --git a/core/src/main/java/com/pikolive/core/room/recommendpos/bean/RcmdCardType.java b/core/src/main/java/com/bingchuang/core/room/recommendpos/bean/RcmdCardType.java similarity index 86% rename from core/src/main/java/com/pikolive/core/room/recommendpos/bean/RcmdCardType.java rename to core/src/main/java/com/bingchuang/core/room/recommendpos/bean/RcmdCardType.java index e7c19e935..be14f5676 100644 --- a/core/src/main/java/com/pikolive/core/room/recommendpos/bean/RcmdCardType.java +++ b/core/src/main/java/com/bingchuang/core/room/recommendpos/bean/RcmdCardType.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.recommendpos.bean; +package com.bingchuang.core.room.recommendpos.bean; /** * Created by lvzebiao on 2019/1/31. diff --git a/core/src/main/java/com/pikolive/core/room/recommendpos/bean/RecommendCard.java b/core/src/main/java/com/bingchuang/core/room/recommendpos/bean/RecommendCard.java similarity index 90% rename from core/src/main/java/com/pikolive/core/room/recommendpos/bean/RecommendCard.java rename to core/src/main/java/com/bingchuang/core/room/recommendpos/bean/RecommendCard.java index 185c7692b..996e93202 100644 --- a/core/src/main/java/com/pikolive/core/room/recommendpos/bean/RecommendCard.java +++ b/core/src/main/java/com/bingchuang/core/room/recommendpos/bean/RecommendCard.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.recommendpos.bean; +package com.bingchuang.core.room.recommendpos.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/room/treasure_box/bean/BoxRankingInfo.java b/core/src/main/java/com/bingchuang/core/room/treasure_box/bean/BoxRankingInfo.java similarity index 95% rename from core/src/main/java/com/pikolive/core/room/treasure_box/bean/BoxRankingInfo.java rename to core/src/main/java/com/bingchuang/core/room/treasure_box/bean/BoxRankingInfo.java index a2c3675d4..96dfcc0bb 100644 --- a/core/src/main/java/com/pikolive/core/room/treasure_box/bean/BoxRankingInfo.java +++ b/core/src/main/java/com/bingchuang/core/room/treasure_box/bean/BoxRankingInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.room.treasure_box.bean; +package com.bingchuang.core.room.treasure_box.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/room/treasure_box/bean/TreasureRankingInfo.kt b/core/src/main/java/com/bingchuang/core/room/treasure_box/bean/TreasureRankingInfo.kt similarity index 82% rename from core/src/main/java/com/pikolive/core/room/treasure_box/bean/TreasureRankingInfo.kt rename to core/src/main/java/com/bingchuang/core/room/treasure_box/bean/TreasureRankingInfo.kt index 3256290d5..760f4772a 100644 --- a/core/src/main/java/com/pikolive/core/room/treasure_box/bean/TreasureRankingInfo.kt +++ b/core/src/main/java/com/bingchuang/core/room/treasure_box/bean/TreasureRankingInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.room.treasure_box.bean +package com.bingchuang.core.room.treasure_box.bean import java.io.Serializable diff --git a/core/src/main/java/com/bingchuang/core/room/treasure_box/event/RefreshBoxRankingEvent.java b/core/src/main/java/com/bingchuang/core/room/treasure_box/event/RefreshBoxRankingEvent.java new file mode 100644 index 000000000..d425ddd1c --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/room/treasure_box/event/RefreshBoxRankingEvent.java @@ -0,0 +1,4 @@ +package com.bingchuang.core.room.treasure_box.event; + +public class RefreshBoxRankingEvent { +} diff --git a/core/src/main/java/com/pikolive/core/settings/ISettingsModel.java b/core/src/main/java/com/bingchuang/core/settings/ISettingsModel.java similarity index 55% rename from core/src/main/java/com/pikolive/core/settings/ISettingsModel.java rename to core/src/main/java/com/bingchuang/core/settings/ISettingsModel.java index 914ad2926..4240dfb7a 100644 --- a/core/src/main/java/com/pikolive/core/settings/ISettingsModel.java +++ b/core/src/main/java/com/bingchuang/core/settings/ISettingsModel.java @@ -1,17 +1,17 @@ -package com.pikolive.core.settings; +package com.bingchuang.core.settings; -import com.pikolive.core.base.IModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.settings.bean.SysAccount; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.base.IModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.settings.bean.SysAccount; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.base.IModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.settings.bean.SysAccount; -import com.pikolive.core.user.bean.UserInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.settings.bean.SysAccount; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.settings.bean.SysAccount; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.settings.bean.SysAccount; +import com.bingchuang.core.user.bean.UserInfo; import io.reactivex.Single; diff --git a/core/src/main/java/com/pikolive/core/settings/SettingsModel.java b/core/src/main/java/com/bingchuang/core/settings/SettingsModel.java similarity index 95% rename from core/src/main/java/com/pikolive/core/settings/SettingsModel.java rename to core/src/main/java/com/bingchuang/core/settings/SettingsModel.java index 43acb3a8a..5464361f8 100644 --- a/core/src/main/java/com/pikolive/core/settings/SettingsModel.java +++ b/core/src/main/java/com/bingchuang/core/settings/SettingsModel.java @@ -1,17 +1,17 @@ -package com.pikolive.core.settings; +package com.bingchuang.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.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.settings.bean.SysAccount; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.R; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.utils.TextUtils; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.settings.bean.SysAccount; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.R; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.utils.TextUtils; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.common.util.SPUtils; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.utils.ResUtil; diff --git a/core/src/main/java/com/pikolive/core/settings/bean/SysAccount.java b/core/src/main/java/com/bingchuang/core/settings/bean/SysAccount.java similarity index 85% rename from core/src/main/java/com/pikolive/core/settings/bean/SysAccount.java rename to core/src/main/java/com/bingchuang/core/settings/bean/SysAccount.java index f1611bb27..bc958007c 100644 --- a/core/src/main/java/com/pikolive/core/settings/bean/SysAccount.java +++ b/core/src/main/java/com/bingchuang/core/settings/bean/SysAccount.java @@ -1,4 +1,4 @@ -package com.pikolive.core.settings.bean; +package com.bingchuang.core.settings.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/share/IShareCoreClient.java b/core/src/main/java/com/bingchuang/core/share/IShareCoreClient.java similarity index 97% rename from core/src/main/java/com/pikolive/core/share/IShareCoreClient.java rename to core/src/main/java/com/bingchuang/core/share/IShareCoreClient.java index 88489d196..2b0a4a0c6 100644 --- a/core/src/main/java/com/pikolive/core/share/IShareCoreClient.java +++ b/core/src/main/java/com/bingchuang/core/share/IShareCoreClient.java @@ -1,4 +1,4 @@ -package com.pikolive.core.share; +package com.bingchuang.core.share; import com.bingchuang.library.coremanager.ICoreClient; diff --git a/core/src/main/java/com/pikolive/core/share/IShareModel.java b/core/src/main/java/com/bingchuang/core/share/IShareModel.java similarity index 77% rename from core/src/main/java/com/pikolive/core/share/IShareModel.java rename to core/src/main/java/com/bingchuang/core/share/IShareModel.java index a1251f09f..1852bbc50 100644 --- a/core/src/main/java/com/pikolive/core/share/IShareModel.java +++ b/core/src/main/java/com/bingchuang/core/share/IShareModel.java @@ -1,11 +1,11 @@ -package com.pikolive.core.share; +package com.bingchuang.core.share; -import com.pikolive.core.share.bean.ShareCommonInfo; -import com.pikolive.core.web.bean.WebJsBeanInfo; -import com.pikolive.core.share.bean.ShareCommonInfo; -import com.pikolive.core.web.bean.WebJsBeanInfo; -import com.pikolive.core.share.bean.ShareCommonInfo; -import com.pikolive.core.web.bean.WebJsBeanInfo; +import com.bingchuang.core.share.bean.ShareCommonInfo; +import com.bingchuang.core.web.bean.WebJsBeanInfo; +import com.bingchuang.core.share.bean.ShareCommonInfo; +import com.bingchuang.core.web.bean.WebJsBeanInfo; +import com.bingchuang.core.share.bean.ShareCommonInfo; +import com.bingchuang.core.web.bean.WebJsBeanInfo; import com.bingchuang.library.coremanager.IBaseCore; import cn.sharesdk.framework.Platform; diff --git a/core/src/main/java/com/pikolive/core/share/ShareModel.java b/core/src/main/java/com/bingchuang/core/share/ShareModel.java similarity index 93% rename from core/src/main/java/com/pikolive/core/share/ShareModel.java rename to core/src/main/java/com/bingchuang/core/share/ShareModel.java index 48d37e1fb..2f14356d1 100644 --- a/core/src/main/java/com/pikolive/core/share/ShareModel.java +++ b/core/src/main/java/com/bingchuang/core/share/ShareModel.java @@ -1,4 +1,4 @@ -package com.pikolive.core.share; +package com.bingchuang.core.share; import android.annotation.SuppressLint; import android.content.ClipData; @@ -7,34 +7,34 @@ import android.content.Context; import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.result.ShareRedPacketResult; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.im.custom.bean.RoomTipAttachment; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.share.bean.ShareCommonInfo; -import com.pikolive.core.user.UserModel; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.utils.Logger; -import com.pikolive.core.web.bean.WebJsBeanInfo; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.result.ShareRedPacketResult; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.im.custom.bean.RoomTipAttachment; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.share.bean.ShareCommonInfo; -import com.pikolive.core.user.UserModel; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.utils.Logger; -import com.pikolive.core.web.bean.WebJsBeanInfo; -import com.pikolive.core.R; -import com.pikolive.core2.XChatConstants; -import com.pikolive.core2.UriProvider; -import com.pikolive.core2.manager.IMNetEaseManager; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.result.ShareRedPacketResult; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.im.custom.bean.RoomTipAttachment; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.share.bean.ShareCommonInfo; +import com.bingchuang.core.user.UserModel; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.utils.Logger; +import com.bingchuang.core.web.bean.WebJsBeanInfo; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.result.ShareRedPacketResult; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.im.custom.bean.RoomTipAttachment; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.share.bean.ShareCommonInfo; +import com.bingchuang.core.user.UserModel; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.utils.Logger; +import com.bingchuang.core.web.bean.WebJsBeanInfo; +import com.bingchuang.core.R; +import com.bingchuang.core2.XChatConstants; +import com.bingchuang.core2.UriProvider; +import com.bingchuang.core2.manager.IMNetEaseManager; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.SingleToastUtil; diff --git a/core/src/main/java/com/pikolive/core/share/bean/InAppSharingFamilyInfo.java b/core/src/main/java/com/bingchuang/core/share/bean/InAppSharingFamilyInfo.java similarity index 53% rename from core/src/main/java/com/pikolive/core/share/bean/InAppSharingFamilyInfo.java rename to core/src/main/java/com/bingchuang/core/share/bean/InAppSharingFamilyInfo.java index 839b91d26..6c199962f 100644 --- a/core/src/main/java/com/pikolive/core/share/bean/InAppSharingFamilyInfo.java +++ b/core/src/main/java/com/bingchuang/core/share/bean/InAppSharingFamilyInfo.java @@ -1,8 +1,8 @@ -package com.pikolive.core.share.bean; +package com.bingchuang.core.share.bean; -import com.pikolive.core.family.bean.FamilyInfo; -import com.pikolive.core.family.bean.FamilyInfo; -import com.pikolive.core.family.bean.FamilyInfo; +import com.bingchuang.core.family.bean.FamilyInfo; +import com.bingchuang.core.family.bean.FamilyInfo; +import com.bingchuang.core.family.bean.FamilyInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/pikolive/core/share/bean/InAppSharingInfo.java b/core/src/main/java/com/bingchuang/core/share/bean/InAppSharingInfo.java similarity index 89% rename from core/src/main/java/com/pikolive/core/share/bean/InAppSharingInfo.java rename to core/src/main/java/com/bingchuang/core/share/bean/InAppSharingInfo.java index f5bea2ecc..010b56d65 100644 --- a/core/src/main/java/com/pikolive/core/share/bean/InAppSharingInfo.java +++ b/core/src/main/java/com/bingchuang/core/share/bean/InAppSharingInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.share.bean; +package com.bingchuang.core.share.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/share/bean/InAppSharingMiniWorldInfo.java b/core/src/main/java/com/bingchuang/core/share/bean/InAppSharingMiniWorldInfo.java similarity index 64% rename from core/src/main/java/com/pikolive/core/share/bean/InAppSharingMiniWorldInfo.java rename to core/src/main/java/com/bingchuang/core/share/bean/InAppSharingMiniWorldInfo.java index c56b15daa..6cef4f93c 100644 --- a/core/src/main/java/com/pikolive/core/share/bean/InAppSharingMiniWorldInfo.java +++ b/core/src/main/java/com/bingchuang/core/share/bean/InAppSharingMiniWorldInfo.java @@ -1,6 +1,6 @@ -package com.pikolive.core.share.bean; +package com.bingchuang.core.share.bean; -import com.pikolive.core.miniworld.bean.MiniWorldDetailInfo; +import com.bingchuang.core.miniworld.bean.MiniWorldDetailInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/pikolive/core/share/bean/InAppSharingRoomInfo.java b/core/src/main/java/com/bingchuang/core/share/bean/InAppSharingRoomInfo.java similarity index 60% rename from core/src/main/java/com/pikolive/core/share/bean/InAppSharingRoomInfo.java rename to core/src/main/java/com/bingchuang/core/share/bean/InAppSharingRoomInfo.java index 7a03d91f5..dca012c69 100644 --- a/core/src/main/java/com/pikolive/core/share/bean/InAppSharingRoomInfo.java +++ b/core/src/main/java/com/bingchuang/core/share/bean/InAppSharingRoomInfo.java @@ -1,8 +1,8 @@ -package com.pikolive.core.share.bean; +package com.bingchuang.core.share.bean; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.room.bean.RoomInfo; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.room.bean.RoomInfo; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/share/bean/InAppSharingTeamInfo.java b/core/src/main/java/com/bingchuang/core/share/bean/InAppSharingTeamInfo.java similarity index 54% rename from core/src/main/java/com/pikolive/core/share/bean/InAppSharingTeamInfo.java rename to core/src/main/java/com/bingchuang/core/share/bean/InAppSharingTeamInfo.java index 6014f4dda..6f9a81a9f 100644 --- a/core/src/main/java/com/pikolive/core/share/bean/InAppSharingTeamInfo.java +++ b/core/src/main/java/com/bingchuang/core/share/bean/InAppSharingTeamInfo.java @@ -1,8 +1,8 @@ -package com.pikolive.core.share.bean; +package com.bingchuang.core.share.bean; -import com.pikolive.core.team.bean.TeamInfo; -import com.pikolive.core.team.bean.TeamInfo; -import com.pikolive.core.team.bean.TeamInfo; +import com.bingchuang.core.team.bean.TeamInfo; +import com.bingchuang.core.team.bean.TeamInfo; +import com.bingchuang.core.team.bean.TeamInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/pikolive/core/share/bean/SessionType.java b/core/src/main/java/com/bingchuang/core/share/bean/SessionType.java similarity index 95% rename from core/src/main/java/com/pikolive/core/share/bean/SessionType.java rename to core/src/main/java/com/bingchuang/core/share/bean/SessionType.java index 1e0ec4808..16e984164 100644 --- a/core/src/main/java/com/pikolive/core/share/bean/SessionType.java +++ b/core/src/main/java/com/bingchuang/core/share/bean/SessionType.java @@ -1,4 +1,4 @@ -package com.pikolive.core.share.bean; +package com.bingchuang.core.share.bean; import android.util.SparseArray; diff --git a/core/src/main/java/com/pikolive/core/share/bean/ShareCommonInfo.java b/core/src/main/java/com/bingchuang/core/share/bean/ShareCommonInfo.java similarity index 95% rename from core/src/main/java/com/pikolive/core/share/bean/ShareCommonInfo.java rename to core/src/main/java/com/bingchuang/core/share/bean/ShareCommonInfo.java index 4e57d5018..5101d579b 100644 --- a/core/src/main/java/com/pikolive/core/share/bean/ShareCommonInfo.java +++ b/core/src/main/java/com/bingchuang/core/share/bean/ShareCommonInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.share.bean; +package com.bingchuang.core.share.bean; import lombok.Getter; diff --git a/core/src/main/java/com/pikolive/core/skill/entity/SkillNotifyEntity.kt b/core/src/main/java/com/bingchuang/core/skill/entity/SkillNotifyEntity.kt similarity index 87% rename from core/src/main/java/com/pikolive/core/skill/entity/SkillNotifyEntity.kt rename to core/src/main/java/com/bingchuang/core/skill/entity/SkillNotifyEntity.kt index 05e7189b5..da0857d83 100644 --- a/core/src/main/java/com/pikolive/core/skill/entity/SkillNotifyEntity.kt +++ b/core/src/main/java/com/bingchuang/core/skill/entity/SkillNotifyEntity.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.skill.entity +package com.bingchuang.core.skill.entity data class SkillNotifyEntity(val layout: LayoutBean) diff --git a/core/src/main/java/com/pikolive/core/skill/entity/SkillPostServerEntity.kt b/core/src/main/java/com/bingchuang/core/skill/entity/SkillPostServerEntity.kt similarity index 85% rename from core/src/main/java/com/pikolive/core/skill/entity/SkillPostServerEntity.kt rename to core/src/main/java/com/bingchuang/core/skill/entity/SkillPostServerEntity.kt index 7ecaf53cb..d0080af9d 100644 --- a/core/src/main/java/com/pikolive/core/skill/entity/SkillPostServerEntity.kt +++ b/core/src/main/java/com/bingchuang/core/skill/entity/SkillPostServerEntity.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.skill.entity +package com.bingchuang.core.skill.entity /** * ...... diff --git a/core/src/main/java/com/pikolive/core/skill/entity/SkillPropertyEntity.kt b/core/src/main/java/com/bingchuang/core/skill/entity/SkillPropertyEntity.kt similarity index 96% rename from core/src/main/java/com/pikolive/core/skill/entity/SkillPropertyEntity.kt rename to core/src/main/java/com/bingchuang/core/skill/entity/SkillPropertyEntity.kt index 7d25aacbc..fa21181fd 100644 --- a/core/src/main/java/com/pikolive/core/skill/entity/SkillPropertyEntity.kt +++ b/core/src/main/java/com/bingchuang/core/skill/entity/SkillPropertyEntity.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.skill.entity +package com.bingchuang.core.skill.entity import com.google.gson.annotations.SerializedName diff --git a/core/src/main/java/com/pikolive/core/skill/entity/SkillRecordEntity.kt b/core/src/main/java/com/bingchuang/core/skill/entity/SkillRecordEntity.kt similarity index 96% rename from core/src/main/java/com/pikolive/core/skill/entity/SkillRecordEntity.kt rename to core/src/main/java/com/bingchuang/core/skill/entity/SkillRecordEntity.kt index 6f51de8bb..346a0f45a 100644 --- a/core/src/main/java/com/pikolive/core/skill/entity/SkillRecordEntity.kt +++ b/core/src/main/java/com/bingchuang/core/skill/entity/SkillRecordEntity.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.skill.entity +package com.bingchuang.core.skill.entity import com.google.gson.annotations.SerializedName diff --git a/core/src/main/java/com/pikolive/core/skill/entity/SkillTypeEntity.kt b/core/src/main/java/com/bingchuang/core/skill/entity/SkillTypeEntity.kt similarity index 66% rename from core/src/main/java/com/pikolive/core/skill/entity/SkillTypeEntity.kt rename to core/src/main/java/com/bingchuang/core/skill/entity/SkillTypeEntity.kt index 8401cfbbf..85e781318 100644 --- a/core/src/main/java/com/pikolive/core/skill/entity/SkillTypeEntity.kt +++ b/core/src/main/java/com/bingchuang/core/skill/entity/SkillTypeEntity.kt @@ -1,3 +1,3 @@ -package com.pikolive.core.skill.entity +package com.bingchuang.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/pikolive/core/skill/event/SkillEvent.java b/core/src/main/java/com/bingchuang/core/skill/event/SkillEvent.java similarity index 86% rename from core/src/main/java/com/pikolive/core/skill/event/SkillEvent.java rename to core/src/main/java/com/bingchuang/core/skill/event/SkillEvent.java index 2803a518f..97adcc1ed 100644 --- a/core/src/main/java/com/pikolive/core/skill/event/SkillEvent.java +++ b/core/src/main/java/com/bingchuang/core/skill/event/SkillEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.skill.event; +package com.bingchuang.core.skill.event; public class SkillEvent { diff --git a/core/src/main/java/com/pikolive/core/statistic/StatLogKey.java b/core/src/main/java/com/bingchuang/core/statistic/StatLogKey.java similarity index 93% rename from core/src/main/java/com/pikolive/core/statistic/StatLogKey.java rename to core/src/main/java/com/bingchuang/core/statistic/StatLogKey.java index ac78e48de..e1ecc56ed 100644 --- a/core/src/main/java/com/pikolive/core/statistic/StatLogKey.java +++ b/core/src/main/java/com/bingchuang/core/statistic/StatLogKey.java @@ -1,4 +1,4 @@ -package com.pikolive.core.statistic; +package com.bingchuang.core.statistic; /** *
diff --git a/core/src/main/java/com/pikolive/core/statistic/protocol/StatisticsProtocol.java b/core/src/main/java/com/bingchuang/core/statistic/protocol/StatisticsProtocol.java similarity index 99% rename from core/src/main/java/com/pikolive/core/statistic/protocol/StatisticsProtocol.java rename to core/src/main/java/com/bingchuang/core/statistic/protocol/StatisticsProtocol.java index fad171d5c..6123767fa 100644 --- a/core/src/main/java/com/pikolive/core/statistic/protocol/StatisticsProtocol.java +++ b/core/src/main/java/com/bingchuang/core/statistic/protocol/StatisticsProtocol.java @@ -1,4 +1,4 @@ -package com.pikolive.core.statistic.protocol; +package com.bingchuang.core.statistic.protocol; /** * @author jiajie @@ -489,7 +489,7 @@ public interface StatisticsProtocol { /** - * Peko1.4.0版本埋点整理 + * Peki1.4.0版本埋点整理 */ String EVENT_APP_LAUNCH = "app_launch"; //app启动 diff --git a/core/src/main/java/com/pikolive/core/support/config/Constants.kt b/core/src/main/java/com/bingchuang/core/support/config/Constants.kt similarity index 73% rename from core/src/main/java/com/pikolive/core/support/config/Constants.kt rename to core/src/main/java/com/bingchuang/core/support/config/Constants.kt index 5226d89aa..52c977183 100644 --- a/core/src/main/java/com/pikolive/core/support/config/Constants.kt +++ b/core/src/main/java/com/bingchuang/core/support/config/Constants.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.support.config +package com.bingchuang.core.support.config /** * Created by Max on 2023/10/26 22:50 diff --git a/core/src/main/java/com/pikolive/core/support/room/FrameLayoutRoomWidget.kt b/core/src/main/java/com/bingchuang/core/support/room/FrameLayoutRoomWidget.kt similarity index 98% rename from core/src/main/java/com/pikolive/core/support/room/FrameLayoutRoomWidget.kt rename to core/src/main/java/com/bingchuang/core/support/room/FrameLayoutRoomWidget.kt index 84843f5c0..bcea489e9 100644 --- a/core/src/main/java/com/pikolive/core/support/room/FrameLayoutRoomWidget.kt +++ b/core/src/main/java/com/bingchuang/core/support/room/FrameLayoutRoomWidget.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.support.room +package com.bingchuang.core.support.room import android.content.Context import android.util.AttributeSet diff --git a/core/src/main/java/com/pikolive/core/support/room/RoomAbility.kt b/core/src/main/java/com/bingchuang/core/support/room/RoomAbility.kt similarity index 94% rename from core/src/main/java/com/pikolive/core/support/room/RoomAbility.kt rename to core/src/main/java/com/bingchuang/core/support/room/RoomAbility.kt index 229b7fab6..6aee7ab36 100644 --- a/core/src/main/java/com/pikolive/core/support/room/RoomAbility.kt +++ b/core/src/main/java/com/bingchuang/core/support/room/RoomAbility.kt @@ -1,11 +1,11 @@ -package com.pikolive.core.support.room +package com.bingchuang.core.support.room import androidx.annotation.CallSuper import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleEventObserver import androidx.lifecycle.LifecycleOwner -import com.pikolive.core.support.room.lifecycle.RoomFullLifecycleObserver -import com.pikolive.core.support.room.lifecycle.RoomLifecycle +import com.bingchuang.core.support.room.lifecycle.RoomFullLifecycleObserver +import com.bingchuang.core.support.room.lifecycle.RoomLifecycle import com.bingchuang.library.utils.log.ILog import com.trello.rxlifecycle3.LifecycleProvider import com.trello.rxlifecycle3.LifecycleTransformer diff --git a/core/src/main/java/com/pikolive/core/support/room/RoomContext.kt b/core/src/main/java/com/bingchuang/core/support/room/RoomContext.kt similarity index 93% rename from core/src/main/java/com/pikolive/core/support/room/RoomContext.kt rename to core/src/main/java/com/bingchuang/core/support/room/RoomContext.kt index 5e07ba945..5e387f6ef 100644 --- a/core/src/main/java/com/pikolive/core/support/room/RoomContext.kt +++ b/core/src/main/java/com/bingchuang/core/support/room/RoomContext.kt @@ -1,10 +1,10 @@ -package com.pikolive.core.support.room +package com.bingchuang.core.support.room import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import com.bingchuang.library.utils.log.ILog -import com.pikolive.core.support.room.lifecycle.RoomLifecycle -import com.pikolive.core.support.room.lifecycle.RoomLifecycleRegistry +import com.bingchuang.core.support.room.lifecycle.RoomLifecycle +import com.bingchuang.core.support.room.lifecycle.RoomLifecycleRegistry /** * Created by Max on 2023/10/26 11:50 diff --git a/core/src/main/java/com/pikolive/core/support/room/RoomHandler.kt b/core/src/main/java/com/bingchuang/core/support/room/RoomHandler.kt similarity index 75% rename from core/src/main/java/com/pikolive/core/support/room/RoomHandler.kt rename to core/src/main/java/com/bingchuang/core/support/room/RoomHandler.kt index fa92091a3..30657d3b9 100644 --- a/core/src/main/java/com/pikolive/core/support/room/RoomHandler.kt +++ b/core/src/main/java/com/bingchuang/core/support/room/RoomHandler.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.support.room +package com.bingchuang.core.support.room /** * Created by Max on 2023/10/26 11:02 diff --git a/core/src/main/java/com/pikolive/core/support/room/RoomService.kt b/core/src/main/java/com/bingchuang/core/support/room/RoomService.kt similarity index 86% rename from core/src/main/java/com/pikolive/core/support/room/RoomService.kt rename to core/src/main/java/com/bingchuang/core/support/room/RoomService.kt index 4c51c319b..e1f1af9dd 100644 --- a/core/src/main/java/com/pikolive/core/support/room/RoomService.kt +++ b/core/src/main/java/com/bingchuang/core/support/room/RoomService.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.support.room +package com.bingchuang.core.support.room /** * Created by Max on 2023/10/26 12:31 diff --git a/core/src/main/java/com/pikolive/core/support/room/RoomView.kt b/core/src/main/java/com/bingchuang/core/support/room/RoomView.kt similarity index 92% rename from core/src/main/java/com/pikolive/core/support/room/RoomView.kt rename to core/src/main/java/com/bingchuang/core/support/room/RoomView.kt index caaf1c9a7..5c0c6676c 100644 --- a/core/src/main/java/com/pikolive/core/support/room/RoomView.kt +++ b/core/src/main/java/com/bingchuang/core/support/room/RoomView.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.support.room +package com.bingchuang.core.support.room import android.app.Activity import androidx.lifecycle.LifecycleOwner diff --git a/core/src/main/java/com/pikolive/core/support/room/RoomWidget.kt b/core/src/main/java/com/bingchuang/core/support/room/RoomWidget.kt similarity index 87% rename from core/src/main/java/com/pikolive/core/support/room/RoomWidget.kt rename to core/src/main/java/com/bingchuang/core/support/room/RoomWidget.kt index 2601a7370..2d88e4ebd 100644 --- a/core/src/main/java/com/pikolive/core/support/room/RoomWidget.kt +++ b/core/src/main/java/com/bingchuang/core/support/room/RoomWidget.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.support.room +package com.bingchuang.core.support.room import com.bingchuang.library.utils.log.ILog diff --git a/core/src/main/java/com/pikolive/core/support/room/lifecycle/RoomFullLifecycleObserver.kt b/core/src/main/java/com/bingchuang/core/support/room/lifecycle/RoomFullLifecycleObserver.kt similarity index 87% rename from core/src/main/java/com/pikolive/core/support/room/lifecycle/RoomFullLifecycleObserver.kt rename to core/src/main/java/com/bingchuang/core/support/room/lifecycle/RoomFullLifecycleObserver.kt index ac76784a5..6d54f233a 100644 --- a/core/src/main/java/com/pikolive/core/support/room/lifecycle/RoomFullLifecycleObserver.kt +++ b/core/src/main/java/com/bingchuang/core/support/room/lifecycle/RoomFullLifecycleObserver.kt @@ -1,6 +1,6 @@ -package com.pikolive.core.support.room.lifecycle +package com.bingchuang.core.support.room.lifecycle -import com.pikolive.core.support.room.RoomContext +import com.bingchuang.core.support.room.RoomContext /** diff --git a/core/src/main/java/com/pikolive/core/support/room/lifecycle/RoomLifecycle.kt b/core/src/main/java/com/bingchuang/core/support/room/lifecycle/RoomLifecycle.kt similarity index 93% rename from core/src/main/java/com/pikolive/core/support/room/lifecycle/RoomLifecycle.kt rename to core/src/main/java/com/bingchuang/core/support/room/lifecycle/RoomLifecycle.kt index 287efe93b..ff7ee0a69 100644 --- a/core/src/main/java/com/pikolive/core/support/room/lifecycle/RoomLifecycle.kt +++ b/core/src/main/java/com/bingchuang/core/support/room/lifecycle/RoomLifecycle.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.support.room.lifecycle +package com.bingchuang.core.support.room.lifecycle import com.bingchuang.library.utils.ICleared diff --git a/core/src/main/java/com/pikolive/core/support/room/lifecycle/RoomLifecycleObserver.kt b/core/src/main/java/com/bingchuang/core/support/room/lifecycle/RoomLifecycleObserver.kt similarity index 72% rename from core/src/main/java/com/pikolive/core/support/room/lifecycle/RoomLifecycleObserver.kt rename to core/src/main/java/com/bingchuang/core/support/room/lifecycle/RoomLifecycleObserver.kt index ba3efea5b..c449a2a4e 100644 --- a/core/src/main/java/com/pikolive/core/support/room/lifecycle/RoomLifecycleObserver.kt +++ b/core/src/main/java/com/bingchuang/core/support/room/lifecycle/RoomLifecycleObserver.kt @@ -1,6 +1,6 @@ -package com.pikolive.core.support.room.lifecycle +package com.bingchuang.core.support.room.lifecycle -import com.pikolive.core.support.room.RoomContext +import com.bingchuang.core.support.room.RoomContext /** diff --git a/core/src/main/java/com/pikolive/core/support/room/lifecycle/RoomLifecycleOwner.kt b/core/src/main/java/com/bingchuang/core/support/room/lifecycle/RoomLifecycleOwner.kt similarity index 75% rename from core/src/main/java/com/pikolive/core/support/room/lifecycle/RoomLifecycleOwner.kt rename to core/src/main/java/com/bingchuang/core/support/room/lifecycle/RoomLifecycleOwner.kt index ae41f2f78..2e4b540e1 100644 --- a/core/src/main/java/com/pikolive/core/support/room/lifecycle/RoomLifecycleOwner.kt +++ b/core/src/main/java/com/bingchuang/core/support/room/lifecycle/RoomLifecycleOwner.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.support.room.lifecycle +package com.bingchuang.core.support.room.lifecycle /** * Created by Max on 2023/10/26 11:50 diff --git a/core/src/main/java/com/pikolive/core/support/room/lifecycle/RoomLifecycleRegistry.kt b/core/src/main/java/com/bingchuang/core/support/room/lifecycle/RoomLifecycleRegistry.kt similarity index 94% rename from core/src/main/java/com/pikolive/core/support/room/lifecycle/RoomLifecycleRegistry.kt rename to core/src/main/java/com/bingchuang/core/support/room/lifecycle/RoomLifecycleRegistry.kt index a3acc7518..c335b21e7 100644 --- a/core/src/main/java/com/pikolive/core/support/room/lifecycle/RoomLifecycleRegistry.kt +++ b/core/src/main/java/com/bingchuang/core/support/room/lifecycle/RoomLifecycleRegistry.kt @@ -1,7 +1,7 @@ -package com.pikolive.core.support.room.lifecycle +package com.bingchuang.core.support.room.lifecycle import com.bingchuang.library.utils.log.ILog -import com.pikolive.core.support.room.RoomContext +import com.bingchuang.core.support.room.RoomContext import java.util.concurrent.CopyOnWriteArrayList /** diff --git a/core/src/main/java/com/pikolive/core/support/room/lifecycle/rx/RoomRxLifecycleEvent.java b/core/src/main/java/com/bingchuang/core/support/room/lifecycle/rx/RoomRxLifecycleEvent.java similarity index 72% rename from core/src/main/java/com/pikolive/core/support/room/lifecycle/rx/RoomRxLifecycleEvent.java rename to core/src/main/java/com/bingchuang/core/support/room/lifecycle/rx/RoomRxLifecycleEvent.java index 0258ffafb..b4bab7130 100644 --- a/core/src/main/java/com/pikolive/core/support/room/lifecycle/rx/RoomRxLifecycleEvent.java +++ b/core/src/main/java/com/bingchuang/core/support/room/lifecycle/rx/RoomRxLifecycleEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.support.room.lifecycle.rx; +package com.bingchuang.core.support.room.lifecycle.rx; /** diff --git a/core/src/main/java/com/pikolive/core/team/bean/RespTeamMemberInfo.java b/core/src/main/java/com/bingchuang/core/team/bean/RespTeamMemberInfo.java similarity index 84% rename from core/src/main/java/com/pikolive/core/team/bean/RespTeamMemberInfo.java rename to core/src/main/java/com/bingchuang/core/team/bean/RespTeamMemberInfo.java index 051941264..dbe0107a7 100644 --- a/core/src/main/java/com/pikolive/core/team/bean/RespTeamMemberInfo.java +++ b/core/src/main/java/com/bingchuang/core/team/bean/RespTeamMemberInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.team.bean; +package com.bingchuang.core.team.bean; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/team/bean/TeamEvent.java b/core/src/main/java/com/bingchuang/core/team/bean/TeamEvent.java similarity index 93% rename from core/src/main/java/com/pikolive/core/team/bean/TeamEvent.java rename to core/src/main/java/com/bingchuang/core/team/bean/TeamEvent.java index 2ebf57d97..01c518e68 100644 --- a/core/src/main/java/com/pikolive/core/team/bean/TeamEvent.java +++ b/core/src/main/java/com/bingchuang/core/team/bean/TeamEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.team.bean; +package com.bingchuang.core.team.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/team/bean/TeamInfo.java b/core/src/main/java/com/bingchuang/core/team/bean/TeamInfo.java similarity index 96% rename from core/src/main/java/com/pikolive/core/team/bean/TeamInfo.java rename to core/src/main/java/com/bingchuang/core/team/bean/TeamInfo.java index fee867c08..93fe0359c 100644 --- a/core/src/main/java/com/pikolive/core/team/bean/TeamInfo.java +++ b/core/src/main/java/com/bingchuang/core/team/bean/TeamInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.team.bean; +package com.bingchuang.core.team.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/team/bean/TeamMemberInfo.java b/core/src/main/java/com/bingchuang/core/team/bean/TeamMemberInfo.java similarity index 88% rename from core/src/main/java/com/pikolive/core/team/bean/TeamMemberInfo.java rename to core/src/main/java/com/bingchuang/core/team/bean/TeamMemberInfo.java index dc6d95932..44510fbb7 100644 --- a/core/src/main/java/com/pikolive/core/team/bean/TeamMemberInfo.java +++ b/core/src/main/java/com/bingchuang/core/team/bean/TeamMemberInfo.java @@ -1,9 +1,9 @@ -package com.pikolive.core.team.bean; +package com.bingchuang.core.team.bean; -import com.pikolive.core.level.UserLevelVo; -import com.pikolive.core.level.UserLevelVo; -import com.pikolive.core.R; -import com.pikolive.core.level.UserLevelVo; +import com.bingchuang.core.level.UserLevelVo; +import com.bingchuang.core.level.UserLevelVo; +import com.bingchuang.core.R; +import com.bingchuang.core.level.UserLevelVo; import com.bingchuang.library.utils.ResUtil; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/team/bean/TeamTransactionInfo.java b/core/src/main/java/com/bingchuang/core/team/bean/TeamTransactionInfo.java similarity index 87% rename from core/src/main/java/com/pikolive/core/team/bean/TeamTransactionInfo.java rename to core/src/main/java/com/bingchuang/core/team/bean/TeamTransactionInfo.java index ae69b3e75..098dd46f3 100644 --- a/core/src/main/java/com/pikolive/core/team/bean/TeamTransactionInfo.java +++ b/core/src/main/java/com/bingchuang/core/team/bean/TeamTransactionInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.team.bean; +package com.bingchuang.core.team.bean; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/team/bean/TeamTransactionRecordInfo.java b/core/src/main/java/com/bingchuang/core/team/bean/TeamTransactionRecordInfo.java similarity index 87% rename from core/src/main/java/com/pikolive/core/team/bean/TeamTransactionRecordInfo.java rename to core/src/main/java/com/bingchuang/core/team/bean/TeamTransactionRecordInfo.java index 5f0853603..a07963726 100644 --- a/core/src/main/java/com/pikolive/core/team/bean/TeamTransactionRecordInfo.java +++ b/core/src/main/java/com/bingchuang/core/team/bean/TeamTransactionRecordInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.team.bean; +package com.bingchuang.core.team.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/team/model/ITeamModel.java b/core/src/main/java/com/bingchuang/core/team/model/ITeamModel.java similarity index 92% rename from core/src/main/java/com/pikolive/core/team/model/ITeamModel.java rename to core/src/main/java/com/bingchuang/core/team/model/ITeamModel.java index a3ebdae4b..9508770a2 100644 --- a/core/src/main/java/com/pikolive/core/team/model/ITeamModel.java +++ b/core/src/main/java/com/bingchuang/core/team/model/ITeamModel.java @@ -1,13 +1,13 @@ -package com.pikolive.core.team.model; +package com.bingchuang.core.team.model; -import com.pikolive.core.base.IModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.luckymoney.LuckyMoneyInfo; -import com.pikolive.core.luckymoney.LuckyMoneyRecordsInfo; -import com.pikolive.core.team.bean.RespTeamMemberInfo; -import com.pikolive.core.team.bean.TeamInfo; -import com.pikolive.core.team.bean.TeamMemberInfo; -import com.pikolive.core.team.bean.TeamTransactionInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.luckymoney.LuckyMoneyInfo; +import com.bingchuang.core.luckymoney.LuckyMoneyRecordsInfo; +import com.bingchuang.core.team.bean.RespTeamMemberInfo; +import com.bingchuang.core.team.bean.TeamInfo; +import com.bingchuang.core.team.bean.TeamMemberInfo; +import com.bingchuang.core.team.bean.TeamTransactionInfo; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/team/model/TeamModel.java b/core/src/main/java/com/bingchuang/core/team/model/TeamModel.java similarity index 98% rename from core/src/main/java/com/pikolive/core/team/model/TeamModel.java rename to core/src/main/java/com/bingchuang/core/team/model/TeamModel.java index 627c90c03..44cc505af 100644 --- a/core/src/main/java/com/pikolive/core/team/model/TeamModel.java +++ b/core/src/main/java/com/bingchuang/core/team/model/TeamModel.java @@ -1,20 +1,20 @@ -package com.pikolive.core.team.model; +package com.bingchuang.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.pikolive.core.R; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.family.model.FamilyModel; -import com.pikolive.core.luckymoney.LuckyMoneyInfo; -import com.pikolive.core.luckymoney.LuckyMoneyRecordsInfo; -import com.pikolive.core.team.bean.RespTeamMemberInfo; -import com.pikolive.core.team.bean.TeamInfo; -import com.pikolive.core.team.bean.TeamMemberInfo; -import com.pikolive.core.team.bean.TeamTransactionInfo; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.R; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.family.model.FamilyModel; +import com.bingchuang.core.luckymoney.LuckyMoneyInfo; +import com.bingchuang.core.luckymoney.LuckyMoneyRecordsInfo; +import com.bingchuang.core.team.bean.RespTeamMemberInfo; +import com.bingchuang.core.team.bean.TeamInfo; +import com.bingchuang.core.team.bean.TeamMemberInfo; +import com.bingchuang.core.team.bean.TeamTransactionInfo; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.utils.ResUtil; diff --git a/core/src/main/java/com/pikolive/core/user/AttentionModel.java b/core/src/main/java/com/bingchuang/core/user/AttentionModel.java similarity index 82% rename from core/src/main/java/com/pikolive/core/user/AttentionModel.java rename to core/src/main/java/com/bingchuang/core/user/AttentionModel.java index 5fbdae401..be5cb4fc8 100644 --- a/core/src/main/java/com/pikolive/core/user/AttentionModel.java +++ b/core/src/main/java/com/bingchuang/core/user/AttentionModel.java @@ -1,15 +1,15 @@ -package com.pikolive.core.user; +package com.bingchuang.core.user; -import com.pikolive.core.user.bean.AttentionInfo; -import com.pikolive.core.user.bean.FansListInfo; -import com.pikolive.core.user.bean.AttentionInfo; -import com.pikolive.core.user.bean.FansListInfo; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.result.AttentionListResult; -import com.pikolive.core.bean.response.result.FansListResult; -import com.pikolive.core.user.bean.AttentionInfo; -import com.pikolive.core.user.bean.FansListInfo; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.user.bean.AttentionInfo; +import com.bingchuang.core.user.bean.FansListInfo; +import com.bingchuang.core.user.bean.AttentionInfo; +import com.bingchuang.core.user.bean.FansListInfo; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.result.AttentionListResult; +import com.bingchuang.core.bean.response.result.FansListResult; +import com.bingchuang.core.user.bean.AttentionInfo; +import com.bingchuang.core.user.bean.FansListInfo; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/user/IAttentionModel.java b/core/src/main/java/com/bingchuang/core/user/IAttentionModel.java similarity index 58% rename from core/src/main/java/com/pikolive/core/user/IAttentionModel.java rename to core/src/main/java/com/bingchuang/core/user/IAttentionModel.java index 1adfabcdc..07b6bf6be 100644 --- a/core/src/main/java/com/pikolive/core/user/IAttentionModel.java +++ b/core/src/main/java/com/bingchuang/core/user/IAttentionModel.java @@ -1,12 +1,12 @@ -package com.pikolive.core.user; +package com.bingchuang.core.user; -import com.pikolive.core.user.bean.AttentionInfo; -import com.pikolive.core.user.bean.FansListInfo; -import com.pikolive.core.user.bean.AttentionInfo; -import com.pikolive.core.user.bean.FansListInfo; -import com.pikolive.core.base.IModel; -import com.pikolive.core.user.bean.AttentionInfo; -import com.pikolive.core.user.bean.FansListInfo; +import com.bingchuang.core.user.bean.AttentionInfo; +import com.bingchuang.core.user.bean.FansListInfo; +import com.bingchuang.core.user.bean.AttentionInfo; +import com.bingchuang.core.user.bean.FansListInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.user.bean.AttentionInfo; +import com.bingchuang.core.user.bean.FansListInfo; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/user/IUserDynamicModel.java b/core/src/main/java/com/bingchuang/core/user/IUserDynamicModel.java similarity index 70% rename from core/src/main/java/com/pikolive/core/user/IUserDynamicModel.java rename to core/src/main/java/com/bingchuang/core/user/IUserDynamicModel.java index 85d0cd1e3..8ae89b785 100644 --- a/core/src/main/java/com/pikolive/core/user/IUserDynamicModel.java +++ b/core/src/main/java/com/bingchuang/core/user/IUserDynamicModel.java @@ -1,7 +1,7 @@ -package com.pikolive.core.user; +package com.bingchuang.core.user; -import com.pikolive.core.base.IModel; -import com.pikolive.core.community.bean.WorldDynamicBean; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.community.bean.WorldDynamicBean; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/user/IUserModel.java b/core/src/main/java/com/bingchuang/core/user/IUserModel.java similarity index 72% rename from core/src/main/java/com/pikolive/core/user/IUserModel.java rename to core/src/main/java/com/bingchuang/core/user/IUserModel.java index f5bd1bb4e..c24673f38 100644 --- a/core/src/main/java/com/pikolive/core/user/IUserModel.java +++ b/core/src/main/java/com/bingchuang/core/user/IUserModel.java @@ -1,41 +1,41 @@ -package com.pikolive.core.user; +package com.bingchuang.core.user; import androidx.annotation.Nullable; -import com.pikolive.core.user.bean.DiamondGiveHistoryInfo; -import com.pikolive.core.user.bean.GiftAchievementInfo; -import com.pikolive.core.user.bean.GiftWallInfo; -import com.pikolive.core.user.bean.NewUserInfo; -import com.pikolive.core.user.bean.ProtocolInfo; -import com.pikolive.core.user.bean.UserDetailInfo; -import com.pikolive.core.user.bean.UserGameInfo; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.user.bean.UserLabelInfo; -import com.pikolive.core.user.bean.UserRandomConfig; -import com.pikolive.core.user.bean.DiamondGiveHistoryInfo; -import com.pikolive.core.user.bean.GiftAchievementInfo; -import com.pikolive.core.user.bean.GiftWallInfo; -import com.pikolive.core.user.bean.NewUserInfo; -import com.pikolive.core.user.bean.ProtocolInfo; -import com.pikolive.core.user.bean.UserDetailInfo; -import com.pikolive.core.user.bean.UserGameInfo; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.user.bean.UserLabelInfo; -import com.pikolive.core.user.bean.UserRandomConfig; -import com.pikolive.core.base.IModel; -import com.pikolive.core.bean.RoomHistoryInfo; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core2.home.bean.VisitorInfo; -import com.pikolive.core.user.bean.DiamondGiveHistoryInfo; -import com.pikolive.core.user.bean.GiftAchievementInfo; -import com.pikolive.core.user.bean.GiftWallInfo; -import com.pikolive.core.user.bean.NewUserInfo; -import com.pikolive.core.user.bean.ProtocolInfo; -import com.pikolive.core.user.bean.UserDetailInfo; -import com.pikolive.core.user.bean.UserGameInfo; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.user.bean.UserLabelInfo; -import com.pikolive.core.user.bean.UserRandomConfig; +import com.bingchuang.core.user.bean.DiamondGiveHistoryInfo; +import com.bingchuang.core.user.bean.GiftAchievementInfo; +import com.bingchuang.core.user.bean.GiftWallInfo; +import com.bingchuang.core.user.bean.NewUserInfo; +import com.bingchuang.core.user.bean.ProtocolInfo; +import com.bingchuang.core.user.bean.UserDetailInfo; +import com.bingchuang.core.user.bean.UserGameInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.user.bean.UserLabelInfo; +import com.bingchuang.core.user.bean.UserRandomConfig; +import com.bingchuang.core.user.bean.DiamondGiveHistoryInfo; +import com.bingchuang.core.user.bean.GiftAchievementInfo; +import com.bingchuang.core.user.bean.GiftWallInfo; +import com.bingchuang.core.user.bean.NewUserInfo; +import com.bingchuang.core.user.bean.ProtocolInfo; +import com.bingchuang.core.user.bean.UserDetailInfo; +import com.bingchuang.core.user.bean.UserGameInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.user.bean.UserLabelInfo; +import com.bingchuang.core.user.bean.UserRandomConfig; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.bean.RoomHistoryInfo; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core2.home.bean.VisitorInfo; +import com.bingchuang.core.user.bean.DiamondGiveHistoryInfo; +import com.bingchuang.core.user.bean.GiftAchievementInfo; +import com.bingchuang.core.user.bean.GiftWallInfo; +import com.bingchuang.core.user.bean.NewUserInfo; +import com.bingchuang.core.user.bean.ProtocolInfo; +import com.bingchuang.core.user.bean.UserDetailInfo; +import com.bingchuang.core.user.bean.UserGameInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.user.bean.UserLabelInfo; +import com.bingchuang.core.user.bean.UserRandomConfig; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/user/UserDynamicModel.java b/core/src/main/java/com/bingchuang/core/user/UserDynamicModel.java similarity index 89% rename from core/src/main/java/com/pikolive/core/user/UserDynamicModel.java rename to core/src/main/java/com/bingchuang/core/user/UserDynamicModel.java index 822994ea5..e69a8473e 100644 --- a/core/src/main/java/com/pikolive/core/user/UserDynamicModel.java +++ b/core/src/main/java/com/bingchuang/core/user/UserDynamicModel.java @@ -1,8 +1,8 @@ -package com.pikolive.core.user; +package com.bingchuang.core.user; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.community.bean.WorldDynamicBean; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.community.bean.WorldDynamicBean; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/user/UserInfoUiMgr.java b/core/src/main/java/com/bingchuang/core/user/UserInfoUiMgr.java similarity index 89% rename from core/src/main/java/com/pikolive/core/user/UserInfoUiMgr.java rename to core/src/main/java/com/bingchuang/core/user/UserInfoUiMgr.java index 7a4d11887..840fc714a 100644 --- a/core/src/main/java/com/pikolive/core/user/UserInfoUiMgr.java +++ b/core/src/main/java/com/bingchuang/core/user/UserInfoUiMgr.java @@ -1,12 +1,12 @@ -package com.pikolive.core.user; +package com.bingchuang.core.user; import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.Observer; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.user.bean.UserInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.user.bean.UserInfo; /** * 个人主页/客态页用户信息监听 diff --git a/core/src/main/java/com/pikolive/core/user/UserModel.java b/core/src/main/java/com/bingchuang/core/user/UserModel.java similarity index 88% rename from core/src/main/java/com/pikolive/core/user/UserModel.java rename to core/src/main/java/com/bingchuang/core/user/UserModel.java index 9ea574b88..c4e0b76e0 100644 --- a/core/src/main/java/com/pikolive/core/user/UserModel.java +++ b/core/src/main/java/com/bingchuang/core/user/UserModel.java @@ -1,4 +1,4 @@ -package com.pikolive.core.user; +package com.bingchuang.core.user; import android.annotation.SuppressLint; import android.text.TextUtils; @@ -7,94 +7,94 @@ import android.util.LruCache; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.auth.event.LoginEvent; -import com.pikolive.core.auth.event.LogoutEvent; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.RoomHistoryInfo; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.bean.response.result.GiftWallListResult; -import com.pikolive.core.bean.response.result.UserListResult; -import com.pikolive.core.bean.response.result.UserResult; -import com.pikolive.core.level.event.CharmLevelUpEvent; -import com.pikolive.core.level.event.LevelUpEvent; -import com.pikolive.core.noble.NobleUtil; -import com.pikolive.core.user.bean.DiamondGiveHistoryInfo; -import com.pikolive.core.user.bean.GiftAchievementInfo; -import com.pikolive.core.user.bean.GiftWallInfo; -import com.pikolive.core.user.bean.NewUserInfo; -import com.pikolive.core.user.bean.ProtocolInfo; -import com.pikolive.core.user.bean.UserDetailInfo; -import com.pikolive.core.user.bean.UserGameInfo; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.user.bean.UserLabelInfo; -import com.pikolive.core.user.bean.UserRandomConfig; -import com.pikolive.core.user.event.CurrentUserInfoCompleteEvent; -import com.pikolive.core.user.event.CurrentUserInfoCompleteFailEvent; -import com.pikolive.core.user.event.LoadLoginUserInfoEvent; -import com.pikolive.core.user.event.LoginUserInfoUpdateEvent; -import com.pikolive.core.user.event.NeedCompleteInfoEvent; -import com.pikolive.core.user.event.NeedVerifyBoundAuthCodeEvent; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.auth.event.LoginEvent; -import com.pikolive.core.auth.event.LogoutEvent; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.RoomHistoryInfo; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.bean.response.result.GiftWallListResult; -import com.pikolive.core.bean.response.result.UserListResult; -import com.pikolive.core.bean.response.result.UserResult; -import com.pikolive.core.level.event.CharmLevelUpEvent; -import com.pikolive.core.level.event.LevelUpEvent; -import com.pikolive.core.noble.NobleUtil; -import com.pikolive.core.user.bean.DiamondGiveHistoryInfo; -import com.pikolive.core.user.bean.GiftAchievementInfo; -import com.pikolive.core.user.bean.GiftWallInfo; -import com.pikolive.core.user.bean.NewUserInfo; -import com.pikolive.core.user.bean.ProtocolInfo; -import com.pikolive.core.user.bean.UserDetailInfo; -import com.pikolive.core.user.bean.UserGameInfo; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.user.bean.UserLabelInfo; -import com.pikolive.core.user.bean.UserRandomConfig; -import com.pikolive.core.user.event.CurrentUserInfoCompleteEvent; -import com.pikolive.core.user.event.CurrentUserInfoCompleteFailEvent; -import com.pikolive.core.user.event.LoadLoginUserInfoEvent; -import com.pikolive.core.user.event.LoginUserInfoUpdateEvent; -import com.pikolive.core.user.event.NeedCompleteInfoEvent; -import com.pikolive.core.user.event.NeedVerifyBoundAuthCodeEvent; -import com.pikolive.core.DemoCache; -import com.pikolive.core.R; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.auth.event.LoginEvent; -import com.pikolive.core.auth.event.LogoutEvent; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.RoomHistoryInfo; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.bean.response.result.GiftWallListResult; -import com.pikolive.core.bean.response.result.UserListResult; -import com.pikolive.core.bean.response.result.UserResult; -import com.pikolive.core2.home.bean.VisitorInfo; -import com.pikolive.core.level.event.CharmLevelUpEvent; -import com.pikolive.core.level.event.LevelUpEvent; -import com.pikolive.core.noble.NobleUtil; -import com.pikolive.core.user.bean.DiamondGiveHistoryInfo; -import com.pikolive.core.user.bean.GiftAchievementInfo; -import com.pikolive.core.user.bean.GiftWallInfo; -import com.pikolive.core.user.bean.NewUserInfo; -import com.pikolive.core.user.bean.ProtocolInfo; -import com.pikolive.core.user.bean.UserDetailInfo; -import com.pikolive.core.user.bean.UserGameInfo; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.user.bean.UserLabelInfo; -import com.pikolive.core.user.bean.UserRandomConfig; -import com.pikolive.core.user.event.CurrentUserInfoCompleteEvent; -import com.pikolive.core.user.event.CurrentUserInfoCompleteFailEvent; -import com.pikolive.core.user.event.LoadLoginUserInfoEvent; -import com.pikolive.core.user.event.LoginUserInfoUpdateEvent; -import com.pikolive.core.user.event.NeedCompleteInfoEvent; -import com.pikolive.core.user.event.NeedVerifyBoundAuthCodeEvent; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.auth.event.LoginEvent; +import com.bingchuang.core.auth.event.LogoutEvent; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.RoomHistoryInfo; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.bean.response.result.GiftWallListResult; +import com.bingchuang.core.bean.response.result.UserListResult; +import com.bingchuang.core.bean.response.result.UserResult; +import com.bingchuang.core.level.event.CharmLevelUpEvent; +import com.bingchuang.core.level.event.LevelUpEvent; +import com.bingchuang.core.noble.NobleUtil; +import com.bingchuang.core.user.bean.DiamondGiveHistoryInfo; +import com.bingchuang.core.user.bean.GiftAchievementInfo; +import com.bingchuang.core.user.bean.GiftWallInfo; +import com.bingchuang.core.user.bean.NewUserInfo; +import com.bingchuang.core.user.bean.ProtocolInfo; +import com.bingchuang.core.user.bean.UserDetailInfo; +import com.bingchuang.core.user.bean.UserGameInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.user.bean.UserLabelInfo; +import com.bingchuang.core.user.bean.UserRandomConfig; +import com.bingchuang.core.user.event.CurrentUserInfoCompleteEvent; +import com.bingchuang.core.user.event.CurrentUserInfoCompleteFailEvent; +import com.bingchuang.core.user.event.LoadLoginUserInfoEvent; +import com.bingchuang.core.user.event.LoginUserInfoUpdateEvent; +import com.bingchuang.core.user.event.NeedCompleteInfoEvent; +import com.bingchuang.core.user.event.NeedVerifyBoundAuthCodeEvent; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.auth.event.LoginEvent; +import com.bingchuang.core.auth.event.LogoutEvent; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.RoomHistoryInfo; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.bean.response.result.GiftWallListResult; +import com.bingchuang.core.bean.response.result.UserListResult; +import com.bingchuang.core.bean.response.result.UserResult; +import com.bingchuang.core.level.event.CharmLevelUpEvent; +import com.bingchuang.core.level.event.LevelUpEvent; +import com.bingchuang.core.noble.NobleUtil; +import com.bingchuang.core.user.bean.DiamondGiveHistoryInfo; +import com.bingchuang.core.user.bean.GiftAchievementInfo; +import com.bingchuang.core.user.bean.GiftWallInfo; +import com.bingchuang.core.user.bean.NewUserInfo; +import com.bingchuang.core.user.bean.ProtocolInfo; +import com.bingchuang.core.user.bean.UserDetailInfo; +import com.bingchuang.core.user.bean.UserGameInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.user.bean.UserLabelInfo; +import com.bingchuang.core.user.bean.UserRandomConfig; +import com.bingchuang.core.user.event.CurrentUserInfoCompleteEvent; +import com.bingchuang.core.user.event.CurrentUserInfoCompleteFailEvent; +import com.bingchuang.core.user.event.LoadLoginUserInfoEvent; +import com.bingchuang.core.user.event.LoginUserInfoUpdateEvent; +import com.bingchuang.core.user.event.NeedCompleteInfoEvent; +import com.bingchuang.core.user.event.NeedVerifyBoundAuthCodeEvent; +import com.bingchuang.core.DemoCache; +import com.bingchuang.core.R; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.auth.event.LoginEvent; +import com.bingchuang.core.auth.event.LogoutEvent; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.RoomHistoryInfo; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.bean.response.result.GiftWallListResult; +import com.bingchuang.core.bean.response.result.UserListResult; +import com.bingchuang.core.bean.response.result.UserResult; +import com.bingchuang.core2.home.bean.VisitorInfo; +import com.bingchuang.core.level.event.CharmLevelUpEvent; +import com.bingchuang.core.level.event.LevelUpEvent; +import com.bingchuang.core.noble.NobleUtil; +import com.bingchuang.core.user.bean.DiamondGiveHistoryInfo; +import com.bingchuang.core.user.bean.GiftAchievementInfo; +import com.bingchuang.core.user.bean.GiftWallInfo; +import com.bingchuang.core.user.bean.NewUserInfo; +import com.bingchuang.core.user.bean.ProtocolInfo; +import com.bingchuang.core.user.bean.UserDetailInfo; +import com.bingchuang.core.user.bean.UserGameInfo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.user.bean.UserLabelInfo; +import com.bingchuang.core.user.bean.UserRandomConfig; +import com.bingchuang.core.user.event.CurrentUserInfoCompleteEvent; +import com.bingchuang.core.user.event.CurrentUserInfoCompleteFailEvent; +import com.bingchuang.core.user.event.LoadLoginUserInfoEvent; +import com.bingchuang.core.user.event.LoginUserInfoUpdateEvent; +import com.bingchuang.core.user.event.NeedCompleteInfoEvent; +import com.bingchuang.core.user.event.NeedVerifyBoundAuthCodeEvent; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.utils.ListUtils; import com.bingchuang.library.utils.ResUtil; @@ -1063,7 +1063,7 @@ public final class UserModel extends BaseModel implements IUserModel { @Field("passwd") String password); /** - * @param erbanNo Peko号或手机号码 + * @param erbanNo Peki号或手机号码 * @return - */ @GET("user/getSimpleUser") diff --git a/core/src/main/java/com/pikolive/core/user/bean/AttentionInfo.java b/core/src/main/java/com/bingchuang/core/user/bean/AttentionInfo.java similarity index 74% rename from core/src/main/java/com/pikolive/core/user/bean/AttentionInfo.java rename to core/src/main/java/com/bingchuang/core/user/bean/AttentionInfo.java index a29fec20c..5ab563efc 100644 --- a/core/src/main/java/com/pikolive/core/user/bean/AttentionInfo.java +++ b/core/src/main/java/com/bingchuang/core/user/bean/AttentionInfo.java @@ -1,13 +1,13 @@ -package com.pikolive.core.user.bean; +package com.bingchuang.core.user.bean; -import com.pikolive.core.level.UserLevelVo; -import com.pikolive.core.noble.NobleInfo; -import com.pikolive.core.level.UserLevelVo; -import com.pikolive.core.noble.NobleInfo; -import com.pikolive.core.level.UserLevelVo; -import com.pikolive.core.noble.NobleInfo; -import com.pikolive.core.room.bean.RoomInfo; -import com.pikolive.core.vip.UserVipInfo; +import com.bingchuang.core.level.UserLevelVo; +import com.bingchuang.core.noble.NobleInfo; +import com.bingchuang.core.level.UserLevelVo; +import com.bingchuang.core.noble.NobleInfo; +import com.bingchuang.core.level.UserLevelVo; +import com.bingchuang.core.noble.NobleInfo; +import com.bingchuang.core.room.bean.RoomInfo; +import com.bingchuang.core.vip.UserVipInfo; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/user/bean/AttentionItem.java b/core/src/main/java/com/bingchuang/core/user/bean/AttentionItem.java similarity index 97% rename from core/src/main/java/com/pikolive/core/user/bean/AttentionItem.java rename to core/src/main/java/com/bingchuang/core/user/bean/AttentionItem.java index 4dea15f10..9cc1e4635 100644 --- a/core/src/main/java/com/pikolive/core/user/bean/AttentionItem.java +++ b/core/src/main/java/com/bingchuang/core/user/bean/AttentionItem.java @@ -1,4 +1,4 @@ -package com.pikolive.core.user.bean; +package com.bingchuang.core.user.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/main/java/com/pikolive/core/user/bean/BaseInfo.java b/core/src/main/java/com/bingchuang/core/user/bean/BaseInfo.java similarity index 96% rename from core/src/main/java/com/pikolive/core/user/bean/BaseInfo.java rename to core/src/main/java/com/bingchuang/core/user/bean/BaseInfo.java index 04d96e8cb..8608604fe 100644 --- a/core/src/main/java/com/pikolive/core/user/bean/BaseInfo.java +++ b/core/src/main/java/com/bingchuang/core/user/bean/BaseInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.user.bean; +package com.bingchuang.core.user.bean; import android.text.TextUtils; diff --git a/core/src/main/java/com/pikolive/core/user/bean/BaseUserInfo.java b/core/src/main/java/com/bingchuang/core/user/bean/BaseUserInfo.java similarity index 93% rename from core/src/main/java/com/pikolive/core/user/bean/BaseUserInfo.java rename to core/src/main/java/com/bingchuang/core/user/bean/BaseUserInfo.java index 609a87354..4c11ace8e 100644 --- a/core/src/main/java/com/pikolive/core/user/bean/BaseUserInfo.java +++ b/core/src/main/java/com/bingchuang/core/user/bean/BaseUserInfo.java @@ -1,6 +1,6 @@ -package com.pikolive.core.user.bean; +package com.bingchuang.core.user.bean; -import com.pikolive.core.vip.UserVipInfo; +import com.bingchuang.core.vip.UserVipInfo; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/user/bean/DiamondGiveHistoryInfo.java b/core/src/main/java/com/bingchuang/core/user/bean/DiamondGiveHistoryInfo.java similarity index 96% rename from core/src/main/java/com/pikolive/core/user/bean/DiamondGiveHistoryInfo.java rename to core/src/main/java/com/bingchuang/core/user/bean/DiamondGiveHistoryInfo.java index 076f31f7f..287a07133 100644 --- a/core/src/main/java/com/pikolive/core/user/bean/DiamondGiveHistoryInfo.java +++ b/core/src/main/java/com/bingchuang/core/user/bean/DiamondGiveHistoryInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.user.bean; +package com.bingchuang.core.user.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/user/bean/FansInfo.java b/core/src/main/java/com/bingchuang/core/user/bean/FansInfo.java similarity index 82% rename from core/src/main/java/com/pikolive/core/user/bean/FansInfo.java rename to core/src/main/java/com/bingchuang/core/user/bean/FansInfo.java index 93a04fc2a..4a3157e2c 100644 --- a/core/src/main/java/com/pikolive/core/user/bean/FansInfo.java +++ b/core/src/main/java/com/bingchuang/core/user/bean/FansInfo.java @@ -1,8 +1,8 @@ -package com.pikolive.core.user.bean; +package com.bingchuang.core.user.bean; -import com.pikolive.core.level.UserLevelVo; -import com.pikolive.core.noble.NobleInfo; -import com.pikolive.core.vip.UserVipInfo; +import com.bingchuang.core.level.UserLevelVo; +import com.bingchuang.core.noble.NobleInfo; +import com.bingchuang.core.vip.UserVipInfo; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/user/bean/FansListInfo.java b/core/src/main/java/com/bingchuang/core/user/bean/FansListInfo.java similarity index 93% rename from core/src/main/java/com/pikolive/core/user/bean/FansListInfo.java rename to core/src/main/java/com/bingchuang/core/user/bean/FansListInfo.java index 5c5538a68..183949374 100644 --- a/core/src/main/java/com/pikolive/core/user/bean/FansListInfo.java +++ b/core/src/main/java/com/bingchuang/core/user/bean/FansListInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.user.bean; +package com.bingchuang.core.user.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/user/bean/FirstChargeInfo.kt b/core/src/main/java/com/bingchuang/core/user/bean/FirstChargeInfo.kt similarity index 80% rename from core/src/main/java/com/pikolive/core/user/bean/FirstChargeInfo.kt rename to core/src/main/java/com/bingchuang/core/user/bean/FirstChargeInfo.kt index fd83dce40..912c25a1e 100644 --- a/core/src/main/java/com/pikolive/core/user/bean/FirstChargeInfo.kt +++ b/core/src/main/java/com/bingchuang/core/user/bean/FirstChargeInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.user.bean +package com.bingchuang.core.user.bean import lombok.Data diff --git a/core/src/main/java/com/pikolive/core/user/bean/GiftAchievementInfo.java b/core/src/main/java/com/bingchuang/core/user/bean/GiftAchievementInfo.java similarity index 91% rename from core/src/main/java/com/pikolive/core/user/bean/GiftAchievementInfo.java rename to core/src/main/java/com/bingchuang/core/user/bean/GiftAchievementInfo.java index 6f39e1021..061a752c9 100644 --- a/core/src/main/java/com/pikolive/core/user/bean/GiftAchievementInfo.java +++ b/core/src/main/java/com/bingchuang/core/user/bean/GiftAchievementInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.user.bean; +package com.bingchuang.core.user.bean; import java.io.Serializable; import java.util.ArrayList; diff --git a/core/src/main/java/com/pikolive/core/user/bean/GiftAchievementInfoSub.java b/core/src/main/java/com/bingchuang/core/user/bean/GiftAchievementInfoSub.java similarity index 89% rename from core/src/main/java/com/pikolive/core/user/bean/GiftAchievementInfoSub.java rename to core/src/main/java/com/bingchuang/core/user/bean/GiftAchievementInfoSub.java index b8613bb93..d8ac18228 100644 --- a/core/src/main/java/com/pikolive/core/user/bean/GiftAchievementInfoSub.java +++ b/core/src/main/java/com/bingchuang/core/user/bean/GiftAchievementInfoSub.java @@ -1,4 +1,4 @@ -package com.pikolive.core.user.bean; +package com.bingchuang.core.user.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/user/bean/GiftAchievementItem.java b/core/src/main/java/com/bingchuang/core/user/bean/GiftAchievementItem.java similarity index 97% rename from core/src/main/java/com/pikolive/core/user/bean/GiftAchievementItem.java rename to core/src/main/java/com/bingchuang/core/user/bean/GiftAchievementItem.java index 61f308e51..e01a64e0a 100644 --- a/core/src/main/java/com/pikolive/core/user/bean/GiftAchievementItem.java +++ b/core/src/main/java/com/bingchuang/core/user/bean/GiftAchievementItem.java @@ -1,4 +1,4 @@ -package com.pikolive.core.user.bean; +package com.bingchuang.core.user.bean; import com.chad.library.adapter.base.entity.MultiItemEntity; diff --git a/core/src/main/java/com/pikolive/core/user/bean/GiftWallInfo.java b/core/src/main/java/com/bingchuang/core/user/bean/GiftWallInfo.java similarity index 96% rename from core/src/main/java/com/pikolive/core/user/bean/GiftWallInfo.java rename to core/src/main/java/com/bingchuang/core/user/bean/GiftWallInfo.java index 8327545ae..a5d3cb9ba 100644 --- a/core/src/main/java/com/pikolive/core/user/bean/GiftWallInfo.java +++ b/core/src/main/java/com/bingchuang/core/user/bean/GiftWallInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.user.bean; +package com.bingchuang.core.user.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/user/bean/InviteUserInfo.java b/core/src/main/java/com/bingchuang/core/user/bean/InviteUserInfo.java similarity index 83% rename from core/src/main/java/com/pikolive/core/user/bean/InviteUserInfo.java rename to core/src/main/java/com/bingchuang/core/user/bean/InviteUserInfo.java index ffccfa6de..681d929e1 100644 --- a/core/src/main/java/com/pikolive/core/user/bean/InviteUserInfo.java +++ b/core/src/main/java/com/bingchuang/core/user/bean/InviteUserInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.user.bean; +package com.bingchuang.core.user.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/user/bean/JoinWorldInfo.java b/core/src/main/java/com/bingchuang/core/user/bean/JoinWorldInfo.java similarity index 89% rename from core/src/main/java/com/pikolive/core/user/bean/JoinWorldInfo.java rename to core/src/main/java/com/bingchuang/core/user/bean/JoinWorldInfo.java index 5d4f60a0a..0d99fca79 100644 --- a/core/src/main/java/com/pikolive/core/user/bean/JoinWorldInfo.java +++ b/core/src/main/java/com/bingchuang/core/user/bean/JoinWorldInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.user.bean; +package com.bingchuang.core.user.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/user/bean/LiveTagInfo.java b/core/src/main/java/com/bingchuang/core/user/bean/LiveTagInfo.java similarity index 98% rename from core/src/main/java/com/pikolive/core/user/bean/LiveTagInfo.java rename to core/src/main/java/com/bingchuang/core/user/bean/LiveTagInfo.java index 9103bb2a2..dc4f655bf 100644 --- a/core/src/main/java/com/pikolive/core/user/bean/LiveTagInfo.java +++ b/core/src/main/java/com/bingchuang/core/user/bean/LiveTagInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.user.bean; +package com.bingchuang.core.user.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/user/bean/NewUserInfo.java b/core/src/main/java/com/bingchuang/core/user/bean/NewUserInfo.java similarity index 97% rename from core/src/main/java/com/pikolive/core/user/bean/NewUserInfo.java rename to core/src/main/java/com/bingchuang/core/user/bean/NewUserInfo.java index 3d0a7a29b..0354df04a 100644 --- a/core/src/main/java/com/pikolive/core/user/bean/NewUserInfo.java +++ b/core/src/main/java/com/bingchuang/core/user/bean/NewUserInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.user.bean; +package com.bingchuang.core.user.bean; public class NewUserInfo { diff --git a/core/src/main/java/com/pikolive/core/user/bean/ProtocolInfo.kt b/core/src/main/java/com/bingchuang/core/user/bean/ProtocolInfo.kt similarity index 81% rename from core/src/main/java/com/pikolive/core/user/bean/ProtocolInfo.kt rename to core/src/main/java/com/bingchuang/core/user/bean/ProtocolInfo.kt index e332074cf..b624ac50a 100644 --- a/core/src/main/java/com/pikolive/core/user/bean/ProtocolInfo.kt +++ b/core/src/main/java/com/bingchuang/core/user/bean/ProtocolInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.user.bean +package com.bingchuang.core.user.bean data class ProtocolInfo( val content: String = "", diff --git a/core/src/main/java/com/pikolive/core/user/bean/RadishWallInfo.java b/core/src/main/java/com/bingchuang/core/user/bean/RadishWallInfo.java similarity index 83% rename from core/src/main/java/com/pikolive/core/user/bean/RadishWallInfo.java rename to core/src/main/java/com/bingchuang/core/user/bean/RadishWallInfo.java index 7865fd413..84e385216 100644 --- a/core/src/main/java/com/pikolive/core/user/bean/RadishWallInfo.java +++ b/core/src/main/java/com/bingchuang/core/user/bean/RadishWallInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.user.bean; +package com.bingchuang.core.user.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/user/bean/SearchUserInfo.java b/core/src/main/java/com/bingchuang/core/user/bean/SearchUserInfo.java similarity index 92% rename from core/src/main/java/com/pikolive/core/user/bean/SearchUserInfo.java rename to core/src/main/java/com/bingchuang/core/user/bean/SearchUserInfo.java index 46be40c37..52da081b5 100644 --- a/core/src/main/java/com/pikolive/core/user/bean/SearchUserInfo.java +++ b/core/src/main/java/com/bingchuang/core/user/bean/SearchUserInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.user.bean; +package com.bingchuang.core.user.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/user/bean/SimpleUserInfo.java b/core/src/main/java/com/bingchuang/core/user/bean/SimpleUserInfo.java similarity index 63% rename from core/src/main/java/com/pikolive/core/user/bean/SimpleUserInfo.java rename to core/src/main/java/com/bingchuang/core/user/bean/SimpleUserInfo.java index ca7785a0a..9a69baed8 100644 --- a/core/src/main/java/com/pikolive/core/user/bean/SimpleUserInfo.java +++ b/core/src/main/java/com/bingchuang/core/user/bean/SimpleUserInfo.java @@ -1,8 +1,8 @@ -package com.pikolive.core.user.bean; +package com.bingchuang.core.user.bean; -import com.pikolive.core.level.UserLevelVo; -import com.pikolive.core.level.UserLevelVo; -import com.pikolive.core.level.UserLevelVo; +import com.bingchuang.core.level.UserLevelVo; +import com.bingchuang.core.level.UserLevelVo; +import com.bingchuang.core.level.UserLevelVo; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/user/bean/UserDetailInfo.java b/core/src/main/java/com/bingchuang/core/user/bean/UserDetailInfo.java similarity index 99% rename from core/src/main/java/com/pikolive/core/user/bean/UserDetailInfo.java rename to core/src/main/java/com/bingchuang/core/user/bean/UserDetailInfo.java index 1220f0d51..8c149187e 100644 --- a/core/src/main/java/com/pikolive/core/user/bean/UserDetailInfo.java +++ b/core/src/main/java/com/bingchuang/core/user/bean/UserDetailInfo.java @@ -1,7 +1,7 @@ -package com.pikolive.core.user.bean; +package com.bingchuang.core.user.bean; import com.chad.library.adapter.base.entity.MultiItemEntity; -import com.pikolive.core.community.bean.WorldDynamicBean; +import com.bingchuang.core.community.bean.WorldDynamicBean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/user/bean/UserGameInfo.java b/core/src/main/java/com/bingchuang/core/user/bean/UserGameInfo.java similarity index 97% rename from core/src/main/java/com/pikolive/core/user/bean/UserGameInfo.java rename to core/src/main/java/com/bingchuang/core/user/bean/UserGameInfo.java index c9e0b02af..523939161 100644 --- a/core/src/main/java/com/pikolive/core/user/bean/UserGameInfo.java +++ b/core/src/main/java/com/bingchuang/core/user/bean/UserGameInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.user.bean; +package com.bingchuang.core.user.bean; public class UserGameInfo { diff --git a/core/src/main/java/com/pikolive/core/user/bean/UserInfo.java b/core/src/main/java/com/bingchuang/core/user/bean/UserInfo.java similarity index 96% rename from core/src/main/java/com/pikolive/core/user/bean/UserInfo.java rename to core/src/main/java/com/bingchuang/core/user/bean/UserInfo.java index 9d4721263..d54b9f61b 100644 --- a/core/src/main/java/com/pikolive/core/user/bean/UserInfo.java +++ b/core/src/main/java/com/bingchuang/core/user/bean/UserInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.user.bean; +package com.bingchuang.core.user.bean; import android.graphics.Color; @@ -10,19 +10,19 @@ import android.text.style.ForegroundColorSpan; import androidx.annotation.Nullable; import com.google.gson.annotations.SerializedName; -import com.pikolive.core.level.UserLevelVo; -import com.pikolive.core.noble.NobleInfo; -import com.pikolive.core.noble.NobleResourceType; -import com.pikolive.core.level.UserLevelVo; -import com.pikolive.core.noble.NobleInfo; -import com.pikolive.core.noble.NobleResourceType; -import com.pikolive.core.decoration.car.bean.CarInfo; -import com.pikolive.core.decoration.headwear.bean.HeadWearInfo; -import com.pikolive.core.level.UserLevelVo; -import com.pikolive.core.noble.NobleInfo; -import com.pikolive.core.noble.NobleResourceType; -import com.pikolive.core.utils.StarUtils; -import com.pikolive.core.vip.UserVipInfo; +import com.bingchuang.core.level.UserLevelVo; +import com.bingchuang.core.noble.NobleInfo; +import com.bingchuang.core.noble.NobleResourceType; +import com.bingchuang.core.level.UserLevelVo; +import com.bingchuang.core.noble.NobleInfo; +import com.bingchuang.core.noble.NobleResourceType; +import com.bingchuang.core.decoration.car.bean.CarInfo; +import com.bingchuang.core.decoration.headwear.bean.HeadWearInfo; +import com.bingchuang.core.level.UserLevelVo; +import com.bingchuang.core.noble.NobleInfo; +import com.bingchuang.core.noble.NobleResourceType; +import com.bingchuang.core.utils.StarUtils; +import com.bingchuang.core.vip.UserVipInfo; import java.io.Serializable; import java.util.ArrayList; diff --git a/core/src/main/java/com/pikolive/core/user/bean/UserInfoSkillEntity.kt b/core/src/main/java/com/bingchuang/core/user/bean/UserInfoSkillEntity.kt similarity index 88% rename from core/src/main/java/com/pikolive/core/user/bean/UserInfoSkillEntity.kt rename to core/src/main/java/com/bingchuang/core/user/bean/UserInfoSkillEntity.kt index f32f87937..8c751e219 100644 --- a/core/src/main/java/com/pikolive/core/user/bean/UserInfoSkillEntity.kt +++ b/core/src/main/java/com/bingchuang/core/user/bean/UserInfoSkillEntity.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.user.bean +package com.bingchuang.core.user.bean /** * { diff --git a/core/src/main/java/com/pikolive/core/user/bean/UserLabelInfo.kt b/core/src/main/java/com/bingchuang/core/user/bean/UserLabelInfo.kt similarity index 85% rename from core/src/main/java/com/pikolive/core/user/bean/UserLabelInfo.kt rename to core/src/main/java/com/bingchuang/core/user/bean/UserLabelInfo.kt index 693e3bc26..8d334b6ce 100644 --- a/core/src/main/java/com/pikolive/core/user/bean/UserLabelInfo.kt +++ b/core/src/main/java/com/bingchuang/core/user/bean/UserLabelInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.user.bean +package com.bingchuang.core.user.bean import lombok.Data import java.io.Serializable diff --git a/core/src/main/java/com/pikolive/core/user/bean/UserLabelItemInfo.kt b/core/src/main/java/com/bingchuang/core/user/bean/UserLabelItemInfo.kt similarity index 83% rename from core/src/main/java/com/pikolive/core/user/bean/UserLabelItemInfo.kt rename to core/src/main/java/com/bingchuang/core/user/bean/UserLabelItemInfo.kt index 648554616..f14eadbfe 100644 --- a/core/src/main/java/com/pikolive/core/user/bean/UserLabelItemInfo.kt +++ b/core/src/main/java/com/bingchuang/core/user/bean/UserLabelItemInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.user.bean +package com.bingchuang.core.user.bean import lombok.Data import java.io.Serializable diff --git a/core/src/main/java/com/pikolive/core/user/bean/UserPhoto.java b/core/src/main/java/com/bingchuang/core/user/bean/UserPhoto.java similarity index 93% rename from core/src/main/java/com/pikolive/core/user/bean/UserPhoto.java rename to core/src/main/java/com/bingchuang/core/user/bean/UserPhoto.java index 06c7041c8..d62dac252 100644 --- a/core/src/main/java/com/pikolive/core/user/bean/UserPhoto.java +++ b/core/src/main/java/com/bingchuang/core/user/bean/UserPhoto.java @@ -1,4 +1,4 @@ -package com.pikolive.core.user.bean; +package com.bingchuang.core.user.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/user/bean/UserRandomConfig.java b/core/src/main/java/com/bingchuang/core/user/bean/UserRandomConfig.java similarity index 80% rename from core/src/main/java/com/pikolive/core/user/bean/UserRandomConfig.java rename to core/src/main/java/com/bingchuang/core/user/bean/UserRandomConfig.java index c6f266b15..2b2914b32 100644 --- a/core/src/main/java/com/pikolive/core/user/bean/UserRandomConfig.java +++ b/core/src/main/java/com/bingchuang/core/user/bean/UserRandomConfig.java @@ -1,4 +1,4 @@ -package com.pikolive.core.user.bean; +package com.bingchuang.core.user.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/user/bean/UserRankInfo.java b/core/src/main/java/com/bingchuang/core/user/bean/UserRankInfo.java similarity index 98% rename from core/src/main/java/com/pikolive/core/user/bean/UserRankInfo.java rename to core/src/main/java/com/bingchuang/core/user/bean/UserRankInfo.java index 9fedefd0d..700a6d80b 100644 --- a/core/src/main/java/com/pikolive/core/user/bean/UserRankInfo.java +++ b/core/src/main/java/com/bingchuang/core/user/bean/UserRankInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.user.bean; +package com.bingchuang.core.user.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/user/bean/UserRecommendRoomInfo.java b/core/src/main/java/com/bingchuang/core/user/bean/UserRecommendRoomInfo.java similarity index 85% rename from core/src/main/java/com/pikolive/core/user/bean/UserRecommendRoomInfo.java rename to core/src/main/java/com/bingchuang/core/user/bean/UserRecommendRoomInfo.java index ab2934c85..f8997474a 100644 --- a/core/src/main/java/com/pikolive/core/user/bean/UserRecommendRoomInfo.java +++ b/core/src/main/java/com/bingchuang/core/user/bean/UserRecommendRoomInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.user.bean; +package com.bingchuang.core.user.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/user/event/CurrentUserInfoCompleteEvent.java b/core/src/main/java/com/bingchuang/core/user/event/CurrentUserInfoCompleteEvent.java similarity index 85% rename from core/src/main/java/com/pikolive/core/user/event/CurrentUserInfoCompleteEvent.java rename to core/src/main/java/com/bingchuang/core/user/event/CurrentUserInfoCompleteEvent.java index a4e1f096e..eddb10289 100644 --- a/core/src/main/java/com/pikolive/core/user/event/CurrentUserInfoCompleteEvent.java +++ b/core/src/main/java/com/bingchuang/core/user/event/CurrentUserInfoCompleteEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.user.event; +package com.bingchuang.core.user.event; /** * 补全资料成功的事件,一般来说,这个事件,整个用户周期只会触发一次 diff --git a/core/src/main/java/com/pikolive/core/user/event/CurrentUserInfoCompleteFailEvent.java b/core/src/main/java/com/bingchuang/core/user/event/CurrentUserInfoCompleteFailEvent.java similarity index 82% rename from core/src/main/java/com/pikolive/core/user/event/CurrentUserInfoCompleteFailEvent.java rename to core/src/main/java/com/bingchuang/core/user/event/CurrentUserInfoCompleteFailEvent.java index fc92331c8..2eb8b255b 100644 --- a/core/src/main/java/com/pikolive/core/user/event/CurrentUserInfoCompleteFailEvent.java +++ b/core/src/main/java/com/bingchuang/core/user/event/CurrentUserInfoCompleteFailEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.user.event; +package com.bingchuang.core.user.event; public class CurrentUserInfoCompleteFailEvent { diff --git a/core/src/main/java/com/pikolive/core/user/event/LoadLoginUserInfoEvent.java b/core/src/main/java/com/bingchuang/core/user/event/LoadLoginUserInfoEvent.java similarity index 71% rename from core/src/main/java/com/pikolive/core/user/event/LoadLoginUserInfoEvent.java rename to core/src/main/java/com/bingchuang/core/user/event/LoadLoginUserInfoEvent.java index 3ea094d95..bb3998c8e 100644 --- a/core/src/main/java/com/pikolive/core/user/event/LoadLoginUserInfoEvent.java +++ b/core/src/main/java/com/bingchuang/core/user/event/LoadLoginUserInfoEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.user.event; +package com.bingchuang.core.user.event; /** * @author jack diff --git a/core/src/main/java/com/pikolive/core/user/event/LoginUserInfoUpdateEvent.java b/core/src/main/java/com/bingchuang/core/user/event/LoginUserInfoUpdateEvent.java similarity index 77% rename from core/src/main/java/com/pikolive/core/user/event/LoginUserInfoUpdateEvent.java rename to core/src/main/java/com/bingchuang/core/user/event/LoginUserInfoUpdateEvent.java index d038b8907..4a58bfb03 100644 --- a/core/src/main/java/com/pikolive/core/user/event/LoginUserInfoUpdateEvent.java +++ b/core/src/main/java/com/bingchuang/core/user/event/LoginUserInfoUpdateEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.user.event; +package com.bingchuang.core.user.event; /** * @author jack diff --git a/core/src/main/java/com/pikolive/core/user/event/NeedBindPhoneEvent.java b/core/src/main/java/com/bingchuang/core/user/event/NeedBindPhoneEvent.java similarity index 72% rename from core/src/main/java/com/pikolive/core/user/event/NeedBindPhoneEvent.java rename to core/src/main/java/com/bingchuang/core/user/event/NeedBindPhoneEvent.java index 51b3f9617..d84e1a099 100644 --- a/core/src/main/java/com/pikolive/core/user/event/NeedBindPhoneEvent.java +++ b/core/src/main/java/com/bingchuang/core/user/event/NeedBindPhoneEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.user.event; +package com.bingchuang.core.user.event; /** * 需要绑定手机号 diff --git a/core/src/main/java/com/pikolive/core/user/event/NeedCompleteInfoEvent.java b/core/src/main/java/com/bingchuang/core/user/event/NeedCompleteInfoEvent.java similarity index 67% rename from core/src/main/java/com/pikolive/core/user/event/NeedCompleteInfoEvent.java rename to core/src/main/java/com/bingchuang/core/user/event/NeedCompleteInfoEvent.java index bee226e0e..771b5549c 100644 --- a/core/src/main/java/com/pikolive/core/user/event/NeedCompleteInfoEvent.java +++ b/core/src/main/java/com/bingchuang/core/user/event/NeedCompleteInfoEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.user.event; +package com.bingchuang.core.user.event; /** * create by lvzebiao on 2018/8/31 diff --git a/core/src/main/java/com/pikolive/core/user/event/NeedVerifyBoundAuthCodeEvent.java b/core/src/main/java/com/bingchuang/core/user/event/NeedVerifyBoundAuthCodeEvent.java similarity index 69% rename from core/src/main/java/com/pikolive/core/user/event/NeedVerifyBoundAuthCodeEvent.java rename to core/src/main/java/com/bingchuang/core/user/event/NeedVerifyBoundAuthCodeEvent.java index ee1a22251..f64faf960 100644 --- a/core/src/main/java/com/pikolive/core/user/event/NeedVerifyBoundAuthCodeEvent.java +++ b/core/src/main/java/com/bingchuang/core/user/event/NeedVerifyBoundAuthCodeEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.user.event; +package com.bingchuang.core.user.event; /** * create by lvzebiao on 2018/8/31 diff --git a/core/src/main/java/com/bingchuang/core/user/event/ShowMeEvent.kt b/core/src/main/java/com/bingchuang/core/user/event/ShowMeEvent.kt new file mode 100644 index 000000000..cfc6a934c --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/user/event/ShowMeEvent.kt @@ -0,0 +1,3 @@ +package com.bingchuang.core.user.event + +class ShowMeEvent diff --git a/core/src/main/java/com/pikolive/core/utils/APIEncryptUtil.java b/core/src/main/java/com/bingchuang/core/utils/APIEncryptUtil.java similarity index 98% rename from core/src/main/java/com/pikolive/core/utils/APIEncryptUtil.java rename to core/src/main/java/com/bingchuang/core/utils/APIEncryptUtil.java index 8ec05768b..9415b5311 100644 --- a/core/src/main/java/com/pikolive/core/utils/APIEncryptUtil.java +++ b/core/src/main/java/com/bingchuang/core/utils/APIEncryptUtil.java @@ -1,7 +1,7 @@ -package com.pikolive.core.utils; +package com.bingchuang.core.utils; import com.bingchuang.library.utils.StringUtils; -import com.pikolive.core2.XChatConstants; +import com.bingchuang.core2.XChatConstants; import com.bingchuang.library.utils.codec.MD5Utils; import java.net.URLEncoder; diff --git a/core/src/main/java/com/pikolive/core/utils/ActivityUtil.java b/core/src/main/java/com/bingchuang/core/utils/ActivityUtil.java similarity index 97% rename from core/src/main/java/com/pikolive/core/utils/ActivityUtil.java rename to core/src/main/java/com/bingchuang/core/utils/ActivityUtil.java index 93964cd89..cdea70780 100644 --- a/core/src/main/java/com/pikolive/core/utils/ActivityUtil.java +++ b/core/src/main/java/com/bingchuang/core/utils/ActivityUtil.java @@ -1,4 +1,4 @@ -package com.pikolive.core.utils; +package com.bingchuang.core.utils; import android.app.Activity; import android.content.Context; diff --git a/app/src/main/java/com/pikolive/app/ui/utils/ArrayUtils.java b/core/src/main/java/com/bingchuang/core/utils/ArrayUtils.java similarity index 97% rename from app/src/main/java/com/pikolive/app/ui/utils/ArrayUtils.java rename to core/src/main/java/com/bingchuang/core/utils/ArrayUtils.java index 9177209f9..d504354bd 100644 --- a/app/src/main/java/com/pikolive/app/ui/utils/ArrayUtils.java +++ b/core/src/main/java/com/bingchuang/core/utils/ArrayUtils.java @@ -1,4 +1,4 @@ -package com.pikolive.app.ui.utils; +package com.bingchuang.core.utils; import com.bingchuang.library.utils.log.MLog; diff --git a/core/src/main/java/com/pikolive/core/utils/AsyncTaskScanMusicFile.java b/core/src/main/java/com/bingchuang/core/utils/AsyncTaskScanMusicFile.java similarity index 98% rename from core/src/main/java/com/pikolive/core/utils/AsyncTaskScanMusicFile.java rename to core/src/main/java/com/bingchuang/core/utils/AsyncTaskScanMusicFile.java index 7b2e9c43d..8a908a3b9 100644 --- a/core/src/main/java/com/pikolive/core/utils/AsyncTaskScanMusicFile.java +++ b/core/src/main/java/com/bingchuang/core/utils/AsyncTaskScanMusicFile.java @@ -1,4 +1,4 @@ -package com.pikolive.core.utils; +package com.bingchuang.core.utils; import android.content.ContentResolver; import android.content.ContentUris; @@ -10,9 +10,9 @@ import android.os.AsyncTask; import android.os.Environment; import android.provider.MediaStore; -import com.pikolive.core.R; -import com.pikolive.core.music.db.bean.LocalMusicBean; -import com.pikolive.core.music.db.model.LocalMusicDbModel; +import com.bingchuang.core.R; +import com.bingchuang.core.music.db.bean.LocalMusicBean; +import com.bingchuang.core.music.db.model.LocalMusicDbModel; import com.bingchuang.library.common.file.FileHelper; import com.bingchuang.library.utils.BlankUtil; import com.bingchuang.library.utils.ResUtil; diff --git a/core/src/main/java/com/pikolive/core/utils/BitmapLruCacheHelper.java b/core/src/main/java/com/bingchuang/core/utils/BitmapLruCacheHelper.java similarity index 98% rename from core/src/main/java/com/pikolive/core/utils/BitmapLruCacheHelper.java rename to core/src/main/java/com/bingchuang/core/utils/BitmapLruCacheHelper.java index dac67ea23..d8834a585 100644 --- a/core/src/main/java/com/pikolive/core/utils/BitmapLruCacheHelper.java +++ b/core/src/main/java/com/bingchuang/core/utils/BitmapLruCacheHelper.java @@ -1,4 +1,4 @@ -package com.pikolive.core.utils; +package com.bingchuang.core.utils; import android.graphics.Bitmap; import android.util.Log; diff --git a/core/src/main/java/com/pikolive/core/utils/BitmapUtils.java b/core/src/main/java/com/bingchuang/core/utils/BitmapUtils.java similarity index 98% rename from core/src/main/java/com/pikolive/core/utils/BitmapUtils.java rename to core/src/main/java/com/bingchuang/core/utils/BitmapUtils.java index ba3223b72..9aa9f20c2 100644 --- a/core/src/main/java/com/pikolive/core/utils/BitmapUtils.java +++ b/core/src/main/java/com/bingchuang/core/utils/BitmapUtils.java @@ -1,4 +1,4 @@ -package com.pikolive.core.utils; +package com.bingchuang.core.utils; import android.content.res.Resources; import android.graphics.Bitmap; diff --git a/core/src/main/java/com/bingchuang/core/utils/CheckUtils.java b/core/src/main/java/com/bingchuang/core/utils/CheckUtils.java new file mode 100644 index 000000000..56016c681 --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/utils/CheckUtils.java @@ -0,0 +1,21 @@ +package com.bingchuang.core.utils; + +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.initial.InitialModel; +import com.bingchuang.core.initial.bean.InitInfo; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.initial.InitialModel; +import com.bingchuang.core.initial.bean.InitInfo; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.initial.InitialModel; +import com.bingchuang.core.initial.bean.InitInfo; +import com.bingchuang.library.utils.ListUtils; + +public class CheckUtils { + + public static boolean isCheckUser() { + InitInfo initInfo = InitialModel.get().getCacheInitInfo(); + if (initInfo == null || ListUtils.isListEmpty(initInfo.getCheckUids())) return false; + return initInfo.getCheckUids().contains(AuthModel.get().getCurrentUid()); + } +} diff --git a/core/src/main/java/com/pikolive/core/utils/CurrentTimeUtils.java b/core/src/main/java/com/bingchuang/core/utils/CurrentTimeUtils.java similarity index 90% rename from core/src/main/java/com/pikolive/core/utils/CurrentTimeUtils.java rename to core/src/main/java/com/bingchuang/core/utils/CurrentTimeUtils.java index 2f2bdd611..296ec5e63 100644 --- a/core/src/main/java/com/pikolive/core/utils/CurrentTimeUtils.java +++ b/core/src/main/java/com/bingchuang/core/utils/CurrentTimeUtils.java @@ -1,4 +1,4 @@ -package com.pikolive.core.utils; +package com.bingchuang.core.utils; public class CurrentTimeUtils { diff --git a/core/src/main/java/com/pikolive/core/utils/DirectoryHelper.java b/core/src/main/java/com/bingchuang/core/utils/DirectoryHelper.java similarity index 96% rename from core/src/main/java/com/pikolive/core/utils/DirectoryHelper.java rename to core/src/main/java/com/bingchuang/core/utils/DirectoryHelper.java index 9c4ac684d..8e6ca5281 100644 --- a/core/src/main/java/com/pikolive/core/utils/DirectoryHelper.java +++ b/core/src/main/java/com/bingchuang/core/utils/DirectoryHelper.java @@ -1,11 +1,11 @@ -package com.pikolive.core.utils; +package com.bingchuang.core.utils; import static android.os.Environment.MEDIA_MOUNTED; import android.content.Context; import android.os.Environment; -import com.pikolive.core.Constants; +import com.bingchuang.core.Constants; import com.bingchuang.library.utils.config.BasicConfig; import com.bingchuang.library.utils.file.StorageUtils; diff --git a/core/src/main/java/com/pikolive/core/utils/ExtensionUtil.java b/core/src/main/java/com/bingchuang/core/utils/ExtensionUtil.java similarity index 92% rename from core/src/main/java/com/pikolive/core/utils/ExtensionUtil.java rename to core/src/main/java/com/bingchuang/core/utils/ExtensionUtil.java index d3fcabc18..2e427f511 100644 --- a/core/src/main/java/com/pikolive/core/utils/ExtensionUtil.java +++ b/core/src/main/java/com/bingchuang/core/utils/ExtensionUtil.java @@ -1,4 +1,4 @@ -package com.pikolive.core.utils; +package com.bingchuang.core.utils; import android.text.TextUtils; @@ -7,15 +7,15 @@ 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.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.im.custom.bean.FaceAttachment; -import com.pikolive.core.im.custom.bean.RoomTipAttachment; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.im.custom.bean.FaceAttachment; -import com.pikolive.core.im.custom.bean.RoomTipAttachment; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.im.custom.bean.FaceAttachment; -import com.pikolive.core.im.custom.bean.RoomTipAttachment; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.im.custom.bean.FaceAttachment; +import com.bingchuang.core.im.custom.bean.RoomTipAttachment; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.im.custom.bean.FaceAttachment; +import com.bingchuang.core.im.custom.bean.RoomTipAttachment; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.im.custom.bean.FaceAttachment; +import com.bingchuang.core.im.custom.bean.RoomTipAttachment; import java.util.HashMap; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/utils/ExtensionUtils.java b/core/src/main/java/com/bingchuang/core/utils/ExtensionUtils.java similarity index 65% rename from core/src/main/java/com/pikolive/core/utils/ExtensionUtils.java rename to core/src/main/java/com/bingchuang/core/utils/ExtensionUtils.java index 1dc1e4dda..9834c29fe 100644 --- a/core/src/main/java/com/pikolive/core/utils/ExtensionUtils.java +++ b/core/src/main/java/com/bingchuang/core/utils/ExtensionUtils.java @@ -1,21 +1,21 @@ -package com.pikolive.core.utils; +package com.bingchuang.core.utils; import androidx.annotation.NonNull; -import com.pikolive.core.decoration.car.bean.CarInfo; -import com.pikolive.core.decoration.headwear.bean.HeadWearInfo; -import com.pikolive.core.level.UserLevelVo; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.decoration.car.bean.CarInfo; -import com.pikolive.core.decoration.headwear.bean.HeadWearInfo; -import com.pikolive.core.level.UserLevelVo; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.decoration.car.bean.CarInfo; -import com.pikolive.core.decoration.headwear.bean.HeadWearInfo; -import com.pikolive.core.level.UserLevelVo; -import com.pikolive.core.admin.util.SuperAdminUtil; -import com.pikolive.core.user.bean.UserInfo; +import com.bingchuang.core.decoration.car.bean.CarInfo; +import com.bingchuang.core.decoration.headwear.bean.HeadWearInfo; +import com.bingchuang.core.level.UserLevelVo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.decoration.car.bean.CarInfo; +import com.bingchuang.core.decoration.headwear.bean.HeadWearInfo; +import com.bingchuang.core.level.UserLevelVo; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.decoration.car.bean.CarInfo; +import com.bingchuang.core.decoration.headwear.bean.HeadWearInfo; +import com.bingchuang.core.level.UserLevelVo; +import com.bingchuang.core.admin.util.SuperAdminUtil; +import com.bingchuang.core.user.bean.UserInfo; import java.util.HashMap; import java.util.Map; diff --git a/core/src/main/java/com/pikolive/core/utils/IConnectivityClient.java b/core/src/main/java/com/bingchuang/core/utils/IConnectivityClient.java similarity index 89% rename from core/src/main/java/com/pikolive/core/utils/IConnectivityClient.java rename to core/src/main/java/com/bingchuang/core/utils/IConnectivityClient.java index e3e185727..344591866 100644 --- a/core/src/main/java/com/pikolive/core/utils/IConnectivityClient.java +++ b/core/src/main/java/com/bingchuang/core/utils/IConnectivityClient.java @@ -1,7 +1,7 @@ /** * */ -package com.pikolive.core.utils; +package com.bingchuang.core.utils; import com.bingchuang.library.coremanager.ICoreClient; diff --git a/core/src/main/java/com/pikolive/core/utils/IConnectivityCore.java b/core/src/main/java/com/bingchuang/core/utils/IConnectivityCore.java similarity index 90% rename from core/src/main/java/com/pikolive/core/utils/IConnectivityCore.java rename to core/src/main/java/com/bingchuang/core/utils/IConnectivityCore.java index 47552d097..ffd49782f 100644 --- a/core/src/main/java/com/pikolive/core/utils/IConnectivityCore.java +++ b/core/src/main/java/com/bingchuang/core/utils/IConnectivityCore.java @@ -1,7 +1,7 @@ /** * */ -package com.pikolive.core.utils; +package com.bingchuang.core.utils; import com.bingchuang.library.coremanager.IBaseCore; diff --git a/core/src/main/java/com/pikolive/core/utils/IHandlerCore.java b/core/src/main/java/com/bingchuang/core/utils/IHandlerCore.java similarity index 96% rename from core/src/main/java/com/pikolive/core/utils/IHandlerCore.java rename to core/src/main/java/com/bingchuang/core/utils/IHandlerCore.java index d8003017a..d47cb31bf 100644 --- a/core/src/main/java/com/pikolive/core/utils/IHandlerCore.java +++ b/core/src/main/java/com/bingchuang/core/utils/IHandlerCore.java @@ -1,4 +1,4 @@ -package com.pikolive.core.utils; +package com.bingchuang.core.utils; import com.bingchuang.library.coremanager.IBaseCore; diff --git a/core/src/main/java/com/pikolive/core/utils/ImageSplitter.java b/core/src/main/java/com/bingchuang/core/utils/ImageSplitter.java similarity index 94% rename from core/src/main/java/com/pikolive/core/utils/ImageSplitter.java rename to core/src/main/java/com/bingchuang/core/utils/ImageSplitter.java index 02891dbda..c03b75026 100644 --- a/core/src/main/java/com/pikolive/core/utils/ImageSplitter.java +++ b/core/src/main/java/com/bingchuang/core/utils/ImageSplitter.java @@ -1,13 +1,13 @@ -package com.pikolive.core.utils; +package com.bingchuang.core.utils; import android.graphics.Bitmap; import android.graphics.Matrix; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core.manager.AvRoomDataManager; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core.manager.AvRoomDataManager; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/utils/ImgServiceUrlUtil.java b/core/src/main/java/com/bingchuang/core/utils/ImgServiceUrlUtil.java similarity index 99% rename from core/src/main/java/com/pikolive/core/utils/ImgServiceUrlUtil.java rename to core/src/main/java/com/bingchuang/core/utils/ImgServiceUrlUtil.java index 5a3442770..1e2b8808c 100644 --- a/core/src/main/java/com/pikolive/core/utils/ImgServiceUrlUtil.java +++ b/core/src/main/java/com/bingchuang/core/utils/ImgServiceUrlUtil.java @@ -1,4 +1,4 @@ -package com.pikolive.core.utils; +package com.bingchuang.core.utils; import com.bingchuang.library.utils.StringUtils; diff --git a/core/src/main/java/com/pikolive/core/utils/IntentUtils.java b/core/src/main/java/com/bingchuang/core/utils/IntentUtils.java similarity index 97% rename from core/src/main/java/com/pikolive/core/utils/IntentUtils.java rename to core/src/main/java/com/bingchuang/core/utils/IntentUtils.java index 2e3b67ab8..c04bd2e61 100644 --- a/core/src/main/java/com/pikolive/core/utils/IntentUtils.java +++ b/core/src/main/java/com/bingchuang/core/utils/IntentUtils.java @@ -1,4 +1,4 @@ -package com.pikolive.core.utils; +package com.bingchuang.core.utils; import android.app.Activity; import android.app.PendingIntent; diff --git a/core/src/main/java/com/pikolive/core/utils/LogUtils.java b/core/src/main/java/com/bingchuang/core/utils/LogUtils.java similarity index 96% rename from core/src/main/java/com/pikolive/core/utils/LogUtils.java rename to core/src/main/java/com/bingchuang/core/utils/LogUtils.java index 5729fe254..e0f7a860b 100644 --- a/core/src/main/java/com/pikolive/core/utils/LogUtils.java +++ b/core/src/main/java/com/bingchuang/core/utils/LogUtils.java @@ -3,12 +3,12 @@ // (powered by Fernflower decompiler) // -package com.pikolive.core.utils; +package com.bingchuang.core.utils; import android.util.Log; -import com.pikolive.core.R; -import com.pikolive.core.BuildConfig; +import com.bingchuang.core.R; +import com.bingchuang.core.BuildConfig; import com.bingchuang.library.utils.ResUtil; import java.util.Locale; diff --git a/core/src/main/java/com/pikolive/core/utils/Logger.java b/core/src/main/java/com/bingchuang/core/utils/Logger.java similarity index 99% rename from core/src/main/java/com/pikolive/core/utils/Logger.java rename to core/src/main/java/com/bingchuang/core/utils/Logger.java index 269b631e1..c6165baa6 100644 --- a/core/src/main/java/com/pikolive/core/utils/Logger.java +++ b/core/src/main/java/com/bingchuang/core/utils/Logger.java @@ -4,7 +4,7 @@ * 使用前需要先调用init初始化 * 内部使用android的Log类实现,并支持写入文件 */ -package com.pikolive.core.utils; +package com.bingchuang.core.utils; import android.annotation.SuppressLint; import android.os.Bundle; diff --git a/core/src/main/java/com/pikolive/core/utils/OaidUtil.java b/core/src/main/java/com/bingchuang/core/utils/OaidUtil.java similarity index 87% rename from core/src/main/java/com/pikolive/core/utils/OaidUtil.java rename to core/src/main/java/com/bingchuang/core/utils/OaidUtil.java index 9a1cd1274..d864e982f 100644 --- a/core/src/main/java/com/pikolive/core/utils/OaidUtil.java +++ b/core/src/main/java/com/bingchuang/core/utils/OaidUtil.java @@ -1,4 +1,4 @@ -package com.pikolive.core.utils; +package com.bingchuang.core.utils; public class OaidUtil { diff --git a/core/src/main/java/com/pikolive/core/utils/OldHttpErrorHandleUtil.java b/core/src/main/java/com/bingchuang/core/utils/OldHttpErrorHandleUtil.java similarity index 89% rename from core/src/main/java/com/pikolive/core/utils/OldHttpErrorHandleUtil.java rename to core/src/main/java/com/bingchuang/core/utils/OldHttpErrorHandleUtil.java index d927c5edd..15d1353b7 100644 --- a/core/src/main/java/com/pikolive/core/utils/OldHttpErrorHandleUtil.java +++ b/core/src/main/java/com/bingchuang/core/utils/OldHttpErrorHandleUtil.java @@ -1,10 +1,10 @@ -package com.pikolive.core.utils; +package com.bingchuang.core.utils; import com.google.gson.Gson; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.R; -import com.pikolive.core.bean.response.ServiceResult; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.R; +import com.bingchuang.core.bean.response.ServiceResult; import com.bingchuang.library.utils.ResUtil; import java.nio.charset.Charset; diff --git a/core/src/main/java/com/pikolive/core/utils/SharedPreferenceUtils.java b/core/src/main/java/com/bingchuang/core/utils/SharedPreferenceUtils.java similarity index 97% rename from core/src/main/java/com/pikolive/core/utils/SharedPreferenceUtils.java rename to core/src/main/java/com/bingchuang/core/utils/SharedPreferenceUtils.java index 7b971416d..806a78c9a 100644 --- a/core/src/main/java/com/pikolive/core/utils/SharedPreferenceUtils.java +++ b/core/src/main/java/com/bingchuang/core/utils/SharedPreferenceUtils.java @@ -1,9 +1,9 @@ -package com.pikolive.core.utils; +package com.bingchuang.core.utils; import android.content.Context; import android.content.SharedPreferences; -import com.pikolive.core2.XChatConstants; +import com.bingchuang.core2.XChatConstants; public class SharedPreferenceUtils { diff --git a/core/src/main/java/com/pikolive/core/utils/SongUtils.java b/core/src/main/java/com/bingchuang/core/utils/SongUtils.java similarity index 92% rename from core/src/main/java/com/pikolive/core/utils/SongUtils.java rename to core/src/main/java/com/bingchuang/core/utils/SongUtils.java index ac5bea3de..77f6590fa 100644 --- a/core/src/main/java/com/pikolive/core/utils/SongUtils.java +++ b/core/src/main/java/com/bingchuang/core/utils/SongUtils.java @@ -1,4 +1,4 @@ -package com.pikolive.core.utils; +package com.bingchuang.core.utils; import com.bingchuang.library.utils.UUIDUtil; diff --git a/core/src/main/java/com/pikolive/core/utils/StarUtils.java b/core/src/main/java/com/bingchuang/core/utils/StarUtils.java similarity index 98% rename from core/src/main/java/com/pikolive/core/utils/StarUtils.java rename to core/src/main/java/com/bingchuang/core/utils/StarUtils.java index cbd4bda81..3a7916e4a 100644 --- a/core/src/main/java/com/pikolive/core/utils/StarUtils.java +++ b/core/src/main/java/com/bingchuang/core/utils/StarUtils.java @@ -1,5 +1,5 @@ -package com.pikolive.core.utils; -import com.pikolive.core.R; +package com.bingchuang.core.utils; +import com.bingchuang.core.R; import com.bingchuang.library.utils.ResUtil; import java.util.Calendar; diff --git a/core/src/main/java/com/pikolive/core/utils/StringExtension.kt b/core/src/main/java/com/bingchuang/core/utils/StringExtension.kt similarity index 97% rename from core/src/main/java/com/pikolive/core/utils/StringExtension.kt rename to core/src/main/java/com/bingchuang/core/utils/StringExtension.kt index 682786573..699d8b4fb 100644 --- a/core/src/main/java/com/pikolive/core/utils/StringExtension.kt +++ b/core/src/main/java/com/bingchuang/core/utils/StringExtension.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.utils +package com.bingchuang.core.utils import android.graphics.Color import com.bingchuang.library.utils.SingleToastUtil diff --git a/core/src/main/java/com/pikolive/core/utils/StringUtils.java b/core/src/main/java/com/bingchuang/core/utils/StringUtils.java similarity index 99% rename from core/src/main/java/com/pikolive/core/utils/StringUtils.java rename to core/src/main/java/com/bingchuang/core/utils/StringUtils.java index add3b007a..3b5aa61c4 100644 --- a/core/src/main/java/com/pikolive/core/utils/StringUtils.java +++ b/core/src/main/java/com/bingchuang/core/utils/StringUtils.java @@ -1,5 +1,5 @@ -package com.pikolive.core.utils; -import com.pikolive.core.R; +package com.bingchuang.core.utils; +import com.bingchuang.core.R; import com.bingchuang.library.utils.ResUtil; import java.net.URLEncoder; diff --git a/core/src/main/java/com/pikolive/core/utils/SystemUidUtil.java b/core/src/main/java/com/bingchuang/core/utils/SystemUidUtil.java similarity index 77% rename from core/src/main/java/com/pikolive/core/utils/SystemUidUtil.java rename to core/src/main/java/com/bingchuang/core/utils/SystemUidUtil.java index b8fa36a2f..ab0ef8d65 100644 --- a/core/src/main/java/com/pikolive/core/utils/SystemUidUtil.java +++ b/core/src/main/java/com/bingchuang/core/utils/SystemUidUtil.java @@ -1,7 +1,7 @@ -package com.pikolive.core.utils; +package com.bingchuang.core.utils; -import com.pikolive.core2.XChatConstants; +import com.bingchuang.core2.XChatConstants; public class SystemUidUtil { diff --git a/core/src/main/java/com/pikolive/core/utils/SystemUtils.java b/core/src/main/java/com/bingchuang/core/utils/SystemUtils.java similarity index 98% rename from core/src/main/java/com/pikolive/core/utils/SystemUtils.java rename to core/src/main/java/com/bingchuang/core/utils/SystemUtils.java index 3ce0d0a26..d23c043e6 100644 --- a/core/src/main/java/com/pikolive/core/utils/SystemUtils.java +++ b/core/src/main/java/com/bingchuang/core/utils/SystemUtils.java @@ -1,7 +1,7 @@ /** * */ -package com.pikolive.core.utils; +package com.bingchuang.core.utils; import android.content.Context; import android.os.Build; diff --git a/core/src/main/java/com/pikolive/core/utils/TestLog.java b/core/src/main/java/com/bingchuang/core/utils/TestLog.java similarity index 95% rename from core/src/main/java/com/pikolive/core/utils/TestLog.java rename to core/src/main/java/com/bingchuang/core/utils/TestLog.java index a3c239c76..05b451e76 100644 --- a/core/src/main/java/com/pikolive/core/utils/TestLog.java +++ b/core/src/main/java/com/bingchuang/core/utils/TestLog.java @@ -1,4 +1,4 @@ -package com.pikolive.core.utils; +package com.bingchuang.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/pikolive/core/utils/TextUtils.java b/core/src/main/java/com/bingchuang/core/utils/TextUtils.java similarity index 98% rename from core/src/main/java/com/pikolive/core/utils/TextUtils.java rename to core/src/main/java/com/bingchuang/core/utils/TextUtils.java index 7bd363c1b..90ffda1f1 100644 --- a/core/src/main/java/com/pikolive/core/utils/TextUtils.java +++ b/core/src/main/java/com/bingchuang/core/utils/TextUtils.java @@ -1,4 +1,4 @@ -package com.pikolive.core.utils; +package com.bingchuang.core.utils; import android.content.ClipData; import android.content.ClipboardManager; diff --git a/core/src/main/java/com/pikolive/core/utils/Transformer.java b/core/src/main/java/com/bingchuang/core/utils/Transformer.java similarity index 95% rename from core/src/main/java/com/pikolive/core/utils/Transformer.java rename to core/src/main/java/com/bingchuang/core/utils/Transformer.java index 488e667a4..de3ed3a18 100644 --- a/core/src/main/java/com/pikolive/core/utils/Transformer.java +++ b/core/src/main/java/com/bingchuang/core/utils/Transformer.java @@ -1,4 +1,4 @@ -package com.pikolive.core.utils; +package com.bingchuang.core.utils; import io.reactivex.Single; import io.reactivex.SingleSource; diff --git a/core/src/main/java/com/pikolive/core/utils/UploadUtils.java b/core/src/main/java/com/bingchuang/core/utils/UploadUtils.java similarity index 68% rename from core/src/main/java/com/pikolive/core/utils/UploadUtils.java rename to core/src/main/java/com/bingchuang/core/utils/UploadUtils.java index 5c100aa55..b9f68caf9 100644 --- a/core/src/main/java/com/pikolive/core/utils/UploadUtils.java +++ b/core/src/main/java/com/bingchuang/core/utils/UploadUtils.java @@ -1,4 +1,4 @@ -package com.pikolive.core.utils; +package com.bingchuang.core.utils; /** * create by lvzebiao @2019/11/20 diff --git a/core/src/main/java/com/pikolive/core/utils/net/BalanceNotEnoughExeption.java b/core/src/main/java/com/bingchuang/core/utils/net/BalanceNotEnoughExeption.java similarity index 86% rename from core/src/main/java/com/pikolive/core/utils/net/BalanceNotEnoughExeption.java rename to core/src/main/java/com/bingchuang/core/utils/net/BalanceNotEnoughExeption.java index b7dbc5401..40812d2ee 100644 --- a/core/src/main/java/com/pikolive/core/utils/net/BalanceNotEnoughExeption.java +++ b/core/src/main/java/com/bingchuang/core/utils/net/BalanceNotEnoughExeption.java @@ -1,4 +1,4 @@ -package com.pikolive.core.utils.net; +package com.bingchuang.core.utils.net; /** * Created by huangmeng1 on 2018/5/14. diff --git a/core/src/main/java/com/pikolive/core/utils/net/BeanObserver.java b/core/src/main/java/com/bingchuang/core/utils/net/BeanObserver.java similarity index 95% rename from core/src/main/java/com/pikolive/core/utils/net/BeanObserver.java rename to core/src/main/java/com/bingchuang/core/utils/net/BeanObserver.java index 86577e179..f898edb72 100644 --- a/core/src/main/java/com/pikolive/core/utils/net/BeanObserver.java +++ b/core/src/main/java/com/bingchuang/core/utils/net/BeanObserver.java @@ -1,7 +1,7 @@ -package com.pikolive.core.utils.net; +package com.bingchuang.core.utils.net; import com.google.gson.JsonParseException; -import com.pikolive.core.R; +import com.bingchuang.core.R; import com.bingchuang.library.utils.ResUtil; import org.json.JSONException; diff --git a/core/src/main/java/com/pikolive/core/utils/net/DontWarnObserver.java b/core/src/main/java/com/bingchuang/core/utils/net/DontWarnObserver.java similarity index 92% rename from core/src/main/java/com/pikolive/core/utils/net/DontWarnObserver.java rename to core/src/main/java/com/bingchuang/core/utils/net/DontWarnObserver.java index 269561f3c..6928eb2d1 100644 --- a/core/src/main/java/com/pikolive/core/utils/net/DontWarnObserver.java +++ b/core/src/main/java/com/bingchuang/core/utils/net/DontWarnObserver.java @@ -1,8 +1,8 @@ -package com.pikolive.core.utils.net; +package com.bingchuang.core.utils.net; import android.text.TextUtils; -import com.pikolive.core2.XChatConstants; +import com.bingchuang.core2.XChatConstants; import java.net.UnknownHostException; diff --git a/core/src/main/java/com/pikolive/core/utils/net/ErrorConsumer.java b/core/src/main/java/com/bingchuang/core/utils/net/ErrorConsumer.java similarity index 86% rename from core/src/main/java/com/pikolive/core/utils/net/ErrorConsumer.java rename to core/src/main/java/com/bingchuang/core/utils/net/ErrorConsumer.java index e3baa5ff7..8e9656b08 100644 --- a/core/src/main/java/com/pikolive/core/utils/net/ErrorConsumer.java +++ b/core/src/main/java/com/bingchuang/core/utils/net/ErrorConsumer.java @@ -1,11 +1,11 @@ -package com.pikolive.core.utils.net; +package com.bingchuang.core.utils.net; import android.text.TextUtils; -import com.pikolive.core.patriarch.exception.PmRoomLimitException; -import com.pikolive.core.patriarch.exception.PmRoomLimitException; -import com.pikolive.core.R; -import com.pikolive.core2.XChatConstants; +import com.bingchuang.core.patriarch.exception.PmRoomLimitException; +import com.bingchuang.core.patriarch.exception.PmRoomLimitException; +import com.bingchuang.core.R; +import com.bingchuang.core2.XChatConstants; import com.bingchuang.library.rxbus.RxBus; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.SingleToastUtil; diff --git a/core/src/main/java/com/pikolive/core/utils/net/FreezeException.java b/core/src/main/java/com/bingchuang/core/utils/net/FreezeException.java similarity index 81% rename from core/src/main/java/com/pikolive/core/utils/net/FreezeException.java rename to core/src/main/java/com/bingchuang/core/utils/net/FreezeException.java index 510b0f316..0ed9de2bf 100644 --- a/core/src/main/java/com/pikolive/core/utils/net/FreezeException.java +++ b/core/src/main/java/com/bingchuang/core/utils/net/FreezeException.java @@ -1,4 +1,4 @@ -package com.pikolive.core.utils.net; +package com.bingchuang.core.utils.net; public class FreezeException extends Exception { public static final int code = 402; diff --git a/core/src/main/java/com/pikolive/core/utils/net/IgnoreException.java b/core/src/main/java/com/bingchuang/core/utils/net/IgnoreException.java similarity index 82% rename from core/src/main/java/com/pikolive/core/utils/net/IgnoreException.java rename to core/src/main/java/com/bingchuang/core/utils/net/IgnoreException.java index 227c58ed8..932627511 100644 --- a/core/src/main/java/com/pikolive/core/utils/net/IgnoreException.java +++ b/core/src/main/java/com/bingchuang/core/utils/net/IgnoreException.java @@ -1,4 +1,4 @@ -package com.pikolive.core.utils.net; +package com.bingchuang.core.utils.net; /** * 可以忽略的异常,比如不弹toast diff --git a/core/src/main/java/com/pikolive/core/utils/net/RadishNotEnoughException.java b/core/src/main/java/com/bingchuang/core/utils/net/RadishNotEnoughException.java similarity index 86% rename from core/src/main/java/com/pikolive/core/utils/net/RadishNotEnoughException.java rename to core/src/main/java/com/bingchuang/core/utils/net/RadishNotEnoughException.java index a62b3afd7..f14f356ed 100644 --- a/core/src/main/java/com/pikolive/core/utils/net/RadishNotEnoughException.java +++ b/core/src/main/java/com/bingchuang/core/utils/net/RadishNotEnoughException.java @@ -1,4 +1,4 @@ -package com.pikolive.core.utils.net; +package com.bingchuang.core.utils.net; /** * create by lvzebiao @2019/3/21 diff --git a/core/src/main/java/com/pikolive/core/utils/net/RxExtension.kt b/core/src/main/java/com/bingchuang/core/utils/net/RxExtension.kt similarity index 93% rename from core/src/main/java/com/pikolive/core/utils/net/RxExtension.kt rename to core/src/main/java/com/bingchuang/core/utils/net/RxExtension.kt index f4c30f851..1d412a80d 100644 --- a/core/src/main/java/com/pikolive/core/utils/net/RxExtension.kt +++ b/core/src/main/java/com/bingchuang/core/utils/net/RxExtension.kt @@ -1,9 +1,9 @@ -package com.pikolive.core.utils.net +package com.bingchuang.core.utils.net -import com.pikolive.core.R -import com.pikolive.core.bean.response.ServiceResult -import com.pikolive.core.utils.ifNullOrEmpty +import com.bingchuang.core.R +import com.bingchuang.core.bean.response.ServiceResult +import com.bingchuang.core.utils.ifNullOrEmpty import com.bingchuang.library.utils.ResUtil import io.reactivex.Single import io.reactivex.android.schedulers.AndroidSchedulers diff --git a/core/src/main/java/com/pikolive/core/utils/net/RxHelper.java b/core/src/main/java/com/bingchuang/core/utils/net/RxHelper.java similarity index 95% rename from core/src/main/java/com/pikolive/core/utils/net/RxHelper.java rename to core/src/main/java/com/bingchuang/core/utils/net/RxHelper.java index 096052914..3981fe2ca 100644 --- a/core/src/main/java/com/pikolive/core/utils/net/RxHelper.java +++ b/core/src/main/java/com/bingchuang/core/utils/net/RxHelper.java @@ -1,24 +1,24 @@ -package com.pikolive.core.utils.net; +package com.bingchuang.core.utils.net; import android.content.Context; import android.text.TextUtils; import com.google.gson.JsonElement; import com.orhanobut.logger.Logger; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.exception.FailReasonException; -import com.pikolive.core.patriarch.exception.PmRoomLimitException; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.exception.FailReasonException; +import com.bingchuang.core.patriarch.exception.PmRoomLimitException; import com.trello.rxlifecycle3.LifecycleProvider; 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.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.exception.FailReasonException; -import com.pikolive.core.patriarch.exception.PmRoomLimitException; -import com.pikolive.core.R; -import com.pikolive.core2.XChatConstants; -import com.pikolive.core.admin.model.exception.SAdminCannotGameException; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.exception.FailReasonException; +import com.bingchuang.core.patriarch.exception.PmRoomLimitException; +import com.bingchuang.core.R; +import com.bingchuang.core2.XChatConstants; +import com.bingchuang.core.admin.model.exception.SAdminCannotGameException; import com.bingchuang.library.rxbus.RxBus; import com.bingchuang.library.utils.ResUtil; diff --git a/core/src/main/java/com/pikolive/core/utils/net/ServerException.java b/core/src/main/java/com/bingchuang/core/utils/net/ServerException.java similarity index 85% rename from core/src/main/java/com/pikolive/core/utils/net/ServerException.java rename to core/src/main/java/com/bingchuang/core/utils/net/ServerException.java index 36d550413..fd7aaaa73 100644 --- a/core/src/main/java/com/pikolive/core/utils/net/ServerException.java +++ b/core/src/main/java/com/bingchuang/core/utils/net/ServerException.java @@ -1,4 +1,4 @@ -package com.pikolive.core.utils.net; +package com.bingchuang.core.utils.net; /** * Created by fwhm on 2017/7/27. diff --git a/core/src/main/java/com/pikolive/core/utils/net/VipLevelNotEnoughException.java b/core/src/main/java/com/bingchuang/core/utils/net/VipLevelNotEnoughException.java similarity index 86% rename from core/src/main/java/com/pikolive/core/utils/net/VipLevelNotEnoughException.java rename to core/src/main/java/com/bingchuang/core/utils/net/VipLevelNotEnoughException.java index 4547410f0..1a3b6e790 100644 --- a/core/src/main/java/com/pikolive/core/utils/net/VipLevelNotEnoughException.java +++ b/core/src/main/java/com/bingchuang/core/utils/net/VipLevelNotEnoughException.java @@ -1,4 +1,4 @@ -package com.pikolive.core.utils.net; +package com.bingchuang.core.utils.net; /** * Created by huangmeng1 on 2018/5/14. diff --git a/core/src/main/java/com/pikolive/core/vip/UserVipInfo.kt b/core/src/main/java/com/bingchuang/core/vip/UserVipInfo.kt similarity index 90% rename from core/src/main/java/com/pikolive/core/vip/UserVipInfo.kt rename to core/src/main/java/com/bingchuang/core/vip/UserVipInfo.kt index 6f595fbbb..e5815c13e 100644 --- a/core/src/main/java/com/pikolive/core/vip/UserVipInfo.kt +++ b/core/src/main/java/com/bingchuang/core/vip/UserVipInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.vip +package com.bingchuang.core.vip import java.io.Serializable diff --git a/core/src/main/java/com/pikolive/core/vip/VipAuthInfo.kt b/core/src/main/java/com/bingchuang/core/vip/VipAuthInfo.kt similarity index 92% rename from core/src/main/java/com/pikolive/core/vip/VipAuthInfo.kt rename to core/src/main/java/com/bingchuang/core/vip/VipAuthInfo.kt index 33c27a86c..71771b5be 100644 --- a/core/src/main/java/com/pikolive/core/vip/VipAuthInfo.kt +++ b/core/src/main/java/com/bingchuang/core/vip/VipAuthInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.vip +package com.bingchuang.core.vip data class VipAuthInfo( val authDesc: String = "", diff --git a/core/src/main/java/com/pikolive/core/vip/VipBroadcastInfo.kt b/core/src/main/java/com/bingchuang/core/vip/VipBroadcastInfo.kt similarity index 84% rename from core/src/main/java/com/pikolive/core/vip/VipBroadcastInfo.kt rename to core/src/main/java/com/bingchuang/core/vip/VipBroadcastInfo.kt index db7846f6a..978c2569e 100644 --- a/core/src/main/java/com/pikolive/core/vip/VipBroadcastInfo.kt +++ b/core/src/main/java/com/bingchuang/core/vip/VipBroadcastInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.vip +package com.bingchuang.core.vip import java.io.Serializable diff --git a/core/src/main/java/com/pikolive/core/vip/VipBroadcastMsgEvent.kt b/core/src/main/java/com/bingchuang/core/vip/VipBroadcastMsgEvent.kt similarity index 81% rename from core/src/main/java/com/pikolive/core/vip/VipBroadcastMsgEvent.kt rename to core/src/main/java/com/bingchuang/core/vip/VipBroadcastMsgEvent.kt index e75c932c5..5389adac5 100644 --- a/core/src/main/java/com/pikolive/core/vip/VipBroadcastMsgEvent.kt +++ b/core/src/main/java/com/bingchuang/core/vip/VipBroadcastMsgEvent.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.vip +package com.bingchuang.core.vip import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage diff --git a/core/src/main/java/com/pikolive/core/vip/VipInfo.kt b/core/src/main/java/com/bingchuang/core/vip/VipInfo.kt similarity index 96% rename from core/src/main/java/com/pikolive/core/vip/VipInfo.kt rename to core/src/main/java/com/bingchuang/core/vip/VipInfo.kt index 2bb6f7db3..09c6982eb 100644 --- a/core/src/main/java/com/pikolive/core/vip/VipInfo.kt +++ b/core/src/main/java/com/bingchuang/core/vip/VipInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.vip +package com.bingchuang.core.vip import java.io.Serializable diff --git a/core/src/main/java/com/pikolive/core/vip/VipMessageInfo.java b/core/src/main/java/com/bingchuang/core/vip/VipMessageInfo.java similarity index 90% rename from core/src/main/java/com/pikolive/core/vip/VipMessageInfo.java rename to core/src/main/java/com/bingchuang/core/vip/VipMessageInfo.java index 96d86a64c..5092369f4 100644 --- a/core/src/main/java/com/pikolive/core/vip/VipMessageInfo.java +++ b/core/src/main/java/com/bingchuang/core/vip/VipMessageInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.vip; +package com.bingchuang.core.vip; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/vip/VipModel.kt b/core/src/main/java/com/bingchuang/core/vip/VipModel.kt similarity index 91% rename from core/src/main/java/com/pikolive/core/vip/VipModel.kt rename to core/src/main/java/com/bingchuang/core/vip/VipModel.kt index 666502748..20b5d0817 100644 --- a/core/src/main/java/com/pikolive/core/vip/VipModel.kt +++ b/core/src/main/java/com/bingchuang/core/vip/VipModel.kt @@ -1,9 +1,9 @@ -package com.pikolive.core.vip +package com.bingchuang.core.vip -import com.pikolive.core.base.BaseModel -import com.pikolive.core.bean.response.ServiceResult -import com.pikolive.core.manager.AvRoomDataManager -import com.pikolive.core.utils.net.launchRequest +import com.bingchuang.core.base.BaseModel +import com.bingchuang.core.bean.response.ServiceResult +import com.bingchuang.core.manager.AvRoomDataManager +import com.bingchuang.core.utils.net.launchRequest import com.bingchuang.library.net.rxnet.RxNet import retrofit2.http.* diff --git a/core/src/main/java/com/bingchuang/core/vip/VipOpenEvent.kt b/core/src/main/java/com/bingchuang/core/vip/VipOpenEvent.kt new file mode 100644 index 000000000..04898b5c1 --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/vip/VipOpenEvent.kt @@ -0,0 +1,3 @@ +package com.bingchuang.core.vip + + class VipOpenEvent diff --git a/core/src/main/java/com/pikolive/core/vip/VipPageInfo.kt b/core/src/main/java/com/bingchuang/core/vip/VipPageInfo.kt similarity index 88% rename from core/src/main/java/com/pikolive/core/vip/VipPageInfo.kt rename to core/src/main/java/com/bingchuang/core/vip/VipPageInfo.kt index c3001504b..ddaa9fdad 100644 --- a/core/src/main/java/com/pikolive/core/vip/VipPageInfo.kt +++ b/core/src/main/java/com/bingchuang/core/vip/VipPageInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.vip +package com.bingchuang.core.vip data class VipPageInfo( val vipAuthInfos: List
? = null, diff --git a/core/src/main/java/com/pikolive/core/vip/VipUpgradeEvent.kt b/core/src/main/java/com/bingchuang/core/vip/VipUpgradeEvent.kt similarity index 60% rename from core/src/main/java/com/pikolive/core/vip/VipUpgradeEvent.kt rename to core/src/main/java/com/bingchuang/core/vip/VipUpgradeEvent.kt index 3ac3a347f..b9808a5a3 100644 --- a/core/src/main/java/com/pikolive/core/vip/VipUpgradeEvent.kt +++ b/core/src/main/java/com/bingchuang/core/vip/VipUpgradeEvent.kt @@ -1,3 +1,3 @@ -package com.pikolive.core.vip +package com.bingchuang.core.vip data class VipUpgradeEvent(val vipInfo: VipInfo) diff --git a/core/src/main/java/com/pikolive/core/web/bean/H5NotifyData.java b/core/src/main/java/com/bingchuang/core/web/bean/H5NotifyData.java similarity index 94% rename from core/src/main/java/com/pikolive/core/web/bean/H5NotifyData.java rename to core/src/main/java/com/bingchuang/core/web/bean/H5NotifyData.java index c8e2f553c..6dbde6132 100644 --- a/core/src/main/java/com/pikolive/core/web/bean/H5NotifyData.java +++ b/core/src/main/java/com/bingchuang/core/web/bean/H5NotifyData.java @@ -1,4 +1,4 @@ -package com.pikolive.core.web.bean; +package com.bingchuang.core.web.bean; import android.text.TextUtils; diff --git a/core/src/main/java/com/pikolive/core/web/bean/WebJsBeanInfo.java b/core/src/main/java/com/bingchuang/core/web/bean/WebJsBeanInfo.java similarity index 98% rename from core/src/main/java/com/pikolive/core/web/bean/WebJsBeanInfo.java rename to core/src/main/java/com/bingchuang/core/web/bean/WebJsBeanInfo.java index 8ce1ea3eb..ff1ef88d1 100644 --- a/core/src/main/java/com/pikolive/core/web/bean/WebJsBeanInfo.java +++ b/core/src/main/java/com/bingchuang/core/web/bean/WebJsBeanInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.web.bean; +package com.bingchuang.core.web.bean; /** * js回调字段信息
diff --git a/core/src/main/java/com/bingchuang/core/web/event/WebViewRefreshEvent.java b/core/src/main/java/com/bingchuang/core/web/event/WebViewRefreshEvent.java new file mode 100644 index 000000000..0b669e4dc --- /dev/null +++ b/core/src/main/java/com/bingchuang/core/web/event/WebViewRefreshEvent.java @@ -0,0 +1,4 @@ +package com.bingchuang.core.web.event; + +public class WebViewRefreshEvent { +} diff --git a/core/src/main/java/com/pikolive/core/withdraw/IWithdrawModel.java b/core/src/main/java/com/bingchuang/core/withdraw/IWithdrawModel.java similarity index 58% rename from core/src/main/java/com/pikolive/core/withdraw/IWithdrawModel.java rename to core/src/main/java/com/bingchuang/core/withdraw/IWithdrawModel.java index 44f944ef6..a3861541e 100644 --- a/core/src/main/java/com/pikolive/core/withdraw/IWithdrawModel.java +++ b/core/src/main/java/com/bingchuang/core/withdraw/IWithdrawModel.java @@ -1,18 +1,18 @@ -package com.pikolive.core.withdraw; +package com.bingchuang.core.withdraw; -import com.pikolive.core.base.IModel; -import com.pikolive.core.withdraw.bean.ExchangerInfo; -import com.pikolive.core.withdraw.bean.WithdrawInfo; -import com.pikolive.core.withdraw.bean.WithdrwaListInfo; -import com.pikolive.core.base.IModel; -import com.pikolive.core.withdraw.bean.ExchangerInfo; -import com.pikolive.core.withdraw.bean.WithdrawInfo; -import com.pikolive.core.withdraw.bean.WithdrwaListInfo; -import com.pikolive.core.base.IModel; -import com.pikolive.core.initial.bean.TaxInfo; -import com.pikolive.core.withdraw.bean.ExchangerInfo; -import com.pikolive.core.withdraw.bean.WithdrawInfo; -import com.pikolive.core.withdraw.bean.WithdrwaListInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.withdraw.bean.ExchangerInfo; +import com.bingchuang.core.withdraw.bean.WithdrawInfo; +import com.bingchuang.core.withdraw.bean.WithdrwaListInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.withdraw.bean.ExchangerInfo; +import com.bingchuang.core.withdraw.bean.WithdrawInfo; +import com.bingchuang.core.withdraw.bean.WithdrwaListInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.initial.bean.TaxInfo; +import com.bingchuang.core.withdraw.bean.ExchangerInfo; +import com.bingchuang.core.withdraw.bean.WithdrawInfo; +import com.bingchuang.core.withdraw.bean.WithdrwaListInfo; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/withdraw/WithdrawModel.java b/core/src/main/java/com/bingchuang/core/withdraw/WithdrawModel.java similarity index 80% rename from core/src/main/java/com/pikolive/core/withdraw/WithdrawModel.java rename to core/src/main/java/com/bingchuang/core/withdraw/WithdrawModel.java index 72eeca355..b284fce95 100644 --- a/core/src/main/java/com/pikolive/core/withdraw/WithdrawModel.java +++ b/core/src/main/java/com/bingchuang/core/withdraw/WithdrawModel.java @@ -1,44 +1,44 @@ -package com.pikolive.core.withdraw; +package com.bingchuang.core.withdraw; import com.google.gson.JsonElement; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.bean.response.result.ExchangeInfoResult; -import com.pikolive.core.bean.response.result.WithdrawListResult; -import com.pikolive.core.bean.response.result.WithdrawUserInfoResult; -import com.pikolive.core.withdraw.bean.BindAliInfo; -import com.pikolive.core.withdraw.bean.ExchangerInfo; -import com.pikolive.core.withdraw.bean.RefreshInfo; -import com.pikolive.core.withdraw.bean.WithdrawInfo; -import com.pikolive.core.withdraw.bean.WithdrwaListInfo; -import com.pikolive.core.withdraw.event.ExchangeInfoEvent; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.bean.response.result.ExchangeInfoResult; -import com.pikolive.core.bean.response.result.WithdrawListResult; -import com.pikolive.core.bean.response.result.WithdrawUserInfoResult; -import com.pikolive.core.withdraw.bean.BindAliInfo; -import com.pikolive.core.withdraw.bean.ExchangerInfo; -import com.pikolive.core.withdraw.bean.RefreshInfo; -import com.pikolive.core.withdraw.bean.WithdrawInfo; -import com.pikolive.core.withdraw.bean.WithdrwaListInfo; -import com.pikolive.core.withdraw.event.ExchangeInfoEvent; -import com.pikolive.core.R; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.bean.response.result.ExchangeInfoResult; -import com.pikolive.core.bean.response.result.WithdrawListResult; -import com.pikolive.core.bean.response.result.WithdrawUserInfoResult; -import com.pikolive.core.initial.bean.TaxInfo; -import com.pikolive.core.user.UserModel; -import com.pikolive.core.utils.APIEncryptUtil; -import com.pikolive.core.utils.net.RxHelper; -import com.pikolive.core.withdraw.bean.BindAliInfo; -import com.pikolive.core.withdraw.bean.ExchangerInfo; -import com.pikolive.core.withdraw.bean.RefreshInfo; -import com.pikolive.core.withdraw.bean.WithdrawInfo; -import com.pikolive.core.withdraw.bean.WithdrwaListInfo; -import com.pikolive.core.withdraw.event.ExchangeInfoEvent; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.bean.response.result.ExchangeInfoResult; +import com.bingchuang.core.bean.response.result.WithdrawListResult; +import com.bingchuang.core.bean.response.result.WithdrawUserInfoResult; +import com.bingchuang.core.withdraw.bean.BindAliInfo; +import com.bingchuang.core.withdraw.bean.ExchangerInfo; +import com.bingchuang.core.withdraw.bean.RefreshInfo; +import com.bingchuang.core.withdraw.bean.WithdrawInfo; +import com.bingchuang.core.withdraw.bean.WithdrwaListInfo; +import com.bingchuang.core.withdraw.event.ExchangeInfoEvent; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.bean.response.result.ExchangeInfoResult; +import com.bingchuang.core.bean.response.result.WithdrawListResult; +import com.bingchuang.core.bean.response.result.WithdrawUserInfoResult; +import com.bingchuang.core.withdraw.bean.BindAliInfo; +import com.bingchuang.core.withdraw.bean.ExchangerInfo; +import com.bingchuang.core.withdraw.bean.RefreshInfo; +import com.bingchuang.core.withdraw.bean.WithdrawInfo; +import com.bingchuang.core.withdraw.bean.WithdrwaListInfo; +import com.bingchuang.core.withdraw.event.ExchangeInfoEvent; +import com.bingchuang.core.R; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.bean.response.result.ExchangeInfoResult; +import com.bingchuang.core.bean.response.result.WithdrawListResult; +import com.bingchuang.core.bean.response.result.WithdrawUserInfoResult; +import com.bingchuang.core.initial.bean.TaxInfo; +import com.bingchuang.core.user.UserModel; +import com.bingchuang.core.utils.APIEncryptUtil; +import com.bingchuang.core.utils.net.RxHelper; +import com.bingchuang.core.withdraw.bean.BindAliInfo; +import com.bingchuang.core.withdraw.bean.ExchangerInfo; +import com.bingchuang.core.withdraw.bean.RefreshInfo; +import com.bingchuang.core.withdraw.bean.WithdrawInfo; +import com.bingchuang.core.withdraw.bean.WithdrwaListInfo; +import com.bingchuang.core.withdraw.event.ExchangeInfoEvent; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.codec.DESUtils; diff --git a/core/src/main/java/com/pikolive/core/withdraw/bean/BindAliInfo.java b/core/src/main/java/com/bingchuang/core/withdraw/bean/BindAliInfo.java similarity index 89% rename from core/src/main/java/com/pikolive/core/withdraw/bean/BindAliInfo.java rename to core/src/main/java/com/bingchuang/core/withdraw/bean/BindAliInfo.java index aa716c1db..66cfe5a22 100644 --- a/core/src/main/java/com/pikolive/core/withdraw/bean/BindAliInfo.java +++ b/core/src/main/java/com/bingchuang/core/withdraw/bean/BindAliInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.withdraw.bean; +package com.bingchuang.core.withdraw.bean; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/withdraw/bean/ExchangerInfo.java b/core/src/main/java/com/bingchuang/core/withdraw/bean/ExchangerInfo.java similarity index 81% rename from core/src/main/java/com/pikolive/core/withdraw/bean/ExchangerInfo.java rename to core/src/main/java/com/bingchuang/core/withdraw/bean/ExchangerInfo.java index f24fbe506..b606bfff1 100644 --- a/core/src/main/java/com/pikolive/core/withdraw/bean/ExchangerInfo.java +++ b/core/src/main/java/com/bingchuang/core/withdraw/bean/ExchangerInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.withdraw.bean; +package com.bingchuang.core.withdraw.bean; /** * Created by Administrator on 2017/7/27. diff --git a/core/src/main/java/com/pikolive/core/withdraw/bean/RefreshInfo.java b/core/src/main/java/com/bingchuang/core/withdraw/bean/RefreshInfo.java similarity index 65% rename from core/src/main/java/com/pikolive/core/withdraw/bean/RefreshInfo.java rename to core/src/main/java/com/bingchuang/core/withdraw/bean/RefreshInfo.java index c166144bb..f4d21a161 100644 --- a/core/src/main/java/com/pikolive/core/withdraw/bean/RefreshInfo.java +++ b/core/src/main/java/com/bingchuang/core/withdraw/bean/RefreshInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.withdraw.bean; +package com.bingchuang.core.withdraw.bean; /** * Created by Administrator on 2017/7/26. diff --git a/core/src/main/java/com/pikolive/core/withdraw/bean/WithdrawInfo.java b/core/src/main/java/com/bingchuang/core/withdraw/bean/WithdrawInfo.java similarity index 96% rename from core/src/main/java/com/pikolive/core/withdraw/bean/WithdrawInfo.java rename to core/src/main/java/com/bingchuang/core/withdraw/bean/WithdrawInfo.java index f119cc4ea..d79bd05c6 100644 --- a/core/src/main/java/com/pikolive/core/withdraw/bean/WithdrawInfo.java +++ b/core/src/main/java/com/bingchuang/core/withdraw/bean/WithdrawInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.withdraw.bean; +package com.bingchuang.core.withdraw.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/withdraw/bean/WithdrwaListInfo.java b/core/src/main/java/com/bingchuang/core/withdraw/bean/WithdrwaListInfo.java similarity index 93% rename from core/src/main/java/com/pikolive/core/withdraw/bean/WithdrwaListInfo.java rename to core/src/main/java/com/bingchuang/core/withdraw/bean/WithdrwaListInfo.java index 5fc0828ad..57569e5f1 100644 --- a/core/src/main/java/com/pikolive/core/withdraw/bean/WithdrwaListInfo.java +++ b/core/src/main/java/com/bingchuang/core/withdraw/bean/WithdrwaListInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.withdraw.bean; +package com.bingchuang.core.withdraw.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/withdraw/event/ExchangeInfoEvent.java b/core/src/main/java/com/bingchuang/core/withdraw/event/ExchangeInfoEvent.java similarity index 53% rename from core/src/main/java/com/pikolive/core/withdraw/event/ExchangeInfoEvent.java rename to core/src/main/java/com/bingchuang/core/withdraw/event/ExchangeInfoEvent.java index 5a07800cd..3607dba69 100644 --- a/core/src/main/java/com/pikolive/core/withdraw/event/ExchangeInfoEvent.java +++ b/core/src/main/java/com/bingchuang/core/withdraw/event/ExchangeInfoEvent.java @@ -1,9 +1,9 @@ -package com.pikolive.core.withdraw.event; +package com.bingchuang.core.withdraw.event; -import com.pikolive.core.base.BaseDataEvent; -import com.pikolive.core.base.BaseDataEvent; -import com.pikolive.core.base.BaseDataEvent; -import com.pikolive.core.withdraw.bean.ExchangerInfo; +import com.bingchuang.core.base.BaseDataEvent; +import com.bingchuang.core.base.BaseDataEvent; +import com.bingchuang.core.base.BaseDataEvent; +import com.bingchuang.core.withdraw.bean.ExchangerInfo; /** * Created by Administrator on 2018/9/17. diff --git a/core/src/main/java/com/pikolive/core/withdraw/event/WithdrawInfoEvent.java b/core/src/main/java/com/bingchuang/core/withdraw/event/WithdrawInfoEvent.java similarity index 52% rename from core/src/main/java/com/pikolive/core/withdraw/event/WithdrawInfoEvent.java rename to core/src/main/java/com/bingchuang/core/withdraw/event/WithdrawInfoEvent.java index cb5dcfa1a..b6fac1023 100644 --- a/core/src/main/java/com/pikolive/core/withdraw/event/WithdrawInfoEvent.java +++ b/core/src/main/java/com/bingchuang/core/withdraw/event/WithdrawInfoEvent.java @@ -1,9 +1,9 @@ -package com.pikolive.core.withdraw.event; +package com.bingchuang.core.withdraw.event; -import com.pikolive.core.base.BaseDataEvent; -import com.pikolive.core.base.BaseDataEvent; -import com.pikolive.core.base.BaseDataEvent; -import com.pikolive.core.withdraw.bean.WithdrawInfo; +import com.bingchuang.core.base.BaseDataEvent; +import com.bingchuang.core.base.BaseDataEvent; +import com.bingchuang.core.base.BaseDataEvent; +import com.bingchuang.core.withdraw.bean.WithdrawInfo; /** * create by lvzebiao on 2018/9/8 diff --git a/core/src/main/java/com/pikolive/core/activity/model/ActivityModel.java b/core/src/main/java/com/pikolive/core/activity/model/ActivityModel.java deleted file mode 100644 index ba2e489d8..000000000 --- a/core/src/main/java/com/pikolive/core/activity/model/ActivityModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.pikolive.core.activity.model; - -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.base.BaseModel; - -public class ActivityModel extends BaseModel implements IActivityModel { -} diff --git a/core/src/main/java/com/pikolive/core/activity/model/IActivityModel.java b/core/src/main/java/com/pikolive/core/activity/model/IActivityModel.java deleted file mode 100644 index f325704b9..000000000 --- a/core/src/main/java/com/pikolive/core/activity/model/IActivityModel.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.pikolive.core.activity.model; - -import com.pikolive.core.base.IModel; -import com.pikolive.core.base.IModel; -import com.pikolive.core.base.IModel; - -public interface IActivityModel extends IModel { -} diff --git a/core/src/main/java/com/pikolive/core/base/IModel.java b/core/src/main/java/com/pikolive/core/base/IModel.java deleted file mode 100644 index b4b51a2b9..000000000 --- a/core/src/main/java/com/pikolive/core/base/IModel.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pikolive.core.base; - -public interface IModel { -} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/ActionDialogResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/ActionDialogResult.java deleted file mode 100644 index 6987ec587..000000000 --- a/core/src/main/java/com/pikolive/core/bean/response/result/ActionDialogResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.pikolive.core.bean.response.result; - - -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.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/pikolive/core/bean/response/result/AttentionListResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/AttentionListResult.java deleted file mode 100644 index dcdbaa605..000000000 --- a/core/src/main/java/com/pikolive/core/bean/response/result/AttentionListResult.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.pikolive.core.bean.response.result; - -import com.pikolive.core.user.bean.AttentionInfo; -import com.pikolive.core.user.bean.AttentionInfo; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.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/pikolive/core/bean/response/result/AuctionInfoResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/AuctionInfoResult.java deleted file mode 100644 index 0d6d58083..000000000 --- a/core/src/main/java/com/pikolive/core/bean/response/result/AuctionInfoResult.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.pikolive.core.bean.response.result; - -import com.pikolive.core.room.auction.bean.AuctionInfo; -import com.pikolive.core.room.auction.bean.AuctionInfo; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.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/pikolive/core/bean/response/result/AuctionListUserInfoResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/AuctionListUserInfoResult.java deleted file mode 100644 index c1258538c..000000000 --- a/core/src/main/java/com/pikolive/core/bean/response/result/AuctionListUserInfoResult.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.pikolive.core.bean.response.result; - -import com.pikolive.core.room.auction.bean.AuctionListUserInfo; -import com.pikolive.core.room.auction.bean.AuctionListUserInfo; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.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/pikolive/core/bean/response/result/AuctionUserListResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/AuctionUserListResult.java deleted file mode 100644 index 4909d28fa..000000000 --- a/core/src/main/java/com/pikolive/core/bean/response/result/AuctionUserListResult.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.pikolive.core.bean.response.result; - -import com.pikolive.core.room.auction.bean.AuctionUser; -import com.pikolive.core.room.auction.bean.AuctionUser; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.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/pikolive/core/bean/response/result/AuctionUserResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/AuctionUserResult.java deleted file mode 100644 index c46b4f61a..000000000 --- a/core/src/main/java/com/pikolive/core/bean/response/result/AuctionUserResult.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.pikolive.core.bean.response.result; - -import com.pikolive.core.room.auction.bean.AuctionUser; -import com.pikolive.core.room.auction.bean.AuctionUser; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.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/pikolive/core/bean/response/result/CheckLostUserResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/CheckLostUserResult.java deleted file mode 100644 index 1736d2767..000000000 --- a/core/src/main/java/com/pikolive/core/bean/response/result/CheckLostUserResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.pikolive.core.bean.response.result; - -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.recall.bean.CheckLostUserInfo; - -public class CheckLostUserResult extends ServiceResult { -} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/ExchangeInfoResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/ExchangeInfoResult.java deleted file mode 100644 index 702510c39..000000000 --- a/core/src/main/java/com/pikolive/core/bean/response/result/ExchangeInfoResult.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.pikolive.core.bean.response.result; - -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.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/pikolive/core/bean/response/result/FaceResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/FaceResult.java deleted file mode 100644 index 87eb6010c..000000000 --- a/core/src/main/java/com/pikolive/core/bean/response/result/FaceResult.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.pikolive.core.bean.response.result; - -import com.pikolive.core.room.face.FaceListInfo; -import com.pikolive.core.room.face.FaceListInfo; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.room.face.FaceListInfo; - -/** - * Created by chenran on 2017/7/27. - */ - -public class FaceResult extends ServiceResult { -} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/FansListResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/FansListResult.java deleted file mode 100644 index f3c3a6342..000000000 --- a/core/src/main/java/com/pikolive/core/bean/response/result/FansListResult.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.pikolive.core.bean.response.result; - -import com.pikolive.core.user.bean.FansListInfo; -import com.pikolive.core.user.bean.FansListInfo; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.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/pikolive/core/bean/response/result/GiftInfosResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/GiftInfosResult.java deleted file mode 100644 index 47c00b3e2..000000000 --- a/core/src/main/java/com/pikolive/core/bean/response/result/GiftInfosResult.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.pikolive.core.bean.response.result; - -import com.pikolive.core.bills.bean.TextInfos; -import com.pikolive.core.bills.bean.TextInfos; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.bills.bean.TextInfos; - -/** - * Created by Seven on 2017/9/9. - */ - -public class GiftInfosResult extends ServiceResult { -} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/GiftRecieveInfoResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/GiftRecieveInfoResult.java deleted file mode 100644 index d100d2287..000000000 --- a/core/src/main/java/com/pikolive/core/bean/response/result/GiftRecieveInfoResult.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.pikolive.core.bean.response.result; - -import com.pikolive.core.gift.bean.GiftReceiveInfo; -import com.pikolive.core.gift.bean.GiftReceiveInfo; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.gift.bean.GiftReceiveInfo; - -/** - * Created by chenran on 2017/11/25. - */ - -public class GiftRecieveInfoResult extends ServiceResult { -} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/GiftResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/GiftResult.java deleted file mode 100644 index 2696783a1..000000000 --- a/core/src/main/java/com/pikolive/core/bean/response/result/GiftResult.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.pikolive.core.bean.response.result; - -import com.pikolive.core.gift.bean.GiftListInfo; -import com.pikolive.core.gift.bean.GiftListInfo; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.gift.bean.GiftListInfo; - -/** - * Created by chenran on 2017/7/27. - */ - -public class GiftResult extends ServiceResult { -} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/GiftWallListResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/GiftWallListResult.java deleted file mode 100644 index ebd538dfc..000000000 --- a/core/src/main/java/com/pikolive/core/bean/response/result/GiftWallListResult.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.pikolive.core.bean.response.result; - -import com.pikolive.core.user.bean.GiftWallInfo; -import com.pikolive.core.user.bean.GiftWallInfo; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.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/pikolive/core/bean/response/result/GoBackResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/GoBackResult.java deleted file mode 100644 index 4dd104ca7..000000000 --- a/core/src/main/java/com/pikolive/core/bean/response/result/GoBackResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.pikolive.core.bean.response.result; - -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.recall.bean.GoBackInfo; - -public class GoBackResult extends ServiceResult
{ -} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/IdQueryUserInfoResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/IdQueryUserInfoResult.java deleted file mode 100644 index 1650ad08b..000000000 --- a/core/src/main/java/com/pikolive/core/bean/response/result/IdQueryUserInfoResult.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.pikolive.core.bean.response.result; - -import com.pikolive.core.auth.entity.AccountInfo; -import com.pikolive.core.bean.response.ServiceResult; - -/** - * Created by chenran on 2017/2/16. - */ - -public class IdQueryUserInfoResult extends ServiceResult { - -} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/InitResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/InitResult.java deleted file mode 100644 index 744a067fe..000000000 --- a/core/src/main/java/com/pikolive/core/bean/response/result/InitResult.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.pikolive.core.bean.response.result; - -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.initial.bean.InitInfo; - -/** - * @author xiaoyu - * @date 2017/12/8 - */ - -public class InitResult extends ServiceResult { -} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/MultiGiftRecieveInfoResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/MultiGiftRecieveInfoResult.java deleted file mode 100644 index f362ed6d9..000000000 --- a/core/src/main/java/com/pikolive/core/bean/response/result/MultiGiftRecieveInfoResult.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.pikolive.core.bean.response.result; - -import com.pikolive.core.gift.bean.MultiGiftReceiveInfo; -import com.pikolive.core.gift.bean.MultiGiftReceiveInfo; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.gift.bean.MultiGiftReceiveInfo; - -/** - * Created by chenran on 2017/11/25. - */ - -public class MultiGiftRecieveInfoResult extends ServiceResult { -} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/RedDrawListInfoResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/RedDrawListInfoResult.java deleted file mode 100644 index ddf9fda57..000000000 --- a/core/src/main/java/com/pikolive/core/bean/response/result/RedDrawListInfoResult.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.pikolive.core.bean.response.result; - -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.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/pikolive/core/bean/response/result/RedPacketResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/RedPacketResult.java deleted file mode 100644 index a8be06d5b..000000000 --- a/core/src/main/java/com/pikolive/core/bean/response/result/RedPacketResult.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.pikolive.core.bean.response.result; - - -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.redPacket.bean.RedPacketInfo; - -/** - * Created by zhouxiangfeng on 2017/5/28. - */ - -public class RedPacketResult extends ServiceResult
{ -} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/RegisterResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/RegisterResult.java deleted file mode 100644 index 1301bfb6d..000000000 --- a/core/src/main/java/com/pikolive/core/bean/response/result/RegisterResult.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.pikolive.core.bean.response.result; - -import com.pikolive.core.auth.entity.TicketInfo; -import com.pikolive.core.bean.response.ServiceResult; - -/** - * Created by chenran on 2017/2/16. - */ - -public class RegisterResult extends ServiceResult { - -} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/RoomConsumeInfoListResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/RoomConsumeInfoListResult.java deleted file mode 100644 index bf5d8f2d0..000000000 --- a/core/src/main/java/com/pikolive/core/bean/response/result/RoomConsumeInfoListResult.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.pikolive.core.bean.response.result; - -import com.pikolive.core.room.queue.bean.RoomConsumeInfo; -import com.pikolive.core.room.queue.bean.RoomConsumeInfo; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.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/pikolive/core/bean/response/result/RoomRewardResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/RoomRewardResult.java deleted file mode 100644 index 4498a1c2e..000000000 --- a/core/src/main/java/com/pikolive/core/bean/response/result/RoomRewardResult.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.pikolive.core.bean.response.result; - -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.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/pikolive/core/bean/response/result/ShareRedPacketResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/ShareRedPacketResult.java deleted file mode 100644 index 272326681..000000000 --- a/core/src/main/java/com/pikolive/core/bean/response/result/ShareRedPacketResult.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.pikolive.core.bean.response.result; - - -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.redPacket.bean.ShareRedBagInfo; - -/** - * Created by zhouxiangfeng on 2017/5/28. - */ - -public class ShareRedPacketResult extends ServiceResult { -} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/TabResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/TabResult.java deleted file mode 100644 index b049b1fd9..000000000 --- a/core/src/main/java/com/pikolive/core/bean/response/result/TabResult.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.pikolive.core.bean.response.result; - -import com.pikolive.core.room.bean.RoomSettingTabInfo; -import com.pikolive.core.room.bean.RoomSettingTabInfo; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.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/pikolive/core/bean/response/result/TicketResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/TicketResult.java deleted file mode 100644 index 559e81259..000000000 --- a/core/src/main/java/com/pikolive/core/bean/response/result/TicketResult.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.pikolive.core.bean.response.result; - -import com.pikolive.core.auth.entity.TicketInfo; -import com.pikolive.core.bean.response.ServiceResult; - -/** - * Created by zhouxiangfeng on 2017/5/4. - */ - -public class TicketResult extends ServiceResult
{ - -} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/UserListResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/UserListResult.java deleted file mode 100644 index 802ebf5c4..000000000 --- a/core/src/main/java/com/pikolive/core/bean/response/result/UserListResult.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.pikolive.core.bean.response.result; - -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.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/pikolive/core/bean/response/result/UserResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/UserResult.java deleted file mode 100644 index 38f3fef7e..000000000 --- a/core/src/main/java/com/pikolive/core/bean/response/result/UserResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.pikolive.core.bean.response.result; - -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.user.bean.UserInfo; - -/** - * Created by zhouxiangfeng on 2017/5/4. - */ - -public class UserResult extends ServiceResult
{ - -} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/WalletInfoResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/WalletInfoResult.java deleted file mode 100644 index a7bf6c813..000000000 --- a/core/src/main/java/com/pikolive/core/bean/response/result/WalletInfoResult.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.pikolive.core.bean.response.result; - -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.pay.bean.WalletInfo; - -/** - * Created by zhouxiangfeng on 2017/5/4. - */ - -public class WalletInfoResult extends ServiceResult { - -} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/WithdrawListResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/WithdrawListResult.java deleted file mode 100644 index 1050b3a51..000000000 --- a/core/src/main/java/com/pikolive/core/bean/response/result/WithdrawListResult.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.pikolive.core.bean.response.result; - -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.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/pikolive/core/bean/response/result/WithdrawRedListResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/WithdrawRedListResult.java deleted file mode 100644 index 74797515b..000000000 --- a/core/src/main/java/com/pikolive/core/bean/response/result/WithdrawRedListResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.pikolive.core.bean.response.result; - - -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.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/pikolive/core/bean/response/result/WithdrawRedSucceedResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/WithdrawRedSucceedResult.java deleted file mode 100644 index 36234fdd0..000000000 --- a/core/src/main/java/com/pikolive/core/bean/response/result/WithdrawRedSucceedResult.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.pikolive.core.bean.response.result; - - -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.redPacket.bean.WithdrawRedSucceedInfo; - -/** - * Created by zhouxiangfeng on 2017/5/28. - */ - -public class WithdrawRedSucceedResult extends ServiceResult
{ -} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/WithdrawUserInfoResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/WithdrawUserInfoResult.java deleted file mode 100644 index 50a0b7056..000000000 --- a/core/src/main/java/com/pikolive/core/bean/response/result/WithdrawUserInfoResult.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.pikolive.core.bean.response.result; - -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.withdraw.bean.WithdrawInfo; - -/** - * Created by zhouxiangfeng on 2017/5/4. - */ - -public class WithdrawUserInfoResult extends ServiceResult { - -} diff --git a/core/src/main/java/com/pikolive/core/bills/IRadishGiftModel.java b/core/src/main/java/com/pikolive/core/bills/IRadishGiftModel.java deleted file mode 100644 index 2febfe914..000000000 --- a/core/src/main/java/com/pikolive/core/bills/IRadishGiftModel.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.pikolive.core.bills; - -import com.pikolive.core.bills.result.RadishGiftResult; -import com.pikolive.core.bills.result.RadishGiftResult; -import com.pikolive.core.base.IModel; -import com.pikolive.core.bills.result.RadishGiftResult; -import com.pikolive.core.user.bean.RadishWallInfo; - -import java.util.List; - -import io.reactivex.Single; - -public interface IRadishGiftModel extends IModel { - Single getRadishRecord(int page, int pageSize, long date, byte type); - Single > getRadishWall(long uid); -} diff --git a/core/src/main/java/com/pikolive/core/bills/result/ChargeResult.java b/core/src/main/java/com/pikolive/core/bills/result/ChargeResult.java deleted file mode 100644 index 7e5d9e363..000000000 --- a/core/src/main/java/com/pikolive/core/bills/result/ChargeResult.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.pikolive.core.bills.result; - -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.bills.bean.ExpendListInfo; - -/** - * Created by Seven on 2017/9/9. - */ - -public class ChargeResult extends ServiceResult
{ -} diff --git a/core/src/main/java/com/pikolive/core/bills/result/ExpendResult.java b/core/src/main/java/com/pikolive/core/bills/result/ExpendResult.java deleted file mode 100644 index 8ab28e64b..000000000 --- a/core/src/main/java/com/pikolive/core/bills/result/ExpendResult.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.pikolive.core.bills.result; - -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.bills.bean.ExpendListInfo; - -/** - * Created by Seven on 2017/9/9. - */ - -public class ExpendResult extends ServiceResult { -} diff --git a/core/src/main/java/com/pikolive/core/bills/result/IncomedResult.java b/core/src/main/java/com/pikolive/core/bills/result/IncomedResult.java deleted file mode 100644 index 735a207c1..000000000 --- a/core/src/main/java/com/pikolive/core/bills/result/IncomedResult.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.pikolive.core.bills.result; - -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.bills.bean.IncomeListInfo; - -/** - * Created by Seven on 2017/9/9. - */ - -public class IncomedResult extends ServiceResult { -} diff --git a/core/src/main/java/com/pikolive/core/bills/result/RadishGiftResult.java b/core/src/main/java/com/pikolive/core/bills/result/RadishGiftResult.java deleted file mode 100644 index 225e4ef88..000000000 --- a/core/src/main/java/com/pikolive/core/bills/result/RadishGiftResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.pikolive.core.bills.result; - -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.bills.bean.RadishGiftListInfo; - -public class RadishGiftResult extends ServiceResult { -} diff --git a/core/src/main/java/com/pikolive/core/bills/result/RedBagResult.java b/core/src/main/java/com/pikolive/core/bills/result/RedBagResult.java deleted file mode 100644 index 24648a94d..000000000 --- a/core/src/main/java/com/pikolive/core/bills/result/RedBagResult.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.pikolive.core.bills.result; - -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.bills.bean.RedBagListInfo; - -/** - * Created by Seven on 2017/9/9. - */ - -public class RedBagResult extends ServiceResult { -} diff --git a/core/src/main/java/com/pikolive/core/contacts/IContactModel.java b/core/src/main/java/com/pikolive/core/contacts/IContactModel.java deleted file mode 100644 index a47a5eb79..000000000 --- a/core/src/main/java/com/pikolive/core/contacts/IContactModel.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.pikolive.core.contacts; - -import com.pikolive.core.base.IModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.room.bean.SearchRoomInfo; -import com.pikolive.core.base.IModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.room.bean.SearchRoomInfo; -import com.pikolive.core.base.IModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.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/pikolive/core/decoration/nameplate/INamePlateModel.java b/core/src/main/java/com/pikolive/core/decoration/nameplate/INamePlateModel.java deleted file mode 100644 index de7a80235..000000000 --- a/core/src/main/java/com/pikolive/core/decoration/nameplate/INamePlateModel.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.pikolive.core.decoration.nameplate; - -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.decoration.nameplate.bean.NamePlateInfo; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.decoration.nameplate.bean.NamePlateInfo; -import com.pikolive.core.base.IModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.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/pikolive/core/family/bean/FamilyPlazaInfo.java b/core/src/main/java/com/pikolive/core/family/bean/FamilyPlazaInfo.java deleted file mode 100644 index 991635e5a..000000000 --- a/core/src/main/java/com/pikolive/core/family/bean/FamilyPlazaInfo.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.pikolive.core.family.bean; - -import com.pikolive.core.family.bean.response.familyPlaza.RespFamily; -import com.pikolive.core.family.bean.response.familyPlaza.RespFamily; -import com.pikolive.core.family.bean.response.familyPlaza.RespFamily; - -import java.util.List; - -import lombok.Data; - -/** - * @author jack - * @Description - * @Date 2018/5/31 - */ -@Data -public class FamilyPlazaInfo { - private List banners; - private RespFamily familys; -} diff --git a/core/src/main/java/com/pikolive/core/gift/bean/GiftLuckyBag.java b/core/src/main/java/com/pikolive/core/gift/bean/GiftLuckyBag.java deleted file mode 100644 index 63d018443..000000000 --- a/core/src/main/java/com/pikolive/core/gift/bean/GiftLuckyBag.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.pikolive.core.gift.bean; - -public class GiftLuckyBag { - -} diff --git a/core/src/main/java/com/pikolive/core/im/chatterbox/HideInputEvent.java b/core/src/main/java/com/pikolive/core/im/chatterbox/HideInputEvent.java deleted file mode 100644 index ae1ec1f4c..000000000 --- a/core/src/main/java/com/pikolive/core/im/chatterbox/HideInputEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pikolive.core.im.chatterbox; - -public class HideInputEvent { -} diff --git a/core/src/main/java/com/pikolive/core/linked/ILinkedModel.java b/core/src/main/java/com/pikolive/core/linked/ILinkedModel.java deleted file mode 100644 index 56242aac6..000000000 --- a/core/src/main/java/com/pikolive/core/linked/ILinkedModel.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.pikolive.core.linked; - -import com.pikolive.core.base.IModel; -import com.pikolive.core.linked.bean.LinkedInfo; -import com.pikolive.core.base.IModel; -import com.pikolive.core.linked.bean.LinkedInfo; -import com.pikolive.core.base.IModel; -import com.pikolive.core.linked.bean.LinkedInfo; - - -public interface ILinkedModel extends IModel { - - void setLinkedInfo(LinkedInfo linkedInfo); - - LinkedInfo getLinkedInfo(); - -} diff --git a/core/src/main/java/com/pikolive/core/radish/RadishRecordResult.java b/core/src/main/java/com/pikolive/core/radish/RadishRecordResult.java deleted file mode 100644 index b97974faa..000000000 --- a/core/src/main/java/com/pikolive/core/radish/RadishRecordResult.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.pikolive.core.radish; - -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.bills.bean.RadishRecordListInfo; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.bills.bean.RadishRecordListInfo; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.bills.bean.RadishRecordListInfo; - -public class RadishRecordResult extends ServiceResult { -} diff --git a/core/src/main/java/com/pikolive/core/radish/signin/ISignInModel.java b/core/src/main/java/com/pikolive/core/radish/signin/ISignInModel.java deleted file mode 100644 index 9e0f045c7..000000000 --- a/core/src/main/java/com/pikolive/core/radish/signin/ISignInModel.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.pikolive.core.radish.signin; - -import com.pikolive.core.radish.signin.bean.DrawNoticeInfo; -import com.pikolive.core.radish.signin.bean.ReceiveTotalRewardInfo; -import com.pikolive.core.radish.signin.bean.ReplenishSignInfo; -import com.pikolive.core.radish.signin.bean.RewardNoticeInfo; -import com.pikolive.core.radish.signin.bean.SignDetailInfo; -import com.pikolive.core.radish.signin.bean.SignDrawInfo; -import com.pikolive.core.radish.signin.bean.SignInfo; -import com.pikolive.core.radish.signin.bean.DrawNoticeInfo; -import com.pikolive.core.radish.signin.bean.ReceiveTotalRewardInfo; -import com.pikolive.core.radish.signin.bean.ReplenishSignInfo; -import com.pikolive.core.radish.signin.bean.RewardNoticeInfo; -import com.pikolive.core.radish.signin.bean.SignDetailInfo; -import com.pikolive.core.radish.signin.bean.SignDrawInfo; -import com.pikolive.core.radish.signin.bean.SignInfo; -import com.pikolive.core.radish.signin.bean.DrawNoticeInfo; -import com.pikolive.core.radish.signin.bean.ReceiveTotalRewardInfo; -import com.pikolive.core.radish.signin.bean.ReplenishSignInfo; -import com.pikolive.core.radish.signin.bean.RewardNoticeInfo; -import com.pikolive.core.radish.signin.bean.SignDetailInfo; -import com.pikolive.core.radish.signin.bean.SignDrawInfo; -import com.pikolive.core.radish.signin.bean.SignInfo; - -import java.util.List; - -import io.reactivex.Single; - -/** - * create by lvzebiao @2019/3/14 - */ -public interface ISignInModel { - - Single sign(); - - Single signDetail(); - - Single signDraw(); - - Single signRemind(); - - Single > drawNotice(); - - Single
> getRewardTotalNotice(); - - Single
> getRewardTodayNotice(); - - Single
getShareImage(int shareType, String day, String reward); - - Single receiveTotalReward(long configId); - - void signShare(); - - Single insertSignDay(int signDay); - - /** - * 获取补签信息 - */ - Single getReplenishSignInfo(int signDay); - - /** - * 补签 - */ - Single replenishSign(int signDay); - -} diff --git a/core/src/main/java/com/pikolive/core/recall/IRecallModel.java b/core/src/main/java/com/pikolive/core/recall/IRecallModel.java deleted file mode 100644 index aa8e5cc9f..000000000 --- a/core/src/main/java/com/pikolive/core/recall/IRecallModel.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.pikolive.core.recall; - -import com.pikolive.core.base.IModel; -import com.pikolive.core.recall.bean.CheckLostUserInfo; -import com.pikolive.core.base.IModel; -import com.pikolive.core.recall.bean.CheckLostUserInfo; -import com.pikolive.core.base.IModel; -import com.pikolive.core.recall.bean.CheckLostUserInfo; - -import io.reactivex.Single; - -public interface IRecallModel extends IModel { - - // 查询是否是回归状态 - Single checkLostUser(long uid); - // 接收回归礼物 - void goBack(String uid, String inviteCode); -} diff --git a/core/src/main/java/com/pikolive/core/recall/event/CheckLostUserEvent.java b/core/src/main/java/com/pikolive/core/recall/event/CheckLostUserEvent.java deleted file mode 100644 index be8628d60..000000000 --- a/core/src/main/java/com/pikolive/core/recall/event/CheckLostUserEvent.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.pikolive.core.recall.event; - -import com.pikolive.core.base.BaseDataEvent; -import com.pikolive.core.base.BaseDataEvent; -import com.pikolive.core.base.BaseDataEvent; -import com.pikolive.core.recall.bean.CheckLostUserInfo; - -public class CheckLostUserEvent extends BaseDataEvent { - - public CheckLostUserEvent(CheckLostUserInfo checkLostUserInfo){ super(checkLostUserInfo); } - public CheckLostUserEvent(String error){ super(error); } -} diff --git a/core/src/main/java/com/pikolive/core/recall/event/GoBackEvent.java b/core/src/main/java/com/pikolive/core/recall/event/GoBackEvent.java deleted file mode 100644 index 2e64913f6..000000000 --- a/core/src/main/java/com/pikolive/core/recall/event/GoBackEvent.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.pikolive.core.recall.event; - -import com.pikolive.core.base.BaseDataEvent; -import com.pikolive.core.base.BaseDataEvent; -import com.pikolive.core.base.BaseDataEvent; -import com.pikolive.core.recall.bean.GoBackInfo; - -public class GoBackEvent extends BaseDataEvent { - - public GoBackEvent(GoBackInfo goBackInfo) { - super(goBackInfo); - } - - public GoBackEvent(String error) { - super(error); - } -} diff --git a/core/src/main/java/com/pikolive/core/redPacket/IRedPacketModel.java b/core/src/main/java/com/pikolive/core/redPacket/IRedPacketModel.java deleted file mode 100644 index ab9e81486..000000000 --- a/core/src/main/java/com/pikolive/core/redPacket/IRedPacketModel.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.pikolive.core.redPacket; - -import com.pikolive.core.base.IModel; -import com.pikolive.core.redPacket.bean.ActionDialogInfo; -import com.pikolive.core.redPacket.bean.RedDrawListInfo; -import com.pikolive.core.redPacket.bean.RedPacketInfo; -import com.pikolive.core.redPacket.bean.WithdrawRedListInfo; -import com.pikolive.core.redPacket.bean.WithdrawRedSucceedInfo; -import com.pikolive.core.base.IModel; -import com.pikolive.core.redPacket.bean.ActionDialogInfo; -import com.pikolive.core.redPacket.bean.RedDrawListInfo; -import com.pikolive.core.redPacket.bean.RedPacketInfo; -import com.pikolive.core.redPacket.bean.WithdrawRedListInfo; -import com.pikolive.core.redPacket.bean.WithdrawRedSucceedInfo; -import com.pikolive.core.base.IModel; -import com.pikolive.core.redPacket.bean.ActionDialogInfo; -import com.pikolive.core.redPacket.bean.RedDrawListInfo; -import com.pikolive.core.redPacket.bean.RedPacketInfo; -import com.pikolive.core.redPacket.bean.WithdrawRedListInfo; -import com.pikolive.core.redPacket.bean.WithdrawRedSucceedInfo; - -import java.util.List; - -import io.reactivex.Single; - -/** - * Created by ${Seven} on 2017/9/20. - */ - -public interface IRedPacketModel extends IModel { - //获取红包页面信息 - Single getRedPacketInfo(); - //进入主界面有红包后设置弹窗类型 1,首页 2直播间 - Single > getActionDialog(int type); - //获取红包提现列表 - Single
> getRedList(); - //发起红包提现 - Single
getRedWithdraw(long uid, int packetId, String pwd); - //获取红包提现列表 - Single > getRedDrawList(); -} diff --git a/core/src/main/java/com/pikolive/core/relation/cp/CpBindUnbindEvent.java b/core/src/main/java/com/pikolive/core/relation/cp/CpBindUnbindEvent.java deleted file mode 100644 index ba311d1dc..000000000 --- a/core/src/main/java/com/pikolive/core/relation/cp/CpBindUnbindEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pikolive.core.relation.cp; - -public class CpBindUnbindEvent { -} diff --git a/core/src/main/java/com/pikolive/core/room/event/EixtCountDownEvent.java b/core/src/main/java/com/pikolive/core/room/event/EixtCountDownEvent.java deleted file mode 100644 index 93cf924a3..000000000 --- a/core/src/main/java/com/pikolive/core/room/event/EixtCountDownEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pikolive.core.room.event; - -public class EixtCountDownEvent { -} diff --git a/core/src/main/java/com/pikolive/core/room/event/FaceIsReadyEvent.java b/core/src/main/java/com/pikolive/core/room/event/FaceIsReadyEvent.java deleted file mode 100644 index a1675fb08..000000000 --- a/core/src/main/java/com/pikolive/core/room/event/FaceIsReadyEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pikolive.core.room.event; - -public class FaceIsReadyEvent { -} diff --git a/core/src/main/java/com/pikolive/core/room/event/FinishAvRoomEvent.java b/core/src/main/java/com/pikolive/core/room/event/FinishAvRoomEvent.java deleted file mode 100644 index 4cb517afb..000000000 --- a/core/src/main/java/com/pikolive/core/room/event/FinishAvRoomEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pikolive.core.room.event; - -public class FinishAvRoomEvent { -} diff --git a/core/src/main/java/com/pikolive/core/room/event/RoomClearScreenEvent.java b/core/src/main/java/com/pikolive/core/room/event/RoomClearScreenEvent.java deleted file mode 100644 index 02cb69ff8..000000000 --- a/core/src/main/java/com/pikolive/core/room/event/RoomClearScreenEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pikolive.core.room.event; - -public class RoomClearScreenEvent { -} diff --git a/core/src/main/java/com/pikolive/core/room/pk/bean/PKMemberInfo.java b/core/src/main/java/com/pikolive/core/room/pk/bean/PKMemberInfo.java deleted file mode 100644 index f9b9d7d4d..000000000 --- a/core/src/main/java/com/pikolive/core/room/pk/bean/PKMemberInfo.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.pikolive.core.room.pk.bean; - -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.user.bean.UserInfo; - -import lombok.Data; - -/** - * @author jack - * @Description - * @Date 2019/1/8 - */ -@Data -public class PKMemberInfo { - private int teamId; - private UserInfo userInfo; -} diff --git a/core/src/main/java/com/pikolive/core/room/queuing_mic/event/QueuingMicEmptyEvent.java b/core/src/main/java/com/pikolive/core/room/queuing_mic/event/QueuingMicEmptyEvent.java deleted file mode 100644 index 9e986aa8e..000000000 --- a/core/src/main/java/com/pikolive/core/room/queuing_mic/event/QueuingMicEmptyEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pikolive.core.room.queuing_mic.event; - -public class QueuingMicEmptyEvent { -} diff --git a/core/src/main/java/com/pikolive/core/room/queuing_mic/event/QueuingMicNotEmptyEvent.java b/core/src/main/java/com/pikolive/core/room/queuing_mic/event/QueuingMicNotEmptyEvent.java deleted file mode 100644 index 1d5fb07a7..000000000 --- a/core/src/main/java/com/pikolive/core/room/queuing_mic/event/QueuingMicNotEmptyEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pikolive.core.room.queuing_mic.event; - -public class QueuingMicNotEmptyEvent { -} diff --git a/core/src/main/java/com/pikolive/core/room/recommendpos/IRecommendCardModel.java b/core/src/main/java/com/pikolive/core/room/recommendpos/IRecommendCardModel.java deleted file mode 100644 index 5428254d7..000000000 --- a/core/src/main/java/com/pikolive/core/room/recommendpos/IRecommendCardModel.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.pikolive.core.room.recommendpos; - -import com.pikolive.core.room.recommendpos.bean.RcmdCardType; -import com.pikolive.core.room.recommendpos.bean.RecommendCard; -import com.pikolive.core.room.recommendpos.bean.RcmdCardType; -import com.pikolive.core.room.recommendpos.bean.RecommendCard; -import com.pikolive.core.room.recommendpos.bean.RecommendCard; - -import java.util.List; - -import io.reactivex.Single; - -/** - * Created by lvzebiao on 2019/1/30. - */ - -public interface IRecommendCardModel { - - /** - * 我的推荐卡接口 - * - * @param status {@link RcmdCardType} - * @return list - */ - Single
> getBagList(int status, int page, int pageSize); - -} diff --git a/core/src/main/java/com/pikolive/core/room/treasure_box/event/RefreshBoxRankingEvent.java b/core/src/main/java/com/pikolive/core/room/treasure_box/event/RefreshBoxRankingEvent.java deleted file mode 100644 index ba514483c..000000000 --- a/core/src/main/java/com/pikolive/core/room/treasure_box/event/RefreshBoxRankingEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pikolive.core.room.treasure_box.event; - -public class RefreshBoxRankingEvent { -} diff --git a/core/src/main/java/com/pikolive/core/user/event/ShowMeEvent.kt b/core/src/main/java/com/pikolive/core/user/event/ShowMeEvent.kt deleted file mode 100644 index 276a75934..000000000 --- a/core/src/main/java/com/pikolive/core/user/event/ShowMeEvent.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.pikolive.core.user.event - -class ShowMeEvent diff --git a/core/src/main/java/com/pikolive/core/utils/CheckUtils.java b/core/src/main/java/com/pikolive/core/utils/CheckUtils.java deleted file mode 100644 index caf59d022..000000000 --- a/core/src/main/java/com/pikolive/core/utils/CheckUtils.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.pikolive.core.utils; - -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.initial.InitialModel; -import com.pikolive.core.initial.bean.InitInfo; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.initial.InitialModel; -import com.pikolive.core.initial.bean.InitInfo; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.initial.InitialModel; -import com.pikolive.core.initial.bean.InitInfo; -import com.bingchuang.library.utils.ListUtils; - -public class CheckUtils { - - public static boolean isCheckUser() { - InitInfo initInfo = InitialModel.get().getCacheInitInfo(); - if (initInfo == null || ListUtils.isListEmpty(initInfo.getCheckUids())) return false; - return initInfo.getCheckUids().contains(AuthModel.get().getCurrentUid()); - } -} diff --git a/core/src/main/java/com/pikolive/core/vip/VipOpenEvent.kt b/core/src/main/java/com/pikolive/core/vip/VipOpenEvent.kt deleted file mode 100644 index ee0d1c2ad..000000000 --- a/core/src/main/java/com/pikolive/core/vip/VipOpenEvent.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.pikolive.core.vip - - class VipOpenEvent diff --git a/core/src/main/java/com/pikolive/core/web/event/WebViewRefreshEvent.java b/core/src/main/java/com/pikolive/core/web/event/WebViewRefreshEvent.java deleted file mode 100644 index ee649925c..000000000 --- a/core/src/main/java/com/pikolive/core/web/event/WebViewRefreshEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pikolive.core.web.event; - -public class WebViewRefreshEvent { -} diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index c49744503..2ea069429 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -1,12 +1,12 @@
XChat_Android_Core 平臺嚴禁未成年人直播或打賞,倡導綠色互動,禁止宣傳及發布政治、低俗、暴力、色情等違規違法內容,嚴禁違規交易和誘導欺詐用戶,如有違規將對賬號進行封禁,發現請及時舉報。 -來piko,邂逅你的專屬聲音 -來Piko,開黑交友玩遊戲 +來peki,邂逅你的專屬聲音 +來peki,開黑交友玩遊戲 加入家族,和你興趣相投的小夥伴一起玩耍吧~ -hi,我想邀請您加入我的Piko家族: +hi,我想邀請您加入我的Peki家族: 加入家族,和你興趣相投的小夥伴一起玩耍吧~ -hi,我想邀請您加入我的Piko群聊: +hi,我想邀請您加入我的Peki群聊: 可點擊房間話題查看本房間公告 相親玩法已開啟,請點擊主持人麥位選擇主持人 新一輪的相親已開啟 @@ -531,7 +531,7 @@成功 網絡異常,請稍後再試! 網絡錯誤 -Piko開小差中~請稍後再試 +Peki開小差中~請稍後再試 網絡異常,請檢查您的網絡再試! 猴 雞 diff --git a/core/src/model_bank_card/java/com/pikolive/core/bank_card/bean/BankCardBean.java b/core/src/model_bank_card/java/com/bingchuang/core/bank_card/bean/BankCardBean.java similarity index 95% rename from core/src/model_bank_card/java/com/pikolive/core/bank_card/bean/BankCardBean.java rename to core/src/model_bank_card/java/com/bingchuang/core/bank_card/bean/BankCardBean.java index 6cc6fb690..83177fe86 100644 --- a/core/src/model_bank_card/java/com/pikolive/core/bank_card/bean/BankCardBean.java +++ b/core/src/model_bank_card/java/com/bingchuang/core/bank_card/bean/BankCardBean.java @@ -1,4 +1,4 @@ -package com.pikolive.core.bank_card.bean; +package com.bingchuang.core.bank_card.bean; import lombok.Data; diff --git a/core/src/model_bank_card/java/com/pikolive/core/bank_card/bean/BankCardListResp.java b/core/src/model_bank_card/java/com/bingchuang/core/bank_card/bean/BankCardListResp.java similarity index 92% rename from core/src/model_bank_card/java/com/pikolive/core/bank_card/bean/BankCardListResp.java rename to core/src/model_bank_card/java/com/bingchuang/core/bank_card/bean/BankCardListResp.java index f81e90c96..3b6601520 100644 --- a/core/src/model_bank_card/java/com/pikolive/core/bank_card/bean/BankCardListResp.java +++ b/core/src/model_bank_card/java/com/bingchuang/core/bank_card/bean/BankCardListResp.java @@ -1,4 +1,4 @@ -package com.pikolive.core.bank_card.bean; +package com.bingchuang.core.bank_card.bean; import java.util.List; diff --git a/core/src/model_bank_card/java/com/pikolive/core/bank_card/exception/NeedBindBankCardException.java b/core/src/model_bank_card/java/com/bingchuang/core/bank_card/exception/NeedBindBankCardException.java similarity index 67% rename from core/src/model_bank_card/java/com/pikolive/core/bank_card/exception/NeedBindBankCardException.java rename to core/src/model_bank_card/java/com/bingchuang/core/bank_card/exception/NeedBindBankCardException.java index 81b585789..2ff2d52e9 100644 --- a/core/src/model_bank_card/java/com/pikolive/core/bank_card/exception/NeedBindBankCardException.java +++ b/core/src/model_bank_card/java/com/bingchuang/core/bank_card/exception/NeedBindBankCardException.java @@ -1,6 +1,6 @@ -package com.pikolive.core.bank_card.exception; +package com.bingchuang.core.bank_card.exception; -import com.pikolive.core.exception.FailReasonException; +import com.bingchuang.core.exception.FailReasonException; /** * Created by MadisonRong on 2019-08-16 diff --git a/core/src/model_bank_card/java/com/pikolive/core/bank_card/model/BankCardModel.java b/core/src/model_bank_card/java/com/bingchuang/core/bank_card/model/BankCardModel.java similarity index 94% rename from core/src/model_bank_card/java/com/pikolive/core/bank_card/model/BankCardModel.java rename to core/src/model_bank_card/java/com/bingchuang/core/bank_card/model/BankCardModel.java index f9cbf2574..8a002e8db 100644 --- a/core/src/model_bank_card/java/com/pikolive/core/bank_card/model/BankCardModel.java +++ b/core/src/model_bank_card/java/com/bingchuang/core/bank_card/model/BankCardModel.java @@ -1,11 +1,11 @@ -package com.pikolive.core.bank_card.model; +package com.bingchuang.core.bank_card.model; -import com.pikolive.core.bank_card.bean.BankCardListResp; -import com.pikolive.core.Constants; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.bank_card.bean.BankCardListResp; +import com.bingchuang.core.Constants; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import io.reactivex.Single; diff --git a/core/src/model_bank_card/java/com/pikolive/core/bank_card/model/IBankCardModel.java b/core/src/model_bank_card/java/com/bingchuang/core/bank_card/model/IBankCardModel.java similarity index 89% rename from core/src/model_bank_card/java/com/pikolive/core/bank_card/model/IBankCardModel.java rename to core/src/model_bank_card/java/com/bingchuang/core/bank_card/model/IBankCardModel.java index b10abf870..f593ae95f 100644 --- a/core/src/model_bank_card/java/com/pikolive/core/bank_card/model/IBankCardModel.java +++ b/core/src/model_bank_card/java/com/bingchuang/core/bank_card/model/IBankCardModel.java @@ -1,7 +1,7 @@ -package com.pikolive.core.bank_card.model; +package com.bingchuang.core.bank_card.model; -import com.pikolive.core.bank_card.bean.BankCardListResp; -import com.pikolive.core.base.IModel; +import com.bingchuang.core.bank_card.bean.BankCardListResp; +import com.bingchuang.core.base.IModel; import io.reactivex.Single; diff --git a/core/src/model_bank_card/java/com/pikolive/core/bank_card/view/IAddBankCardAgreementView.java b/core/src/model_bank_card/java/com/bingchuang/core/bank_card/view/IAddBankCardAgreementView.java similarity index 94% rename from core/src/model_bank_card/java/com/pikolive/core/bank_card/view/IAddBankCardAgreementView.java rename to core/src/model_bank_card/java/com/bingchuang/core/bank_card/view/IAddBankCardAgreementView.java index 2a057d327..890c162d3 100644 --- a/core/src/model_bank_card/java/com/pikolive/core/bank_card/view/IAddBankCardAgreementView.java +++ b/core/src/model_bank_card/java/com/bingchuang/core/bank_card/view/IAddBankCardAgreementView.java @@ -1,4 +1,4 @@ -package com.pikolive.core.bank_card.view; +package com.bingchuang.core.bank_card.view; import com.bingchuang.library.base.IMvpBaseView; diff --git a/core/src/model_bank_card/java/com/pikolive/core/bank_card/view/IBankCardView.java b/core/src/model_bank_card/java/com/bingchuang/core/bank_card/view/IBankCardView.java similarity index 88% rename from core/src/model_bank_card/java/com/pikolive/core/bank_card/view/IBankCardView.java rename to core/src/model_bank_card/java/com/bingchuang/core/bank_card/view/IBankCardView.java index 1c1fc79b1..e81e097ab 100644 --- a/core/src/model_bank_card/java/com/pikolive/core/bank_card/view/IBankCardView.java +++ b/core/src/model_bank_card/java/com/bingchuang/core/bank_card/view/IBankCardView.java @@ -1,6 +1,6 @@ -package com.pikolive.core.bank_card.view; +package com.bingchuang.core.bank_card.view; -import com.pikolive.core.bank_card.bean.BankCardListResp; +import com.bingchuang.core.bank_card.bean.BankCardListResp; import com.bingchuang.library.base.IMvpBaseView; /** diff --git a/core/src/model_channel_page/java/com/pikolive/core/channel_page/bean/ChannelPageInfo.java b/core/src/model_channel_page/java/com/bingchuang/core/channel_page/bean/ChannelPageInfo.java similarity index 78% rename from core/src/model_channel_page/java/com/pikolive/core/channel_page/bean/ChannelPageInfo.java rename to core/src/model_channel_page/java/com/bingchuang/core/channel_page/bean/ChannelPageInfo.java index 7ec124ef3..b3fc5b586 100644 --- a/core/src/model_channel_page/java/com/pikolive/core/channel_page/bean/ChannelPageInfo.java +++ b/core/src/model_channel_page/java/com/bingchuang/core/channel_page/bean/ChannelPageInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.channel_page.bean; +package com.bingchuang.core.channel_page.bean; import lombok.Data; diff --git a/core/src/model_channel_page/java/com/pikolive/core/channel_page/bean/HelloMessageInfo.kt b/core/src/model_channel_page/java/com/bingchuang/core/channel_page/bean/HelloMessageInfo.kt similarity index 81% rename from core/src/model_channel_page/java/com/pikolive/core/channel_page/bean/HelloMessageInfo.kt rename to core/src/model_channel_page/java/com/bingchuang/core/channel_page/bean/HelloMessageInfo.kt index 6ab133651..f6368a5cd 100644 --- a/core/src/model_channel_page/java/com/pikolive/core/channel_page/bean/HelloMessageInfo.kt +++ b/core/src/model_channel_page/java/com/bingchuang/core/channel_page/bean/HelloMessageInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.channel_page.bean +package com.bingchuang.core.channel_page.bean import java.io.Serializable diff --git a/core/src/model_channel_page/java/com/pikolive/core/channel_page/bean/NewUserHelloInfo.kt b/core/src/model_channel_page/java/com/bingchuang/core/channel_page/bean/NewUserHelloInfo.kt similarity index 87% rename from core/src/model_channel_page/java/com/pikolive/core/channel_page/bean/NewUserHelloInfo.kt rename to core/src/model_channel_page/java/com/bingchuang/core/channel_page/bean/NewUserHelloInfo.kt index 542022081..9866a9c5a 100644 --- a/core/src/model_channel_page/java/com/pikolive/core/channel_page/bean/NewUserHelloInfo.kt +++ b/core/src/model_channel_page/java/com/bingchuang/core/channel_page/bean/NewUserHelloInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.channel_page.bean +package com.bingchuang.core.channel_page.bean import java.io.Serializable diff --git a/core/src/model_channel_page/java/com/pikolive/core/channel_page/model/ChannelPageModel.java b/core/src/model_channel_page/java/com/bingchuang/core/channel_page/model/ChannelPageModel.java similarity index 91% rename from core/src/model_channel_page/java/com/pikolive/core/channel_page/model/ChannelPageModel.java rename to core/src/model_channel_page/java/com/bingchuang/core/channel_page/model/ChannelPageModel.java index 487714ace..f651fda74 100644 --- a/core/src/model_channel_page/java/com/pikolive/core/channel_page/model/ChannelPageModel.java +++ b/core/src/model_channel_page/java/com/bingchuang/core/channel_page/model/ChannelPageModel.java @@ -1,13 +1,13 @@ -package com.pikolive.core.channel_page.model; +package com.bingchuang.core.channel_page.model; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.channel_page.bean.ChannelPageInfo; -import com.pikolive.core.channel_page.bean.HelloMessageInfo; -import com.pikolive.core.channel_page.bean.NewUserHelloInfo; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core.user.bean.InviteUserInfo; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.channel_page.bean.ChannelPageInfo; +import com.bingchuang.core.channel_page.bean.HelloMessageInfo; +import com.bingchuang.core.channel_page.bean.NewUserHelloInfo; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core.user.bean.InviteUserInfo; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.utils.NetworkUtils; import com.bingchuang.library.utils.config.BasicConfig; diff --git a/core/src/model_channel_page/java/com/pikolive/core/channel_page/model/IChannelPageModel.java b/core/src/model_channel_page/java/com/bingchuang/core/channel_page/model/IChannelPageModel.java similarity index 60% rename from core/src/model_channel_page/java/com/pikolive/core/channel_page/model/IChannelPageModel.java rename to core/src/model_channel_page/java/com/bingchuang/core/channel_page/model/IChannelPageModel.java index fcfa14920..9b1cc8447 100644 --- a/core/src/model_channel_page/java/com/pikolive/core/channel_page/model/IChannelPageModel.java +++ b/core/src/model_channel_page/java/com/bingchuang/core/channel_page/model/IChannelPageModel.java @@ -1,9 +1,9 @@ -package com.pikolive.core.channel_page.model; +package com.bingchuang.core.channel_page.model; -import com.pikolive.core.channel_page.bean.ChannelPageInfo; -import com.pikolive.core.channel_page.bean.HelloMessageInfo; -import com.pikolive.core.channel_page.bean.NewUserHelloInfo; -import com.pikolive.core.user.bean.InviteUserInfo; +import com.bingchuang.core.channel_page.bean.ChannelPageInfo; +import com.bingchuang.core.channel_page.bean.HelloMessageInfo; +import com.bingchuang.core.channel_page.bean.NewUserHelloInfo; +import com.bingchuang.core.user.bean.InviteUserInfo; import io.reactivex.Single; diff --git a/core/src/model_community/java/com/pikolive/core/community/CommunityConstant.java b/core/src/model_community/java/com/bingchuang/core/community/CommunityConstant.java similarity index 89% rename from core/src/model_community/java/com/pikolive/core/community/CommunityConstant.java rename to core/src/model_community/java/com/bingchuang/core/community/CommunityConstant.java index 22a92a6d6..d3dd6c8d8 100644 --- a/core/src/model_community/java/com/pikolive/core/community/CommunityConstant.java +++ b/core/src/model_community/java/com/bingchuang/core/community/CommunityConstant.java @@ -1,4 +1,4 @@ -package com.pikolive.core.community; +package com.bingchuang.core.community; /** * 社区模块的一些常量定义 diff --git a/core/src/model_community/java/com/pikolive/core/community/IPublishModel.java b/core/src/model_community/java/com/bingchuang/core/community/IPublishModel.java similarity index 62% rename from core/src/model_community/java/com/pikolive/core/community/IPublishModel.java rename to core/src/model_community/java/com/bingchuang/core/community/IPublishModel.java index a8a9e06b3..7697935c6 100644 --- a/core/src/model_community/java/com/pikolive/core/community/IPublishModel.java +++ b/core/src/model_community/java/com/bingchuang/core/community/IPublishModel.java @@ -1,7 +1,7 @@ -package com.pikolive.core.community; +package com.bingchuang.core.community; -import com.pikolive.core.community.bean.MiniWorldChooseInfo; -import com.pikolive.core.community.bean.PublishBody; +import com.bingchuang.core.community.bean.MiniWorldChooseInfo; +import com.bingchuang.core.community.bean.PublishBody; import java.util.List; diff --git a/core/src/model_community/java/com/pikolive/core/community/ImageUploadConfig.java b/core/src/model_community/java/com/bingchuang/core/community/ImageUploadConfig.java similarity index 92% rename from core/src/model_community/java/com/pikolive/core/community/ImageUploadConfig.java rename to core/src/model_community/java/com/bingchuang/core/community/ImageUploadConfig.java index bc936f6d3..8428b669d 100644 --- a/core/src/model_community/java/com/pikolive/core/community/ImageUploadConfig.java +++ b/core/src/model_community/java/com/bingchuang/core/community/ImageUploadConfig.java @@ -1,4 +1,4 @@ -package com.pikolive.core.community; +package com.bingchuang.core.community; /** * 动态上传的一些配置 diff --git a/core/src/model_community/java/com/pikolive/core/community/PublishModel.java b/core/src/model_community/java/com/bingchuang/core/community/PublishModel.java similarity index 86% rename from core/src/model_community/java/com/pikolive/core/community/PublishModel.java rename to core/src/model_community/java/com/bingchuang/core/community/PublishModel.java index 05638fb76..e3794e6e6 100644 --- a/core/src/model_community/java/com/pikolive/core/community/PublishModel.java +++ b/core/src/model_community/java/com/bingchuang/core/community/PublishModel.java @@ -1,13 +1,13 @@ -package com.pikolive.core.community; +package com.bingchuang.core.community; import com.google.gson.JsonElement; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.community.bean.MiniWorldChooseInfo; -import com.pikolive.core.community.bean.PublishBody; -import com.pikolive.core.community.event.DynamicPublishEvent; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.community.bean.MiniWorldChooseInfo; +import com.bingchuang.core.community.bean.PublishBody; +import com.bingchuang.core.community.event.DynamicPublishEvent; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import org.greenrobot.eventbus.EventBus; diff --git a/core/src/model_community/java/com/pikolive/core/community/attachment/DynamicSysAttachment.java b/core/src/model_community/java/com/bingchuang/core/community/attachment/DynamicSysAttachment.java similarity index 86% rename from core/src/model_community/java/com/pikolive/core/community/attachment/DynamicSysAttachment.java rename to core/src/model_community/java/com/bingchuang/core/community/attachment/DynamicSysAttachment.java index 4173e0434..e370935aa 100644 --- a/core/src/model_community/java/com/pikolive/core/community/attachment/DynamicSysAttachment.java +++ b/core/src/model_community/java/com/bingchuang/core/community/attachment/DynamicSysAttachment.java @@ -1,9 +1,9 @@ -package com.pikolive.core.community.attachment; +package com.bingchuang.core.community.attachment; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.msg.sys.ErbanSysMsgInfo; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.msg.sys.ErbanSysMsgInfo; public class DynamicSysAttachment extends CustomAttachment { private ErbanSysMsgInfo erbanSysMsgInfo; diff --git a/core/src/model_community/java/com/pikolive/core/community/attachment/UnReadCountAttachment.java b/core/src/model_community/java/com/bingchuang/core/community/attachment/UnReadCountAttachment.java similarity index 91% rename from core/src/model_community/java/com/pikolive/core/community/attachment/UnReadCountAttachment.java rename to core/src/model_community/java/com/bingchuang/core/community/attachment/UnReadCountAttachment.java index 509d0c173..55755683b 100644 --- a/core/src/model_community/java/com/pikolive/core/community/attachment/UnReadCountAttachment.java +++ b/core/src/model_community/java/com/bingchuang/core/community/attachment/UnReadCountAttachment.java @@ -1,7 +1,7 @@ -package com.pikolive.core.community.attachment; +package com.bingchuang.core.community.attachment; import com.alibaba.fastjson.JSONObject; -import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.im.custom.bean.CustomAttachment; public class UnReadCountAttachment extends CustomAttachment { diff --git a/core/src/model_community/java/com/pikolive/core/community/bean/Comment.java b/core/src/model_community/java/com/bingchuang/core/community/bean/Comment.java similarity index 90% rename from core/src/model_community/java/com/pikolive/core/community/bean/Comment.java rename to core/src/model_community/java/com/bingchuang/core/community/bean/Comment.java index 29dc84971..59f633b7f 100644 --- a/core/src/model_community/java/com/pikolive/core/community/bean/Comment.java +++ b/core/src/model_community/java/com/bingchuang/core/community/bean/Comment.java @@ -1,8 +1,8 @@ -package com.pikolive.core.community.bean; +package com.bingchuang.core.community.bean; -import com.pikolive.core.community.bean.comment.Reply; -import com.pikolive.core.community.bean.comment.ReplyResult; -import com.pikolive.core.vip.UserVipInfo; +import com.bingchuang.core.community.bean.comment.Reply; +import com.bingchuang.core.community.bean.comment.ReplyResult; +import com.bingchuang.core.vip.UserVipInfo; import com.bingchuang.library.utils.ListUtils; import java.util.ArrayList; diff --git a/core/src/model_community/java/com/pikolive/core/community/bean/CommentResult.java b/core/src/model_community/java/com/bingchuang/core/community/bean/CommentResult.java similarity index 81% rename from core/src/model_community/java/com/pikolive/core/community/bean/CommentResult.java rename to core/src/model_community/java/com/bingchuang/core/community/bean/CommentResult.java index fb93be9de..53c0b6dcc 100644 --- a/core/src/model_community/java/com/pikolive/core/community/bean/CommentResult.java +++ b/core/src/model_community/java/com/bingchuang/core/community/bean/CommentResult.java @@ -1,4 +1,4 @@ -package com.pikolive.core.community.bean; +package com.bingchuang.core.community.bean; import java.util.List; diff --git a/core/src/model_community/java/com/pikolive/core/community/bean/CommunityNoticeInfo.java b/core/src/model_community/java/com/bingchuang/core/community/bean/CommunityNoticeInfo.java similarity index 96% rename from core/src/model_community/java/com/pikolive/core/community/bean/CommunityNoticeInfo.java rename to core/src/model_community/java/com/bingchuang/core/community/bean/CommunityNoticeInfo.java index e0acf96cb..585e10f86 100644 --- a/core/src/model_community/java/com/pikolive/core/community/bean/CommunityNoticeInfo.java +++ b/core/src/model_community/java/com/bingchuang/core/community/bean/CommunityNoticeInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.community.bean; +package com.bingchuang.core.community.bean; import lombok.Data; diff --git a/core/src/model_community/java/com/pikolive/core/community/bean/DyChangeData.java b/core/src/model_community/java/com/bingchuang/core/community/bean/DyChangeData.java similarity index 78% rename from core/src/model_community/java/com/pikolive/core/community/bean/DyChangeData.java rename to core/src/model_community/java/com/bingchuang/core/community/bean/DyChangeData.java index fc6923d16..fcb80a38b 100644 --- a/core/src/model_community/java/com/pikolive/core/community/bean/DyChangeData.java +++ b/core/src/model_community/java/com/bingchuang/core/community/bean/DyChangeData.java @@ -1,4 +1,4 @@ -package com.pikolive.core.community.bean; +package com.bingchuang.core.community.bean; import lombok.Data; diff --git a/core/src/model_community/java/com/pikolive/core/community/bean/DynamicMedia.java b/core/src/model_community/java/com/bingchuang/core/community/bean/DynamicMedia.java similarity index 96% rename from core/src/model_community/java/com/pikolive/core/community/bean/DynamicMedia.java rename to core/src/model_community/java/com/bingchuang/core/community/bean/DynamicMedia.java index 2f35e8c97..01a42525c 100644 --- a/core/src/model_community/java/com/pikolive/core/community/bean/DynamicMedia.java +++ b/core/src/model_community/java/com/bingchuang/core/community/bean/DynamicMedia.java @@ -1,4 +1,4 @@ -package com.pikolive.core.community.bean; +package com.bingchuang.core.community.bean; import android.text.TextUtils; diff --git a/core/src/model_community/java/com/pikolive/core/community/bean/MiniWorldChooseInfo.java b/core/src/model_community/java/com/bingchuang/core/community/bean/MiniWorldChooseInfo.java similarity index 85% rename from core/src/model_community/java/com/pikolive/core/community/bean/MiniWorldChooseInfo.java rename to core/src/model_community/java/com/bingchuang/core/community/bean/MiniWorldChooseInfo.java index 755a06e68..78c35c46e 100644 --- a/core/src/model_community/java/com/pikolive/core/community/bean/MiniWorldChooseInfo.java +++ b/core/src/model_community/java/com/bingchuang/core/community/bean/MiniWorldChooseInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.community.bean; +package com.bingchuang.core.community.bean; import java.io.Serializable; diff --git a/core/src/model_community/java/com/pikolive/core/community/bean/PublishBody.java b/core/src/model_community/java/com/bingchuang/core/community/bean/PublishBody.java similarity index 93% rename from core/src/model_community/java/com/pikolive/core/community/bean/PublishBody.java rename to core/src/model_community/java/com/bingchuang/core/community/bean/PublishBody.java index 094fc8834..0e54c9087 100644 --- a/core/src/model_community/java/com/pikolive/core/community/bean/PublishBody.java +++ b/core/src/model_community/java/com/bingchuang/core/community/bean/PublishBody.java @@ -1,4 +1,4 @@ -package com.pikolive.core.community.bean; +package com.bingchuang.core.community.bean; import java.util.ArrayList; diff --git a/core/src/model_community/java/com/pikolive/core/community/bean/PublishItem.java b/core/src/model_community/java/com/bingchuang/core/community/bean/PublishItem.java similarity index 97% rename from core/src/model_community/java/com/pikolive/core/community/bean/PublishItem.java rename to core/src/model_community/java/com/bingchuang/core/community/bean/PublishItem.java index 3e8bed7cd..0cc99ac73 100644 --- a/core/src/model_community/java/com/pikolive/core/community/bean/PublishItem.java +++ b/core/src/model_community/java/com/bingchuang/core/community/bean/PublishItem.java @@ -1,4 +1,4 @@ -package com.pikolive.core.community.bean; +package com.bingchuang.core.community.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/model_community/java/com/pikolive/core/community/bean/UnReadCountInfo.java b/core/src/model_community/java/com/bingchuang/core/community/bean/UnReadCountInfo.java similarity index 95% rename from core/src/model_community/java/com/pikolive/core/community/bean/UnReadCountInfo.java rename to core/src/model_community/java/com/bingchuang/core/community/bean/UnReadCountInfo.java index 2bb43a693..1c8fdcfdd 100644 --- a/core/src/model_community/java/com/pikolive/core/community/bean/UnReadCountInfo.java +++ b/core/src/model_community/java/com/bingchuang/core/community/bean/UnReadCountInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.community.bean; +package com.bingchuang.core.community.bean; import java.io.Serializable; diff --git a/core/src/model_community/java/com/pikolive/core/community/bean/UserDynamicItem.java b/core/src/model_community/java/com/bingchuang/core/community/bean/UserDynamicItem.java similarity index 97% rename from core/src/model_community/java/com/pikolive/core/community/bean/UserDynamicItem.java rename to core/src/model_community/java/com/bingchuang/core/community/bean/UserDynamicItem.java index 3544b3e08..1426d10ed 100644 --- a/core/src/model_community/java/com/pikolive/core/community/bean/UserDynamicItem.java +++ b/core/src/model_community/java/com/bingchuang/core/community/bean/UserDynamicItem.java @@ -1,4 +1,4 @@ -package com.pikolive.core.community.bean; +package com.bingchuang.core.community.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/model_community/java/com/pikolive/core/community/bean/WorldDynamicBean.java b/core/src/model_community/java/com/bingchuang/core/community/bean/WorldDynamicBean.java similarity index 95% rename from core/src/model_community/java/com/pikolive/core/community/bean/WorldDynamicBean.java rename to core/src/model_community/java/com/bingchuang/core/community/bean/WorldDynamicBean.java index f27476375..e005b0c6a 100644 --- a/core/src/model_community/java/com/pikolive/core/community/bean/WorldDynamicBean.java +++ b/core/src/model_community/java/com/bingchuang/core/community/bean/WorldDynamicBean.java @@ -1,9 +1,9 @@ -package com.pikolive.core.community.bean; +package com.bingchuang.core.community.bean; import android.text.TextUtils; -import com.pikolive.core.user.bean.BaseUserInfo; +import com.bingchuang.core.user.bean.BaseUserInfo; import java.io.Serializable; import java.util.ArrayList; diff --git a/core/src/model_community/java/com/pikolive/core/community/bean/WorldDynamicListResult.java b/core/src/model_community/java/com/bingchuang/core/community/bean/WorldDynamicListResult.java similarity index 85% rename from core/src/model_community/java/com/pikolive/core/community/bean/WorldDynamicListResult.java rename to core/src/model_community/java/com/bingchuang/core/community/bean/WorldDynamicListResult.java index 9bec909ae..efedd0cff 100644 --- a/core/src/model_community/java/com/pikolive/core/community/bean/WorldDynamicListResult.java +++ b/core/src/model_community/java/com/bingchuang/core/community/bean/WorldDynamicListResult.java @@ -1,4 +1,4 @@ -package com.pikolive.core.community.bean; +package com.bingchuang.core.community.bean; import java.util.List; diff --git a/core/src/model_community/java/com/pikolive/core/community/bean/comment/PopupParams.java b/core/src/model_community/java/com/bingchuang/core/community/bean/comment/PopupParams.java similarity index 89% rename from core/src/model_community/java/com/pikolive/core/community/bean/comment/PopupParams.java rename to core/src/model_community/java/com/bingchuang/core/community/bean/comment/PopupParams.java index 6cb58697e..1027a9489 100644 --- a/core/src/model_community/java/com/pikolive/core/community/bean/comment/PopupParams.java +++ b/core/src/model_community/java/com/bingchuang/core/community/bean/comment/PopupParams.java @@ -1,4 +1,4 @@ -package com.pikolive.core.community.bean.comment; +package com.bingchuang.core.community.bean.comment; import lombok.Data; diff --git a/core/src/model_community/java/com/pikolive/core/community/bean/comment/Reply.java b/core/src/model_community/java/com/bingchuang/core/community/bean/comment/Reply.java similarity index 84% rename from core/src/model_community/java/com/pikolive/core/community/bean/comment/Reply.java rename to core/src/model_community/java/com/bingchuang/core/community/bean/comment/Reply.java index 4dec81f0b..415af1276 100644 --- a/core/src/model_community/java/com/pikolive/core/community/bean/comment/Reply.java +++ b/core/src/model_community/java/com/bingchuang/core/community/bean/comment/Reply.java @@ -1,6 +1,6 @@ -package com.pikolive.core.community.bean.comment; +package com.bingchuang.core.community.bean.comment; -import com.pikolive.core.vip.UserVipInfo; +import com.bingchuang.core.vip.UserVipInfo; import lombok.Data; diff --git a/core/src/model_community/java/com/pikolive/core/community/bean/comment/ReplyResult.java b/core/src/model_community/java/com/bingchuang/core/community/bean/comment/ReplyResult.java similarity index 89% rename from core/src/model_community/java/com/pikolive/core/community/bean/comment/ReplyResult.java rename to core/src/model_community/java/com/bingchuang/core/community/bean/comment/ReplyResult.java index c056bd27c..15d86f5f0 100644 --- a/core/src/model_community/java/com/pikolive/core/community/bean/comment/ReplyResult.java +++ b/core/src/model_community/java/com/bingchuang/core/community/bean/comment/ReplyResult.java @@ -1,4 +1,4 @@ -package com.pikolive.core.community.bean.comment; +package com.bingchuang.core.community.bean.comment; import java.util.ArrayList; import java.util.List; diff --git a/core/src/model_community/java/com/pikolive/core/community/dynamic/DynamicDetailModel.java b/core/src/model_community/java/com/bingchuang/core/community/dynamic/DynamicDetailModel.java similarity index 90% rename from core/src/model_community/java/com/pikolive/core/community/dynamic/DynamicDetailModel.java rename to core/src/model_community/java/com/bingchuang/core/community/dynamic/DynamicDetailModel.java index d1ad642bf..949c44518 100644 --- a/core/src/model_community/java/com/pikolive/core/community/dynamic/DynamicDetailModel.java +++ b/core/src/model_community/java/com/bingchuang/core/community/dynamic/DynamicDetailModel.java @@ -1,14 +1,14 @@ -package com.pikolive.core.community.dynamic; +package com.bingchuang.core.community.dynamic; import com.google.gson.JsonElement; -import com.pikolive.core.community.bean.CommentResult; -import com.pikolive.core.community.bean.WorldDynamicBean; -import com.pikolive.core.community.bean.comment.Reply; -import com.pikolive.core.community.bean.comment.ReplyResult; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.community.bean.CommentResult; +import com.bingchuang.core.community.bean.WorldDynamicBean; +import com.bingchuang.core.community.bean.comment.Reply; +import com.bingchuang.core.community.bean.comment.ReplyResult; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import io.reactivex.Single; diff --git a/core/src/model_community/java/com/pikolive/core/community/dynamic/DynamicModel.java b/core/src/model_community/java/com/bingchuang/core/community/dynamic/DynamicModel.java similarity index 92% rename from core/src/model_community/java/com/pikolive/core/community/dynamic/DynamicModel.java rename to core/src/model_community/java/com/bingchuang/core/community/dynamic/DynamicModel.java index 7e4352d08..974ae59b2 100644 --- a/core/src/model_community/java/com/pikolive/core/community/dynamic/DynamicModel.java +++ b/core/src/model_community/java/com/bingchuang/core/community/dynamic/DynamicModel.java @@ -1,12 +1,12 @@ -package com.pikolive.core.community.dynamic; +package com.bingchuang.core.community.dynamic; import com.google.gson.JsonElement; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.community.CommunityConstant; -import com.pikolive.core.community.bean.WorldDynamicListResult; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.community.CommunityConstant; +import com.bingchuang.core.community.bean.WorldDynamicListResult; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import io.reactivex.Single; diff --git a/core/src/model_community/java/com/pikolive/core/community/dynamic/IDynamicDetailModel.java b/core/src/model_community/java/com/bingchuang/core/community/dynamic/IDynamicDetailModel.java similarity index 66% rename from core/src/model_community/java/com/pikolive/core/community/dynamic/IDynamicDetailModel.java rename to core/src/model_community/java/com/bingchuang/core/community/dynamic/IDynamicDetailModel.java index c7241bc6f..b067e126b 100644 --- a/core/src/model_community/java/com/pikolive/core/community/dynamic/IDynamicDetailModel.java +++ b/core/src/model_community/java/com/bingchuang/core/community/dynamic/IDynamicDetailModel.java @@ -1,9 +1,9 @@ -package com.pikolive.core.community.dynamic; +package com.bingchuang.core.community.dynamic; -import com.pikolive.core.community.bean.comment.ReplyResult; -import com.pikolive.core.community.bean.CommentResult; -import com.pikolive.core.community.bean.WorldDynamicBean; -import com.pikolive.core.community.bean.comment.Reply; +import com.bingchuang.core.community.bean.comment.ReplyResult; +import com.bingchuang.core.community.bean.CommentResult; +import com.bingchuang.core.community.bean.WorldDynamicBean; +import com.bingchuang.core.community.bean.comment.Reply; import io.reactivex.Single; diff --git a/core/src/model_community/java/com/pikolive/core/community/dynamic/IDynamicModel.java b/core/src/model_community/java/com/bingchuang/core/community/dynamic/IDynamicModel.java similarity index 82% rename from core/src/model_community/java/com/pikolive/core/community/dynamic/IDynamicModel.java rename to core/src/model_community/java/com/bingchuang/core/community/dynamic/IDynamicModel.java index e36b08411..74acb1b60 100644 --- a/core/src/model_community/java/com/pikolive/core/community/dynamic/IDynamicModel.java +++ b/core/src/model_community/java/com/bingchuang/core/community/dynamic/IDynamicModel.java @@ -1,6 +1,6 @@ -package com.pikolive.core.community.dynamic; +package com.bingchuang.core.community.dynamic; -import com.pikolive.core.community.bean.WorldDynamicListResult; +import com.bingchuang.core.community.bean.WorldDynamicListResult; import io.reactivex.Single; diff --git a/core/src/model_community/java/com/pikolive/core/community/event/DynamicDetailFinishEvent.java b/core/src/model_community/java/com/bingchuang/core/community/event/DynamicDetailFinishEvent.java similarity index 75% rename from core/src/model_community/java/com/pikolive/core/community/event/DynamicDetailFinishEvent.java rename to core/src/model_community/java/com/bingchuang/core/community/event/DynamicDetailFinishEvent.java index fb2b0666d..2dc35c599 100644 --- a/core/src/model_community/java/com/pikolive/core/community/event/DynamicDetailFinishEvent.java +++ b/core/src/model_community/java/com/bingchuang/core/community/event/DynamicDetailFinishEvent.java @@ -1,6 +1,6 @@ -package com.pikolive.core.community.event; +package com.bingchuang.core.community.event; -import com.pikolive.core.community.bean.WorldDynamicBean; +import com.bingchuang.core.community.bean.WorldDynamicBean; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/src/model_community/java/com/pikolive/core/community/event/DynamicPublishEvent.java b/core/src/model_community/java/com/bingchuang/core/community/event/DynamicPublishEvent.java similarity index 63% rename from core/src/model_community/java/com/pikolive/core/community/event/DynamicPublishEvent.java rename to core/src/model_community/java/com/bingchuang/core/community/event/DynamicPublishEvent.java index 1f1836500..fb3817208 100644 --- a/core/src/model_community/java/com/pikolive/core/community/event/DynamicPublishEvent.java +++ b/core/src/model_community/java/com/bingchuang/core/community/event/DynamicPublishEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.community.event; +package com.bingchuang.core.community.event; /** * create by lvzebiao @2019/12/1 diff --git a/core/src/model_community/java/com/pikolive/core/community/event/DynamicRefreshEvent.java b/core/src/model_community/java/com/bingchuang/core/community/event/DynamicRefreshEvent.java similarity index 63% rename from core/src/model_community/java/com/pikolive/core/community/event/DynamicRefreshEvent.java rename to core/src/model_community/java/com/bingchuang/core/community/event/DynamicRefreshEvent.java index 652223846..17821bb5f 100644 --- a/core/src/model_community/java/com/pikolive/core/community/event/DynamicRefreshEvent.java +++ b/core/src/model_community/java/com/bingchuang/core/community/event/DynamicRefreshEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.community.event; +package com.bingchuang.core.community.event; /** * create by lvzebiao @2019/12/1 diff --git a/core/src/model_community/java/com/pikolive/core/community/event/SquareTaskEvent.java b/core/src/model_community/java/com/bingchuang/core/community/event/SquareTaskEvent.java similarity index 57% rename from core/src/model_community/java/com/pikolive/core/community/event/SquareTaskEvent.java rename to core/src/model_community/java/com/bingchuang/core/community/event/SquareTaskEvent.java index 3b33d419b..a741f5258 100644 --- a/core/src/model_community/java/com/pikolive/core/community/event/SquareTaskEvent.java +++ b/core/src/model_community/java/com/bingchuang/core/community/event/SquareTaskEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.community.event; +package com.bingchuang.core.community.event; import lombok.Data; diff --git a/core/src/model_community/java/com/pikolive/core/community/event/UnReadCountEvent.java b/core/src/model_community/java/com/bingchuang/core/community/event/UnReadCountEvent.java similarity index 75% rename from core/src/model_community/java/com/pikolive/core/community/event/UnReadCountEvent.java rename to core/src/model_community/java/com/bingchuang/core/community/event/UnReadCountEvent.java index 8204453d4..88bdae6ca 100644 --- a/core/src/model_community/java/com/pikolive/core/community/event/UnReadCountEvent.java +++ b/core/src/model_community/java/com/bingchuang/core/community/event/UnReadCountEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.community.event; +package com.bingchuang.core.community.event; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/src/model_community/java/com/pikolive/core/community/im/DynamicImMsg.java b/core/src/model_community/java/com/bingchuang/core/community/im/DynamicImMsg.java similarity index 93% rename from core/src/model_community/java/com/pikolive/core/community/im/DynamicImMsg.java rename to core/src/model_community/java/com/bingchuang/core/community/im/DynamicImMsg.java index 2f0d66f0f..37699f47d 100644 --- a/core/src/model_community/java/com/pikolive/core/community/im/DynamicImMsg.java +++ b/core/src/model_community/java/com/bingchuang/core/community/im/DynamicImMsg.java @@ -1,6 +1,6 @@ -package com.pikolive.core.community.im; +package com.bingchuang.core.community.im; -import com.pikolive.core.community.bean.WorldDynamicBean; +import com.bingchuang.core.community.bean.WorldDynamicBean; import java.io.Serializable; diff --git a/core/src/model_community/java/com/pikolive/core/community/im/WorldDynamicAttachment.java b/core/src/model_community/java/com/bingchuang/core/community/im/WorldDynamicAttachment.java similarity index 95% rename from core/src/model_community/java/com/pikolive/core/community/im/WorldDynamicAttachment.java rename to core/src/model_community/java/com/bingchuang/core/community/im/WorldDynamicAttachment.java index 382c50d54..81e8cb6d7 100644 --- a/core/src/model_community/java/com/pikolive/core/community/im/WorldDynamicAttachment.java +++ b/core/src/model_community/java/com/bingchuang/core/community/im/WorldDynamicAttachment.java @@ -1,11 +1,11 @@ -package com.pikolive.core.community.im; +package com.bingchuang.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.pikolive.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.im.custom.bean.CustomAttachment; import lombok.Getter; import lombok.Setter; diff --git a/core/src/model_community/java/com/pikolive/core/community/square/ISquareModel.java b/core/src/model_community/java/com/bingchuang/core/community/square/ISquareModel.java similarity index 74% rename from core/src/model_community/java/com/pikolive/core/community/square/ISquareModel.java rename to core/src/model_community/java/com/bingchuang/core/community/square/ISquareModel.java index 0fb2efd84..55ab7d0a3 100644 --- a/core/src/model_community/java/com/pikolive/core/community/square/ISquareModel.java +++ b/core/src/model_community/java/com/bingchuang/core/community/square/ISquareModel.java @@ -1,7 +1,7 @@ -package com.pikolive.core.community.square; +package com.bingchuang.core.community.square; -import com.pikolive.core.community.bean.WorldDynamicBean; -import com.pikolive.core.community.bean.WorldDynamicListResult; +import com.bingchuang.core.community.bean.WorldDynamicBean; +import com.bingchuang.core.community.bean.WorldDynamicListResult; import java.util.List; diff --git a/core/src/model_community/java/com/pikolive/core/community/square/SquareModel.java b/core/src/model_community/java/com/bingchuang/core/community/square/SquareModel.java similarity index 88% rename from core/src/model_community/java/com/pikolive/core/community/square/SquareModel.java rename to core/src/model_community/java/com/bingchuang/core/community/square/SquareModel.java index 8ce8d4453..185b1f977 100644 --- a/core/src/model_community/java/com/pikolive/core/community/square/SquareModel.java +++ b/core/src/model_community/java/com/bingchuang/core/community/square/SquareModel.java @@ -1,11 +1,11 @@ -package com.pikolive.core.community.square; +package com.bingchuang.core.community.square; -import com.pikolive.core.community.CommunityConstant; -import com.pikolive.core.community.bean.WorldDynamicBean; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.community.bean.WorldDynamicListResult; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.community.CommunityConstant; +import com.bingchuang.core.community.bean.WorldDynamicBean; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.community.bean.WorldDynamicListResult; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import java.util.ArrayList; diff --git a/core/src/model_database_room/java/com/pikolive/core/database/AppDataBase.java b/core/src/model_database_room/java/com/bingchuang/core/database/AppDataBase.java similarity index 83% rename from core/src/model_database_room/java/com/pikolive/core/database/AppDataBase.java rename to core/src/model_database_room/java/com/bingchuang/core/database/AppDataBase.java index f2ca3c153..0220f30c2 100644 --- a/core/src/model_database_room/java/com/pikolive/core/database/AppDataBase.java +++ b/core/src/model_database_room/java/com/bingchuang/core/database/AppDataBase.java @@ -1,4 +1,4 @@ -package com.pikolive.core.database; +package com.bingchuang.core.database; import androidx.annotation.NonNull; import androidx.room.Database; @@ -7,11 +7,11 @@ import androidx.room.RoomDatabase; import androidx.room.migration.Migration; import androidx.sqlite.db.SupportSQLiteDatabase; -import com.pikolive.core2.XChatConstants; -import com.pikolive.core.music.db.bean.LocalMusicBean; -import com.pikolive.core.music.db.bean.SongBean; -import com.pikolive.core.music.db.dao.LocalMusicDao; -import com.pikolive.core.music.db.dao.SongDao; +import com.bingchuang.core2.XChatConstants; +import com.bingchuang.core.music.db.bean.LocalMusicBean; +import com.bingchuang.core.music.db.bean.SongBean; +import com.bingchuang.core.music.db.dao.LocalMusicDao; +import com.bingchuang.core.music.db.dao.SongDao; import com.bingchuang.library.utils.config.BasicConfig; @Database(entities = {LocalMusicBean.class, SongBean.class}, version = 2, exportSchema = false) diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/HallModel.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/HallModel.java similarity index 93% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/HallModel.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/HallModel.java index 258366352..4fb2bf5c8 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/HallModel.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/HallModel.java @@ -1,28 +1,28 @@ -package com.pikolive.core.module_hall.hall; +package com.bingchuang.core.module_hall.hall; -import com.pikolive.core.module_hall.hall.bean.AuthListResult; -import com.pikolive.core.module_hall.hall.bean.ClanAndHallInfo; -import com.pikolive.core.module_hall.hall.bean.HallInfo; -import com.pikolive.core.module_hall.hall.bean.SuperAdminInfo; -import com.pikolive.core.R; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.auth.event.LogoutEvent; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.module_hall.hall.bean.ApplyResult; -import com.pikolive.core.module_hall.hall.bean.AuthInfo; -import com.pikolive.core.module_hall.hall.bean.ClanInfo; -import com.pikolive.core.module_hall.hall.bean.HallMenuByUidResult; -import com.pikolive.core.module_hall.hall.bean.JoinRoomInfo; -import com.pikolive.core.module_hall.hall.bean.ListMemberInfo; -import com.pikolive.core.module_hall.hall.bean.OptionInfo; -import com.pikolive.core.module_hall.hall.bean.OwnerHallInfo; -import com.pikolive.core.module_hall.hall.bean.SuperAdminHall; -import com.pikolive.core.module_hall.hall.event.UserHallUpdateEvent; -import com.pikolive.core.user.UserModel; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.user.event.LoginUserInfoUpdateEvent; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.module_hall.hall.bean.AuthListResult; +import com.bingchuang.core.module_hall.hall.bean.ClanAndHallInfo; +import com.bingchuang.core.module_hall.hall.bean.HallInfo; +import com.bingchuang.core.module_hall.hall.bean.SuperAdminInfo; +import com.bingchuang.core.R; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.auth.event.LogoutEvent; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.module_hall.hall.bean.ApplyResult; +import com.bingchuang.core.module_hall.hall.bean.AuthInfo; +import com.bingchuang.core.module_hall.hall.bean.ClanInfo; +import com.bingchuang.core.module_hall.hall.bean.HallMenuByUidResult; +import com.bingchuang.core.module_hall.hall.bean.JoinRoomInfo; +import com.bingchuang.core.module_hall.hall.bean.ListMemberInfo; +import com.bingchuang.core.module_hall.hall.bean.OptionInfo; +import com.bingchuang.core.module_hall.hall.bean.OwnerHallInfo; +import com.bingchuang.core.module_hall.hall.bean.SuperAdminHall; +import com.bingchuang.core.module_hall.hall.event.UserHallUpdateEvent; +import com.bingchuang.core.user.UserModel; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.user.event.LoginUserInfoUpdateEvent; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.utils.ResUtil; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/HallNameModel.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/HallNameModel.java similarity index 85% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/HallNameModel.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/HallNameModel.java index 52f0bfeb8..015319282 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/HallNameModel.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/HallNameModel.java @@ -1,9 +1,9 @@ -package com.pikolive.core.module_hall.hall; +package com.bingchuang.core.module_hall.hall; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import io.reactivex.Single; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/IHallModel.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/IHallModel.java similarity index 77% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/IHallModel.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/IHallModel.java index d3be50440..342bb36d1 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/IHallModel.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/IHallModel.java @@ -1,16 +1,16 @@ -package com.pikolive.core.module_hall.hall; +package com.bingchuang.core.module_hall.hall; -import com.pikolive.core.module_hall.hall.bean.ClanAndHallInfo; -import com.pikolive.core.module_hall.hall.bean.HallInfo; -import com.pikolive.core.module_hall.hall.bean.SuperAdminInfo; -import com.pikolive.core.module_hall.hall.bean.ApplyResult; -import com.pikolive.core.module_hall.hall.bean.AuthInfo; -import com.pikolive.core.module_hall.hall.bean.JoinRoomInfo; -import com.pikolive.core.module_hall.hall.bean.ListMemberInfo; -import com.pikolive.core.module_hall.hall.bean.OptionInfo; -import com.pikolive.core.module_hall.hall.bean.OwnerHallInfo; -import com.pikolive.core.module_hall.hall.bean.SuperAdminHall; +import com.bingchuang.core.module_hall.hall.bean.ClanAndHallInfo; +import com.bingchuang.core.module_hall.hall.bean.HallInfo; +import com.bingchuang.core.module_hall.hall.bean.SuperAdminInfo; +import com.bingchuang.core.module_hall.hall.bean.ApplyResult; +import com.bingchuang.core.module_hall.hall.bean.AuthInfo; +import com.bingchuang.core.module_hall.hall.bean.JoinRoomInfo; +import com.bingchuang.core.module_hall.hall.bean.ListMemberInfo; +import com.bingchuang.core.module_hall.hall.bean.OptionInfo; +import com.bingchuang.core.module_hall.hall.bean.OwnerHallInfo; +import com.bingchuang.core.module_hall.hall.bean.SuperAdminHall; import java.util.List; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/IHallNameModel.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/IHallNameModel.java similarity index 62% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/IHallNameModel.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/IHallNameModel.java index 032d3c5ee..b07585f12 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/IHallNameModel.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/IHallNameModel.java @@ -1,6 +1,6 @@ -package com.pikolive.core.module_hall.hall; +package com.bingchuang.core.module_hall.hall; -import com.pikolive.core.base.IModel; +import com.bingchuang.core.base.IModel; import io.reactivex.Single; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/ApplyResult.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/ApplyResult.java similarity index 87% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/ApplyResult.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/ApplyResult.java index 5a5ab1f84..9304cd553 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/ApplyResult.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/ApplyResult.java @@ -1,4 +1,4 @@ -package com.pikolive.core.module_hall.hall.bean; +package com.bingchuang.core.module_hall.hall.bean; import lombok.Data; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/AuthInfo.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/AuthInfo.java similarity index 97% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/AuthInfo.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/AuthInfo.java index 2311e2f9c..2e5d6bb5c 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/AuthInfo.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/AuthInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.module_hall.hall.bean; +package com.bingchuang.core.module_hall.hall.bean; import java.io.Serializable; import java.util.ArrayList; diff --git a/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/AuthListResult.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/AuthListResult.java new file mode 100644 index 000000000..b6cf59c3b --- /dev/null +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/AuthListResult.java @@ -0,0 +1,8 @@ +package com.bingchuang.core.module_hall.hall.bean; + +import com.bingchuang.core.bean.response.ServiceResult; + +import java.util.List; + +public class AuthListResult extends ServiceResult> { +} diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/ClanAndHallInfo.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/ClanAndHallInfo.java similarity index 74% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/ClanAndHallInfo.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/ClanAndHallInfo.java index c8ddab4cf..f631242b8 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/ClanAndHallInfo.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/ClanAndHallInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.module_hall.hall.bean; +package com.bingchuang.core.module_hall.hall.bean; import lombok.Data; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/ClanInfo.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/ClanInfo.java similarity index 88% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/ClanInfo.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/ClanInfo.java index 845c4aa24..edefef54d 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/ClanInfo.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/ClanInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.module_hall.hall.bean; +package com.bingchuang.core.module_hall.hall.bean; import lombok.Data; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/GroupListInfo.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/GroupListInfo.java similarity index 82% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/GroupListInfo.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/GroupListInfo.java index 560a8861e..91bb4b26d 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/GroupListInfo.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/GroupListInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.module_hall.hall.bean; +package com.bingchuang.core.module_hall.hall.bean; import java.io.Serializable; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/HTeamInfo.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/HTeamInfo.java similarity index 88% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/HTeamInfo.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/HTeamInfo.java index 528d05a70..4bb5ccaf9 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/HTeamInfo.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/HTeamInfo.java @@ -1,6 +1,6 @@ -package com.pikolive.core.module_hall.hall.bean; +package com.bingchuang.core.module_hall.hall.bean; -import com.pikolive.core.module_hall.team.bean.HTeamType; +import com.bingchuang.core.module_hall.team.bean.HTeamType; import java.io.Serializable; import java.util.List; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/HTeamMember.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/HTeamMember.java similarity index 88% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/HTeamMember.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/HTeamMember.java index c4e37655c..5ae11412f 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/HTeamMember.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/HTeamMember.java @@ -1,6 +1,6 @@ -package com.pikolive.core.module_hall.hall.bean; +package com.bingchuang.core.module_hall.hall.bean; -import com.pikolive.core.user.bean.SimpleUserInfo; +import com.bingchuang.core.user.bean.SimpleUserInfo; import java.io.Serializable; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/HallInfo.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/HallInfo.java similarity index 91% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/HallInfo.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/HallInfo.java index aa28040dc..58f557732 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/HallInfo.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/HallInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.module_hall.hall.bean; +package com.bingchuang.core.module_hall.hall.bean; import lombok.Data; diff --git a/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/HallMenuByUidResult.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/HallMenuByUidResult.java new file mode 100644 index 000000000..da417325d --- /dev/null +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/HallMenuByUidResult.java @@ -0,0 +1,8 @@ +package com.bingchuang.core.module_hall.hall.bean; + +import com.bingchuang.core.bean.response.ServiceResult; + +import java.util.List; + +public class HallMenuByUidResult extends ServiceResult
> { +} diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/JoinRoomInfo.kt b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/JoinRoomInfo.kt similarity index 77% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/JoinRoomInfo.kt rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/JoinRoomInfo.kt index f69deacb4..3851c3382 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/JoinRoomInfo.kt +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/JoinRoomInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.module_hall.hall.bean +package com.bingchuang.core.module_hall.hall.bean data class JoinRoomInfo( val recordId: Long = 0, diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/ListHTeamMember.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/ListHTeamMember.java similarity index 86% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/ListHTeamMember.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/ListHTeamMember.java index f3190bc39..88cb4efd1 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/ListHTeamMember.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/ListHTeamMember.java @@ -1,4 +1,4 @@ -package com.pikolive.core.module_hall.hall.bean; +package com.bingchuang.core.module_hall.hall.bean; import java.util.List; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/ListMemberInfo.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/ListMemberInfo.java similarity index 79% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/ListMemberInfo.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/ListMemberInfo.java index 6993f5871..1b340c3a0 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/ListMemberInfo.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/ListMemberInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.module_hall.hall.bean; +package com.bingchuang.core.module_hall.hall.bean; import java.util.List; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/MemberInfo.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/MemberInfo.java similarity index 88% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/MemberInfo.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/MemberInfo.java index 31bf0a73f..85bd7343b 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/MemberInfo.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/MemberInfo.java @@ -1,6 +1,6 @@ -package com.pikolive.core.module_hall.hall.bean; +package com.bingchuang.core.module_hall.hall.bean; -import com.pikolive.core.user.bean.SimpleUserInfo; +import com.bingchuang.core.user.bean.SimpleUserInfo; import java.io.Serializable; import java.util.Objects; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/OptionInfo.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/OptionInfo.java similarity index 96% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/OptionInfo.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/OptionInfo.java index 190a37598..5762a128d 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/OptionInfo.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/OptionInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.module_hall.hall.bean; +package com.bingchuang.core.module_hall.hall.bean; import java.io.Serializable; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/OwnerHallInfo.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/OwnerHallInfo.java similarity index 91% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/OwnerHallInfo.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/OwnerHallInfo.java index c15e7dc17..49db90b23 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/OwnerHallInfo.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/OwnerHallInfo.java @@ -1,6 +1,6 @@ -package com.pikolive.core.module_hall.hall.bean; +package com.bingchuang.core.module_hall.hall.bean; -import com.pikolive.core.module_hall.team.bean.HTeamType; +import com.bingchuang.core.module_hall.team.bean.HTeamType; import java.io.Serializable; import java.util.List; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/RoleType.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/RoleType.java similarity index 89% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/RoleType.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/RoleType.java index ea11dc48d..41a924017 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/RoleType.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/RoleType.java @@ -1,4 +1,4 @@ -package com.pikolive.core.module_hall.hall.bean; +package com.bingchuang.core.module_hall.hall.bean; /** * 模厅角色 diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/SuperAdminHall.kt b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/SuperAdminHall.kt similarity index 80% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/SuperAdminHall.kt rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/SuperAdminHall.kt index 10c918a6e..03467df42 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/SuperAdminHall.kt +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/SuperAdminHall.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.module_hall.hall.bean +package com.bingchuang.core.module_hall.hall.bean data class SuperAdminHall( val hallAvatar: String? = null, diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/SuperAdminInfo.kt b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/SuperAdminInfo.kt similarity index 83% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/SuperAdminInfo.kt rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/SuperAdminInfo.kt index c3625b61a..f9df25790 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/SuperAdminInfo.kt +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/bean/SuperAdminInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.module_hall.hall.bean +package com.bingchuang.core.module_hall.hall.bean data class SuperAdminInfo( val avatar: String? = "", diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/event/UserHallUpdateEvent.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/event/UserHallUpdateEvent.java similarity index 68% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/event/UserHallUpdateEvent.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/event/UserHallUpdateEvent.java index e487ec604..f35847096 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/event/UserHallUpdateEvent.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/hall/event/UserHallUpdateEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.module_hall.hall.event; +package com.bingchuang.core.module_hall.hall.event; /** * 用户模厅更新事件 diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/im/ClanAttachment.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/im/ClanAttachment.java similarity index 88% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/im/ClanAttachment.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/im/ClanAttachment.java index 1a2a6f8d7..0f219e7d4 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/im/ClanAttachment.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/im/ClanAttachment.java @@ -1,8 +1,8 @@ -package com.pikolive.core.module_hall.im; +package com.bingchuang.core.module_hall.im; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.im.custom.bean.CustomAttachment; /** * 公会消息 diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/im/ClanImMsgInfo.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/im/ClanImMsgInfo.java similarity index 95% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/im/ClanImMsgInfo.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/im/ClanImMsgInfo.java index bc9f0d356..c84e519b4 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/im/ClanImMsgInfo.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/im/ClanImMsgInfo.java @@ -1,6 +1,6 @@ -package com.pikolive.core.module_hall.im; +package com.bingchuang.core.module_hall.im; -import com.pikolive.core.im.custom.bean.RouterType; +import com.bingchuang.core.im.custom.bean.RouterType; import java.io.Serializable; import java.util.HashMap; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/im/HallAttachment.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/im/HallAttachment.java similarity index 88% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/im/HallAttachment.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/im/HallAttachment.java index 5a156c585..97e521e55 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/im/HallAttachment.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/im/HallAttachment.java @@ -1,8 +1,8 @@ -package com.pikolive.core.module_hall.im; +package com.bingchuang.core.module_hall.im; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.im.custom.bean.CustomAttachment; /** * 模厅消息 diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/im/HallImMsgInfo.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/im/HallImMsgInfo.java similarity index 95% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/im/HallImMsgInfo.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/im/HallImMsgInfo.java index 3ec3ecbfe..dcc1788aa 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/im/HallImMsgInfo.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/im/HallImMsgInfo.java @@ -1,6 +1,6 @@ -package com.pikolive.core.module_hall.im; +package com.bingchuang.core.module_hall.im; -import com.pikolive.core.im.custom.bean.RouterType; +import com.bingchuang.core.im.custom.bean.RouterType; import java.io.Serializable; import java.util.HashMap; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/im/bean/HallMsgComponent.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/im/bean/HallMsgComponent.java similarity index 87% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/im/bean/HallMsgComponent.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/im/bean/HallMsgComponent.java index 5e43e157b..cea180f10 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/im/bean/HallMsgComponent.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/im/bean/HallMsgComponent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.module_hall.im.bean; +package com.bingchuang.core.module_hall.im.bean; import java.io.Serializable; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/im/bean/HallMsgLayout.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/im/bean/HallMsgLayout.java similarity index 84% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/im/bean/HallMsgLayout.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/im/bean/HallMsgLayout.java index c78cf80ea..87bc591d2 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/im/bean/HallMsgLayout.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/im/bean/HallMsgLayout.java @@ -1,4 +1,4 @@ -package com.pikolive.core.module_hall.im.bean; +package com.bingchuang.core.module_hall.im.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/IIncomeModel.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/IIncomeModel.java similarity index 59% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/income/IIncomeModel.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/IIncomeModel.java index 3d0490c2d..b5f7c79b3 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/IIncomeModel.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/IIncomeModel.java @@ -1,12 +1,12 @@ -package com.pikolive.core.module_hall.income; +package com.bingchuang.core.module_hall.income; -import com.pikolive.core.module_hall.income.bean.IncomeGiftInfo; -import com.pikolive.core.module_hall.income.bean.IncomeTotalInfo; -import com.pikolive.core.module_hall.income.bean.SingleRoomTotalIncomeInfo; -import com.pikolive.core.base.IModel; -import com.pikolive.core.module_hall.income.bean.ClanTotalIncomeInfo; -import com.pikolive.core.module_hall.income.bean.HallTotalIncomeInfo; -import com.pikolive.core.module_hall.income.bean.LiveTotalIncomeInfo; +import com.bingchuang.core.module_hall.income.bean.IncomeGiftInfo; +import com.bingchuang.core.module_hall.income.bean.IncomeTotalInfo; +import com.bingchuang.core.module_hall.income.bean.SingleRoomTotalIncomeInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.module_hall.income.bean.ClanTotalIncomeInfo; +import com.bingchuang.core.module_hall.income.bean.HallTotalIncomeInfo; +import com.bingchuang.core.module_hall.income.bean.LiveTotalIncomeInfo; import java.util.List; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/IncomeModel.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/IncomeModel.java similarity index 91% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/income/IncomeModel.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/IncomeModel.java index 92e80cb74..73a86ce2f 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/IncomeModel.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/IncomeModel.java @@ -1,15 +1,15 @@ -package com.pikolive.core.module_hall.income; +package com.bingchuang.core.module_hall.income; -import com.pikolive.core.module_hall.income.bean.IncomeGiftInfo; -import com.pikolive.core.module_hall.income.bean.IncomeTotalInfo; -import com.pikolive.core.module_hall.income.bean.SingleRoomTotalIncomeInfo; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.module_hall.income.bean.ClanTotalIncomeInfo; -import com.pikolive.core.module_hall.income.bean.HallTotalIncomeInfo; -import com.pikolive.core.module_hall.income.bean.LiveTotalIncomeInfo; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.module_hall.income.bean.IncomeGiftInfo; +import com.bingchuang.core.module_hall.income.bean.IncomeTotalInfo; +import com.bingchuang.core.module_hall.income.bean.SingleRoomTotalIncomeInfo; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.module_hall.income.bean.ClanTotalIncomeInfo; +import com.bingchuang.core.module_hall.income.bean.HallTotalIncomeInfo; +import com.bingchuang.core.module_hall.income.bean.LiveTotalIncomeInfo; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import java.util.List; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/ClanIncomeInfo.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/bean/ClanIncomeInfo.java similarity index 86% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/ClanIncomeInfo.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/bean/ClanIncomeInfo.java index 8cf9a3d56..21e6b1561 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/ClanIncomeInfo.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/bean/ClanIncomeInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.module_hall.income.bean; +package com.bingchuang.core.module_hall.income.bean; import java.io.Serializable; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/ClanTotalIncomeInfo.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/bean/ClanTotalIncomeInfo.java similarity index 74% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/ClanTotalIncomeInfo.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/bean/ClanTotalIncomeInfo.java index fdba22983..ce092980b 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/ClanTotalIncomeInfo.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/bean/ClanTotalIncomeInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.module_hall.income.bean; +package com.bingchuang.core.module_hall.income.bean; import java.util.List; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/HallIncomeInfo.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/bean/HallIncomeInfo.java similarity index 99% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/HallIncomeInfo.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/bean/HallIncomeInfo.java index 2fcd32bf4..3dc3340ba 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/HallIncomeInfo.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/bean/HallIncomeInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.module_hall.income.bean; +package com.bingchuang.core.module_hall.income.bean; import java.io.Serializable; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/HallTotalIncomeInfo.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/bean/HallTotalIncomeInfo.java similarity index 97% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/HallTotalIncomeInfo.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/bean/HallTotalIncomeInfo.java index 4ddd59670..6e4ae54b5 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/HallTotalIncomeInfo.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/bean/HallTotalIncomeInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.module_hall.income.bean; +package com.bingchuang.core.module_hall.income.bean; import java.util.List; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/IncomeGiftInfo.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/bean/IncomeGiftInfo.java similarity index 84% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/IncomeGiftInfo.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/bean/IncomeGiftInfo.java index b2fc0bc9d..e94399e7b 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/IncomeGiftInfo.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/bean/IncomeGiftInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.module_hall.income.bean; +package com.bingchuang.core.module_hall.income.bean; import java.io.Serializable; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/IncomeInfo.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/bean/IncomeInfo.java similarity index 87% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/IncomeInfo.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/bean/IncomeInfo.java index 783a19ff4..8473fc406 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/IncomeInfo.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/bean/IncomeInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.module_hall.income.bean; +package com.bingchuang.core.module_hall.income.bean; import java.io.Serializable; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/IncomeTotalInfo.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/bean/IncomeTotalInfo.java similarity index 73% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/IncomeTotalInfo.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/bean/IncomeTotalInfo.java index ad177affe..6b915cfcc 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/IncomeTotalInfo.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/bean/IncomeTotalInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.module_hall.income.bean; +package com.bingchuang.core.module_hall.income.bean; import java.util.List; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/LiveIncomeInfo.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/bean/LiveIncomeInfo.java similarity index 86% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/LiveIncomeInfo.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/bean/LiveIncomeInfo.java index 017299e0c..6f35f4f8d 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/LiveIncomeInfo.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/bean/LiveIncomeInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.module_hall.income.bean; +package com.bingchuang.core.module_hall.income.bean; import java.io.Serializable; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/LiveTotalIncomeInfo.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/bean/LiveTotalIncomeInfo.java similarity index 75% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/LiveTotalIncomeInfo.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/bean/LiveTotalIncomeInfo.java index 1e7da64aa..901aeb91c 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/LiveTotalIncomeInfo.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/bean/LiveTotalIncomeInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.module_hall.income.bean; +package com.bingchuang.core.module_hall.income.bean; import java.util.List; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/SingleRoomIncomeInfo.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/bean/SingleRoomIncomeInfo.java similarity index 84% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/SingleRoomIncomeInfo.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/bean/SingleRoomIncomeInfo.java index 94a9c0b97..642b8aafb 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/SingleRoomIncomeInfo.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/bean/SingleRoomIncomeInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.module_hall.income.bean; +package com.bingchuang.core.module_hall.income.bean; import java.io.Serializable; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/SingleRoomTotalIncomeInfo.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/bean/SingleRoomTotalIncomeInfo.java similarity index 77% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/SingleRoomTotalIncomeInfo.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/bean/SingleRoomTotalIncomeInfo.java index 5714aca27..5ae1923ef 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/SingleRoomTotalIncomeInfo.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/bean/SingleRoomTotalIncomeInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.module_hall.income.bean; +package com.bingchuang.core.module_hall.income.bean; import java.util.List; diff --git a/core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/event/UpdateMemberListEvent.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/event/UpdateMemberListEvent.java new file mode 100644 index 000000000..3ad77db5a --- /dev/null +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/income/event/UpdateMemberListEvent.java @@ -0,0 +1,4 @@ +package com.bingchuang.core.module_hall.income.event; + +public class UpdateMemberListEvent { +} diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/secretcode/ISecretCodeModel.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/secretcode/ISecretCodeModel.java similarity index 63% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/secretcode/ISecretCodeModel.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/secretcode/ISecretCodeModel.java index 77b4d84d1..5c7595d99 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/secretcode/ISecretCodeModel.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/secretcode/ISecretCodeModel.java @@ -1,7 +1,7 @@ -package com.pikolive.core.module_hall.secretcode; +package com.bingchuang.core.module_hall.secretcode; -import com.pikolive.core.module_hall.secretcode.bean.CheckCodeResult; -import com.pikolive.core.module_hall.secretcode.bean.SecretCodeInfo; +import com.bingchuang.core.module_hall.secretcode.bean.CheckCodeResult; +import com.bingchuang.core.module_hall.secretcode.bean.SecretCodeInfo; import io.reactivex.Single; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/secretcode/SecretCodeModel.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/secretcode/SecretCodeModel.java similarity index 86% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/secretcode/SecretCodeModel.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/secretcode/SecretCodeModel.java index 58aeb0665..ff95d82ff 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/secretcode/SecretCodeModel.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/secretcode/SecretCodeModel.java @@ -1,13 +1,13 @@ -package com.pikolive.core.module_hall.secretcode; +package com.bingchuang.core.module_hall.secretcode; import com.google.gson.JsonElement; -import com.pikolive.core.module_hall.secretcode.bean.CheckCodeResult; -import com.pikolive.core.module_hall.secretcode.bean.SecretCodeInfo; -import com.pikolive.core.R; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.module_hall.secretcode.bean.CheckCodeResult; +import com.bingchuang.core.module_hall.secretcode.bean.SecretCodeInfo; +import com.bingchuang.core.R; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.utils.ResUtil; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/secretcode/bean/CheckCodeResult.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/secretcode/bean/CheckCodeResult.java similarity index 95% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/secretcode/bean/CheckCodeResult.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/secretcode/bean/CheckCodeResult.java index 7f72089a4..48b57fffb 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/secretcode/bean/CheckCodeResult.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/secretcode/bean/CheckCodeResult.java @@ -1,4 +1,4 @@ -package com.pikolive.core.module_hall.secretcode.bean; +package com.bingchuang.core.module_hall.secretcode.bean; import java.io.Serializable; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/secretcode/bean/SecretCodeInfo.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/secretcode/bean/SecretCodeInfo.java similarity index 91% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/secretcode/bean/SecretCodeInfo.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/secretcode/bean/SecretCodeInfo.java index 662f7d31b..8bbbf6e51 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/secretcode/bean/SecretCodeInfo.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/secretcode/bean/SecretCodeInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.module_hall.secretcode.bean; +package com.bingchuang.core.module_hall.secretcode.bean; import java.io.Serializable; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/team/HTeamModel.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/team/HTeamModel.java similarity index 95% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/team/HTeamModel.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/team/HTeamModel.java index 34b571e14..93b933930 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/team/HTeamModel.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/team/HTeamModel.java @@ -1,21 +1,21 @@ -package com.pikolive.core.module_hall.team; +package com.bingchuang.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.pikolive.core.module_hall.hall.HallModel; -import com.pikolive.core.module_hall.hall.bean.HTeamInfo; -import com.pikolive.core.module_hall.team.bean.HTeamChatLimit; -import com.pikolive.core.module_hall.team.event.HteamInfoUpdateInfoEvent; -import com.pikolive.core.module_hall.team.event.HteamListChangeEvent; -import com.pikolive.core.module_hall.team.event.HteamMemberNumChangeEvent; -import com.pikolive.core.R; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.module_hall.hall.bean.ListHTeamMember; -import com.pikolive.core.module_hall.hall.bean.ListMemberInfo; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.module_hall.hall.HallModel; +import com.bingchuang.core.module_hall.hall.bean.HTeamInfo; +import com.bingchuang.core.module_hall.team.bean.HTeamChatLimit; +import com.bingchuang.core.module_hall.team.event.HteamInfoUpdateInfoEvent; +import com.bingchuang.core.module_hall.team.event.HteamListChangeEvent; +import com.bingchuang.core.module_hall.team.event.HteamMemberNumChangeEvent; +import com.bingchuang.core.R; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.module_hall.hall.bean.ListHTeamMember; +import com.bingchuang.core.module_hall.hall.bean.ListMemberInfo; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.utils.ResUtil; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/team/IHTeamModel.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/team/IHTeamModel.java similarity index 89% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/team/IHTeamModel.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/team/IHTeamModel.java index 76fd00e9f..f7061d6f3 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/team/IHTeamModel.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/team/IHTeamModel.java @@ -1,9 +1,9 @@ -package com.pikolive.core.module_hall.team; +package com.bingchuang.core.module_hall.team; -import com.pikolive.core.module_hall.hall.bean.HTeamInfo; -import com.pikolive.core.module_hall.team.bean.HTeamChatLimit; -import com.pikolive.core.module_hall.hall.bean.ListHTeamMember; -import com.pikolive.core.module_hall.hall.bean.ListMemberInfo; +import com.bingchuang.core.module_hall.hall.bean.HTeamInfo; +import com.bingchuang.core.module_hall.team.bean.HTeamChatLimit; +import com.bingchuang.core.module_hall.hall.bean.ListHTeamMember; +import com.bingchuang.core.module_hall.hall.bean.ListMemberInfo; import java.util.List; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/team/bean/HTeamChatLimit.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/team/bean/HTeamChatLimit.java similarity index 85% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/team/bean/HTeamChatLimit.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/team/bean/HTeamChatLimit.java index 94d82377c..167743c92 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/team/bean/HTeamChatLimit.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/team/bean/HTeamChatLimit.java @@ -1,4 +1,4 @@ -package com.pikolive.core.module_hall.team.bean; +package com.bingchuang.core.module_hall.team.bean; import lombok.Data; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/team/bean/HTeamType.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/team/bean/HTeamType.java similarity index 77% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/team/bean/HTeamType.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/team/bean/HTeamType.java index 661570037..aa6ba4422 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/team/bean/HTeamType.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/team/bean/HTeamType.java @@ -1,4 +1,4 @@ -package com.pikolive.core.module_hall.team.bean; +package com.bingchuang.core.module_hall.team.bean; /** * 群类型 diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/team/event/HteamInfoUpdateInfoEvent.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/team/event/HteamInfoUpdateInfoEvent.java similarity index 56% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/team/event/HteamInfoUpdateInfoEvent.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/team/event/HteamInfoUpdateInfoEvent.java index 5c717e17a..7cb5de933 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/team/event/HteamInfoUpdateInfoEvent.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/team/event/HteamInfoUpdateInfoEvent.java @@ -1,7 +1,7 @@ -package com.pikolive.core.module_hall.team.event; +package com.bingchuang.core.module_hall.team.event; -import com.pikolive.core.module_hall.hall.bean.HTeamInfo; -import com.pikolive.core.base.BaseBusEvent; +import com.bingchuang.core.module_hall.hall.bean.HTeamInfo; +import com.bingchuang.core.base.BaseBusEvent; /** * Created by lvzebiao on 2019/1/15. diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/team/event/HteamListChangeEvent.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/team/event/HteamListChangeEvent.java similarity index 69% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/team/event/HteamListChangeEvent.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/team/event/HteamListChangeEvent.java index 21e3b4abe..ccc4ea878 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/team/event/HteamListChangeEvent.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/team/event/HteamListChangeEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.module_hall.team.event; +package com.bingchuang.core.module_hall.team.event; /** * 厅群列表改变的事件 diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/team/event/HteamMemberNumChangeEvent.java b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/team/event/HteamMemberNumChangeEvent.java similarity index 69% rename from core/src/model_labour_union/java/com/pikolive/core/module_hall/team/event/HteamMemberNumChangeEvent.java rename to core/src/model_labour_union/java/com/bingchuang/core/module_hall/team/event/HteamMemberNumChangeEvent.java index ce4026888..f89704284 100644 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/team/event/HteamMemberNumChangeEvent.java +++ b/core/src/model_labour_union/java/com/bingchuang/core/module_hall/team/event/HteamMemberNumChangeEvent.java @@ -1,6 +1,6 @@ -package com.pikolive.core.module_hall.team.event; +package com.bingchuang.core.module_hall.team.event; -import com.pikolive.core.base.BaseBusEvent; +import com.bingchuang.core.base.BaseBusEvent; /** * 厅群的成员变动事件 diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/AuthListResult.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/AuthListResult.java deleted file mode 100644 index c0f130c90..000000000 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/AuthListResult.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.pikolive.core.module_hall.hall.bean; - -import com.pikolive.core.bean.response.ServiceResult; - -import java.util.List; - -public class AuthListResult extends ServiceResult
> { -} diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/HallMenuByUidResult.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/HallMenuByUidResult.java deleted file mode 100644 index 4eec8258e..000000000 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/HallMenuByUidResult.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.pikolive.core.module_hall.hall.bean; - -import com.pikolive.core.bean.response.ServiceResult; - -import java.util.List; - -public class HallMenuByUidResult extends ServiceResult
> { -} diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/event/UpdateMemberListEvent.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/event/UpdateMemberListEvent.java deleted file mode 100644 index 724e19ec5..000000000 --- a/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/event/UpdateMemberListEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pikolive.core.module_hall.income.event; - -public class UpdateMemberListEvent { -} diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringApprenticeMissionFourAttachment.java b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/attachment/MentoringApprenticeMissionFourAttachment.java similarity index 73% rename from core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringApprenticeMissionFourAttachment.java rename to core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/attachment/MentoringApprenticeMissionFourAttachment.java index 015851b48..d76198c13 100644 --- a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringApprenticeMissionFourAttachment.java +++ b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/attachment/MentoringApprenticeMissionFourAttachment.java @@ -1,6 +1,6 @@ -package com.pikolive.core.mentoring_relationship.attachment; +package com.bingchuang.core.mentoring_relationship.attachment; -import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.im.custom.bean.CustomAttachment; public class MentoringApprenticeMissionFourAttachment extends MentoringMasterMissionFourAttachment { diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringApprenticeMissionOneAttachment.java b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/attachment/MentoringApprenticeMissionOneAttachment.java similarity index 82% rename from core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringApprenticeMissionOneAttachment.java rename to core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/attachment/MentoringApprenticeMissionOneAttachment.java index b5345db40..9fe2543de 100644 --- a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringApprenticeMissionOneAttachment.java +++ b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/attachment/MentoringApprenticeMissionOneAttachment.java @@ -1,4 +1,4 @@ -package com.pikolive.core.mentoring_relationship.attachment; +package com.bingchuang.core.mentoring_relationship.attachment; public class MentoringApprenticeMissionOneAttachment extends MentoringMasterMissionOneAttachment { diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringApprenticeMissionThreeAttachment.java b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/attachment/MentoringApprenticeMissionThreeAttachment.java similarity index 82% rename from core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringApprenticeMissionThreeAttachment.java rename to core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/attachment/MentoringApprenticeMissionThreeAttachment.java index 5040af1d6..c45e69977 100644 --- a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringApprenticeMissionThreeAttachment.java +++ b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/attachment/MentoringApprenticeMissionThreeAttachment.java @@ -1,10 +1,10 @@ -package com.pikolive.core.mentoring_relationship.attachment; +package com.bingchuang.core.mentoring_relationship.attachment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; -import com.pikolive.core.mentoring_relationship.bean.MissionVo; -import com.pikolive.core.mentoring_relationship.bean.SimpleGiftVo; +import com.bingchuang.core.mentoring_relationship.bean.MissionVo; +import com.bingchuang.core.mentoring_relationship.bean.SimpleGiftVo; public class MentoringApprenticeMissionThreeAttachment extends MentoringMasterMissionThreeAttachment { diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringApprenticeMissionTwoAttachment.java b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/attachment/MentoringApprenticeMissionTwoAttachment.java similarity index 82% rename from core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringApprenticeMissionTwoAttachment.java rename to core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/attachment/MentoringApprenticeMissionTwoAttachment.java index 6e269e3e5..ea985b34e 100644 --- a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringApprenticeMissionTwoAttachment.java +++ b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/attachment/MentoringApprenticeMissionTwoAttachment.java @@ -1,4 +1,4 @@ -package com.pikolive.core.mentoring_relationship.attachment; +package com.bingchuang.core.mentoring_relationship.attachment; public class MentoringApprenticeMissionTwoAttachment extends MentoringMasterMissionTwoAttachment { diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringGrabApprenticesAttachment.java b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/attachment/MentoringGrabApprenticesAttachment.java similarity index 70% rename from core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringGrabApprenticesAttachment.java rename to core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/attachment/MentoringGrabApprenticesAttachment.java index 9d0b4bb36..2b6fc7616 100644 --- a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringGrabApprenticesAttachment.java +++ b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/attachment/MentoringGrabApprenticesAttachment.java @@ -1,11 +1,11 @@ -package com.pikolive.core.mentoring_relationship.attachment; +package com.bingchuang.core.mentoring_relationship.attachment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.pikolive.core.mentoring_relationship.bean.GrabApprenticesMissionInfo; -import com.pikolive.core.mentoring_relationship.bean.GrabApprenticesMissionInfo; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.mentoring_relationship.bean.GrabApprenticesMissionInfo; +import com.bingchuang.core.mentoring_relationship.bean.GrabApprenticesMissionInfo; +import com.bingchuang.core.mentoring_relationship.bean.GrabApprenticesMissionInfo; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.mentoring_relationship.bean.GrabApprenticesMissionInfo; public class MentoringGrabApprenticesAttachment extends CustomAttachment { diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringMasterMissionFourAttachment.java b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/attachment/MentoringMasterMissionFourAttachment.java similarity index 81% rename from core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringMasterMissionFourAttachment.java rename to core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/attachment/MentoringMasterMissionFourAttachment.java index f57a13dab..4b5315b57 100644 --- a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringMasterMissionFourAttachment.java +++ b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/attachment/MentoringMasterMissionFourAttachment.java @@ -1,9 +1,9 @@ -package com.pikolive.core.mentoring_relationship.attachment; +package com.bingchuang.core.mentoring_relationship.attachment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.mentoring_relationship.bean.MissionVo; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.mentoring_relationship.bean.MissionVo; public class MentoringMasterMissionFourAttachment extends CustomAttachment { diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringMasterMissionOneAttachment.java b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/attachment/MentoringMasterMissionOneAttachment.java similarity index 66% rename from core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringMasterMissionOneAttachment.java rename to core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/attachment/MentoringMasterMissionOneAttachment.java index 5988b66cb..c35946b4e 100644 --- a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringMasterMissionOneAttachment.java +++ b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/attachment/MentoringMasterMissionOneAttachment.java @@ -1,15 +1,15 @@ -package com.pikolive.core.mentoring_relationship.attachment; +package com.bingchuang.core.mentoring_relationship.attachment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; -import com.pikolive.core.mentoring_relationship.bean.MissionVo; -import com.pikolive.core.mentoring_relationship.bean.SimpleUserVo; -import com.pikolive.core.mentoring_relationship.bean.MissionVo; -import com.pikolive.core.mentoring_relationship.bean.SimpleUserVo; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.mentoring_relationship.bean.MissionVo; -import com.pikolive.core.mentoring_relationship.bean.SimpleUserVo; +import com.bingchuang.core.mentoring_relationship.bean.MissionVo; +import com.bingchuang.core.mentoring_relationship.bean.SimpleUserVo; +import com.bingchuang.core.mentoring_relationship.bean.MissionVo; +import com.bingchuang.core.mentoring_relationship.bean.SimpleUserVo; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.mentoring_relationship.bean.MissionVo; +import com.bingchuang.core.mentoring_relationship.bean.SimpleUserVo; public class MentoringMasterMissionOneAttachment extends CustomAttachment { diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringMasterMissionThreeAttachment.java b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/attachment/MentoringMasterMissionThreeAttachment.java similarity index 72% rename from core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringMasterMissionThreeAttachment.java rename to core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/attachment/MentoringMasterMissionThreeAttachment.java index 49834fa42..2f3ccdfc4 100644 --- a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringMasterMissionThreeAttachment.java +++ b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/attachment/MentoringMasterMissionThreeAttachment.java @@ -1,11 +1,11 @@ -package com.pikolive.core.mentoring_relationship.attachment; +package com.bingchuang.core.mentoring_relationship.attachment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.pikolive.core.mentoring_relationship.bean.MissionVo; -import com.pikolive.core.mentoring_relationship.bean.MissionVo; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.mentoring_relationship.bean.MissionVo; +import com.bingchuang.core.mentoring_relationship.bean.MissionVo; +import com.bingchuang.core.mentoring_relationship.bean.MissionVo; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.mentoring_relationship.bean.MissionVo; public class MentoringMasterMissionThreeAttachment extends CustomAttachment { diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringMasterMissionTwoAttachment.java b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/attachment/MentoringMasterMissionTwoAttachment.java similarity index 80% rename from core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringMasterMissionTwoAttachment.java rename to core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/attachment/MentoringMasterMissionTwoAttachment.java index b95261651..0e6b09980 100644 --- a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringMasterMissionTwoAttachment.java +++ b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/attachment/MentoringMasterMissionTwoAttachment.java @@ -1,11 +1,11 @@ -package com.pikolive.core.mentoring_relationship.attachment; +package com.bingchuang.core.mentoring_relationship.attachment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; -import com.pikolive.core.mentoring_relationship.bean.MissionVo; -import com.pikolive.core.mentoring_relationship.bean.SimpleGiftVo; -import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.mentoring_relationship.bean.MissionVo; +import com.bingchuang.core.mentoring_relationship.bean.SimpleGiftVo; +import com.bingchuang.core.im.custom.bean.CustomAttachment; public class MentoringMasterMissionTwoAttachment extends CustomAttachment { diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringMissionTipsAttachment.java b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/attachment/MentoringMissionTipsAttachment.java similarity index 71% rename from core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringMissionTipsAttachment.java rename to core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/attachment/MentoringMissionTipsAttachment.java index 0f9b70de3..5245a90e1 100644 --- a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringMissionTipsAttachment.java +++ b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/attachment/MentoringMissionTipsAttachment.java @@ -1,11 +1,11 @@ -package com.pikolive.core.mentoring_relationship.attachment; +package com.bingchuang.core.mentoring_relationship.attachment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.pikolive.core.mentoring_relationship.bean.MentoringTipsInfo; -import com.pikolive.core.mentoring_relationship.bean.MentoringTipsInfo; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.mentoring_relationship.bean.MentoringTipsInfo; +import com.bingchuang.core.mentoring_relationship.bean.MentoringTipsInfo; +import com.bingchuang.core.mentoring_relationship.bean.MentoringTipsInfo; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.mentoring_relationship.bean.MentoringTipsInfo; public class MentoringMissionTipsAttachment extends CustomAttachment { diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringSharingRoomAttachment.java b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/attachment/MentoringSharingRoomAttachment.java similarity index 83% rename from core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringSharingRoomAttachment.java rename to core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/attachment/MentoringSharingRoomAttachment.java index f6fa44d00..f1371c7a7 100644 --- a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringSharingRoomAttachment.java +++ b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/attachment/MentoringSharingRoomAttachment.java @@ -1,9 +1,9 @@ -package com.pikolive.core.mentoring_relationship.attachment; +package com.bingchuang.core.mentoring_relationship.attachment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.pikolive.core.mentoring_relationship.bean.MentoringSharingRoomInfo; -import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.mentoring_relationship.bean.MentoringSharingRoomInfo; +import com.bingchuang.core.im.custom.bean.CustomAttachment; public class MentoringSharingRoomAttachment extends CustomAttachment { diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/GrabApprenticesInfo.kt b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/bean/GrabApprenticesInfo.kt similarity index 85% rename from core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/GrabApprenticesInfo.kt rename to core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/bean/GrabApprenticesInfo.kt index cbd0c2437..0bb9f689c 100644 --- a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/GrabApprenticesInfo.kt +++ b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/bean/GrabApprenticesInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.mentoring_relationship.bean +package com.bingchuang.core.mentoring_relationship.bean data class GrabApprenticesInfo( /** @@ -6,7 +6,7 @@ data class GrabApprenticesInfo( */ val uid: Long = 0L, /** - * Peko号 + * Peki号 */ val erbanNo: Long = 0L, /** diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/GrabApprenticesMissionInfo.kt b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/bean/GrabApprenticesMissionInfo.kt similarity index 73% rename from core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/GrabApprenticesMissionInfo.kt rename to core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/bean/GrabApprenticesMissionInfo.kt index 69e5ffefe..dc481e635 100644 --- a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/GrabApprenticesMissionInfo.kt +++ b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/bean/GrabApprenticesMissionInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.mentoring_relationship.bean +package com.bingchuang.core.mentoring_relationship.bean data class GrabApprenticesMissionInfo( /** diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/MentoringRankingDataInfo.kt b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/bean/MentoringRankingDataInfo.kt similarity index 99% rename from core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/MentoringRankingDataInfo.kt rename to core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/bean/MentoringRankingDataInfo.kt index e8c987bcc..45e89d6ba 100644 --- a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/MentoringRankingDataInfo.kt +++ b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/bean/MentoringRankingDataInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.mentoring_relationship.bean +package com.bingchuang.core.mentoring_relationship.bean data class MentoringRankingDataInfo( /** diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/MentoringResultMarqueeInfo.java b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/bean/MentoringResultMarqueeInfo.java similarity index 85% rename from core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/MentoringResultMarqueeInfo.java rename to core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/bean/MentoringResultMarqueeInfo.java index 87d094ab1..aa8bbd636 100644 --- a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/MentoringResultMarqueeInfo.java +++ b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/bean/MentoringResultMarqueeInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.mentoring_relationship.bean; +package com.bingchuang.core.mentoring_relationship.bean; import lombok.Data; diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/MentoringSharingRoomInfo.java b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/bean/MentoringSharingRoomInfo.java similarity index 90% rename from core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/MentoringSharingRoomInfo.java rename to core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/bean/MentoringSharingRoomInfo.java index 720e6667e..a18973684 100644 --- a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/MentoringSharingRoomInfo.java +++ b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/bean/MentoringSharingRoomInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.mentoring_relationship.bean; +package com.bingchuang.core.mentoring_relationship.bean; import java.io.Serializable; diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/MentoringTipsInfo.kt b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/bean/MentoringTipsInfo.kt similarity index 82% rename from core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/MentoringTipsInfo.kt rename to core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/bean/MentoringTipsInfo.kt index 85c7b7342..3268a6f4d 100644 --- a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/MentoringTipsInfo.kt +++ b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/bean/MentoringTipsInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.mentoring_relationship.bean +package com.bingchuang.core.mentoring_relationship.bean import java.io.Serializable diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/MentoringUserInfo.kt b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/bean/MentoringUserInfo.kt similarity index 97% rename from core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/MentoringUserInfo.kt rename to core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/bean/MentoringUserInfo.kt index 4e4f8c5e9..fe5a5db45 100644 --- a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/MentoringUserInfo.kt +++ b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/bean/MentoringUserInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.mentoring_relationship.bean +package com.bingchuang.core.mentoring_relationship.bean data class MentoringUserInfo( /** diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/MissionVo.kt b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/bean/MissionVo.kt similarity index 92% rename from core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/MissionVo.kt rename to core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/bean/MissionVo.kt index d2b331c02..8a836d300 100644 --- a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/MissionVo.kt +++ b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/bean/MissionVo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.mentoring_relationship.bean +package com.bingchuang.core.mentoring_relationship.bean import java.io.Serializable diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/PickUpApprenticeInfo.kt b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/bean/PickUpApprenticeInfo.kt similarity index 85% rename from core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/PickUpApprenticeInfo.kt rename to core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/bean/PickUpApprenticeInfo.kt index 5541f5314..c01b3b61f 100644 --- a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/PickUpApprenticeInfo.kt +++ b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/bean/PickUpApprenticeInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.mentoring_relationship.bean +package com.bingchuang.core.mentoring_relationship.bean data class PickUpApprenticeInfo( /** diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/SimpleGiftVo.java b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/bean/SimpleGiftVo.java similarity index 85% rename from core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/SimpleGiftVo.java rename to core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/bean/SimpleGiftVo.java index bc90c3479..91ae1bb02 100644 --- a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/SimpleGiftVo.java +++ b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/bean/SimpleGiftVo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.mentoring_relationship.bean; +package com.bingchuang.core.mentoring_relationship.bean; import java.io.Serializable; diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/SimpleUserVo.kt b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/bean/SimpleUserVo.kt similarity index 85% rename from core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/SimpleUserVo.kt rename to core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/bean/SimpleUserVo.kt index 864fe74a8..a26daa5d4 100644 --- a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/SimpleUserVo.kt +++ b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/bean/SimpleUserVo.kt @@ -1,4 +1,4 @@ -package com.pikolive.core.mentoring_relationship.bean +package com.bingchuang.core.mentoring_relationship.bean import java.io.Serializable @@ -12,7 +12,7 @@ data class SimpleUserVo( val uid: Long = 0L, /** - * Peko号 + * Peki号 */ val erbanNo: Long = 0L, diff --git a/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/event/GrabApprenticesDataEvent.java b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/event/GrabApprenticesDataEvent.java new file mode 100644 index 000000000..76bd5f468 --- /dev/null +++ b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/event/GrabApprenticesDataEvent.java @@ -0,0 +1,18 @@ +package com.bingchuang.core.mentoring_relationship.event; + +import com.bingchuang.core.mentoring_relationship.bean.GrabApprenticesInfo; +import com.bingchuang.core.mentoring_relationship.bean.GrabApprenticesInfo; +import com.bingchuang.core.mentoring_relationship.bean.GrabApprenticesInfo; + +import java.util.List; + +import lombok.Data; + +/** + * 抢徒弟消息到达时,消息页数据更新 + */ +@Data +public class GrabApprenticesDataEvent { + + private List
grabApprenticesInfoList; +} diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/GrabApprenticesEvent.java b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/event/GrabApprenticesEvent.java similarity index 67% rename from core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/GrabApprenticesEvent.java rename to core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/event/GrabApprenticesEvent.java index 3f2e9e811..886e6c916 100644 --- a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/GrabApprenticesEvent.java +++ b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/event/GrabApprenticesEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.mentoring_relationship.event; +package com.bingchuang.core.mentoring_relationship.event; /** * 抢徒弟消息到达时,在顶部出现一个 dialog 作为提示 diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/MentoringCountingEvent.java b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/event/MentoringCountingEvent.java similarity index 86% rename from core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/MentoringCountingEvent.java rename to core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/event/MentoringCountingEvent.java index 8a932022a..1e0ec175f 100644 --- a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/MentoringCountingEvent.java +++ b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/event/MentoringCountingEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.mentoring_relationship.event; +package com.bingchuang.core.mentoring_relationship.event; import lombok.Data; diff --git a/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/event/MentoringCountingFinishEvent.java b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/event/MentoringCountingFinishEvent.java new file mode 100644 index 000000000..ea1229270 --- /dev/null +++ b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/event/MentoringCountingFinishEvent.java @@ -0,0 +1,4 @@ +package com.bingchuang.core.mentoring_relationship.event; + +public class MentoringCountingFinishEvent { +} diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/MentoringRelationshipMissionEvent.java b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/event/MentoringRelationshipMissionEvent.java similarity index 77% rename from core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/MentoringRelationshipMissionEvent.java rename to core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/event/MentoringRelationshipMissionEvent.java index 5e109921f..12f5b938b 100644 --- a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/MentoringRelationshipMissionEvent.java +++ b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/event/MentoringRelationshipMissionEvent.java @@ -1,6 +1,6 @@ -package com.pikolive.core.mentoring_relationship.event; +package com.bingchuang.core.mentoring_relationship.event; -import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.im.custom.bean.CustomAttachment; import lombok.Data; diff --git a/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/event/MentoringStartCountingEvent.java b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/event/MentoringStartCountingEvent.java new file mode 100644 index 000000000..7cf675317 --- /dev/null +++ b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/event/MentoringStartCountingEvent.java @@ -0,0 +1,4 @@ +package com.bingchuang.core.mentoring_relationship.event; + +public class MentoringStartCountingEvent { +} diff --git a/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/event/MentoringStopCountingEvent.java b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/event/MentoringStopCountingEvent.java new file mode 100644 index 000000000..02324acbf --- /dev/null +++ b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/event/MentoringStopCountingEvent.java @@ -0,0 +1,4 @@ +package com.bingchuang.core.mentoring_relationship.event; + +public class MentoringStopCountingEvent { +} diff --git a/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/event/MentoringSuccessEvent.java b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/event/MentoringSuccessEvent.java new file mode 100644 index 000000000..c30f5d67a --- /dev/null +++ b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/event/MentoringSuccessEvent.java @@ -0,0 +1,4 @@ +package com.bingchuang.core.mentoring_relationship.event; + +public class MentoringSuccessEvent { +} diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/exception/MentoringAlreadyHasMasterException.java b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/exception/MentoringAlreadyHasMasterException.java similarity index 84% rename from core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/exception/MentoringAlreadyHasMasterException.java rename to core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/exception/MentoringAlreadyHasMasterException.java index 10c0ffd50..1c51b1614 100644 --- a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/exception/MentoringAlreadyHasMasterException.java +++ b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/exception/MentoringAlreadyHasMasterException.java @@ -1,4 +1,4 @@ -package com.pikolive.core.mentoring_relationship.exception; +package com.bingchuang.core.mentoring_relationship.exception; public class MentoringAlreadyHasMasterException extends Exception { diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/exception/MentoringCanNotPickUpApprenticeException.java b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/exception/MentoringCanNotPickUpApprenticeException.java similarity index 55% rename from core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/exception/MentoringCanNotPickUpApprenticeException.java rename to core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/exception/MentoringCanNotPickUpApprenticeException.java index f5711dc50..f5c946e21 100644 --- a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/exception/MentoringCanNotPickUpApprenticeException.java +++ b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/exception/MentoringCanNotPickUpApprenticeException.java @@ -1,4 +1,4 @@ -package com.pikolive.core.mentoring_relationship.exception; +package com.bingchuang.core.mentoring_relationship.exception; public class MentoringCanNotPickUpApprenticeException extends Exception { } diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/exception/MentoringLessThanFiveMinutesException.java b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/exception/MentoringLessThanFiveMinutesException.java similarity index 82% rename from core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/exception/MentoringLessThanFiveMinutesException.java rename to core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/exception/MentoringLessThanFiveMinutesException.java index 7239c2afd..df19a38e5 100644 --- a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/exception/MentoringLessThanFiveMinutesException.java +++ b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/exception/MentoringLessThanFiveMinutesException.java @@ -1,4 +1,4 @@ -package com.pikolive.core.mentoring_relationship.exception; +package com.bingchuang.core.mentoring_relationship.exception; public class MentoringLessThanFiveMinutesException extends Exception { diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/exception/MentoringMissionExpiredException.java b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/exception/MentoringMissionExpiredException.java similarity index 81% rename from core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/exception/MentoringMissionExpiredException.java rename to core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/exception/MentoringMissionExpiredException.java index d176b0814..fef01c285 100644 --- a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/exception/MentoringMissionExpiredException.java +++ b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/exception/MentoringMissionExpiredException.java @@ -1,4 +1,4 @@ -package com.pikolive.core.mentoring_relationship.exception; +package com.bingchuang.core.mentoring_relationship.exception; public class MentoringMissionExpiredException extends Exception { diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/model/IMentoringRelationshipModel.java b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/model/IMentoringRelationshipModel.java similarity index 72% rename from core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/model/IMentoringRelationshipModel.java rename to core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/model/IMentoringRelationshipModel.java index abc5a6020..d76ea4241 100644 --- a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/model/IMentoringRelationshipModel.java +++ b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/model/IMentoringRelationshipModel.java @@ -1,12 +1,12 @@ -package com.pikolive.core.mentoring_relationship.model; +package com.bingchuang.core.mentoring_relationship.model; -import com.pikolive.core.mentoring_relationship.bean.MentoringRankingDataInfo; -import com.pikolive.core.mentoring_relationship.bean.MentoringResultMarqueeInfo; -import com.pikolive.core.mentoring_relationship.bean.MentoringUserInfo; -import com.pikolive.core.mentoring_relationship.bean.PickUpApprenticeInfo; -import com.pikolive.core.base.IModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.gift.bean.GiftReceiveInfo; +import com.bingchuang.core.mentoring_relationship.bean.MentoringRankingDataInfo; +import com.bingchuang.core.mentoring_relationship.bean.MentoringResultMarqueeInfo; +import com.bingchuang.core.mentoring_relationship.bean.MentoringUserInfo; +import com.bingchuang.core.mentoring_relationship.bean.PickUpApprenticeInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.gift.bean.GiftReceiveInfo; import java.util.List; diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/model/MentoringRelationshipModel.java b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/model/MentoringRelationshipModel.java similarity index 92% rename from core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/model/MentoringRelationshipModel.java rename to core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/model/MentoringRelationshipModel.java index 9959ef24b..657d6c902 100644 --- a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/model/MentoringRelationshipModel.java +++ b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/model/MentoringRelationshipModel.java @@ -1,4 +1,4 @@ -package com.pikolive.core.mentoring_relationship.model; +package com.bingchuang.core.mentoring_relationship.model; import android.os.CountDownTimer; import android.util.Log; @@ -8,50 +8,50 @@ 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.pikolive.core.mentoring_relationship.attachment.MentoringApprenticeMissionFourAttachment; -import com.pikolive.core.mentoring_relationship.attachment.MentoringApprenticeMissionOneAttachment; -import com.pikolive.core.mentoring_relationship.attachment.MentoringApprenticeMissionThreeAttachment; -import com.pikolive.core.mentoring_relationship.attachment.MentoringApprenticeMissionTwoAttachment; -import com.pikolive.core.mentoring_relationship.attachment.MentoringGrabApprenticesAttachment; -import com.pikolive.core.mentoring_relationship.attachment.MentoringMasterMissionFourAttachment; -import com.pikolive.core.mentoring_relationship.attachment.MentoringMasterMissionOneAttachment; -import com.pikolive.core.mentoring_relationship.attachment.MentoringMasterMissionThreeAttachment; -import com.pikolive.core.mentoring_relationship.attachment.MentoringMasterMissionTwoAttachment; -import com.pikolive.core.mentoring_relationship.attachment.MentoringMissionTipsAttachment; -import com.pikolive.core.mentoring_relationship.bean.GrabApprenticesInfo; -import com.pikolive.core.mentoring_relationship.bean.GrabApprenticesMissionInfo; -import com.pikolive.core.mentoring_relationship.bean.MentoringRankingDataInfo; -import com.pikolive.core.mentoring_relationship.bean.MentoringResultMarqueeInfo; -import com.pikolive.core.mentoring_relationship.bean.MentoringTipsInfo; -import com.pikolive.core.mentoring_relationship.bean.MentoringUserInfo; -import com.pikolive.core.mentoring_relationship.bean.MissionVo; -import com.pikolive.core.mentoring_relationship.bean.PickUpApprenticeInfo; -import com.pikolive.core.mentoring_relationship.bean.SimpleGiftVo; -import com.pikolive.core.mentoring_relationship.bean.SimpleUserVo; -import com.pikolive.core.mentoring_relationship.event.MentoringCountingEvent; -import com.pikolive.core.mentoring_relationship.event.MentoringCountingFinishEvent; -import com.pikolive.core.mentoring_relationship.event.MentoringStartCountingEvent; -import com.pikolive.core.mentoring_relationship.event.MentoringSuccessEvent; -import com.pikolive.core.Constants; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.auth.event.LogoutEvent; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.exception.FailReasonException; -import com.pikolive.core.exception.UnKnowException; -import com.pikolive.core.gift.bean.GiftReceiveInfo; -import com.pikolive.core.gift.exception.GiftOutOfDateException; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.mentoring_relationship.event.GrabApprenticesDataEvent; -import com.pikolive.core.mentoring_relationship.event.GrabApprenticesEvent; -import com.pikolive.core.mentoring_relationship.event.MentoringRelationshipMissionEvent; -import com.pikolive.core.mentoring_relationship.event.MentoringStopCountingEvent; -import com.pikolive.core.msg.sys.ErbanSysMsgInfo; -import com.pikolive.core.utils.SharedPreferenceUtils; -import com.pikolive.core.utils.net.BalanceNotEnoughExeption; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.mentoring_relationship.attachment.MentoringApprenticeMissionFourAttachment; +import com.bingchuang.core.mentoring_relationship.attachment.MentoringApprenticeMissionOneAttachment; +import com.bingchuang.core.mentoring_relationship.attachment.MentoringApprenticeMissionThreeAttachment; +import com.bingchuang.core.mentoring_relationship.attachment.MentoringApprenticeMissionTwoAttachment; +import com.bingchuang.core.mentoring_relationship.attachment.MentoringGrabApprenticesAttachment; +import com.bingchuang.core.mentoring_relationship.attachment.MentoringMasterMissionFourAttachment; +import com.bingchuang.core.mentoring_relationship.attachment.MentoringMasterMissionOneAttachment; +import com.bingchuang.core.mentoring_relationship.attachment.MentoringMasterMissionThreeAttachment; +import com.bingchuang.core.mentoring_relationship.attachment.MentoringMasterMissionTwoAttachment; +import com.bingchuang.core.mentoring_relationship.attachment.MentoringMissionTipsAttachment; +import com.bingchuang.core.mentoring_relationship.bean.GrabApprenticesInfo; +import com.bingchuang.core.mentoring_relationship.bean.GrabApprenticesMissionInfo; +import com.bingchuang.core.mentoring_relationship.bean.MentoringRankingDataInfo; +import com.bingchuang.core.mentoring_relationship.bean.MentoringResultMarqueeInfo; +import com.bingchuang.core.mentoring_relationship.bean.MentoringTipsInfo; +import com.bingchuang.core.mentoring_relationship.bean.MentoringUserInfo; +import com.bingchuang.core.mentoring_relationship.bean.MissionVo; +import com.bingchuang.core.mentoring_relationship.bean.PickUpApprenticeInfo; +import com.bingchuang.core.mentoring_relationship.bean.SimpleGiftVo; +import com.bingchuang.core.mentoring_relationship.bean.SimpleUserVo; +import com.bingchuang.core.mentoring_relationship.event.MentoringCountingEvent; +import com.bingchuang.core.mentoring_relationship.event.MentoringCountingFinishEvent; +import com.bingchuang.core.mentoring_relationship.event.MentoringStartCountingEvent; +import com.bingchuang.core.mentoring_relationship.event.MentoringSuccessEvent; +import com.bingchuang.core.Constants; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.auth.event.LogoutEvent; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.exception.FailReasonException; +import com.bingchuang.core.exception.UnKnowException; +import com.bingchuang.core.gift.bean.GiftReceiveInfo; +import com.bingchuang.core.gift.exception.GiftOutOfDateException; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.mentoring_relationship.event.GrabApprenticesDataEvent; +import com.bingchuang.core.mentoring_relationship.event.GrabApprenticesEvent; +import com.bingchuang.core.mentoring_relationship.event.MentoringRelationshipMissionEvent; +import com.bingchuang.core.mentoring_relationship.event.MentoringStopCountingEvent; +import com.bingchuang.core.msg.sys.ErbanSysMsgInfo; +import com.bingchuang.core.utils.SharedPreferenceUtils; +import com.bingchuang.core.utils.net.BalanceNotEnoughExeption; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.rxbus.RxBus; diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/view/IMentoringRelationshipView.java b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/view/IMentoringRelationshipView.java similarity index 80% rename from core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/view/IMentoringRelationshipView.java rename to core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/view/IMentoringRelationshipView.java index b5eeeee23..76a20f75f 100644 --- a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/view/IMentoringRelationshipView.java +++ b/core/src/model_mentoring_relationship/java/com/bingchuang/core/mentoring_relationship/view/IMentoringRelationshipView.java @@ -1,9 +1,9 @@ -package com.pikolive.core.mentoring_relationship.view; +package com.bingchuang.core.mentoring_relationship.view; -import com.pikolive.core.mentoring_relationship.bean.MentoringRankingDataInfo; -import com.pikolive.core.mentoring_relationship.bean.MentoringResultMarqueeInfo; -import com.pikolive.core.mentoring_relationship.bean.MentoringUserInfo; -import com.pikolive.core.mentoring_relationship.bean.PickUpApprenticeInfo; +import com.bingchuang.core.mentoring_relationship.bean.MentoringRankingDataInfo; +import com.bingchuang.core.mentoring_relationship.bean.MentoringResultMarqueeInfo; +import com.bingchuang.core.mentoring_relationship.bean.MentoringUserInfo; +import com.bingchuang.core.mentoring_relationship.bean.PickUpApprenticeInfo; import com.bingchuang.library.base.IMvpBaseView; import java.util.List; diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/GrabApprenticesDataEvent.java b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/GrabApprenticesDataEvent.java deleted file mode 100644 index b839d70ee..000000000 --- a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/GrabApprenticesDataEvent.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.pikolive.core.mentoring_relationship.event; - -import com.pikolive.core.mentoring_relationship.bean.GrabApprenticesInfo; -import com.pikolive.core.mentoring_relationship.bean.GrabApprenticesInfo; -import com.pikolive.core.mentoring_relationship.bean.GrabApprenticesInfo; - -import java.util.List; - -import lombok.Data; - -/** - * 抢徒弟消息到达时,消息页数据更新 - */ -@Data -public class GrabApprenticesDataEvent { - - private List grabApprenticesInfoList; -} diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/MentoringCountingFinishEvent.java b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/MentoringCountingFinishEvent.java deleted file mode 100644 index c72b3cf4d..000000000 --- a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/MentoringCountingFinishEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pikolive.core.mentoring_relationship.event; - -public class MentoringCountingFinishEvent { -} diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/MentoringStartCountingEvent.java b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/MentoringStartCountingEvent.java deleted file mode 100644 index 38357f09f..000000000 --- a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/MentoringStartCountingEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pikolive.core.mentoring_relationship.event; - -public class MentoringStartCountingEvent { -} diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/MentoringStopCountingEvent.java b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/MentoringStopCountingEvent.java deleted file mode 100644 index 8da62d2f3..000000000 --- a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/MentoringStopCountingEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pikolive.core.mentoring_relationship.event; - -public class MentoringStopCountingEvent { -} diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/MentoringSuccessEvent.java b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/MentoringSuccessEvent.java deleted file mode 100644 index 118e6c00c..000000000 --- a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/MentoringSuccessEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pikolive.core.mentoring_relationship.event; - -public class MentoringSuccessEvent { -} diff --git a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/AudioPartyInfo.java b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/AudioPartyInfo.java similarity index 92% rename from core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/AudioPartyInfo.java rename to core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/AudioPartyInfo.java index 077a31c81..8923ffb5d 100644 --- a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/AudioPartyInfo.java +++ b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/AudioPartyInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.miniworld.bean; +package com.bingchuang.core.miniworld.bean; import java.io.Serializable; diff --git a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/AudioPartyItem.java b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/AudioPartyItem.java similarity index 97% rename from core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/AudioPartyItem.java rename to core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/AudioPartyItem.java index 8d5ae83c0..035226b9a 100644 --- a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/AudioPartyItem.java +++ b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/AudioPartyItem.java @@ -1,4 +1,4 @@ -package com.pikolive.core.miniworld.bean; +package com.bingchuang.core.miniworld.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/AudioPartyListInfo.java b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/AudioPartyListInfo.java similarity index 81% rename from core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/AudioPartyListInfo.java rename to core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/AudioPartyListInfo.java index 019ec865c..7753140f4 100644 --- a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/AudioPartyListInfo.java +++ b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/AudioPartyListInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.miniworld.bean; +package com.bingchuang.core.miniworld.bean; import java.util.ArrayList; diff --git a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MWChatInfo.java b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MWChatInfo.java similarity index 90% rename from core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MWChatInfo.java rename to core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MWChatInfo.java index c397bba5a..2d4f72687 100644 --- a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MWChatInfo.java +++ b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MWChatInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.miniworld.bean; +package com.bingchuang.core.miniworld.bean; import java.util.List; diff --git a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MWChatMemberCountAttachment.java b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MWChatMemberCountAttachment.java similarity index 92% rename from core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MWChatMemberCountAttachment.java rename to core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MWChatMemberCountAttachment.java index c9e47ef5e..26cc1ec85 100644 --- a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MWChatMemberCountAttachment.java +++ b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MWChatMemberCountAttachment.java @@ -1,7 +1,7 @@ -package com.pikolive.core.miniworld.bean; +package com.bingchuang.core.miniworld.bean; import com.alibaba.fastjson.JSONObject; -import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.im.custom.bean.CustomAttachment; import java.util.List; diff --git a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MWChatTopicAttachment.java b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MWChatTopicAttachment.java similarity index 90% rename from core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MWChatTopicAttachment.java rename to core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MWChatTopicAttachment.java index d58278cee..c139b6d5d 100644 --- a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MWChatTopicAttachment.java +++ b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MWChatTopicAttachment.java @@ -1,7 +1,7 @@ -package com.pikolive.core.miniworld.bean; +package com.bingchuang.core.miniworld.bean; import com.alibaba.fastjson.JSONObject; -import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.im.custom.bean.CustomAttachment; public class MWChatTopicAttachment extends CustomAttachment { public long getWorldId() { diff --git a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldCategoryInfo.java b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MiniWorldCategoryInfo.java similarity index 90% rename from core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldCategoryInfo.java rename to core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MiniWorldCategoryInfo.java index 016ea245e..67b64aee7 100644 --- a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldCategoryInfo.java +++ b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MiniWorldCategoryInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.miniworld.bean; +package com.bingchuang.core.miniworld.bean; import java.util.List; diff --git a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldDetailInfo.java b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MiniWorldDetailInfo.java similarity index 97% rename from core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldDetailInfo.java rename to core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MiniWorldDetailInfo.java index 627f8c5a8..3a8ab28e2 100644 --- a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldDetailInfo.java +++ b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MiniWorldDetailInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.miniworld.bean; +package com.bingchuang.core.miniworld.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldDetailInfoWithCurrentMember.java b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MiniWorldDetailInfoWithCurrentMember.java similarity index 93% rename from core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldDetailInfoWithCurrentMember.java rename to core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MiniWorldDetailInfoWithCurrentMember.java index 97440fec6..2d54e777b 100644 --- a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldDetailInfoWithCurrentMember.java +++ b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MiniWorldDetailInfoWithCurrentMember.java @@ -1,4 +1,4 @@ -package com.pikolive.core.miniworld.bean; +package com.bingchuang.core.miniworld.bean; import java.io.Serializable; diff --git a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldDetailInfoWithMemberInfo.java b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MiniWorldDetailInfoWithMemberInfo.java similarity index 92% rename from core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldDetailInfoWithMemberInfo.java rename to core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MiniWorldDetailInfoWithMemberInfo.java index 2bb920276..7916a72f6 100644 --- a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldDetailInfoWithMemberInfo.java +++ b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MiniWorldDetailInfoWithMemberInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.miniworld.bean; +package com.bingchuang.core.miniworld.bean; import java.io.Serializable; diff --git a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldEditClassifyInfo.java b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MiniWorldEditClassifyInfo.java similarity index 88% rename from core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldEditClassifyInfo.java rename to core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MiniWorldEditClassifyInfo.java index bda5ba5e6..8403eacb3 100644 --- a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldEditClassifyInfo.java +++ b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MiniWorldEditClassifyInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.miniworld.bean; +package com.bingchuang.core.miniworld.bean; import lombok.Data; diff --git a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldInWorldInfo.java b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MiniWorldInWorldInfo.java similarity index 83% rename from core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldInWorldInfo.java rename to core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MiniWorldInWorldInfo.java index 9f391be43..6e36c8e8c 100644 --- a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldInWorldInfo.java +++ b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MiniWorldInWorldInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.miniworld.bean; +package com.bingchuang.core.miniworld.bean; import lombok.Data; diff --git a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldInfo.java b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MiniWorldInfo.java similarity index 94% rename from core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldInfo.java rename to core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MiniWorldInfo.java index 79768f40c..0e61c55ee 100644 --- a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldInfo.java +++ b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MiniWorldInfo.java @@ -1,6 +1,6 @@ -package com.pikolive.core.miniworld.bean; +package com.bingchuang.core.miniworld.bean; -import com.pikolive.core.user.bean.UserInfo; +import com.bingchuang.core.user.bean.UserInfo; import java.util.List; diff --git a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldListInfo.java b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MiniWorldListInfo.java similarity index 73% rename from core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldListInfo.java rename to core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MiniWorldListInfo.java index e3671cae3..d37c4b3a8 100644 --- a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldListInfo.java +++ b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MiniWorldListInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.miniworld.bean; +package com.bingchuang.core.miniworld.bean; import java.util.List; diff --git a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldMainInfo.java b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MiniWorldMainInfo.java similarity index 72% rename from core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldMainInfo.java rename to core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MiniWorldMainInfo.java index eb4a78ca7..7a3fafae8 100644 --- a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldMainInfo.java +++ b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MiniWorldMainInfo.java @@ -1,6 +1,6 @@ -package com.pikolive.core.miniworld.bean; +package com.bingchuang.core.miniworld.bean; -import com.pikolive.core2.home.bean.BannerInfo; +import com.bingchuang.core2.home.bean.BannerInfo; import java.util.List; diff --git a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldMainItemInfo.java b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MiniWorldMainItemInfo.java similarity index 94% rename from core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldMainItemInfo.java rename to core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MiniWorldMainItemInfo.java index e925d170e..4de9bf8a8 100644 --- a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldMainItemInfo.java +++ b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MiniWorldMainItemInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.miniworld.bean; +package com.bingchuang.core.miniworld.bean; import com.chad.library.adapter.base.entity.MultiItemEntity; diff --git a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldMemberListInfo.java b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MiniWorldMemberListInfo.java similarity index 86% rename from core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldMemberListInfo.java rename to core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MiniWorldMemberListInfo.java index 6c3ed6890..5456612c4 100644 --- a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldMemberListInfo.java +++ b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MiniWorldMemberListInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.miniworld.bean; +package com.bingchuang.core.miniworld.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldMemberListMemberInfo.java b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MiniWorldMemberListMemberInfo.java similarity index 89% rename from core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldMemberListMemberInfo.java rename to core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MiniWorldMemberListMemberInfo.java index 920362fcd..3af2bf1bf 100644 --- a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldMemberListMemberInfo.java +++ b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/MiniWorldMemberListMemberInfo.java @@ -1,6 +1,6 @@ -package com.pikolive.core.miniworld.bean; +package com.bingchuang.core.miniworld.bean; -import com.pikolive.core.level.UserLevelVo; +import com.bingchuang.core.level.UserLevelVo; import java.io.Serializable; diff --git a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/OpenAudioPartyAttachment.java b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/OpenAudioPartyAttachment.java similarity index 92% rename from core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/OpenAudioPartyAttachment.java rename to core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/OpenAudioPartyAttachment.java index 2636352c9..e5872851e 100644 --- a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/OpenAudioPartyAttachment.java +++ b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/OpenAudioPartyAttachment.java @@ -1,7 +1,7 @@ -package com.pikolive.core.miniworld.bean; +package com.bingchuang.core.miniworld.bean; import com.alibaba.fastjson.JSONObject; -import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.im.custom.bean.CustomAttachment; public class OpenAudioPartyAttachment extends CustomAttachment { diff --git a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/OpenSuccessInfo.java b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/OpenSuccessInfo.java similarity index 66% rename from core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/OpenSuccessInfo.java rename to core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/OpenSuccessInfo.java index 0f3ecccc0..cfa60a4d1 100644 --- a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/OpenSuccessInfo.java +++ b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/OpenSuccessInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.miniworld.bean; +package com.bingchuang.core.miniworld.bean; import lombok.Data; diff --git a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/TopicInfo.java b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/TopicInfo.java similarity index 64% rename from core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/TopicInfo.java rename to core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/TopicInfo.java index dd5091fc2..6255ed0a1 100644 --- a/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/TopicInfo.java +++ b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/bean/TopicInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.miniworld.bean; +package com.bingchuang.core.miniworld.bean; import lombok.Data; diff --git a/core/src/model_mini_world/java/com/bingchuang/core/miniworld/event/AudioPartyOpenEvent.java b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/event/AudioPartyOpenEvent.java new file mode 100644 index 000000000..e3b7ab1dc --- /dev/null +++ b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/event/AudioPartyOpenEvent.java @@ -0,0 +1,4 @@ +package com.bingchuang.core.miniworld.event; + +public class AudioPartyOpenEvent { +} diff --git a/core/src/model_mini_world/java/com/pikolive/core/miniworld/event/MWChatTopicEvent.java b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/event/MWChatTopicEvent.java similarity index 71% rename from core/src/model_mini_world/java/com/pikolive/core/miniworld/event/MWChatTopicEvent.java rename to core/src/model_mini_world/java/com/bingchuang/core/miniworld/event/MWChatTopicEvent.java index 16e558eb3..90414d174 100644 --- a/core/src/model_mini_world/java/com/pikolive/core/miniworld/event/MWChatTopicEvent.java +++ b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/event/MWChatTopicEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.miniworld.event; +package com.bingchuang.core.miniworld.event; import lombok.Data; diff --git a/core/src/model_mini_world/java/com/pikolive/core/miniworld/event/MWGroupChatMemberEvent.java b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/event/MWGroupChatMemberEvent.java similarity index 79% rename from core/src/model_mini_world/java/com/pikolive/core/miniworld/event/MWGroupChatMemberEvent.java rename to core/src/model_mini_world/java/com/bingchuang/core/miniworld/event/MWGroupChatMemberEvent.java index 91f7c0bdc..950996d35 100644 --- a/core/src/model_mini_world/java/com/pikolive/core/miniworld/event/MWGroupChatMemberEvent.java +++ b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/event/MWGroupChatMemberEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.miniworld.event; +package com.bingchuang.core.miniworld.event; import java.util.List; diff --git a/core/src/model_mini_world/java/com/pikolive/core/miniworld/event/MWOpenAudioPartyEvent.java b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/event/MWOpenAudioPartyEvent.java similarity index 76% rename from core/src/model_mini_world/java/com/pikolive/core/miniworld/event/MWOpenAudioPartyEvent.java rename to core/src/model_mini_world/java/com/bingchuang/core/miniworld/event/MWOpenAudioPartyEvent.java index ebdf94a39..767146cb6 100644 --- a/core/src/model_mini_world/java/com/pikolive/core/miniworld/event/MWOpenAudioPartyEvent.java +++ b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/event/MWOpenAudioPartyEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.miniworld.event; +package com.bingchuang.core.miniworld.event; import lombok.Data; diff --git a/core/src/model_mini_world/java/com/pikolive/core/miniworld/event/MiniWorldJoinVerifiedEvent.java b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/event/MiniWorldJoinVerifiedEvent.java similarity index 78% rename from core/src/model_mini_world/java/com/pikolive/core/miniworld/event/MiniWorldJoinVerifiedEvent.java rename to core/src/model_mini_world/java/com/bingchuang/core/miniworld/event/MiniWorldJoinVerifiedEvent.java index 81b762b14..7835fe330 100644 --- a/core/src/model_mini_world/java/com/pikolive/core/miniworld/event/MiniWorldJoinVerifiedEvent.java +++ b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/event/MiniWorldJoinVerifiedEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.miniworld.event; +package com.bingchuang.core.miniworld.event; import lombok.Data; diff --git a/core/src/model_mini_world/java/com/pikolive/core/miniworld/event/MiniWorldStateChangedEvent.java b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/event/MiniWorldStateChangedEvent.java similarity index 94% rename from core/src/model_mini_world/java/com/pikolive/core/miniworld/event/MiniWorldStateChangedEvent.java rename to core/src/model_mini_world/java/com/bingchuang/core/miniworld/event/MiniWorldStateChangedEvent.java index efe9aba25..73d1cd8f7 100644 --- a/core/src/model_mini_world/java/com/pikolive/core/miniworld/event/MiniWorldStateChangedEvent.java +++ b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/event/MiniWorldStateChangedEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.miniworld.event; +package com.bingchuang.core.miniworld.event; import lombok.Data; diff --git a/core/src/model_mini_world/java/com/pikolive/core/miniworld/event/MiniWorldTeamExitEvent.java b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/event/MiniWorldTeamExitEvent.java similarity index 76% rename from core/src/model_mini_world/java/com/pikolive/core/miniworld/event/MiniWorldTeamExitEvent.java rename to core/src/model_mini_world/java/com/bingchuang/core/miniworld/event/MiniWorldTeamExitEvent.java index c479891a6..ee5acfeb7 100644 --- a/core/src/model_mini_world/java/com/pikolive/core/miniworld/event/MiniWorldTeamExitEvent.java +++ b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/event/MiniWorldTeamExitEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.miniworld.event; +package com.bingchuang.core.miniworld.event; import java.io.Serializable; diff --git a/core/src/model_mini_world/java/com/pikolive/core/miniworld/event/OpenedMyMiniWorldEvent.java b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/event/OpenedMyMiniWorldEvent.java similarity index 85% rename from core/src/model_mini_world/java/com/pikolive/core/miniworld/event/OpenedMyMiniWorldEvent.java rename to core/src/model_mini_world/java/com/bingchuang/core/miniworld/event/OpenedMyMiniWorldEvent.java index 74e1e9167..9c8c3aa96 100644 --- a/core/src/model_mini_world/java/com/pikolive/core/miniworld/event/OpenedMyMiniWorldEvent.java +++ b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/event/OpenedMyMiniWorldEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.miniworld.event; +package com.bingchuang.core.miniworld.event; /** * 打开我加入的事件 diff --git a/core/src/model_mini_world/java/com/pikolive/core/miniworld/model/IMiniWorldModel.java b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/model/IMiniWorldModel.java similarity index 80% rename from core/src/model_mini_world/java/com/pikolive/core/miniworld/model/IMiniWorldModel.java rename to core/src/model_mini_world/java/com/bingchuang/core/miniworld/model/IMiniWorldModel.java index dd06e5a36..5fea986c1 100644 --- a/core/src/model_mini_world/java/com/pikolive/core/miniworld/model/IMiniWorldModel.java +++ b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/model/IMiniWorldModel.java @@ -1,18 +1,18 @@ -package com.pikolive.core.miniworld.model; +package com.bingchuang.core.miniworld.model; -import com.pikolive.core.miniworld.bean.AudioPartyInfo; -import com.pikolive.core.miniworld.bean.AudioPartyListInfo; -import com.pikolive.core.miniworld.bean.MWChatInfo; -import com.pikolive.core.miniworld.bean.MiniWorldCategoryInfo; -import com.pikolive.core.miniworld.bean.MiniWorldDetailInfo; -import com.pikolive.core.miniworld.bean.MiniWorldEditClassifyInfo; -import com.pikolive.core.miniworld.bean.MiniWorldInWorldInfo; -import com.pikolive.core.miniworld.bean.MiniWorldMainInfo; -import com.pikolive.core.miniworld.bean.MiniWorldMemberListInfo; -import com.pikolive.core.miniworld.bean.TopicInfo; -import com.pikolive.core.base.IModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.miniworld.bean.MiniWorldInfo; +import com.bingchuang.core.miniworld.bean.AudioPartyInfo; +import com.bingchuang.core.miniworld.bean.AudioPartyListInfo; +import com.bingchuang.core.miniworld.bean.MWChatInfo; +import com.bingchuang.core.miniworld.bean.MiniWorldCategoryInfo; +import com.bingchuang.core.miniworld.bean.MiniWorldDetailInfo; +import com.bingchuang.core.miniworld.bean.MiniWorldEditClassifyInfo; +import com.bingchuang.core.miniworld.bean.MiniWorldInWorldInfo; +import com.bingchuang.core.miniworld.bean.MiniWorldMainInfo; +import com.bingchuang.core.miniworld.bean.MiniWorldMemberListInfo; +import com.bingchuang.core.miniworld.bean.TopicInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.miniworld.bean.MiniWorldInfo; import java.util.List; diff --git a/core/src/model_mini_world/java/com/pikolive/core/miniworld/model/MiniWorldHelper.java b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/model/MiniWorldHelper.java similarity index 92% rename from core/src/model_mini_world/java/com/pikolive/core/miniworld/model/MiniWorldHelper.java rename to core/src/model_mini_world/java/com/bingchuang/core/miniworld/model/MiniWorldHelper.java index d03d15f71..2ff7259e9 100644 --- a/core/src/model_mini_world/java/com/pikolive/core/miniworld/model/MiniWorldHelper.java +++ b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/model/MiniWorldHelper.java @@ -1,7 +1,7 @@ -package com.pikolive.core.miniworld.model; +package com.bingchuang.core.miniworld.model; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.utils.SharedPreferenceUtils; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.utils.SharedPreferenceUtils; import java.util.HashMap; import java.util.Map; diff --git a/core/src/model_mini_world/java/com/pikolive/core/miniworld/model/MiniWorldModel.java b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/model/MiniWorldModel.java similarity index 95% rename from core/src/model_mini_world/java/com/pikolive/core/miniworld/model/MiniWorldModel.java rename to core/src/model_mini_world/java/com/bingchuang/core/miniworld/model/MiniWorldModel.java index 98044530e..09a7a52ab 100644 --- a/core/src/model_mini_world/java/com/pikolive/core/miniworld/model/MiniWorldModel.java +++ b/core/src/model_mini_world/java/com/bingchuang/core/miniworld/model/MiniWorldModel.java @@ -1,27 +1,27 @@ -package com.pikolive.core.miniworld.model; +package com.bingchuang.core.miniworld.model; import androidx.annotation.Nullable; import com.google.gson.JsonElement; -import com.pikolive.core.miniworld.bean.AudioPartyInfo; -import com.pikolive.core.miniworld.bean.AudioPartyListInfo; -import com.pikolive.core.miniworld.bean.MWChatInfo; -import com.pikolive.core.miniworld.bean.MiniWorldCategoryInfo; -import com.pikolive.core.miniworld.bean.MiniWorldDetailInfo; -import com.pikolive.core.miniworld.bean.MiniWorldEditClassifyInfo; -import com.pikolive.core.miniworld.bean.MiniWorldInWorldInfo; -import com.pikolive.core.miniworld.bean.MiniWorldInfo; -import com.pikolive.core.miniworld.bean.MiniWorldListInfo; -import com.pikolive.core.miniworld.bean.MiniWorldMainInfo; -import com.pikolive.core.miniworld.bean.MiniWorldMemberListInfo; -import com.pikolive.core.miniworld.bean.OpenSuccessInfo; -import com.pikolive.core.miniworld.bean.TopicInfo; -import com.pikolive.core.R; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.exception.FailReasonException; -import com.pikolive.core.monsterhunting.model.MonsterHuntingModel; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.miniworld.bean.AudioPartyInfo; +import com.bingchuang.core.miniworld.bean.AudioPartyListInfo; +import com.bingchuang.core.miniworld.bean.MWChatInfo; +import com.bingchuang.core.miniworld.bean.MiniWorldCategoryInfo; +import com.bingchuang.core.miniworld.bean.MiniWorldDetailInfo; +import com.bingchuang.core.miniworld.bean.MiniWorldEditClassifyInfo; +import com.bingchuang.core.miniworld.bean.MiniWorldInWorldInfo; +import com.bingchuang.core.miniworld.bean.MiniWorldInfo; +import com.bingchuang.core.miniworld.bean.MiniWorldListInfo; +import com.bingchuang.core.miniworld.bean.MiniWorldMainInfo; +import com.bingchuang.core.miniworld.bean.MiniWorldMemberListInfo; +import com.bingchuang.core.miniworld.bean.OpenSuccessInfo; +import com.bingchuang.core.miniworld.bean.TopicInfo; +import com.bingchuang.core.R; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.exception.FailReasonException; +import com.bingchuang.core.monsterhunting.model.MonsterHuntingModel; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.utils.ResUtil; diff --git a/core/src/model_mini_world/java/com/pikolive/core/miniworld/event/AudioPartyOpenEvent.java b/core/src/model_mini_world/java/com/pikolive/core/miniworld/event/AudioPartyOpenEvent.java deleted file mode 100644 index c96d84bd5..000000000 --- a/core/src/model_mini_world/java/com/pikolive/core/miniworld/event/AudioPartyOpenEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pikolive.core.miniworld.event; - -public class AudioPartyOpenEvent { -} diff --git a/core/src/model_music/java/com/pikolive/core/music/bean/BaseMusicInfo.java b/core/src/model_music/java/com/bingchuang/core/music/bean/BaseMusicInfo.java similarity index 99% rename from core/src/model_music/java/com/pikolive/core/music/bean/BaseMusicInfo.java rename to core/src/model_music/java/com/bingchuang/core/music/bean/BaseMusicInfo.java index ede4743ef..50df8320c 100644 --- a/core/src/model_music/java/com/pikolive/core/music/bean/BaseMusicInfo.java +++ b/core/src/model_music/java/com/bingchuang/core/music/bean/BaseMusicInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.music.bean; +package com.bingchuang.core.music.bean; import com.bingchuang.library.utils.BlankUtil; import com.bingchuang.library.utils.json.JsonParser; diff --git a/core/src/model_music/java/com/pikolive/core/music/bean/LocalMusicInfo.java b/core/src/model_music/java/com/bingchuang/core/music/bean/LocalMusicInfo.java similarity index 99% rename from core/src/model_music/java/com/pikolive/core/music/bean/LocalMusicInfo.java rename to core/src/model_music/java/com/bingchuang/core/music/bean/LocalMusicInfo.java index 53bcf6af2..b06d1f495 100644 --- a/core/src/model_music/java/com/pikolive/core/music/bean/LocalMusicInfo.java +++ b/core/src/model_music/java/com/bingchuang/core/music/bean/LocalMusicInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.music.bean; +package com.bingchuang.core.music.bean; import com.bingchuang.library.utils.BlankUtil; import com.bingchuang.library.utils.json.JsonParser; diff --git a/core/src/model_music/java/com/pikolive/core/music/bean/ShareMusicInfo.java b/core/src/model_music/java/com/bingchuang/core/music/bean/ShareMusicInfo.java similarity index 96% rename from core/src/model_music/java/com/pikolive/core/music/bean/ShareMusicInfo.java rename to core/src/model_music/java/com/bingchuang/core/music/bean/ShareMusicInfo.java index 7f38b9ba4..1233692f2 100644 --- a/core/src/model_music/java/com/pikolive/core/music/bean/ShareMusicInfo.java +++ b/core/src/model_music/java/com/bingchuang/core/music/bean/ShareMusicInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.music.bean; +package com.bingchuang.core.music.bean; import java.io.Serializable; diff --git a/core/src/model_music/java/com/pikolive/core/music/db/bean/LocalMusicBean.java b/core/src/model_music/java/com/bingchuang/core/music/db/bean/LocalMusicBean.java similarity index 96% rename from core/src/model_music/java/com/pikolive/core/music/db/bean/LocalMusicBean.java rename to core/src/model_music/java/com/bingchuang/core/music/db/bean/LocalMusicBean.java index 798c08e9a..d55a7b56f 100644 --- a/core/src/model_music/java/com/pikolive/core/music/db/bean/LocalMusicBean.java +++ b/core/src/model_music/java/com/bingchuang/core/music/db/bean/LocalMusicBean.java @@ -1,4 +1,4 @@ -package com.pikolive.core.music.db.bean; +package com.bingchuang.core.music.db.bean; import androidx.room.ColumnInfo; import androidx.room.Entity; diff --git a/core/src/model_music/java/com/pikolive/core/music/db/bean/SongBean.java b/core/src/model_music/java/com/bingchuang/core/music/db/bean/SongBean.java similarity index 96% rename from core/src/model_music/java/com/pikolive/core/music/db/bean/SongBean.java rename to core/src/model_music/java/com/bingchuang/core/music/db/bean/SongBean.java index cc984eda2..6895f95f6 100644 --- a/core/src/model_music/java/com/pikolive/core/music/db/bean/SongBean.java +++ b/core/src/model_music/java/com/bingchuang/core/music/db/bean/SongBean.java @@ -1,4 +1,4 @@ -package com.pikolive.core.music.db.bean; +package com.bingchuang.core.music.db.bean; import androidx.room.ColumnInfo; import androidx.room.Entity; diff --git a/core/src/model_music/java/com/pikolive/core/music/db/converter/LocalMusicBeanConverter.java b/core/src/model_music/java/com/bingchuang/core/music/db/converter/LocalMusicBeanConverter.java similarity index 84% rename from core/src/model_music/java/com/pikolive/core/music/db/converter/LocalMusicBeanConverter.java rename to core/src/model_music/java/com/bingchuang/core/music/db/converter/LocalMusicBeanConverter.java index 857ebd4eb..e3ac0097f 100644 --- a/core/src/model_music/java/com/pikolive/core/music/db/converter/LocalMusicBeanConverter.java +++ b/core/src/model_music/java/com/bingchuang/core/music/db/converter/LocalMusicBeanConverter.java @@ -1,7 +1,7 @@ -package com.pikolive.core.music.db.converter; +package com.bingchuang.core.music.db.converter; -import com.pikolive.core.music.bean.LocalMusicInfo; -import com.pikolive.core.music.db.bean.LocalMusicBean; +import com.bingchuang.core.music.bean.LocalMusicInfo; +import com.bingchuang.core.music.db.bean.LocalMusicBean; /** * 方便将 UI 实体 跟 数据库实体 互相转换的工具类 diff --git a/core/src/model_music/java/com/pikolive/core/music/db/converter/ShareMusicConverter.java b/core/src/model_music/java/com/bingchuang/core/music/db/converter/ShareMusicConverter.java similarity index 71% rename from core/src/model_music/java/com/pikolive/core/music/db/converter/ShareMusicConverter.java rename to core/src/model_music/java/com/bingchuang/core/music/db/converter/ShareMusicConverter.java index e0fe6bd93..836cace5c 100644 --- a/core/src/model_music/java/com/pikolive/core/music/db/converter/ShareMusicConverter.java +++ b/core/src/model_music/java/com/bingchuang/core/music/db/converter/ShareMusicConverter.java @@ -1,7 +1,7 @@ -package com.pikolive.core.music.db.converter; +package com.bingchuang.core.music.db.converter; -import com.pikolive.core.music.bean.ShareMusicInfo; -import com.pikolive.core.music.db.bean.SongBean; +import com.bingchuang.core.music.bean.ShareMusicInfo; +import com.bingchuang.core.music.db.bean.SongBean; /** * 方便将 UI 实体 跟 数据库实体 互相转换的工具类 diff --git a/core/src/model_music/java/com/pikolive/core/music/db/dao/LocalMusicDao.java b/core/src/model_music/java/com/bingchuang/core/music/db/dao/LocalMusicDao.java similarity index 94% rename from core/src/model_music/java/com/pikolive/core/music/db/dao/LocalMusicDao.java rename to core/src/model_music/java/com/bingchuang/core/music/db/dao/LocalMusicDao.java index 25dac3092..2b95b1da0 100644 --- a/core/src/model_music/java/com/pikolive/core/music/db/dao/LocalMusicDao.java +++ b/core/src/model_music/java/com/bingchuang/core/music/db/dao/LocalMusicDao.java @@ -1,11 +1,11 @@ -package com.pikolive.core.music.db.dao; +package com.bingchuang.core.music.db.dao; import androidx.room.Dao; import androidx.room.Insert; import androidx.room.OnConflictStrategy; import androidx.room.Query; -import com.pikolive.core.music.db.bean.LocalMusicBean; +import com.bingchuang.core.music.db.bean.LocalMusicBean; import java.util.List; diff --git a/core/src/model_music/java/com/pikolive/core/music/db/dao/SongDao.java b/core/src/model_music/java/com/bingchuang/core/music/db/dao/SongDao.java similarity index 81% rename from core/src/model_music/java/com/pikolive/core/music/db/dao/SongDao.java rename to core/src/model_music/java/com/bingchuang/core/music/db/dao/SongDao.java index 46804610b..8c4a59149 100644 --- a/core/src/model_music/java/com/pikolive/core/music/db/dao/SongDao.java +++ b/core/src/model_music/java/com/bingchuang/core/music/db/dao/SongDao.java @@ -1,4 +1,4 @@ -package com.pikolive.core.music.db.dao; +package com.bingchuang.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.pikolive.core.music.db.bean.LocalMusicBean; -import com.pikolive.core.music.db.bean.SongBean; +import com.bingchuang.core.music.db.bean.LocalMusicBean; +import com.bingchuang.core.music.db.bean.SongBean; import java.util.List; diff --git a/core/src/model_music/java/com/pikolive/core/music/db/model/ILocalMusicDbModel.java b/core/src/model_music/java/com/bingchuang/core/music/db/model/ILocalMusicDbModel.java similarity index 80% rename from core/src/model_music/java/com/pikolive/core/music/db/model/ILocalMusicDbModel.java rename to core/src/model_music/java/com/bingchuang/core/music/db/model/ILocalMusicDbModel.java index d5971316c..561e8bfca 100644 --- a/core/src/model_music/java/com/pikolive/core/music/db/model/ILocalMusicDbModel.java +++ b/core/src/model_music/java/com/bingchuang/core/music/db/model/ILocalMusicDbModel.java @@ -1,8 +1,8 @@ -package com.pikolive.core.music.db.model; +package com.bingchuang.core.music.db.model; -import com.pikolive.core.music.bean.LocalMusicInfo; -import com.pikolive.core.base.IModel; -import com.pikolive.core.music.db.bean.LocalMusicBean; +import com.bingchuang.core.music.bean.LocalMusicInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.music.db.bean.LocalMusicBean; import java.util.List; diff --git a/core/src/model_music/java/com/pikolive/core/music/db/model/IPlayerDbModel.java b/core/src/model_music/java/com/bingchuang/core/music/db/model/IPlayerDbModel.java similarity index 88% rename from core/src/model_music/java/com/pikolive/core/music/db/model/IPlayerDbModel.java rename to core/src/model_music/java/com/bingchuang/core/music/db/model/IPlayerDbModel.java index 5aa7085fa..364a674ae 100644 --- a/core/src/model_music/java/com/pikolive/core/music/db/model/IPlayerDbModel.java +++ b/core/src/model_music/java/com/bingchuang/core/music/db/model/IPlayerDbModel.java @@ -1,7 +1,7 @@ -package com.pikolive.core.music.db.model; +package com.bingchuang.core.music.db.model; -import com.pikolive.core.music.bean.LocalMusicInfo; -import com.pikolive.core.base.IModel; +import com.bingchuang.core.music.bean.LocalMusicInfo; +import com.bingchuang.core.base.IModel; import java.util.List; diff --git a/core/src/model_music/java/com/pikolive/core/music/db/model/LocalMusicDbModel.java b/core/src/model_music/java/com/bingchuang/core/music/db/model/LocalMusicDbModel.java similarity index 95% rename from core/src/model_music/java/com/pikolive/core/music/db/model/LocalMusicDbModel.java rename to core/src/model_music/java/com/bingchuang/core/music/db/model/LocalMusicDbModel.java index 41ff22b2e..c676622d4 100644 --- a/core/src/model_music/java/com/pikolive/core/music/db/model/LocalMusicDbModel.java +++ b/core/src/model_music/java/com/bingchuang/core/music/db/model/LocalMusicDbModel.java @@ -1,4 +1,4 @@ -package com.pikolive.core.music.db.model; +package com.bingchuang.core.music.db.model; import android.annotation.SuppressLint; import android.content.ContentUris; @@ -9,15 +9,15 @@ import android.provider.MediaStore; import androidx.annotation.Nullable; -import com.pikolive.core.music.bean.LocalMusicInfo; -import com.pikolive.core.music.db.converter.LocalMusicBeanConverter; -import com.pikolive.core.music.event.RefreshLocalMusicEvent; -import com.pikolive.core.database.AppDataBase; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.music.db.bean.LocalMusicBean; -import com.pikolive.core.utils.AsyncTaskScanMusicFile; -import com.pikolive.core.utils.SongUtils; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.music.bean.LocalMusicInfo; +import com.bingchuang.core.music.db.converter.LocalMusicBeanConverter; +import com.bingchuang.core.music.event.RefreshLocalMusicEvent; +import com.bingchuang.core.database.AppDataBase; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.music.db.bean.LocalMusicBean; +import com.bingchuang.core.utils.AsyncTaskScanMusicFile; +import com.bingchuang.core.utils.SongUtils; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.utils.ListUtils; import com.bingchuang.library.utils.config.BasicConfig; diff --git a/core/src/model_music/java/com/pikolive/core/music/db/model/PlayerDbModel.java b/core/src/model_music/java/com/bingchuang/core/music/db/model/PlayerDbModel.java similarity index 96% rename from core/src/model_music/java/com/pikolive/core/music/db/model/PlayerDbModel.java rename to core/src/model_music/java/com/bingchuang/core/music/db/model/PlayerDbModel.java index 85c084afd..f8728ae55 100644 --- a/core/src/model_music/java/com/pikolive/core/music/db/model/PlayerDbModel.java +++ b/core/src/model_music/java/com/bingchuang/core/music/db/model/PlayerDbModel.java @@ -1,7 +1,7 @@ -package com.pikolive.core.music.db.model; +package com.bingchuang.core.music.db.model; -import com.pikolive.core.music.bean.LocalMusicInfo; -import com.pikolive.core.base.BaseModel; +import com.bingchuang.core.music.bean.LocalMusicInfo; +import com.bingchuang.core.base.BaseModel; import java.util.List; diff --git a/core/src/model_music/java/com/pikolive/core/music/event/CurrentMusicUpdateEvent.java b/core/src/model_music/java/com/bingchuang/core/music/event/CurrentMusicUpdateEvent.java similarity index 67% rename from core/src/model_music/java/com/pikolive/core/music/event/CurrentMusicUpdateEvent.java rename to core/src/model_music/java/com/bingchuang/core/music/event/CurrentMusicUpdateEvent.java index 02d584c99..a68a91483 100644 --- a/core/src/model_music/java/com/pikolive/core/music/event/CurrentMusicUpdateEvent.java +++ b/core/src/model_music/java/com/bingchuang/core/music/event/CurrentMusicUpdateEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.music.event; +package com.bingchuang.core.music.event; /** * create by lvzebiao on 2018/9/5 diff --git a/core/src/model_music/java/com/pikolive/core/music/event/JumpToShareMusicListFragmentEvent.java b/core/src/model_music/java/com/bingchuang/core/music/event/JumpToShareMusicListFragmentEvent.java similarity index 55% rename from core/src/model_music/java/com/pikolive/core/music/event/JumpToShareMusicListFragmentEvent.java rename to core/src/model_music/java/com/bingchuang/core/music/event/JumpToShareMusicListFragmentEvent.java index e918d4d81..c12b7478d 100644 --- a/core/src/model_music/java/com/pikolive/core/music/event/JumpToShareMusicListFragmentEvent.java +++ b/core/src/model_music/java/com/bingchuang/core/music/event/JumpToShareMusicListFragmentEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.music.event; +package com.bingchuang.core.music.event; public class JumpToShareMusicListFragmentEvent { } diff --git a/core/src/model_music/java/com/pikolive/core/music/event/MusicAddEvent.java b/core/src/model_music/java/com/bingchuang/core/music/event/MusicAddEvent.java similarity index 52% rename from core/src/model_music/java/com/pikolive/core/music/event/MusicAddEvent.java rename to core/src/model_music/java/com/bingchuang/core/music/event/MusicAddEvent.java index 5d05c81c8..3ae222a08 100644 --- a/core/src/model_music/java/com/pikolive/core/music/event/MusicAddEvent.java +++ b/core/src/model_music/java/com/bingchuang/core/music/event/MusicAddEvent.java @@ -1,6 +1,6 @@ -package com.pikolive.core.music.event; +package com.bingchuang.core.music.event; -import com.pikolive.core.music.bean.LocalMusicInfo; +import com.bingchuang.core.music.bean.LocalMusicInfo; import lombok.Data; diff --git a/core/src/model_music/java/com/pikolive/core/music/event/MusicDeleteEvent.java b/core/src/model_music/java/com/bingchuang/core/music/event/MusicDeleteEvent.java similarity index 52% rename from core/src/model_music/java/com/pikolive/core/music/event/MusicDeleteEvent.java rename to core/src/model_music/java/com/bingchuang/core/music/event/MusicDeleteEvent.java index c36e346b4..78ec228cf 100644 --- a/core/src/model_music/java/com/pikolive/core/music/event/MusicDeleteEvent.java +++ b/core/src/model_music/java/com/bingchuang/core/music/event/MusicDeleteEvent.java @@ -1,6 +1,6 @@ -package com.pikolive.core.music.event; +package com.bingchuang.core.music.event; -import com.pikolive.core.music.bean.LocalMusicInfo; +import com.bingchuang.core.music.bean.LocalMusicInfo; import lombok.Data; diff --git a/core/src/model_music/java/com/pikolive/core/music/event/MusicPauseEvent.java b/core/src/model_music/java/com/bingchuang/core/music/event/MusicPauseEvent.java similarity index 64% rename from core/src/model_music/java/com/pikolive/core/music/event/MusicPauseEvent.java rename to core/src/model_music/java/com/bingchuang/core/music/event/MusicPauseEvent.java index 385a403fe..c6c122626 100644 --- a/core/src/model_music/java/com/pikolive/core/music/event/MusicPauseEvent.java +++ b/core/src/model_music/java/com/bingchuang/core/music/event/MusicPauseEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.music.event; +package com.bingchuang.core.music.event; /** * create by lvzebiao on 2018/9/6 diff --git a/core/src/model_music/java/com/pikolive/core/music/event/MusicPlayingEvent.java b/core/src/model_music/java/com/bingchuang/core/music/event/MusicPlayingEvent.java similarity index 65% rename from core/src/model_music/java/com/pikolive/core/music/event/MusicPlayingEvent.java rename to core/src/model_music/java/com/bingchuang/core/music/event/MusicPlayingEvent.java index 3d34e68b0..d15a87a39 100644 --- a/core/src/model_music/java/com/pikolive/core/music/event/MusicPlayingEvent.java +++ b/core/src/model_music/java/com/bingchuang/core/music/event/MusicPlayingEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.music.event; +package com.bingchuang.core.music.event; /** * create by lvzebiao on 2018/9/6 diff --git a/core/src/model_music/java/com/pikolive/core/music/event/MusicStopEvent.java b/core/src/model_music/java/com/bingchuang/core/music/event/MusicStopEvent.java similarity index 64% rename from core/src/model_music/java/com/pikolive/core/music/event/MusicStopEvent.java rename to core/src/model_music/java/com/bingchuang/core/music/event/MusicStopEvent.java index ad0c86ef2..5c92dc2d2 100644 --- a/core/src/model_music/java/com/pikolive/core/music/event/MusicStopEvent.java +++ b/core/src/model_music/java/com/bingchuang/core/music/event/MusicStopEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.music.event; +package com.bingchuang.core.music.event; /** * create by lvzebiao on 2018/9/6 diff --git a/core/src/model_music/java/com/pikolive/core/music/event/RefreshLocalMusicEvent.java b/core/src/model_music/java/com/bingchuang/core/music/event/RefreshLocalMusicEvent.java similarity index 66% rename from core/src/model_music/java/com/pikolive/core/music/event/RefreshLocalMusicEvent.java rename to core/src/model_music/java/com/bingchuang/core/music/event/RefreshLocalMusicEvent.java index e59b7c027..728d3d2cc 100644 --- a/core/src/model_music/java/com/pikolive/core/music/event/RefreshLocalMusicEvent.java +++ b/core/src/model_music/java/com/bingchuang/core/music/event/RefreshLocalMusicEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.music.event; +package com.bingchuang.core.music.event; /** * create by lvzebiao on 2018/9/5 diff --git a/core/src/model_music/java/com/pikolive/core/music/event/RefreshPlayerListEvent.java b/core/src/model_music/java/com/bingchuang/core/music/event/RefreshPlayerListEvent.java similarity index 66% rename from core/src/model_music/java/com/pikolive/core/music/event/RefreshPlayerListEvent.java rename to core/src/model_music/java/com/bingchuang/core/music/event/RefreshPlayerListEvent.java index fe2619b60..cfa613247 100644 --- a/core/src/model_music/java/com/pikolive/core/music/event/RefreshPlayerListEvent.java +++ b/core/src/model_music/java/com/bingchuang/core/music/event/RefreshPlayerListEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.music.event; +package com.bingchuang.core.music.event; /** * create by lvzebiao on 2018/9/5 diff --git a/core/src/model_music/java/com/bingchuang/core/music/model/ILocalMusicListModel.java b/core/src/model_music/java/com/bingchuang/core/music/model/ILocalMusicListModel.java new file mode 100644 index 000000000..4eb54997d --- /dev/null +++ b/core/src/model_music/java/com/bingchuang/core/music/model/ILocalMusicListModel.java @@ -0,0 +1,6 @@ +package com.bingchuang.core.music.model; + +import com.bingchuang.core.base.IModel; + +public interface ILocalMusicListModel extends IModel { +} diff --git a/core/src/model_music/java/com/bingchuang/core/music/model/IMusicListModel.java b/core/src/model_music/java/com/bingchuang/core/music/model/IMusicListModel.java new file mode 100644 index 000000000..96132df36 --- /dev/null +++ b/core/src/model_music/java/com/bingchuang/core/music/model/IMusicListModel.java @@ -0,0 +1,6 @@ +package com.bingchuang.core.music.model; + +import com.bingchuang.core.base.IModel; + +public interface IMusicListModel extends IModel { +} diff --git a/core/src/model_music/java/com/pikolive/core/music/model/IPlayerModel.java b/core/src/model_music/java/com/bingchuang/core/music/model/IPlayerModel.java similarity index 87% rename from core/src/model_music/java/com/pikolive/core/music/model/IPlayerModel.java rename to core/src/model_music/java/com/bingchuang/core/music/model/IPlayerModel.java index 4d90974a4..06051ac4e 100644 --- a/core/src/model_music/java/com/pikolive/core/music/model/IPlayerModel.java +++ b/core/src/model_music/java/com/bingchuang/core/music/model/IPlayerModel.java @@ -1,8 +1,8 @@ -package com.pikolive.core.music.model; +package com.bingchuang.core.music.model; -import com.pikolive.core.music.bean.LocalMusicInfo; -import com.pikolive.core.music.db.bean.LocalMusicBean; -import com.pikolive.core.base.IModel; +import com.bingchuang.core.music.bean.LocalMusicInfo; +import com.bingchuang.core.music.db.bean.LocalMusicBean; +import com.bingchuang.core.base.IModel; import java.util.List; diff --git a/core/src/model_music/java/com/pikolive/core/music/model/IShareMusicListModel.java b/core/src/model_music/java/com/bingchuang/core/music/model/IShareMusicListModel.java similarity index 69% rename from core/src/model_music/java/com/pikolive/core/music/model/IShareMusicListModel.java rename to core/src/model_music/java/com/bingchuang/core/music/model/IShareMusicListModel.java index 5328fda67..97f96417c 100644 --- a/core/src/model_music/java/com/pikolive/core/music/model/IShareMusicListModel.java +++ b/core/src/model_music/java/com/bingchuang/core/music/model/IShareMusicListModel.java @@ -1,7 +1,7 @@ -package com.pikolive.core.music.model; +package com.bingchuang.core.music.model; -import com.pikolive.core.base.IModel; -import com.pikolive.core.music.bean.ShareMusicInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.music.bean.ShareMusicInfo; import java.util.List; diff --git a/core/src/model_music/java/com/bingchuang/core/music/model/LocalMusicListModel.java b/core/src/model_music/java/com/bingchuang/core/music/model/LocalMusicListModel.java new file mode 100644 index 000000000..e92091270 --- /dev/null +++ b/core/src/model_music/java/com/bingchuang/core/music/model/LocalMusicListModel.java @@ -0,0 +1,7 @@ +package com.bingchuang.core.music.model; + +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.base.IModel; + +public class LocalMusicListModel extends BaseModel implements IModel { +} diff --git a/core/src/model_music/java/com/pikolive/core/music/model/MusicListModel.java b/core/src/model_music/java/com/bingchuang/core/music/model/MusicListModel.java similarity index 80% rename from core/src/model_music/java/com/pikolive/core/music/model/MusicListModel.java rename to core/src/model_music/java/com/bingchuang/core/music/model/MusicListModel.java index a67441a03..c6aa291e0 100644 --- a/core/src/model_music/java/com/pikolive/core/music/model/MusicListModel.java +++ b/core/src/model_music/java/com/bingchuang/core/music/model/MusicListModel.java @@ -1,6 +1,6 @@ -package com.pikolive.core.music.model; +package com.bingchuang.core.music.model; -import com.pikolive.core.base.BaseModel; +import com.bingchuang.core.base.BaseModel; public class MusicListModel extends BaseModel implements IMusicListModel { diff --git a/core/src/model_music/java/com/pikolive/core/music/model/PlayerModel.java b/core/src/model_music/java/com/bingchuang/core/music/model/PlayerModel.java similarity index 94% rename from core/src/model_music/java/com/pikolive/core/music/model/PlayerModel.java rename to core/src/model_music/java/com/bingchuang/core/music/model/PlayerModel.java index d84977daf..c525a8c26 100644 --- a/core/src/model_music/java/com/pikolive/core/music/model/PlayerModel.java +++ b/core/src/model_music/java/com/bingchuang/core/music/model/PlayerModel.java @@ -1,22 +1,22 @@ -package com.pikolive.core.music.model; +package com.bingchuang.core.music.model; import android.os.Handler; import android.os.Message; import android.text.TextUtils; -import com.pikolive.core.DemoCache; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core2.manager.AudioEngineManager; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.manager.RoomEvent; -import com.pikolive.core.music.bean.LocalMusicInfo; -import com.pikolive.core.music.db.bean.LocalMusicBean; -import com.pikolive.core.music.db.model.LocalMusicDbModel; -import com.pikolive.core.music.db.model.PlayerDbModel; -import com.pikolive.core.music.event.MusicPauseEvent; -import com.pikolive.core.music.event.MusicPlayingEvent; -import com.pikolive.core.music.event.MusicStopEvent; +import com.bingchuang.core.DemoCache; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core2.manager.AudioEngineManager; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.manager.RoomEvent; +import com.bingchuang.core.music.bean.LocalMusicInfo; +import com.bingchuang.core.music.db.bean.LocalMusicBean; +import com.bingchuang.core.music.db.model.LocalMusicDbModel; +import com.bingchuang.core.music.db.model.PlayerDbModel; +import com.bingchuang.core.music.event.MusicPauseEvent; +import com.bingchuang.core.music.event.MusicPlayingEvent; +import com.bingchuang.core.music.event.MusicStopEvent; import com.bingchuang.library.utils.config.BasicConfig; import com.bingchuang.library.utils.pref.CommonPref; diff --git a/core/src/model_music/java/com/pikolive/core/music/model/ShareMusicListModel.java b/core/src/model_music/java/com/bingchuang/core/music/model/ShareMusicListModel.java similarity index 92% rename from core/src/model_music/java/com/pikolive/core/music/model/ShareMusicListModel.java rename to core/src/model_music/java/com/bingchuang/core/music/model/ShareMusicListModel.java index afbfffbbf..ef36eedd4 100644 --- a/core/src/model_music/java/com/pikolive/core/music/model/ShareMusicListModel.java +++ b/core/src/model_music/java/com/bingchuang/core/music/model/ShareMusicListModel.java @@ -1,14 +1,14 @@ -package com.pikolive.core.music.model; +package com.bingchuang.core.music.model; -import com.pikolive.core.music.bean.ShareMusicInfo; -import com.pikolive.core.music.db.bean.LocalMusicBean; -import com.pikolive.core.R; -import com.pikolive.core.database.AppDataBase; -import com.pikolive.core.Constants; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.music.bean.ShareMusicInfo; +import com.bingchuang.core.music.db.bean.LocalMusicBean; +import com.bingchuang.core.R; +import com.bingchuang.core.database.AppDataBase; +import com.bingchuang.core.Constants; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.utils.ListUtils; import com.bingchuang.library.utils.ResUtil; diff --git a/core/src/model_music/java/com/pikolive/core/music/view/IAddLocalMusicListView.java b/core/src/model_music/java/com/bingchuang/core/music/view/IAddLocalMusicListView.java similarity index 90% rename from core/src/model_music/java/com/pikolive/core/music/view/IAddLocalMusicListView.java rename to core/src/model_music/java/com/bingchuang/core/music/view/IAddLocalMusicListView.java index 36946b702..880ef03f5 100644 --- a/core/src/model_music/java/com/pikolive/core/music/view/IAddLocalMusicListView.java +++ b/core/src/model_music/java/com/bingchuang/core/music/view/IAddLocalMusicListView.java @@ -1,6 +1,6 @@ -package com.pikolive.core.music.view; +package com.bingchuang.core.music.view; -import com.pikolive.core.music.db.bean.LocalMusicBean; +import com.bingchuang.core.music.db.bean.LocalMusicBean; import com.bingchuang.library.base.IMvpBaseView; import java.util.List; diff --git a/core/src/model_music/java/com/pikolive/core/music/view/ILocalMusicListView.java b/core/src/model_music/java/com/bingchuang/core/music/view/ILocalMusicListView.java similarity index 89% rename from core/src/model_music/java/com/pikolive/core/music/view/ILocalMusicListView.java rename to core/src/model_music/java/com/bingchuang/core/music/view/ILocalMusicListView.java index 930e489ce..c83a74b01 100644 --- a/core/src/model_music/java/com/pikolive/core/music/view/ILocalMusicListView.java +++ b/core/src/model_music/java/com/bingchuang/core/music/view/ILocalMusicListView.java @@ -1,6 +1,6 @@ -package com.pikolive.core.music.view; +package com.bingchuang.core.music.view; -import com.pikolive.core.music.db.bean.LocalMusicBean; +import com.bingchuang.core.music.db.bean.LocalMusicBean; import com.bingchuang.library.base.IMvpBaseView; import java.util.List; diff --git a/core/src/model_music/java/com/pikolive/core/music/view/IMusicListView.java b/core/src/model_music/java/com/bingchuang/core/music/view/IMusicListView.java similarity index 72% rename from core/src/model_music/java/com/pikolive/core/music/view/IMusicListView.java rename to core/src/model_music/java/com/bingchuang/core/music/view/IMusicListView.java index b6c6ba035..e8e7e91b3 100644 --- a/core/src/model_music/java/com/pikolive/core/music/view/IMusicListView.java +++ b/core/src/model_music/java/com/bingchuang/core/music/view/IMusicListView.java @@ -1,4 +1,4 @@ -package com.pikolive.core.music.view; +package com.bingchuang.core.music.view; import com.bingchuang.library.base.IMvpBaseView; diff --git a/core/src/model_music/java/com/pikolive/core/music/view/IShareMusicListView.java b/core/src/model_music/java/com/bingchuang/core/music/view/IShareMusicListView.java similarity index 85% rename from core/src/model_music/java/com/pikolive/core/music/view/IShareMusicListView.java rename to core/src/model_music/java/com/bingchuang/core/music/view/IShareMusicListView.java index e6e6f77eb..6036bfd3c 100644 --- a/core/src/model_music/java/com/pikolive/core/music/view/IShareMusicListView.java +++ b/core/src/model_music/java/com/bingchuang/core/music/view/IShareMusicListView.java @@ -1,7 +1,7 @@ -package com.pikolive.core.music.view; +package com.bingchuang.core.music.view; -import com.pikolive.core.music.bean.ShareMusicInfo; -import com.pikolive.core.music.db.bean.LocalMusicBean; +import com.bingchuang.core.music.bean.ShareMusicInfo; +import com.bingchuang.core.music.db.bean.LocalMusicBean; import com.bingchuang.library.base.IMvpBaseView; import java.util.List; diff --git a/core/src/model_music/java/com/pikolive/core/music/model/ILocalMusicListModel.java b/core/src/model_music/java/com/pikolive/core/music/model/ILocalMusicListModel.java deleted file mode 100644 index 7188186fb..000000000 --- a/core/src/model_music/java/com/pikolive/core/music/model/ILocalMusicListModel.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.pikolive.core.music.model; - -import com.pikolive.core.base.IModel; - -public interface ILocalMusicListModel extends IModel { -} diff --git a/core/src/model_music/java/com/pikolive/core/music/model/IMusicListModel.java b/core/src/model_music/java/com/pikolive/core/music/model/IMusicListModel.java deleted file mode 100644 index 5fc824fcf..000000000 --- a/core/src/model_music/java/com/pikolive/core/music/model/IMusicListModel.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.pikolive.core.music.model; - -import com.pikolive.core.base.IModel; - -public interface IMusicListModel extends IModel { -} diff --git a/core/src/model_music/java/com/pikolive/core/music/model/LocalMusicListModel.java b/core/src/model_music/java/com/pikolive/core/music/model/LocalMusicListModel.java deleted file mode 100644 index 7211d705a..000000000 --- a/core/src/model_music/java/com/pikolive/core/music/model/LocalMusicListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.pikolive.core.music.model; - -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.base.IModel; - -public class LocalMusicListModel extends BaseModel implements IModel { -} diff --git a/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/attachment/AitFriendsAttachment.java b/core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/attachment/AitFriendsAttachment.java similarity index 82% rename from core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/attachment/AitFriendsAttachment.java rename to core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/attachment/AitFriendsAttachment.java index 6853f3612..f736ca99c 100644 --- a/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/attachment/AitFriendsAttachment.java +++ b/core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/attachment/AitFriendsAttachment.java @@ -1,10 +1,10 @@ -package com.pikolive.core.public_chat_hall.attachment; +package com.bingchuang.core.public_chat_hall.attachment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.public_chat_hall.bean.AitFriendsInfo; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.public_chat_hall.bean.AitFriendsInfo; public class AitFriendsAttachment extends CustomAttachment { diff --git a/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/attachment/AitMeAttachment.java b/core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/attachment/AitMeAttachment.java similarity index 81% rename from core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/attachment/AitMeAttachment.java rename to core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/attachment/AitMeAttachment.java index 35e82c5b5..44656bc43 100644 --- a/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/attachment/AitMeAttachment.java +++ b/core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/attachment/AitMeAttachment.java @@ -1,10 +1,10 @@ -package com.pikolive.core.public_chat_hall.attachment; +package com.bingchuang.core.public_chat_hall.attachment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core.public_chat_hall.bean.AitMeInfo; -import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.public_chat_hall.bean.AitMeInfo; +import com.bingchuang.core.im.custom.bean.CustomAttachment; public class AitMeAttachment extends CustomAttachment { diff --git a/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/bean/AitFriendsInfo.java b/core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/bean/AitFriendsInfo.java similarity index 93% rename from core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/bean/AitFriendsInfo.java rename to core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/bean/AitFriendsInfo.java index 9ee334c38..02fe2bd76 100644 --- a/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/bean/AitFriendsInfo.java +++ b/core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/bean/AitFriendsInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.public_chat_hall.bean; +package com.bingchuang.core.public_chat_hall.bean; import java.util.List; diff --git a/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/bean/AitMeInfo.java b/core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/bean/AitMeInfo.java similarity index 91% rename from core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/bean/AitMeInfo.java rename to core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/bean/AitMeInfo.java index 1f3edcae7..b303f16a1 100644 --- a/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/bean/AitMeInfo.java +++ b/core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/bean/AitMeInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.public_chat_hall.bean; +package com.bingchuang.core.public_chat_hall.bean; import java.io.Serializable; diff --git a/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/bean/PublicChatHallMessage.java b/core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/bean/PublicChatHallMessage.java similarity index 99% rename from core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/bean/PublicChatHallMessage.java rename to core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/bean/PublicChatHallMessage.java index 15c677dd8..030589187 100644 --- a/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/bean/PublicChatHallMessage.java +++ b/core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/bean/PublicChatHallMessage.java @@ -1,4 +1,4 @@ -package com.pikolive.core.public_chat_hall.bean; +package com.bingchuang.core.public_chat_hall.bean; import java.util.List; diff --git a/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/event/PublicChatHallAitMeEvent.java b/core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/event/PublicChatHallAitMeEvent.java similarity index 80% rename from core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/event/PublicChatHallAitMeEvent.java rename to core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/event/PublicChatHallAitMeEvent.java index 339d9ba69..49b1da111 100644 --- a/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/event/PublicChatHallAitMeEvent.java +++ b/core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/event/PublicChatHallAitMeEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.public_chat_hall.event; +package com.bingchuang.core.public_chat_hall.event; import lombok.Data; diff --git a/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/event/PublicChatHallHistoryEvent.java b/core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/event/PublicChatHallHistoryEvent.java similarity index 87% rename from core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/event/PublicChatHallHistoryEvent.java rename to core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/event/PublicChatHallHistoryEvent.java index 5644ec7db..2ac2152a5 100644 --- a/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/event/PublicChatHallHistoryEvent.java +++ b/core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/event/PublicChatHallHistoryEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.public_chat_hall.event; +package com.bingchuang.core.public_chat_hall.event; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; diff --git a/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/event/PublicChatHallMsgCountingDownEvent.java b/core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/event/PublicChatHallMsgCountingDownEvent.java similarity index 89% rename from core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/event/PublicChatHallMsgCountingDownEvent.java rename to core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/event/PublicChatHallMsgCountingDownEvent.java index 9817e6db4..90575e8fb 100644 --- a/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/event/PublicChatHallMsgCountingDownEvent.java +++ b/core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/event/PublicChatHallMsgCountingDownEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.public_chat_hall.event; +package com.bingchuang.core.public_chat_hall.event; import lombok.Data; diff --git a/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/event/PublicChatHallMsgIncomingEvent.java b/core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/event/PublicChatHallMsgIncomingEvent.java similarity index 87% rename from core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/event/PublicChatHallMsgIncomingEvent.java rename to core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/event/PublicChatHallMsgIncomingEvent.java index fb0cb5ead..3ee5c2d59 100644 --- a/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/event/PublicChatHallMsgIncomingEvent.java +++ b/core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/event/PublicChatHallMsgIncomingEvent.java @@ -1,4 +1,4 @@ -package com.pikolive.core.public_chat_hall.event; +package com.bingchuang.core.public_chat_hall.event; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; diff --git a/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/event/PublicChatHallPlayGiftAnimationEvent.java b/core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/event/PublicChatHallPlayGiftAnimationEvent.java similarity index 74% rename from core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/event/PublicChatHallPlayGiftAnimationEvent.java rename to core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/event/PublicChatHallPlayGiftAnimationEvent.java index 195c70b22..5d0178330 100644 --- a/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/event/PublicChatHallPlayGiftAnimationEvent.java +++ b/core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/event/PublicChatHallPlayGiftAnimationEvent.java @@ -1,6 +1,6 @@ -package com.pikolive.core.public_chat_hall.event; +package com.bingchuang.core.public_chat_hall.event; -import com.pikolive.core.gift.bean.GiftReceiveInfo; +import com.bingchuang.core.gift.bean.GiftReceiveInfo; import lombok.Data; diff --git a/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/manager/PublicChatHallDataManager.java b/core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/manager/PublicChatHallDataManager.java similarity index 93% rename from core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/manager/PublicChatHallDataManager.java rename to core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/manager/PublicChatHallDataManager.java index 25d439278..dfaed6c33 100644 --- a/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/manager/PublicChatHallDataManager.java +++ b/core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/manager/PublicChatHallDataManager.java @@ -1,4 +1,4 @@ -package com.pikolive.core.public_chat_hall.manager; +package com.bingchuang.core.public_chat_hall.manager; import static com.netease.nimlib.sdk.msg.constant.NotificationType.ChatRoomMemberTempMuteAdd; @@ -24,21 +24,21 @@ import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum; import com.netease.nimlib.sdk.msg.model.IMMessage; import com.netease.nimlib.sdk.msg.model.QueryDirectionEnum; import com.orhanobut.logger.Logger; -import com.pikolive.core.public_chat_hall.attachment.AitFriendsAttachment; -import com.pikolive.core.R; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.gift.GiftModel; -import com.pikolive.core.gift.bean.GiftInfo; -import com.pikolive.core.gift.bean.GiftReceiveInfo; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.im.custom.bean.GiftAttachment; -import com.pikolive.core.public_chat_hall.bean.AitFriendsInfo; -import com.pikolive.core.public_chat_hall.event.PublicChatHallAitMeEvent; -import com.pikolive.core.public_chat_hall.event.PublicChatHallHistoryEvent; -import com.pikolive.core.public_chat_hall.event.PublicChatHallMsgCountingDownEvent; -import com.pikolive.core.public_chat_hall.event.PublicChatHallMsgIncomingEvent; -import com.pikolive.core.public_chat_hall.event.PublicChatHallPlayGiftAnimationEvent; -import com.pikolive.core.public_chat_hall.model.PublicChatHallModel; +import com.bingchuang.core.public_chat_hall.attachment.AitFriendsAttachment; +import com.bingchuang.core.R; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.gift.GiftModel; +import com.bingchuang.core.gift.bean.GiftInfo; +import com.bingchuang.core.gift.bean.GiftReceiveInfo; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.im.custom.bean.GiftAttachment; +import com.bingchuang.core.public_chat_hall.bean.AitFriendsInfo; +import com.bingchuang.core.public_chat_hall.event.PublicChatHallAitMeEvent; +import com.bingchuang.core.public_chat_hall.event.PublicChatHallHistoryEvent; +import com.bingchuang.core.public_chat_hall.event.PublicChatHallMsgCountingDownEvent; +import com.bingchuang.core.public_chat_hall.event.PublicChatHallMsgIncomingEvent; +import com.bingchuang.core.public_chat_hall.event.PublicChatHallPlayGiftAnimationEvent; +import com.bingchuang.core.public_chat_hall.model.PublicChatHallModel; import com.bingchuang.library.utils.ListUtils; import com.bingchuang.library.utils.ResUtil; diff --git a/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/model/IPublicChatHallModel.java b/core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/model/IPublicChatHallModel.java similarity index 81% rename from core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/model/IPublicChatHallModel.java rename to core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/model/IPublicChatHallModel.java index 9871bec1c..d8800b52a 100644 --- a/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/model/IPublicChatHallModel.java +++ b/core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/model/IPublicChatHallModel.java @@ -1,9 +1,9 @@ -package com.pikolive.core.public_chat_hall.model; +package com.bingchuang.core.public_chat_hall.model; import com.netease.nimlib.sdk.chatroom.model.EnterChatRoomResultData; -import com.pikolive.core.base.IModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.public_chat_hall.bean.PublicChatHallMessage; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.public_chat_hall.bean.PublicChatHallMessage; import java.util.List; diff --git a/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/model/PublicChatHallModel.java b/core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/model/PublicChatHallModel.java similarity index 93% rename from core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/model/PublicChatHallModel.java rename to core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/model/PublicChatHallModel.java index ea147f6ce..3ba8c0c89 100644 --- a/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/model/PublicChatHallModel.java +++ b/core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/model/PublicChatHallModel.java @@ -1,4 +1,4 @@ -package com.pikolive.core.public_chat_hall.model; +package com.bingchuang.core.public_chat_hall.model; import android.annotation.SuppressLint; @@ -12,22 +12,22 @@ 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.pikolive.core.public_chat_hall.manager.PublicChatHallDataManager; -import com.pikolive.core.R; -import com.pikolive.core.Constants; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.decoration.car.bean.CarInfo; -import com.pikolive.core.decoration.headwear.bean.HeadWearInfo; -import com.pikolive.core.initial.InitialModel; -import com.pikolive.core.level.UserLevelVo; -import com.pikolive.core.noble.NobleInfo; -import com.pikolive.core.public_chat_hall.bean.PublicChatHallMessage; -import com.pikolive.core.user.UserModel; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.user.event.LoadLoginUserInfoEvent; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.public_chat_hall.manager.PublicChatHallDataManager; +import com.bingchuang.core.R; +import com.bingchuang.core.Constants; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.decoration.car.bean.CarInfo; +import com.bingchuang.core.decoration.headwear.bean.HeadWearInfo; +import com.bingchuang.core.initial.InitialModel; +import com.bingchuang.core.level.UserLevelVo; +import com.bingchuang.core.noble.NobleInfo; +import com.bingchuang.core.public_chat_hall.bean.PublicChatHallMessage; +import com.bingchuang.core.user.UserModel; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.user.event.LoadLoginUserInfoEvent; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.utils.ListUtils; import com.bingchuang.library.utils.ResUtil; diff --git a/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/util/PublicChatHallMessageConvertor.java b/core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/util/PublicChatHallMessageConvertor.java similarity index 82% rename from core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/util/PublicChatHallMessageConvertor.java rename to core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/util/PublicChatHallMessageConvertor.java index 3fc44b2d5..aab6f2a54 100644 --- a/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/util/PublicChatHallMessageConvertor.java +++ b/core/src/model_public_chat_hall/java/com/bingchuang/core/public_chat_hall/util/PublicChatHallMessageConvertor.java @@ -1,4 +1,4 @@ -package com.pikolive.core.public_chat_hall.util; +package com.bingchuang.core.public_chat_hall.util; public class PublicChatHallMessageConvertor { diff --git a/core/src/model_smscode/java/com/pikolive/core/code/CodeModel.java b/core/src/model_smscode/java/com/bingchuang/core/code/CodeModel.java similarity index 92% rename from core/src/model_smscode/java/com/pikolive/core/code/CodeModel.java rename to core/src/model_smscode/java/com/bingchuang/core/code/CodeModel.java index aba883c11..150eb642e 100644 --- a/core/src/model_smscode/java/com/pikolive/core/code/CodeModel.java +++ b/core/src/model_smscode/java/com/bingchuang/core/code/CodeModel.java @@ -1,11 +1,11 @@ -package com.pikolive.core.code; +package com.bingchuang.core.code; import android.text.TextUtils; -import com.pikolive.core.R; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; +import com.bingchuang.core.R; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.utils.ResUtil; import com.bingchuang.library.utils.codec.DESUtils; diff --git a/core/src/model_smscode/java/com/pikolive/core/code/CodeType.java b/core/src/model_smscode/java/com/bingchuang/core/code/CodeType.java similarity index 95% rename from core/src/model_smscode/java/com/pikolive/core/code/CodeType.java rename to core/src/model_smscode/java/com/bingchuang/core/code/CodeType.java index 5969bcfdd..9eabd04ac 100644 --- a/core/src/model_smscode/java/com/pikolive/core/code/CodeType.java +++ b/core/src/model_smscode/java/com/bingchuang/core/code/CodeType.java @@ -1,4 +1,4 @@ -package com.pikolive.core.code; +package com.bingchuang.core.code; /** * 验证码类型 diff --git a/core/src/model_smscode/java/com/pikolive/core/code/ICodeModel.java b/core/src/model_smscode/java/com/bingchuang/core/code/ICodeModel.java similarity index 78% rename from core/src/model_smscode/java/com/pikolive/core/code/ICodeModel.java rename to core/src/model_smscode/java/com/bingchuang/core/code/ICodeModel.java index 271dd301b..00bd489e9 100644 --- a/core/src/model_smscode/java/com/pikolive/core/code/ICodeModel.java +++ b/core/src/model_smscode/java/com/bingchuang/core/code/ICodeModel.java @@ -1,6 +1,6 @@ -package com.pikolive.core.code; +package com.bingchuang.core.code; -import com.pikolive.core.base.IModel; +import com.bingchuang.core.base.IModel; import io.reactivex.Single; diff --git a/core/src/model_super_admin/java/com/pikolive/core/admin/SaConstant.java b/core/src/model_super_admin/java/com/bingchuang/core/admin/SaConstant.java similarity index 78% rename from core/src/model_super_admin/java/com/pikolive/core/admin/SaConstant.java rename to core/src/model_super_admin/java/com/bingchuang/core/admin/SaConstant.java index 5314c7307..8b5bb7312 100644 --- a/core/src/model_super_admin/java/com/pikolive/core/admin/SaConstant.java +++ b/core/src/model_super_admin/java/com/bingchuang/core/admin/SaConstant.java @@ -1,6 +1,6 @@ -package com.pikolive.core.admin; +package com.bingchuang.core.admin; -import com.pikolive.core.R; +import com.bingchuang.core.R; import com.bingchuang.library.utils.ResUtil; /** diff --git a/core/src/model_super_admin/java/com/pikolive/core/admin/SuperAdminDataMrg.java b/core/src/model_super_admin/java/com/bingchuang/core/admin/SuperAdminDataMrg.java similarity index 93% rename from core/src/model_super_admin/java/com/pikolive/core/admin/SuperAdminDataMrg.java rename to core/src/model_super_admin/java/com/bingchuang/core/admin/SuperAdminDataMrg.java index bf8218d8f..7ee71b711 100644 --- a/core/src/model_super_admin/java/com/pikolive/core/admin/SuperAdminDataMrg.java +++ b/core/src/model_super_admin/java/com/bingchuang/core/admin/SuperAdminDataMrg.java @@ -1,4 +1,4 @@ -package com.pikolive.core.admin; +package com.bingchuang.core.admin; import android.annotation.SuppressLint; import android.text.TextUtils; @@ -7,12 +7,12 @@ 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.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core.room.model.AvRoomModel; -import com.pikolive.core.room.model.RoomBaseModel; -import com.pikolive.core.admin.util.SuperAdminUtil; -import com.pikolive.core.utils.ExtensionUtil; -import com.pikolive.core.utils.net.DontWarnObserver; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core.room.model.AvRoomModel; +import com.bingchuang.core.room.model.RoomBaseModel; +import com.bingchuang.core.admin.util.SuperAdminUtil; +import com.bingchuang.core.utils.ExtensionUtil; +import com.bingchuang.core.utils.net.DontWarnObserver; import com.bingchuang.library.utils.ListUtils; import java.util.ArrayList; diff --git a/core/src/model_super_admin/java/com/pikolive/core/admin/attachment/SuperAdminOpAttachment.java b/core/src/model_super_admin/java/com/bingchuang/core/admin/attachment/SuperAdminOpAttachment.java similarity index 88% rename from core/src/model_super_admin/java/com/pikolive/core/admin/attachment/SuperAdminOpAttachment.java rename to core/src/model_super_admin/java/com/bingchuang/core/admin/attachment/SuperAdminOpAttachment.java index 168583a26..dc6d4a133 100644 --- a/core/src/model_super_admin/java/com/pikolive/core/admin/attachment/SuperAdminOpAttachment.java +++ b/core/src/model_super_admin/java/com/bingchuang/core/admin/attachment/SuperAdminOpAttachment.java @@ -1,10 +1,10 @@ -package com.pikolive.core.admin.attachment; +package com.bingchuang.core.admin.attachment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.admin.bean.SaOpInfo; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.admin.bean.SaOpInfo; import lombok.Getter; import lombok.Setter; diff --git a/core/src/model_super_admin/java/com/pikolive/core/admin/bean/KickOutExtBean.java b/core/src/model_super_admin/java/com/bingchuang/core/admin/bean/KickOutExtBean.java similarity index 91% rename from core/src/model_super_admin/java/com/pikolive/core/admin/bean/KickOutExtBean.java rename to core/src/model_super_admin/java/com/bingchuang/core/admin/bean/KickOutExtBean.java index df2a6daeb..eee51b34d 100644 --- a/core/src/model_super_admin/java/com/pikolive/core/admin/bean/KickOutExtBean.java +++ b/core/src/model_super_admin/java/com/bingchuang/core/admin/bean/KickOutExtBean.java @@ -1,4 +1,4 @@ -package com.pikolive.core.admin.bean; +package com.bingchuang.core.admin.bean; import lombok.Getter; import lombok.Setter; diff --git a/core/src/model_super_admin/java/com/pikolive/core/admin/bean/SaOpInfo.java b/core/src/model_super_admin/java/com/bingchuang/core/admin/bean/SaOpInfo.java similarity index 90% rename from core/src/model_super_admin/java/com/pikolive/core/admin/bean/SaOpInfo.java rename to core/src/model_super_admin/java/com/bingchuang/core/admin/bean/SaOpInfo.java index 17a1f500f..fa20b7ffc 100644 --- a/core/src/model_super_admin/java/com/pikolive/core/admin/bean/SaOpInfo.java +++ b/core/src/model_super_admin/java/com/bingchuang/core/admin/bean/SaOpInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.admin.bean; +package com.bingchuang.core.admin.bean; import java.io.Serializable; diff --git a/core/src/model_super_admin/java/com/pikolive/core/admin/model/ISuperAdminModel.java b/core/src/model_super_admin/java/com/bingchuang/core/admin/model/ISuperAdminModel.java similarity index 79% rename from core/src/model_super_admin/java/com/pikolive/core/admin/model/ISuperAdminModel.java rename to core/src/model_super_admin/java/com/bingchuang/core/admin/model/ISuperAdminModel.java index 901b23748..85de07985 100644 --- a/core/src/model_super_admin/java/com/pikolive/core/admin/model/ISuperAdminModel.java +++ b/core/src/model_super_admin/java/com/bingchuang/core/admin/model/ISuperAdminModel.java @@ -1,6 +1,6 @@ -package com.pikolive.core.admin.model; +package com.bingchuang.core.admin.model; -import com.pikolive.core.base.IModel; +import com.bingchuang.core.base.IModel; import io.reactivex.Single; diff --git a/core/src/model_super_admin/java/com/pikolive/core/admin/model/SuperAdminModel.java b/core/src/model_super_admin/java/com/bingchuang/core/admin/model/SuperAdminModel.java similarity index 92% rename from core/src/model_super_admin/java/com/pikolive/core/admin/model/SuperAdminModel.java rename to core/src/model_super_admin/java/com/bingchuang/core/admin/model/SuperAdminModel.java index ce653a218..9f664ac01 100644 --- a/core/src/model_super_admin/java/com/pikolive/core/admin/model/SuperAdminModel.java +++ b/core/src/model_super_admin/java/com/bingchuang/core/admin/model/SuperAdminModel.java @@ -1,11 +1,11 @@ -package com.pikolive.core.admin.model; +package com.bingchuang.core.admin.model; import com.google.gson.JsonElement; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import io.reactivex.Single; diff --git a/core/src/model_super_admin/java/com/pikolive/core/admin/model/exception/SAdminCannotGameException.java b/core/src/model_super_admin/java/com/bingchuang/core/admin/model/exception/SAdminCannotGameException.java similarity index 83% rename from core/src/model_super_admin/java/com/pikolive/core/admin/model/exception/SAdminCannotGameException.java rename to core/src/model_super_admin/java/com/bingchuang/core/admin/model/exception/SAdminCannotGameException.java index 7bd845642..77f113204 100644 --- a/core/src/model_super_admin/java/com/pikolive/core/admin/model/exception/SAdminCannotGameException.java +++ b/core/src/model_super_admin/java/com/bingchuang/core/admin/model/exception/SAdminCannotGameException.java @@ -1,4 +1,4 @@ -package com.pikolive.core.admin.model.exception; +package com.bingchuang.core.admin.model.exception; /** * 超管不能玩游戏 diff --git a/core/src/model_super_admin/java/com/pikolive/core/admin/util/SAdminOptUtil.java b/core/src/model_super_admin/java/com/bingchuang/core/admin/util/SAdminOptUtil.java similarity index 90% rename from core/src/model_super_admin/java/com/pikolive/core/admin/util/SAdminOptUtil.java rename to core/src/model_super_admin/java/com/bingchuang/core/admin/util/SAdminOptUtil.java index b84fbd4c1..8302ae882 100644 --- a/core/src/model_super_admin/java/com/pikolive/core/admin/util/SAdminOptUtil.java +++ b/core/src/model_super_admin/java/com/bingchuang/core/admin/util/SAdminOptUtil.java @@ -1,14 +1,14 @@ -package com.pikolive.core.admin.util; +package com.bingchuang.core.admin.util; import com.netease.nimlib.sdk.chatroom.model.ChatRoomKickOutEvent; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.kick.KickModel; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core2.manager.IMNetEaseManager; -import com.pikolive.core.room.model.AvRoomModel; -import com.pikolive.core.admin.bean.KickOutExtBean; -import com.pikolive.core.utils.net.DontWarnObserver; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.kick.KickModel; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core2.manager.IMNetEaseManager; +import com.bingchuang.core.room.model.AvRoomModel; +import com.bingchuang.core.admin.bean.KickOutExtBean; +import com.bingchuang.core.utils.net.DontWarnObserver; import com.bingchuang.library.utils.JavaUtil; import com.bingchuang.library.utils.SingleToastUtil; diff --git a/core/src/model_super_admin/java/com/pikolive/core/admin/util/SaAttachmentFactory.java b/core/src/model_super_admin/java/com/bingchuang/core/admin/util/SaAttachmentFactory.java similarity index 88% rename from core/src/model_super_admin/java/com/pikolive/core/admin/util/SaAttachmentFactory.java rename to core/src/model_super_admin/java/com/bingchuang/core/admin/util/SaAttachmentFactory.java index a7db903e8..39f978b10 100644 --- a/core/src/model_super_admin/java/com/pikolive/core/admin/util/SaAttachmentFactory.java +++ b/core/src/model_super_admin/java/com/bingchuang/core/admin/util/SaAttachmentFactory.java @@ -1,13 +1,13 @@ -package com.pikolive.core.admin.util; +package com.bingchuang.core.admin.util; import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.im.custom.bean.CustomAttachment; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core.admin.attachment.SuperAdminOpAttachment; -import com.pikolive.core.admin.bean.SaOpInfo; -import com.pikolive.core.user.UserModel; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core.admin.attachment.SuperAdminOpAttachment; +import com.bingchuang.core.admin.bean.SaOpInfo; +import com.bingchuang.core.user.UserModel; /** * create by lvzebiao @2019/8/22 diff --git a/core/src/model_super_admin/java/com/pikolive/core/admin/util/SaMsgUtil.java b/core/src/model_super_admin/java/com/bingchuang/core/admin/util/SaMsgUtil.java similarity index 92% rename from core/src/model_super_admin/java/com/pikolive/core/admin/util/SaMsgUtil.java rename to core/src/model_super_admin/java/com/bingchuang/core/admin/util/SaMsgUtil.java index 3fe890653..b6c72a2ae 100644 --- a/core/src/model_super_admin/java/com/pikolive/core/admin/util/SaMsgUtil.java +++ b/core/src/model_super_admin/java/com/bingchuang/core/admin/util/SaMsgUtil.java @@ -1,6 +1,6 @@ -package com.pikolive.core.admin.util; +package com.bingchuang.core.admin.util; -import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.bingchuang.core.im.custom.bean.CustomAttachment; /** * 判断超管的自定义消息 是否需要加入公屏 diff --git a/core/src/model_super_admin/java/com/pikolive/core/admin/util/SuperAdminUtil.java b/core/src/model_super_admin/java/com/bingchuang/core/admin/util/SuperAdminUtil.java similarity index 92% rename from core/src/model_super_admin/java/com/pikolive/core/admin/util/SuperAdminUtil.java rename to core/src/model_super_admin/java/com/bingchuang/core/admin/util/SuperAdminUtil.java index a44b1319b..b8e2c2684 100644 --- a/core/src/model_super_admin/java/com/pikolive/core/admin/util/SuperAdminUtil.java +++ b/core/src/model_super_admin/java/com/bingchuang/core/admin/util/SuperAdminUtil.java @@ -1,13 +1,13 @@ -package com.pikolive.core.admin.util; +package com.bingchuang.core.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.pikolive.core.user.UserModel; -import com.pikolive.core.user.bean.UserInfo; -import com.pikolive.core.utils.ExtensionUtil; +import com.bingchuang.core.user.UserModel; +import com.bingchuang.core.user.bean.UserInfo; +import com.bingchuang.core.utils.ExtensionUtil; import java.util.Map; diff --git a/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/BoxOpenStatusInfo.java b/core/src/model_treasure_box/java/com/bingchuang/treasure_box/bean/BoxOpenStatusInfo.java similarity index 94% rename from core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/BoxOpenStatusInfo.java rename to core/src/model_treasure_box/java/com/bingchuang/treasure_box/bean/BoxOpenStatusInfo.java index 718986aa0..47076f423 100644 --- a/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/BoxOpenStatusInfo.java +++ b/core/src/model_treasure_box/java/com/bingchuang/treasure_box/bean/BoxOpenStatusInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.treasure_box.bean; +package com.bingchuang.treasure_box.bean; import java.io.Serializable; diff --git a/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/ConfigImgUrl.java b/core/src/model_treasure_box/java/com/bingchuang/treasure_box/bean/ConfigImgUrl.java similarity index 92% rename from core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/ConfigImgUrl.java rename to core/src/model_treasure_box/java/com/bingchuang/treasure_box/bean/ConfigImgUrl.java index 11e92527c..2d7131e02 100644 --- a/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/ConfigImgUrl.java +++ b/core/src/model_treasure_box/java/com/bingchuang/treasure_box/bean/ConfigImgUrl.java @@ -1,4 +1,4 @@ -package com.pikolive.treasure_box.bean; +package com.bingchuang.treasure_box.bean; import java.io.Serializable; diff --git a/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/HonourBuyKeyResultInfo.java b/core/src/model_treasure_box/java/com/bingchuang/treasure_box/bean/HonourBuyKeyResultInfo.java similarity index 92% rename from core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/HonourBuyKeyResultInfo.java rename to core/src/model_treasure_box/java/com/bingchuang/treasure_box/bean/HonourBuyKeyResultInfo.java index 392b0735b..2fb0792c6 100644 --- a/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/HonourBuyKeyResultInfo.java +++ b/core/src/model_treasure_box/java/com/bingchuang/treasure_box/bean/HonourBuyKeyResultInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.treasure_box.bean; +package com.bingchuang.treasure_box.bean; import java.io.Serializable; diff --git a/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/HonourKeyInfo.java b/core/src/model_treasure_box/java/com/bingchuang/treasure_box/bean/HonourKeyInfo.java similarity index 92% rename from core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/HonourKeyInfo.java rename to core/src/model_treasure_box/java/com/bingchuang/treasure_box/bean/HonourKeyInfo.java index 87cd941a8..cb5943d6e 100644 --- a/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/HonourKeyInfo.java +++ b/core/src/model_treasure_box/java/com/bingchuang/treasure_box/bean/HonourKeyInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.treasure_box.bean; +package com.bingchuang.treasure_box.bean; import java.io.Serializable; diff --git a/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/KeyInfo.java b/core/src/model_treasure_box/java/com/bingchuang/treasure_box/bean/KeyInfo.java similarity index 95% rename from core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/KeyInfo.java rename to core/src/model_treasure_box/java/com/bingchuang/treasure_box/bean/KeyInfo.java index ebb8a7187..c2a49584e 100644 --- a/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/KeyInfo.java +++ b/core/src/model_treasure_box/java/com/bingchuang/treasure_box/bean/KeyInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.treasure_box.bean; +package com.bingchuang.treasure_box.bean; import java.io.Serializable; diff --git a/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/OpenBoxDrawResult.java b/core/src/model_treasure_box/java/com/bingchuang/treasure_box/bean/OpenBoxDrawResult.java similarity index 89% rename from core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/OpenBoxDrawResult.java rename to core/src/model_treasure_box/java/com/bingchuang/treasure_box/bean/OpenBoxDrawResult.java index c6ef7cd92..a242fca17 100644 --- a/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/OpenBoxDrawResult.java +++ b/core/src/model_treasure_box/java/com/bingchuang/treasure_box/bean/OpenBoxDrawResult.java @@ -1,4 +1,4 @@ -package com.pikolive.treasure_box.bean; +package com.bingchuang.treasure_box.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/OpenBoxHonourResult.java b/core/src/model_treasure_box/java/com/bingchuang/treasure_box/bean/OpenBoxHonourResult.java similarity index 94% rename from core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/OpenBoxHonourResult.java rename to core/src/model_treasure_box/java/com/bingchuang/treasure_box/bean/OpenBoxHonourResult.java index 48281fd09..7d1f0cb21 100644 --- a/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/OpenBoxHonourResult.java +++ b/core/src/model_treasure_box/java/com/bingchuang/treasure_box/bean/OpenBoxHonourResult.java @@ -1,4 +1,4 @@ -package com.pikolive.treasure_box.bean; +package com.bingchuang.treasure_box.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/OpenBoxResult.java b/core/src/model_treasure_box/java/com/bingchuang/treasure_box/bean/OpenBoxResult.java similarity index 94% rename from core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/OpenBoxResult.java rename to core/src/model_treasure_box/java/com/bingchuang/treasure_box/bean/OpenBoxResult.java index 57e29ec4d..adc94d805 100644 --- a/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/OpenBoxResult.java +++ b/core/src/model_treasure_box/java/com/bingchuang/treasure_box/bean/OpenBoxResult.java @@ -1,4 +1,4 @@ -package com.pikolive.treasure_box.bean; +package com.bingchuang.treasure_box.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/PrizeInfo.java b/core/src/model_treasure_box/java/com/bingchuang/treasure_box/bean/PrizeInfo.java similarity index 97% rename from core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/PrizeInfo.java rename to core/src/model_treasure_box/java/com/bingchuang/treasure_box/bean/PrizeInfo.java index 7ad5afd67..aeb2ccff8 100644 --- a/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/PrizeInfo.java +++ b/core/src/model_treasure_box/java/com/bingchuang/treasure_box/bean/PrizeInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.treasure_box.bean; +package com.bingchuang.treasure_box.bean; import java.io.Serializable; diff --git a/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/PrizeNewInfo.java b/core/src/model_treasure_box/java/com/bingchuang/treasure_box/bean/PrizeNewInfo.java similarity index 96% rename from core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/PrizeNewInfo.java rename to core/src/model_treasure_box/java/com/bingchuang/treasure_box/bean/PrizeNewInfo.java index 6bd121fcb..81d5f2706 100644 --- a/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/PrizeNewInfo.java +++ b/core/src/model_treasure_box/java/com/bingchuang/treasure_box/bean/PrizeNewInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.treasure_box.bean; +package com.bingchuang.treasure_box.bean; import java.io.Serializable; diff --git a/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/UserTicketInfo.kt b/core/src/model_treasure_box/java/com/bingchuang/treasure_box/bean/UserTicketInfo.kt similarity index 77% rename from core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/UserTicketInfo.kt rename to core/src/model_treasure_box/java/com/bingchuang/treasure_box/bean/UserTicketInfo.kt index 2aeaa795d..14d2b3670 100644 --- a/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/UserTicketInfo.kt +++ b/core/src/model_treasure_box/java/com/bingchuang/treasure_box/bean/UserTicketInfo.kt @@ -1,4 +1,4 @@ -package com.pikolive.treasure_box.bean +package com.bingchuang.treasure_box.bean data class UserTicketInfo( val diamond: Double = 0.0, diff --git a/core/src/model_treasure_box/java/com/pikolive/treasure_box/event/AutoOpenBoxEvent.java b/core/src/model_treasure_box/java/com/bingchuang/treasure_box/event/AutoOpenBoxEvent.java similarity index 80% rename from core/src/model_treasure_box/java/com/pikolive/treasure_box/event/AutoOpenBoxEvent.java rename to core/src/model_treasure_box/java/com/bingchuang/treasure_box/event/AutoOpenBoxEvent.java index df998470d..27a8d8436 100644 --- a/core/src/model_treasure_box/java/com/pikolive/treasure_box/event/AutoOpenBoxEvent.java +++ b/core/src/model_treasure_box/java/com/bingchuang/treasure_box/event/AutoOpenBoxEvent.java @@ -1,6 +1,6 @@ -package com.pikolive.treasure_box.event; +package com.bingchuang.treasure_box.event; -import com.pikolive.treasure_box.bean.OpenBoxResult; +import com.bingchuang.treasure_box.bean.OpenBoxResult; import lombok.Data; diff --git a/core/src/model_treasure_box/java/com/pikolive/treasure_box/event/AutoOpenHonourBoxEvent.java b/core/src/model_treasure_box/java/com/bingchuang/treasure_box/event/AutoOpenHonourBoxEvent.java similarity index 80% rename from core/src/model_treasure_box/java/com/pikolive/treasure_box/event/AutoOpenHonourBoxEvent.java rename to core/src/model_treasure_box/java/com/bingchuang/treasure_box/event/AutoOpenHonourBoxEvent.java index 0b3e6f910..2f09c9f45 100644 --- a/core/src/model_treasure_box/java/com/pikolive/treasure_box/event/AutoOpenHonourBoxEvent.java +++ b/core/src/model_treasure_box/java/com/bingchuang/treasure_box/event/AutoOpenHonourBoxEvent.java @@ -1,6 +1,6 @@ -package com.pikolive.treasure_box.event; +package com.bingchuang.treasure_box.event; -import com.pikolive.treasure_box.bean.OpenBoxHonourResult; +import com.bingchuang.treasure_box.bean.OpenBoxHonourResult; import lombok.Data; diff --git a/core/src/model_treasure_box/java/com/pikolive/treasure_box/event/BoxBuyKeyEvent.java b/core/src/model_treasure_box/java/com/bingchuang/treasure_box/event/BoxBuyKeyEvent.java similarity index 89% rename from core/src/model_treasure_box/java/com/pikolive/treasure_box/event/BoxBuyKeyEvent.java rename to core/src/model_treasure_box/java/com/bingchuang/treasure_box/event/BoxBuyKeyEvent.java index fc353b158..97057452f 100644 --- a/core/src/model_treasure_box/java/com/pikolive/treasure_box/event/BoxBuyKeyEvent.java +++ b/core/src/model_treasure_box/java/com/bingchuang/treasure_box/event/BoxBuyKeyEvent.java @@ -1,6 +1,6 @@ -package com.pikolive.treasure_box.event; +package com.bingchuang.treasure_box.event; -import com.pikolive.treasure_box.bean.KeyInfo; +import com.bingchuang.treasure_box.bean.KeyInfo; import lombok.Data; diff --git a/core/src/model_treasure_box/java/com/pikolive/treasure_box/event/HonourBoxBuyKeyEvent.java b/core/src/model_treasure_box/java/com/bingchuang/treasure_box/event/HonourBoxBuyKeyEvent.java similarity index 88% rename from core/src/model_treasure_box/java/com/pikolive/treasure_box/event/HonourBoxBuyKeyEvent.java rename to core/src/model_treasure_box/java/com/bingchuang/treasure_box/event/HonourBoxBuyKeyEvent.java index ab853b600..94a52df81 100644 --- a/core/src/model_treasure_box/java/com/pikolive/treasure_box/event/HonourBoxBuyKeyEvent.java +++ b/core/src/model_treasure_box/java/com/bingchuang/treasure_box/event/HonourBoxBuyKeyEvent.java @@ -1,6 +1,6 @@ -package com.pikolive.treasure_box.event; +package com.bingchuang.treasure_box.event; -import com.pikolive.treasure_box.bean.HonourBuyKeyResultInfo; +import com.bingchuang.treasure_box.bean.HonourBuyKeyResultInfo; import lombok.Data; diff --git a/core/src/model_treasure_box/java/com/pikolive/treasure_box/model/BoxModel.java b/core/src/model_treasure_box/java/com/bingchuang/treasure_box/model/BoxModel.java similarity index 92% rename from core/src/model_treasure_box/java/com/pikolive/treasure_box/model/BoxModel.java rename to core/src/model_treasure_box/java/com/bingchuang/treasure_box/model/BoxModel.java index 774600947..e028775f7 100644 --- a/core/src/model_treasure_box/java/com/pikolive/treasure_box/model/BoxModel.java +++ b/core/src/model_treasure_box/java/com/bingchuang/treasure_box/model/BoxModel.java @@ -1,23 +1,23 @@ -package com.pikolive.treasure_box.model; +package com.bingchuang.treasure_box.model; -import com.pikolive.treasure_box.bean.BoxOpenStatusInfo; -import com.pikolive.treasure_box.bean.ConfigImgUrl; -import com.pikolive.treasure_box.bean.HonourBuyKeyResultInfo; -import com.pikolive.treasure_box.bean.HonourKeyInfo; -import com.pikolive.treasure_box.bean.KeyInfo; -import com.pikolive.treasure_box.bean.OpenBoxHonourResult; -import com.pikolive.treasure_box.bean.OpenBoxResult; -import com.pikolive.treasure_box.bean.PrizeInfo; -import com.pikolive.treasure_box.bean.PrizeNewInfo; -import com.pikolive.treasure_box.bean.UserTicketInfo; -import com.pikolive.core.R; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.exception.FailReasonException; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core.utils.net.BalanceNotEnoughExeption; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.treasure_box.bean.BoxOpenStatusInfo; +import com.bingchuang.treasure_box.bean.ConfigImgUrl; +import com.bingchuang.treasure_box.bean.HonourBuyKeyResultInfo; +import com.bingchuang.treasure_box.bean.HonourKeyInfo; +import com.bingchuang.treasure_box.bean.KeyInfo; +import com.bingchuang.treasure_box.bean.OpenBoxHonourResult; +import com.bingchuang.treasure_box.bean.OpenBoxResult; +import com.bingchuang.treasure_box.bean.PrizeInfo; +import com.bingchuang.treasure_box.bean.PrizeNewInfo; +import com.bingchuang.treasure_box.bean.UserTicketInfo; +import com.bingchuang.core.R; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.exception.FailReasonException; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core.utils.net.BalanceNotEnoughExeption; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.utils.ResUtil; diff --git a/core/src/model_treasure_box/java/com/pikolive/treasure_box/model/IBoxModel.java b/core/src/model_treasure_box/java/com/bingchuang/treasure_box/model/IBoxModel.java similarity index 78% rename from core/src/model_treasure_box/java/com/pikolive/treasure_box/model/IBoxModel.java rename to core/src/model_treasure_box/java/com/bingchuang/treasure_box/model/IBoxModel.java index 5de01431a..45a81850a 100644 --- a/core/src/model_treasure_box/java/com/pikolive/treasure_box/model/IBoxModel.java +++ b/core/src/model_treasure_box/java/com/bingchuang/treasure_box/model/IBoxModel.java @@ -1,17 +1,17 @@ -package com.pikolive.treasure_box.model; +package com.bingchuang.treasure_box.model; -import com.pikolive.treasure_box.bean.BoxOpenStatusInfo; -import com.pikolive.treasure_box.bean.ConfigImgUrl; -import com.pikolive.treasure_box.bean.HonourBuyKeyResultInfo; -import com.pikolive.treasure_box.bean.HonourKeyInfo; -import com.pikolive.treasure_box.bean.KeyInfo; -import com.pikolive.treasure_box.bean.OpenBoxHonourResult; -import com.pikolive.treasure_box.bean.OpenBoxResult; -import com.pikolive.treasure_box.bean.PrizeInfo; -import com.pikolive.treasure_box.bean.PrizeNewInfo; -import com.pikolive.treasure_box.bean.UserTicketInfo; -import com.pikolive.core.base.IModel; -import com.pikolive.core.bean.response.ServiceResult; +import com.bingchuang.treasure_box.bean.BoxOpenStatusInfo; +import com.bingchuang.treasure_box.bean.ConfigImgUrl; +import com.bingchuang.treasure_box.bean.HonourBuyKeyResultInfo; +import com.bingchuang.treasure_box.bean.HonourKeyInfo; +import com.bingchuang.treasure_box.bean.KeyInfo; +import com.bingchuang.treasure_box.bean.OpenBoxHonourResult; +import com.bingchuang.treasure_box.bean.OpenBoxResult; +import com.bingchuang.treasure_box.bean.PrizeInfo; +import com.bingchuang.treasure_box.bean.PrizeNewInfo; +import com.bingchuang.treasure_box.bean.UserTicketInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.bean.response.ServiceResult; import java.util.List; diff --git a/core/src/model_treasure_box/java/com/pikolive/treasure_box/model/IRadishModel.java b/core/src/model_treasure_box/java/com/bingchuang/treasure_box/model/IRadishModel.java similarity index 73% rename from core/src/model_treasure_box/java/com/pikolive/treasure_box/model/IRadishModel.java rename to core/src/model_treasure_box/java/com/bingchuang/treasure_box/model/IRadishModel.java index c60d0f71d..4389233e9 100644 --- a/core/src/model_treasure_box/java/com/pikolive/treasure_box/model/IRadishModel.java +++ b/core/src/model_treasure_box/java/com/bingchuang/treasure_box/model/IRadishModel.java @@ -1,12 +1,12 @@ -package com.pikolive.treasure_box.model; +package com.bingchuang.treasure_box.model; -import com.pikolive.treasure_box.bean.BoxOpenStatusInfo; -import com.pikolive.treasure_box.bean.KeyInfo; -import com.pikolive.treasure_box.bean.OpenBoxResult; -import com.pikolive.treasure_box.bean.PrizeInfo; -import com.pikolive.core.base.IModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.room.treasure_box.bean.BoxRankingInfo; +import com.bingchuang.treasure_box.bean.BoxOpenStatusInfo; +import com.bingchuang.treasure_box.bean.KeyInfo; +import com.bingchuang.treasure_box.bean.OpenBoxResult; +import com.bingchuang.treasure_box.bean.PrizeInfo; +import com.bingchuang.core.base.IModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.room.treasure_box.bean.BoxRankingInfo; import java.util.List; diff --git a/core/src/model_treasure_box/java/com/pikolive/treasure_box/model/RadishModel.java b/core/src/model_treasure_box/java/com/bingchuang/treasure_box/model/RadishModel.java similarity index 89% rename from core/src/model_treasure_box/java/com/pikolive/treasure_box/model/RadishModel.java rename to core/src/model_treasure_box/java/com/bingchuang/treasure_box/model/RadishModel.java index 43d609c8d..d660c01d5 100644 --- a/core/src/model_treasure_box/java/com/pikolive/treasure_box/model/RadishModel.java +++ b/core/src/model_treasure_box/java/com/bingchuang/treasure_box/model/RadishModel.java @@ -1,18 +1,18 @@ -package com.pikolive.treasure_box.model; +package com.bingchuang.treasure_box.model; -import com.pikolive.treasure_box.bean.BoxOpenStatusInfo; -import com.pikolive.treasure_box.bean.KeyInfo; -import com.pikolive.treasure_box.bean.OpenBoxResult; -import com.pikolive.treasure_box.bean.PrizeInfo; -import com.pikolive.core.R; -import com.pikolive.core.auth.AuthModel; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.community.CommunityConstant; -import com.pikolive.core.exception.FailReasonException; -import com.pikolive.core.manager.AvRoomDataManager; -import com.pikolive.core.room.treasure_box.bean.BoxRankingInfo; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.treasure_box.bean.BoxOpenStatusInfo; +import com.bingchuang.treasure_box.bean.KeyInfo; +import com.bingchuang.treasure_box.bean.OpenBoxResult; +import com.bingchuang.treasure_box.bean.PrizeInfo; +import com.bingchuang.core.R; +import com.bingchuang.core.auth.AuthModel; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.community.CommunityConstant; +import com.bingchuang.core.exception.FailReasonException; +import com.bingchuang.core.manager.AvRoomDataManager; +import com.bingchuang.core.room.treasure_box.bean.BoxRankingInfo; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.utils.ResUtil; diff --git a/core/src/model_upgrade_app/java/com/pikolive/core/upgrade/bean/NewestVersionInfo.java b/core/src/model_upgrade_app/java/com/bingchuang/core/upgrade/bean/NewestVersionInfo.java similarity index 97% rename from core/src/model_upgrade_app/java/com/pikolive/core/upgrade/bean/NewestVersionInfo.java rename to core/src/model_upgrade_app/java/com/bingchuang/core/upgrade/bean/NewestVersionInfo.java index 16ee31bd9..e7fc88aeb 100644 --- a/core/src/model_upgrade_app/java/com/pikolive/core/upgrade/bean/NewestVersionInfo.java +++ b/core/src/model_upgrade_app/java/com/bingchuang/core/upgrade/bean/NewestVersionInfo.java @@ -1,4 +1,4 @@ -package com.pikolive.core.upgrade.bean; +package com.bingchuang.core.upgrade.bean; import lombok.Data; diff --git a/core/src/model_upgrade_app/java/com/pikolive/core/upgrade/bean/UpgradeCache.java b/core/src/model_upgrade_app/java/com/bingchuang/core/upgrade/bean/UpgradeCache.java similarity index 83% rename from core/src/model_upgrade_app/java/com/pikolive/core/upgrade/bean/UpgradeCache.java rename to core/src/model_upgrade_app/java/com/bingchuang/core/upgrade/bean/UpgradeCache.java index 968f4a396..d5b3563be 100644 --- a/core/src/model_upgrade_app/java/com/pikolive/core/upgrade/bean/UpgradeCache.java +++ b/core/src/model_upgrade_app/java/com/bingchuang/core/upgrade/bean/UpgradeCache.java @@ -1,4 +1,4 @@ -package com.pikolive.core.upgrade.bean; +package com.bingchuang.core.upgrade.bean; import lombok.Getter; import lombok.Setter; diff --git a/core/src/model_upgrade_app/java/com/pikolive/core/upgrade/event/ImPushUpdateAppEvent.java b/core/src/model_upgrade_app/java/com/bingchuang/core/upgrade/event/ImPushUpdateAppEvent.java similarity index 80% rename from core/src/model_upgrade_app/java/com/pikolive/core/upgrade/event/ImPushUpdateAppEvent.java rename to core/src/model_upgrade_app/java/com/bingchuang/core/upgrade/event/ImPushUpdateAppEvent.java index 824bbcc80..86d0d80dd 100644 --- a/core/src/model_upgrade_app/java/com/pikolive/core/upgrade/event/ImPushUpdateAppEvent.java +++ b/core/src/model_upgrade_app/java/com/bingchuang/core/upgrade/event/ImPushUpdateAppEvent.java @@ -1,6 +1,6 @@ -package com.pikolive.core.upgrade.event; +package com.bingchuang.core.upgrade.event; -import com.pikolive.core.upgrade.bean.NewestVersionInfo; +import com.bingchuang.core.upgrade.bean.NewestVersionInfo; /** * IM推送全局广播-发出事件-用户请求更新接口 diff --git a/core/src/model_upgrade_app/java/com/pikolive/core/upgrade/model/IUpgradeModel.java b/core/src/model_upgrade_app/java/com/bingchuang/core/upgrade/model/IUpgradeModel.java similarity index 79% rename from core/src/model_upgrade_app/java/com/pikolive/core/upgrade/model/IUpgradeModel.java rename to core/src/model_upgrade_app/java/com/bingchuang/core/upgrade/model/IUpgradeModel.java index c4f440a0f..cbcf62a09 100644 --- a/core/src/model_upgrade_app/java/com/pikolive/core/upgrade/model/IUpgradeModel.java +++ b/core/src/model_upgrade_app/java/com/bingchuang/core/upgrade/model/IUpgradeModel.java @@ -1,6 +1,6 @@ -package com.pikolive.core.upgrade.model; +package com.bingchuang.core.upgrade.model; -import com.pikolive.core.upgrade.bean.NewestVersionInfo; +import com.bingchuang.core.upgrade.bean.NewestVersionInfo; import io.reactivex.Single; diff --git a/core/src/model_upgrade_app/java/com/pikolive/core/upgrade/model/UpgradeModel.java b/core/src/model_upgrade_app/java/com/bingchuang/core/upgrade/model/UpgradeModel.java similarity index 89% rename from core/src/model_upgrade_app/java/com/pikolive/core/upgrade/model/UpgradeModel.java rename to core/src/model_upgrade_app/java/com/bingchuang/core/upgrade/model/UpgradeModel.java index d0518bdf3..82499605f 100644 --- a/core/src/model_upgrade_app/java/com/pikolive/core/upgrade/model/UpgradeModel.java +++ b/core/src/model_upgrade_app/java/com/bingchuang/core/upgrade/model/UpgradeModel.java @@ -1,10 +1,10 @@ -package com.pikolive.core.upgrade.model; +package com.bingchuang.core.upgrade.model; -import com.pikolive.core.R; -import com.pikolive.core.base.BaseModel; -import com.pikolive.core.bean.response.ServiceResult; -import com.pikolive.core.upgrade.bean.NewestVersionInfo; -import com.pikolive.core.utils.net.RxHelper; +import com.bingchuang.core.R; +import com.bingchuang.core.base.BaseModel; +import com.bingchuang.core.bean.response.ServiceResult; +import com.bingchuang.core.upgrade.bean.NewestVersionInfo; +import com.bingchuang.core.utils.net.RxHelper; import com.bingchuang.library.net.rxnet.RxNet; import com.bingchuang.library.utils.ResUtil; diff --git a/mob.gradle b/mob.gradle index d21a4ad0f..3e3f6bd08 100644 --- a/mob.gradle +++ b/mob.gradle @@ -5,7 +5,7 @@ MobSDK { appSecret "5547946de29a5694162c2cf547edc5a7" appBundleMode true MobLink { - uriScheme "pekoapp://sharesdk" + uriScheme "pekiapp://sharesdk" appLinkHost "cebg.t4m.cn" } ShareSDK { diff --git a/nim_uikit/res/values/strings.xml b/nim_uikit/res/values/strings.xml index 8a5201642..2140e0707 100644 --- a/nim_uikit/res/values/strings.xml +++ b/nim_uikit/res/values/strings.xml @@ -313,8 +313,8 @@ ,時長: 秒 yyyy年MM月 -發送失敗,Piko提醒您文明用語~ -發送失敗,Piko提醒您文明用語~ +發送失敗,Peki提醒您文明用語~ +發送失敗,Peki提醒您文明用語~ 邀請 加入群 加入討論組