* There are two built-in themes:
- * 1. com.zhihu.matisse.R.style.Matisse_Zhihu;
- * 2. com.zhihu.matisse.R.style.Matisse_Dracula
+ * 1. com.example.matisse.R.style.Matisse_Zhihu;
+ * 2. com.example.matisse.R.style.Matisse_Dracula
* you can define a custom theme derived from the above ones or other themes.
*
- * @param themeId theme resource id. Default value is com.zhihu.matisse.R.style.Matisse_Zhihu.
+ * @param themeId theme resource id. Default value is com.example.matisse.R.style.Matisse_Zhihu.
* @return {@link SelectionCreator} for fluent API.
*/
public SelectionCreator theme(@StyleRes int themeId) {
@@ -307,8 +307,8 @@ public final class SelectionCreator {
* Provide an image engine.
*
* There are two built-in image engines:
- * 1. {@link com.zhihu.matisse.engine.impl.GlideEngine}
- * 2. {@link com.zhihu.matisse.engine.impl.PicassoEngine}
+ * 1. {@link com.example.matisse.engine.impl.GlideEngine}
+ * 2. {@link com.example.matisse.engine.impl.PicassoEngine}
* And you can implement your own image engine.
*
* @param imageEngine {@link ImageEngine}
diff --git a/app/src/module_album/java/com/zhihu/matisse/engine/ImageEngine.java b/app/src/module_album/java/com/example/matisse/engine/ImageEngine.java
similarity index 93%
rename from app/src/module_album/java/com/zhihu/matisse/engine/ImageEngine.java
rename to app/src/module_album/java/com/example/matisse/engine/ImageEngine.java
index 84e5c967d..3a73e6ffc 100644
--- a/app/src/module_album/java/com/zhihu/matisse/engine/ImageEngine.java
+++ b/app/src/module_album/java/com/example/matisse/engine/ImageEngine.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.zhihu.matisse.engine;
+package com.example.matisse.engine;
import android.content.Context;
import android.graphics.drawable.Drawable;
@@ -21,8 +21,8 @@ import android.net.Uri;
import android.widget.ImageView;
/**
- * Image loader interface. There are predefined {@link com.zhihu.matisse.engine.impl.GlideEngine}
- * and {@link com.zhihu.matisse.engine.impl.PicassoEngine}.
+ * Image loader interface. There are predefined {@link com.example.matisse.engine.impl.GlideEngine}
+ * and {@link com.example.matisse.engine.impl.PicassoEngine}.
*/
@SuppressWarnings("unused")
public interface ImageEngine {
diff --git a/app/src/module_album/java/com/zhihu/matisse/engine/impl/GlideEngine.java b/app/src/module_album/java/com/example/matisse/engine/impl/GlideEngine.java
similarity index 96%
rename from app/src/module_album/java/com/zhihu/matisse/engine/impl/GlideEngine.java
rename to app/src/module_album/java/com/example/matisse/engine/impl/GlideEngine.java
index 570be17ca..6e471c255 100644
--- a/app/src/module_album/java/com/zhihu/matisse/engine/impl/GlideEngine.java
+++ b/app/src/module_album/java/com/example/matisse/engine/impl/GlideEngine.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.zhihu.matisse.engine.impl;
+package com.example.matisse.engine.impl;
import android.content.Context;
import android.graphics.drawable.Drawable;
@@ -22,7 +22,7 @@ import android.widget.ImageView;
import com.bumptech.glide.Priority;
import com.netease.nim.uikit.support.glide.GlideApp;
-import com.zhihu.matisse.engine.ImageEngine;
+import com.example.matisse.engine.ImageEngine;
/**
* {@link ImageEngine} implementation using Glide.
diff --git a/app/src/module_album/java/com/zhihu/matisse/filter/Filter.java b/app/src/module_album/java/com/example/matisse/filter/Filter.java
similarity index 89%
rename from app/src/module_album/java/com/zhihu/matisse/filter/Filter.java
rename to app/src/module_album/java/com/example/matisse/filter/Filter.java
index f3a582eac..d2ab5aaaa 100644
--- a/app/src/module_album/java/com/zhihu/matisse/filter/Filter.java
+++ b/app/src/module_album/java/com/example/matisse/filter/Filter.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.zhihu.matisse.filter;
+package com.example.matisse.filter;
import android.content.Context;
-import com.zhihu.matisse.MimeType;
-import com.zhihu.matisse.SelectionCreator;
-import com.zhihu.matisse.internal.entity.IncapableCause;
-import com.zhihu.matisse.internal.entity.Item;
+import com.example.matisse.MimeType;
+import com.example.matisse.SelectionCreator;
+import com.example.matisse.internal.entity.IncapableCause;
+import com.example.matisse.internal.entity.Item;
import java.util.Set;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/entity/Album.java b/app/src/module_album/java/com/example/matisse/internal/entity/Album.java
similarity index 97%
rename from app/src/module_album/java/com/zhihu/matisse/internal/entity/Album.java
rename to app/src/module_album/java/com/example/matisse/internal/entity/Album.java
index f08cd58a1..9dc60e648 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/entity/Album.java
+++ b/app/src/module_album/java/com/example/matisse/internal/entity/Album.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.zhihu.matisse.internal.entity;
+package com.example.matisse.internal.entity;
import android.content.Context;
import android.database.Cursor;
@@ -25,7 +25,7 @@ import android.os.Parcelable;
import androidx.annotation.Nullable;
import com.chwl.app.R;
-import com.zhihu.matisse.internal.loader.AlbumLoader;
+import com.example.matisse.internal.loader.AlbumLoader;
public class Album implements Parcelable {
public static final Creator CREATOR = new Creator() {
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/entity/CaptureStrategy.java b/app/src/module_album/java/com/example/matisse/internal/entity/CaptureStrategy.java
similarity index 96%
rename from app/src/module_album/java/com/zhihu/matisse/internal/entity/CaptureStrategy.java
rename to app/src/module_album/java/com/example/matisse/internal/entity/CaptureStrategy.java
index 6d724816e..6a95e53c7 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/entity/CaptureStrategy.java
+++ b/app/src/module_album/java/com/example/matisse/internal/entity/CaptureStrategy.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.zhihu.matisse.internal.entity;
+package com.example.matisse.internal.entity;
import com.netease.nim.uikit.common.util.log.LogUtil;
import com.chwl.app.R;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/entity/CustomItem.java b/app/src/module_album/java/com/example/matisse/internal/entity/CustomItem.java
similarity index 97%
rename from app/src/module_album/java/com/zhihu/matisse/internal/entity/CustomItem.java
rename to app/src/module_album/java/com/example/matisse/internal/entity/CustomItem.java
index 2296967f6..8ea485642 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/entity/CustomItem.java
+++ b/app/src/module_album/java/com/example/matisse/internal/entity/CustomItem.java
@@ -1,4 +1,4 @@
-package com.zhihu.matisse.internal.entity;
+package com.example.matisse.internal.entity;
import android.os.Parcel;
import android.os.Parcelable;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/entity/IncapableCause.java b/app/src/module_album/java/com/example/matisse/internal/entity/IncapableCause.java
similarity index 95%
rename from app/src/module_album/java/com/zhihu/matisse/internal/entity/IncapableCause.java
rename to app/src/module_album/java/com/example/matisse/internal/entity/IncapableCause.java
index a899c15af..4323175c9 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/entity/IncapableCause.java
+++ b/app/src/module_album/java/com/example/matisse/internal/entity/IncapableCause.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.zhihu.matisse.internal.entity;
+package com.example.matisse.internal.entity;
import static java.lang.annotation.RetentionPolicy.SOURCE;
@@ -23,7 +23,7 @@ import androidx.annotation.IntDef;
import androidx.fragment.app.FragmentActivity;
import com.chwl.library.utils.SingleToastUtil;
-import com.zhihu.matisse.internal.ui.widget.IncapableDialog;
+import com.example.matisse.internal.ui.widget.IncapableDialog;
import java.lang.annotation.Retention;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/entity/Item.java b/app/src/module_album/java/com/example/matisse/internal/entity/Item.java
similarity index 98%
rename from app/src/module_album/java/com/zhihu/matisse/internal/entity/Item.java
rename to app/src/module_album/java/com/example/matisse/internal/entity/Item.java
index 01ad63788..314b1f61f 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/entity/Item.java
+++ b/app/src/module_album/java/com/example/matisse/internal/entity/Item.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.zhihu.matisse.internal.entity;
+package com.example.matisse.internal.entity;
import android.content.ContentUris;
import android.database.Cursor;
@@ -25,7 +25,7 @@ import android.provider.MediaStore;
import androidx.annotation.Nullable;
-import com.zhihu.matisse.MimeType;
+import com.example.matisse.MimeType;
public class Item implements Parcelable {
public static final Creator- CREATOR = new Creator
- () {
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/entity/SelectionSpec.java b/app/src/module_album/java/com/example/matisse/internal/entity/SelectionSpec.java
similarity index 91%
rename from app/src/module_album/java/com/zhihu/matisse/internal/entity/SelectionSpec.java
rename to app/src/module_album/java/com/example/matisse/internal/entity/SelectionSpec.java
index abca64d91..1cfa793ef 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/entity/SelectionSpec.java
+++ b/app/src/module_album/java/com/example/matisse/internal/entity/SelectionSpec.java
@@ -14,19 +14,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.zhihu.matisse.internal.entity;
+package com.example.matisse.internal.entity;
import android.content.pm.ActivityInfo;
import androidx.annotation.StyleRes;
import com.chwl.app.R;
-import com.zhihu.matisse.MimeType;
-import com.zhihu.matisse.engine.ImageEngine;
-import com.zhihu.matisse.engine.impl.GlideEngine;
-import com.zhihu.matisse.filter.Filter;
-import com.zhihu.matisse.listener.OnCheckedListener;
-import com.zhihu.matisse.listener.OnSelectedListener;
+import com.example.matisse.MimeType;
+import com.example.matisse.engine.ImageEngine;
+import com.example.matisse.engine.impl.GlideEngine;
+import com.example.matisse.filter.Filter;
+import com.example.matisse.listener.OnCheckedListener;
+import com.example.matisse.listener.OnSelectedListener;
import java.util.List;
import java.util.Set;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/loader/AlbumLoader.java b/app/src/module_album/java/com/example/matisse/internal/loader/AlbumLoader.java
similarity index 98%
rename from app/src/module_album/java/com/zhihu/matisse/internal/loader/AlbumLoader.java
rename to app/src/module_album/java/com/example/matisse/internal/loader/AlbumLoader.java
index 157a56349..2447ef68b 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/loader/AlbumLoader.java
+++ b/app/src/module_album/java/com/example/matisse/internal/loader/AlbumLoader.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.zhihu.matisse.internal.loader;
+package com.example.matisse.internal.loader;
import android.content.ContentUris;
import android.content.Context;
@@ -27,9 +27,9 @@ import android.provider.MediaStore;
import androidx.loader.content.CursorLoader;
-import com.zhihu.matisse.MimeType;
-import com.zhihu.matisse.internal.entity.Album;
-import com.zhihu.matisse.internal.entity.SelectionSpec;
+import com.example.matisse.MimeType;
+import com.example.matisse.internal.entity.Album;
+import com.example.matisse.internal.entity.SelectionSpec;
import java.util.HashMap;
import java.util.HashSet;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/loader/AlbumMediaLoader.java b/app/src/module_album/java/com/example/matisse/internal/loader/AlbumMediaLoader.java
similarity index 96%
rename from app/src/module_album/java/com/zhihu/matisse/internal/loader/AlbumMediaLoader.java
rename to app/src/module_album/java/com/example/matisse/internal/loader/AlbumMediaLoader.java
index 709905be0..df7975ff4 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/loader/AlbumMediaLoader.java
+++ b/app/src/module_album/java/com/example/matisse/internal/loader/AlbumMediaLoader.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.zhihu.matisse.internal.loader;
+package com.example.matisse.internal.loader;
import android.content.Context;
import android.database.Cursor;
@@ -25,10 +25,10 @@ import android.provider.MediaStore;
import androidx.loader.content.CursorLoader;
-import com.zhihu.matisse.internal.entity.Album;
-import com.zhihu.matisse.internal.entity.Item;
-import com.zhihu.matisse.internal.entity.SelectionSpec;
-import com.zhihu.matisse.internal.utils.MediaStoreCompat;
+import com.example.matisse.internal.entity.Album;
+import com.example.matisse.internal.entity.Item;
+import com.example.matisse.internal.entity.SelectionSpec;
+import com.example.matisse.internal.utils.MediaStoreCompat;
/**
* Load images and videos into a single cursor.
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/model/AlbumCollection.java b/app/src/module_album/java/com/example/matisse/internal/model/AlbumCollection.java
similarity index 97%
rename from app/src/module_album/java/com/zhihu/matisse/internal/model/AlbumCollection.java
rename to app/src/module_album/java/com/example/matisse/internal/model/AlbumCollection.java
index 7d0b48ec8..a596ba2e0 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/model/AlbumCollection.java
+++ b/app/src/module_album/java/com/example/matisse/internal/model/AlbumCollection.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.zhihu.matisse.internal.model;
+package com.example.matisse.internal.model;
import android.content.Context;
import android.database.Cursor;
@@ -24,7 +24,7 @@ import androidx.fragment.app.FragmentActivity;
import androidx.loader.app.LoaderManager;
import androidx.loader.content.Loader;
-import com.zhihu.matisse.internal.loader.AlbumLoader;
+import com.example.matisse.internal.loader.AlbumLoader;
import java.lang.ref.WeakReference;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/model/AlbumMediaCollection.java b/app/src/module_album/java/com/example/matisse/internal/model/AlbumMediaCollection.java
similarity index 95%
rename from app/src/module_album/java/com/zhihu/matisse/internal/model/AlbumMediaCollection.java
rename to app/src/module_album/java/com/example/matisse/internal/model/AlbumMediaCollection.java
index 770178e6b..eae235c8d 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/model/AlbumMediaCollection.java
+++ b/app/src/module_album/java/com/example/matisse/internal/model/AlbumMediaCollection.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.zhihu.matisse.internal.model;
+package com.example.matisse.internal.model;
import android.content.Context;
import android.database.Cursor;
@@ -26,8 +26,8 @@ import androidx.fragment.app.FragmentActivity;
import androidx.loader.app.LoaderManager;
import androidx.loader.content.Loader;
-import com.zhihu.matisse.internal.entity.Album;
-import com.zhihu.matisse.internal.loader.AlbumMediaLoader;
+import com.example.matisse.internal.entity.Album;
+import com.example.matisse.internal.loader.AlbumMediaLoader;
import java.lang.ref.WeakReference;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/model/SelectedItemCollection.java b/app/src/module_album/java/com/example/matisse/internal/model/SelectedItemCollection.java
similarity index 95%
rename from app/src/module_album/java/com/zhihu/matisse/internal/model/SelectedItemCollection.java
rename to app/src/module_album/java/com/example/matisse/internal/model/SelectedItemCollection.java
index 9fe167e59..aa8ccbd87 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/model/SelectedItemCollection.java
+++ b/app/src/module_album/java/com/example/matisse/internal/model/SelectedItemCollection.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.zhihu.matisse.internal.model;
+package com.example.matisse.internal.model;
import android.content.Context;
import android.content.res.Resources;
@@ -21,13 +21,13 @@ import android.net.Uri;
import android.os.Bundle;
import com.chwl.app.R;
-import com.zhihu.matisse.internal.entity.CustomItem;
-import com.zhihu.matisse.internal.entity.IncapableCause;
-import com.zhihu.matisse.internal.entity.Item;
-import com.zhihu.matisse.internal.entity.SelectionSpec;
-import com.zhihu.matisse.internal.ui.widget.CheckView;
-import com.zhihu.matisse.internal.utils.PathUtils;
-import com.zhihu.matisse.internal.utils.PhotoMetadataUtils;
+import com.example.matisse.internal.entity.CustomItem;
+import com.example.matisse.internal.entity.IncapableCause;
+import com.example.matisse.internal.entity.Item;
+import com.example.matisse.internal.entity.SelectionSpec;
+import com.example.matisse.internal.ui.widget.CheckView;
+import com.example.matisse.internal.utils.PathUtils;
+import com.example.matisse.internal.utils.PhotoMetadataUtils;
import java.util.ArrayList;
import java.util.LinkedHashSet;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/AlbumPreviewActivity.java b/app/src/module_album/java/com/example/matisse/internal/ui/AlbumPreviewActivity.java
similarity index 89%
rename from app/src/module_album/java/com/zhihu/matisse/internal/ui/AlbumPreviewActivity.java
rename to app/src/module_album/java/com/example/matisse/internal/ui/AlbumPreviewActivity.java
index c6ba8c0e5..60506c186 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/AlbumPreviewActivity.java
+++ b/app/src/module_album/java/com/example/matisse/internal/ui/AlbumPreviewActivity.java
@@ -13,18 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.zhihu.matisse.internal.ui;
+package com.example.matisse.internal.ui;
import android.database.Cursor;
import android.os.Bundle;
import androidx.annotation.Nullable;
-import com.zhihu.matisse.internal.entity.Album;
-import com.zhihu.matisse.internal.entity.Item;
-import com.zhihu.matisse.internal.entity.SelectionSpec;
-import com.zhihu.matisse.internal.model.AlbumMediaCollection;
-import com.zhihu.matisse.internal.ui.adapter.PreviewPagerAdapter;
+import com.example.matisse.internal.entity.Album;
+import com.example.matisse.internal.entity.Item;
+import com.example.matisse.internal.entity.SelectionSpec;
+import com.example.matisse.internal.model.AlbumMediaCollection;
+import com.example.matisse.internal.ui.adapter.PreviewPagerAdapter;
import java.util.ArrayList;
import java.util.List;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/BasePreviewActivity.java b/app/src/module_album/java/com/example/matisse/internal/ui/BasePreviewActivity.java
similarity index 94%
rename from app/src/module_album/java/com/zhihu/matisse/internal/ui/BasePreviewActivity.java
rename to app/src/module_album/java/com/example/matisse/internal/ui/BasePreviewActivity.java
index 7229c34b6..1eedc5366 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/BasePreviewActivity.java
+++ b/app/src/module_album/java/com/example/matisse/internal/ui/BasePreviewActivity.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.zhihu.matisse.internal.ui;
+package com.example.matisse.internal.ui;
import android.app.Activity;
import android.content.Intent;
@@ -36,18 +36,18 @@ import androidx.viewpager.widget.ViewPager;
import com.chwl.app.R;
import com.chwl.app.base.TitleBar;
import com.chwl.library.utils.ResUtil;
-import com.zhihu.matisse.internal.entity.IncapableCause;
-import com.zhihu.matisse.internal.entity.Item;
-import com.zhihu.matisse.internal.entity.SelectionSpec;
-import com.zhihu.matisse.internal.model.SelectedItemCollection;
-import com.zhihu.matisse.internal.ui.adapter.PreviewPagerAdapter;
-import com.zhihu.matisse.internal.ui.widget.CheckRadioView;
-import com.zhihu.matisse.internal.ui.widget.CheckView;
-import com.zhihu.matisse.internal.ui.widget.IncapableDialog;
-import com.zhihu.matisse.internal.utils.PhotoMetadataUtils;
-import com.zhihu.matisse.internal.utils.Platform;
-import com.zhihu.matisse.listener.OnFragmentInteractionListener;
-import com.zhihu.matisse.widget.ConfirmPickView;
+import com.example.matisse.internal.entity.IncapableCause;
+import com.example.matisse.internal.entity.Item;
+import com.example.matisse.internal.entity.SelectionSpec;
+import com.example.matisse.internal.model.SelectedItemCollection;
+import com.example.matisse.internal.ui.adapter.PreviewPagerAdapter;
+import com.example.matisse.internal.ui.widget.CheckRadioView;
+import com.example.matisse.internal.ui.widget.CheckView;
+import com.example.matisse.internal.ui.widget.IncapableDialog;
+import com.example.matisse.internal.utils.PhotoMetadataUtils;
+import com.example.matisse.internal.utils.Platform;
+import com.example.matisse.listener.OnFragmentInteractionListener;
+import com.example.matisse.widget.ConfirmPickView;
public abstract class BasePreviewActivity extends AppCompatActivity implements View.OnClickListener,
ViewPager.OnPageChangeListener, OnFragmentInteractionListener {
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/MediaSelectionFragment.java b/app/src/module_album/java/com/example/matisse/internal/ui/MediaSelectionFragment.java
similarity index 91%
rename from app/src/module_album/java/com/zhihu/matisse/internal/ui/MediaSelectionFragment.java
rename to app/src/module_album/java/com/example/matisse/internal/ui/MediaSelectionFragment.java
index 2154f92c4..70b9d6551 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/MediaSelectionFragment.java
+++ b/app/src/module_album/java/com/example/matisse/internal/ui/MediaSelectionFragment.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.zhihu.matisse.internal.ui;
+package com.example.matisse.internal.ui;
import android.content.Context;
import android.database.Cursor;
@@ -28,14 +28,14 @@ import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.chwl.app.R;
-import com.zhihu.matisse.internal.entity.Album;
-import com.zhihu.matisse.internal.entity.Item;
-import com.zhihu.matisse.internal.entity.SelectionSpec;
-import com.zhihu.matisse.internal.model.AlbumMediaCollection;
-import com.zhihu.matisse.internal.model.SelectedItemCollection;
-import com.zhihu.matisse.internal.ui.adapter.AlbumMediaAdapter;
-import com.zhihu.matisse.internal.ui.widget.MediaGridInset;
-import com.zhihu.matisse.internal.utils.UIUtils;
+import com.example.matisse.internal.entity.Album;
+import com.example.matisse.internal.entity.Item;
+import com.example.matisse.internal.entity.SelectionSpec;
+import com.example.matisse.internal.model.AlbumMediaCollection;
+import com.example.matisse.internal.model.SelectedItemCollection;
+import com.example.matisse.internal.ui.adapter.AlbumMediaAdapter;
+import com.example.matisse.internal.ui.widget.MediaGridInset;
+import com.example.matisse.internal.utils.UIUtils;
public class MediaSelectionFragment extends Fragment implements
AlbumMediaCollection.AlbumMediaCallbacks, AlbumMediaAdapter.CheckStateListener,
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/PreviewItemFragment.java b/app/src/module_album/java/com/example/matisse/internal/ui/PreviewItemFragment.java
similarity index 94%
rename from app/src/module_album/java/com/zhihu/matisse/internal/ui/PreviewItemFragment.java
rename to app/src/module_album/java/com/example/matisse/internal/ui/PreviewItemFragment.java
index 7fb3cf274..0ef223549 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/PreviewItemFragment.java
+++ b/app/src/module_album/java/com/example/matisse/internal/ui/PreviewItemFragment.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.zhihu.matisse.internal.ui;
+package com.example.matisse.internal.ui;
import android.content.ActivityNotFoundException;
import android.content.Context;
@@ -29,10 +29,10 @@ import androidx.fragment.app.Fragment;
import com.chwl.app.R;
import com.chwl.library.utils.SingleToastUtil;
-import com.zhihu.matisse.internal.entity.Item;
-import com.zhihu.matisse.internal.entity.SelectionSpec;
-import com.zhihu.matisse.internal.utils.PhotoMetadataUtils;
-import com.zhihu.matisse.listener.OnFragmentInteractionListener;
+import com.example.matisse.internal.entity.Item;
+import com.example.matisse.internal.entity.SelectionSpec;
+import com.example.matisse.internal.utils.PhotoMetadataUtils;
+import com.example.matisse.listener.OnFragmentInteractionListener;
import it.sephiroth.android.library.imagezoom.ImageViewTouch;
import it.sephiroth.android.library.imagezoom.ImageViewTouchBase;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/SelectedPreviewActivity.java b/app/src/module_album/java/com/example/matisse/internal/ui/SelectedPreviewActivity.java
similarity index 87%
rename from app/src/module_album/java/com/zhihu/matisse/internal/ui/SelectedPreviewActivity.java
rename to app/src/module_album/java/com/example/matisse/internal/ui/SelectedPreviewActivity.java
index 7b8132d84..4bc91c227 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/SelectedPreviewActivity.java
+++ b/app/src/module_album/java/com/example/matisse/internal/ui/SelectedPreviewActivity.java
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.zhihu.matisse.internal.ui;
+package com.example.matisse.internal.ui;
import android.os.Bundle;
import androidx.annotation.Nullable;
-import com.zhihu.matisse.internal.entity.Item;
-import com.zhihu.matisse.internal.entity.SelectionSpec;
-import com.zhihu.matisse.internal.model.SelectedItemCollection;
+import com.example.matisse.internal.entity.Item;
+import com.example.matisse.internal.entity.SelectionSpec;
+import com.example.matisse.internal.model.SelectedItemCollection;
import java.util.List;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/AlbumMediaAdapter.java b/app/src/module_album/java/com/example/matisse/internal/ui/adapter/AlbumMediaAdapter.java
similarity index 96%
rename from app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/AlbumMediaAdapter.java
rename to app/src/module_album/java/com/example/matisse/internal/ui/adapter/AlbumMediaAdapter.java
index dddf59eef..67d008cf3 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/AlbumMediaAdapter.java
+++ b/app/src/module_album/java/com/example/matisse/internal/ui/adapter/AlbumMediaAdapter.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.zhihu.matisse.internal.ui.adapter;
+package com.example.matisse.internal.ui.adapter;
import android.content.Context;
import android.content.res.TypedArray;
@@ -28,13 +28,13 @@ import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.chwl.app.R;
-import com.zhihu.matisse.internal.entity.Album;
-import com.zhihu.matisse.internal.entity.IncapableCause;
-import com.zhihu.matisse.internal.entity.Item;
-import com.zhihu.matisse.internal.entity.SelectionSpec;
-import com.zhihu.matisse.internal.model.SelectedItemCollection;
-import com.zhihu.matisse.internal.ui.widget.CheckView;
-import com.zhihu.matisse.internal.ui.widget.MediaGrid;
+import com.example.matisse.internal.entity.Album;
+import com.example.matisse.internal.entity.IncapableCause;
+import com.example.matisse.internal.entity.Item;
+import com.example.matisse.internal.entity.SelectionSpec;
+import com.example.matisse.internal.model.SelectedItemCollection;
+import com.example.matisse.internal.ui.widget.CheckView;
+import com.example.matisse.internal.ui.widget.MediaGrid;
public class AlbumMediaAdapter extends
RecyclerViewCursorAdapter implements
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/AlbumsAdapter.java b/app/src/module_album/java/com/example/matisse/internal/ui/adapter/AlbumsAdapter.java
similarity index 94%
rename from app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/AlbumsAdapter.java
rename to app/src/module_album/java/com/example/matisse/internal/ui/adapter/AlbumsAdapter.java
index 134387616..ed998c0e1 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/AlbumsAdapter.java
+++ b/app/src/module_album/java/com/example/matisse/internal/ui/adapter/AlbumsAdapter.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.zhihu.matisse.internal.ui.adapter;
+package com.example.matisse.internal.ui.adapter;
import android.content.Context;
import android.content.res.TypedArray;
@@ -27,8 +27,8 @@ import android.widget.ImageView;
import android.widget.TextView;
import com.chwl.app.R;
-import com.zhihu.matisse.internal.entity.Album;
-import com.zhihu.matisse.internal.entity.SelectionSpec;
+import com.example.matisse.internal.entity.Album;
+import com.example.matisse.internal.entity.SelectionSpec;
public class AlbumsAdapter extends CursorAdapter {
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/PreviewPagerAdapter.java b/app/src/module_album/java/com/example/matisse/internal/ui/adapter/PreviewPagerAdapter.java
similarity index 92%
rename from app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/PreviewPagerAdapter.java
rename to app/src/module_album/java/com/example/matisse/internal/ui/adapter/PreviewPagerAdapter.java
index 7dcbf594b..64cdd0ff2 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/PreviewPagerAdapter.java
+++ b/app/src/module_album/java/com/example/matisse/internal/ui/adapter/PreviewPagerAdapter.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.zhihu.matisse.internal.ui.adapter;
+package com.example.matisse.internal.ui.adapter;
import android.view.ViewGroup;
@@ -21,8 +21,8 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentPagerAdapter;
-import com.zhihu.matisse.internal.entity.Item;
-import com.zhihu.matisse.internal.ui.PreviewItemFragment;
+import com.example.matisse.internal.entity.Item;
+import com.example.matisse.internal.ui.PreviewItemFragment;
import java.util.ArrayList;
import java.util.List;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/RecyclerViewCursorAdapter.java b/app/src/module_album/java/com/example/matisse/internal/ui/adapter/RecyclerViewCursorAdapter.java
similarity index 98%
rename from app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/RecyclerViewCursorAdapter.java
rename to app/src/module_album/java/com/example/matisse/internal/ui/adapter/RecyclerViewCursorAdapter.java
index feee6533c..11a2f82f0 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/RecyclerViewCursorAdapter.java
+++ b/app/src/module_album/java/com/example/matisse/internal/ui/adapter/RecyclerViewCursorAdapter.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.zhihu.matisse.internal.ui.adapter;
+package com.example.matisse.internal.ui.adapter;
import android.database.Cursor;
import android.provider.MediaStore;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/AlbumsSpinner.java b/app/src/module_album/java/com/example/matisse/internal/ui/widget/AlbumsSpinner.java
similarity index 96%
rename from app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/AlbumsSpinner.java
rename to app/src/module_album/java/com/example/matisse/internal/ui/widget/AlbumsSpinner.java
index 71778de34..497c60d11 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/AlbumsSpinner.java
+++ b/app/src/module_album/java/com/example/matisse/internal/ui/widget/AlbumsSpinner.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.zhihu.matisse.internal.ui.widget;
+package com.example.matisse.internal.ui.widget;
import android.content.Context;
import android.content.res.TypedArray;
@@ -29,8 +29,8 @@ import androidx.annotation.NonNull;
import androidx.appcompat.widget.ListPopupWindow;
import com.chwl.app.R;
-import com.zhihu.matisse.internal.entity.Album;
-import com.zhihu.matisse.internal.utils.Platform;
+import com.example.matisse.internal.entity.Album;
+import com.example.matisse.internal.utils.Platform;
public class AlbumsSpinner {
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/CheckRadioView.java b/app/src/module_album/java/com/example/matisse/internal/ui/widget/CheckRadioView.java
similarity index 97%
rename from app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/CheckRadioView.java
rename to app/src/module_album/java/com/example/matisse/internal/ui/widget/CheckRadioView.java
index 900b12b72..a85283d43 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/CheckRadioView.java
+++ b/app/src/module_album/java/com/example/matisse/internal/ui/widget/CheckRadioView.java
@@ -1,4 +1,4 @@
-package com.zhihu.matisse.internal.ui.widget;
+package com.example.matisse.internal.ui.widget;
import android.content.Context;
import android.graphics.PorterDuff;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/CheckView.java b/app/src/module_album/java/com/example/matisse/internal/ui/widget/CheckView.java
similarity index 99%
rename from app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/CheckView.java
rename to app/src/module_album/java/com/example/matisse/internal/ui/widget/CheckView.java
index aa982d0d2..9445854c4 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/CheckView.java
+++ b/app/src/module_album/java/com/example/matisse/internal/ui/widget/CheckView.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.zhihu.matisse.internal.ui.widget;
+package com.example.matisse.internal.ui.widget;
import android.content.Context;
import android.content.res.TypedArray;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/IncapableDialog.java b/app/src/module_album/java/com/example/matisse/internal/ui/widget/IncapableDialog.java
similarity index 97%
rename from app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/IncapableDialog.java
rename to app/src/module_album/java/com/example/matisse/internal/ui/widget/IncapableDialog.java
index e733f689e..3393d1bcb 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/IncapableDialog.java
+++ b/app/src/module_album/java/com/example/matisse/internal/ui/widget/IncapableDialog.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.zhihu.matisse.internal.ui.widget;
+package com.example.matisse.internal.ui.widget;
import android.app.Dialog;
import android.content.DialogInterface;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/MediaGrid.java b/app/src/module_album/java/com/example/matisse/internal/ui/widget/MediaGrid.java
similarity index 96%
rename from app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/MediaGrid.java
rename to app/src/module_album/java/com/example/matisse/internal/ui/widget/MediaGrid.java
index 9f2d07439..03119f95f 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/MediaGrid.java
+++ b/app/src/module_album/java/com/example/matisse/internal/ui/widget/MediaGrid.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.zhihu.matisse.internal.ui.widget;
+package com.example.matisse.internal.ui.widget;
import android.content.Context;
import android.graphics.drawable.Drawable;
@@ -27,8 +27,8 @@ import android.widget.TextView;
import androidx.recyclerview.widget.RecyclerView;
import com.chwl.app.R;
-import com.zhihu.matisse.internal.entity.Item;
-import com.zhihu.matisse.internal.entity.SelectionSpec;
+import com.example.matisse.internal.entity.Item;
+import com.example.matisse.internal.entity.SelectionSpec;
public class MediaGrid extends SquareFrameLayout implements View.OnClickListener {
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/MediaGridInset.java b/app/src/module_album/java/com/example/matisse/internal/ui/widget/MediaGridInset.java
similarity index 97%
rename from app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/MediaGridInset.java
rename to app/src/module_album/java/com/example/matisse/internal/ui/widget/MediaGridInset.java
index 67358134f..3ad2b8191 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/MediaGridInset.java
+++ b/app/src/module_album/java/com/example/matisse/internal/ui/widget/MediaGridInset.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.zhihu.matisse.internal.ui.widget;
+package com.example.matisse.internal.ui.widget;
import android.graphics.Rect;
import android.view.View;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/PreviewViewPager.java b/app/src/module_album/java/com/example/matisse/internal/ui/widget/PreviewViewPager.java
similarity index 96%
rename from app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/PreviewViewPager.java
rename to app/src/module_album/java/com/example/matisse/internal/ui/widget/PreviewViewPager.java
index 1771bae7b..828b549fb 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/PreviewViewPager.java
+++ b/app/src/module_album/java/com/example/matisse/internal/ui/widget/PreviewViewPager.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.zhihu.matisse.internal.ui.widget;
+package com.example.matisse.internal.ui.widget;
import android.content.Context;
import android.util.AttributeSet;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/RoundedRectangleImageView.java b/app/src/module_album/java/com/example/matisse/internal/ui/widget/RoundedRectangleImageView.java
similarity index 97%
rename from app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/RoundedRectangleImageView.java
rename to app/src/module_album/java/com/example/matisse/internal/ui/widget/RoundedRectangleImageView.java
index 54aaa11cd..fc7d4f240 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/RoundedRectangleImageView.java
+++ b/app/src/module_album/java/com/example/matisse/internal/ui/widget/RoundedRectangleImageView.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.zhihu.matisse.internal.ui.widget;
+package com.example.matisse.internal.ui.widget;
import android.content.Context;
import android.graphics.Canvas;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/SquareFrameLayout.java b/app/src/module_album/java/com/example/matisse/internal/ui/widget/SquareFrameLayout.java
similarity index 95%
rename from app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/SquareFrameLayout.java
rename to app/src/module_album/java/com/example/matisse/internal/ui/widget/SquareFrameLayout.java
index 1f95518cf..8cc332ecd 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/SquareFrameLayout.java
+++ b/app/src/module_album/java/com/example/matisse/internal/ui/widget/SquareFrameLayout.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.zhihu.matisse.internal.ui.widget;
+package com.example.matisse.internal.ui.widget;
import android.content.Context;
import android.util.AttributeSet;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/utils/ExifInterfaceCompat.java b/app/src/module_album/java/com/example/matisse/internal/utils/ExifInterfaceCompat.java
similarity index 99%
rename from app/src/module_album/java/com/zhihu/matisse/internal/utils/ExifInterfaceCompat.java
rename to app/src/module_album/java/com/example/matisse/internal/utils/ExifInterfaceCompat.java
index b2be0e40e..b76d0a93d 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/utils/ExifInterfaceCompat.java
+++ b/app/src/module_album/java/com/example/matisse/internal/utils/ExifInterfaceCompat.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.zhihu.matisse.internal.utils;
+package com.example.matisse.internal.utils;
import android.media.ExifInterface;
import android.text.TextUtils;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/utils/MediaStoreCompat.java b/app/src/module_album/java/com/example/matisse/internal/utils/MediaStoreCompat.java
similarity index 98%
rename from app/src/module_album/java/com/zhihu/matisse/internal/utils/MediaStoreCompat.java
rename to app/src/module_album/java/com/example/matisse/internal/utils/MediaStoreCompat.java
index 669f90810..1748f0da3 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/utils/MediaStoreCompat.java
+++ b/app/src/module_album/java/com/example/matisse/internal/utils/MediaStoreCompat.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.zhihu.matisse.internal.utils;
+package com.example.matisse.internal.utils;
import android.app.Activity;
import android.content.Context;
@@ -29,7 +29,7 @@ import androidx.core.content.FileProvider;
import androidx.core.os.EnvironmentCompat;
import androidx.fragment.app.Fragment;
-import com.zhihu.matisse.internal.entity.CaptureStrategy;
+import com.example.matisse.internal.entity.CaptureStrategy;
import java.io.File;
import java.io.IOException;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/utils/PathUtils.java b/app/src/module_album/java/com/example/matisse/internal/utils/PathUtils.java
similarity index 99%
rename from app/src/module_album/java/com/zhihu/matisse/internal/utils/PathUtils.java
rename to app/src/module_album/java/com/example/matisse/internal/utils/PathUtils.java
index 2cbd79866..c7a6a04cd 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/utils/PathUtils.java
+++ b/app/src/module_album/java/com/example/matisse/internal/utils/PathUtils.java
@@ -1,4 +1,4 @@
-package com.zhihu.matisse.internal.utils;
+package com.example.matisse.internal.utils;
import android.content.ContentUris;
import android.content.Context;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/utils/PhotoMetadataUtils.java b/app/src/module_album/java/com/example/matisse/internal/utils/PhotoMetadataUtils.java
similarity index 95%
rename from app/src/module_album/java/com/zhihu/matisse/internal/utils/PhotoMetadataUtils.java
rename to app/src/module_album/java/com/example/matisse/internal/utils/PhotoMetadataUtils.java
index cf7c9ca48..5a3afd38e 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/utils/PhotoMetadataUtils.java
+++ b/app/src/module_album/java/com/example/matisse/internal/utils/PhotoMetadataUtils.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.zhihu.matisse.internal.utils;
+package com.example.matisse.internal.utils;
import android.app.Activity;
import android.content.ContentResolver;
@@ -29,11 +29,11 @@ import android.util.DisplayMetrics;
import android.util.Log;
import com.chwl.app.R;
-import com.zhihu.matisse.MimeType;
-import com.zhihu.matisse.filter.Filter;
-import com.zhihu.matisse.internal.entity.IncapableCause;
-import com.zhihu.matisse.internal.entity.Item;
-import com.zhihu.matisse.internal.entity.SelectionSpec;
+import com.example.matisse.MimeType;
+import com.example.matisse.filter.Filter;
+import com.example.matisse.internal.entity.IncapableCause;
+import com.example.matisse.internal.entity.Item;
+import com.example.matisse.internal.entity.SelectionSpec;
import java.io.FileNotFoundException;
import java.io.IOException;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/utils/Platform.java b/app/src/module_album/java/com/example/matisse/internal/utils/Platform.java
similarity index 88%
rename from app/src/module_album/java/com/zhihu/matisse/internal/utils/Platform.java
rename to app/src/module_album/java/com/example/matisse/internal/utils/Platform.java
index df41989ae..dfd8d6d12 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/utils/Platform.java
+++ b/app/src/module_album/java/com/example/matisse/internal/utils/Platform.java
@@ -1,4 +1,4 @@
-package com.zhihu.matisse.internal.utils;
+package com.example.matisse.internal.utils;
import android.os.Build;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/utils/SingleMediaScanner.java b/app/src/module_album/java/com/example/matisse/internal/utils/SingleMediaScanner.java
similarity index 96%
rename from app/src/module_album/java/com/zhihu/matisse/internal/utils/SingleMediaScanner.java
rename to app/src/module_album/java/com/example/matisse/internal/utils/SingleMediaScanner.java
index d587bd87e..3ce7391c0 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/utils/SingleMediaScanner.java
+++ b/app/src/module_album/java/com/example/matisse/internal/utils/SingleMediaScanner.java
@@ -1,4 +1,4 @@
-package com.zhihu.matisse.internal.utils;
+package com.example.matisse.internal.utils;
import android.content.Context;
import android.media.MediaScannerConnection;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/utils/UIUtils.java b/app/src/module_album/java/com/example/matisse/internal/utils/UIUtils.java
similarity index 95%
rename from app/src/module_album/java/com/zhihu/matisse/internal/utils/UIUtils.java
rename to app/src/module_album/java/com/example/matisse/internal/utils/UIUtils.java
index 129b59946..e55ab06d9 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/utils/UIUtils.java
+++ b/app/src/module_album/java/com/example/matisse/internal/utils/UIUtils.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.zhihu.matisse.internal.utils;
+package com.example.matisse.internal.utils;
import android.content.Context;
diff --git a/app/src/module_album/java/com/zhihu/matisse/listener/OnCheckedListener.java b/app/src/module_album/java/com/example/matisse/listener/OnCheckedListener.java
similarity index 82%
rename from app/src/module_album/java/com/zhihu/matisse/listener/OnCheckedListener.java
rename to app/src/module_album/java/com/example/matisse/listener/OnCheckedListener.java
index 4a0ebae8f..e7545c6b1 100644
--- a/app/src/module_album/java/com/zhihu/matisse/listener/OnCheckedListener.java
+++ b/app/src/module_album/java/com/example/matisse/listener/OnCheckedListener.java
@@ -1,4 +1,4 @@
-package com.zhihu.matisse.listener;
+package com.example.matisse.listener;
/**
diff --git a/app/src/module_album/java/com/zhihu/matisse/listener/OnFragmentInteractionListener.java b/app/src/module_album/java/com/example/matisse/listener/OnFragmentInteractionListener.java
similarity index 86%
rename from app/src/module_album/java/com/zhihu/matisse/listener/OnFragmentInteractionListener.java
rename to app/src/module_album/java/com/example/matisse/listener/OnFragmentInteractionListener.java
index 79f553639..6e0b2e3d2 100644
--- a/app/src/module_album/java/com/zhihu/matisse/listener/OnFragmentInteractionListener.java
+++ b/app/src/module_album/java/com/example/matisse/listener/OnFragmentInteractionListener.java
@@ -1,4 +1,4 @@
-package com.zhihu.matisse.listener;
+package com.example.matisse.listener;
/**
* PreViewItemFragment 和 BasePreViewActivity 通信的接口 ，为了方便拿到 ImageViewTouch 的点击事件
diff --git a/app/src/module_album/java/com/zhihu/matisse/listener/OnSelectedListener.java b/app/src/module_album/java/com/example/matisse/listener/OnSelectedListener.java
similarity index 96%
rename from app/src/module_album/java/com/zhihu/matisse/listener/OnSelectedListener.java
rename to app/src/module_album/java/com/example/matisse/listener/OnSelectedListener.java
index 515ab9148..f6743b246 100644
--- a/app/src/module_album/java/com/zhihu/matisse/listener/OnSelectedListener.java
+++ b/app/src/module_album/java/com/example/matisse/listener/OnSelectedListener.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.zhihu.matisse.listener;
+package com.example.matisse.listener;
import android.net.Uri;
diff --git a/app/src/module_album/java/com/zhihu/matisse/ui/MatisseActivity.java b/app/src/module_album/java/com/example/matisse/ui/MatisseActivity.java
similarity index 94%
rename from app/src/module_album/java/com/zhihu/matisse/ui/MatisseActivity.java
rename to app/src/module_album/java/com/example/matisse/ui/MatisseActivity.java
index 8c45b012b..971a7656c 100644
--- a/app/src/module_album/java/com/zhihu/matisse/ui/MatisseActivity.java
+++ b/app/src/module_album/java/com/example/matisse/ui/MatisseActivity.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.zhihu.matisse.ui;
+package com.example.matisse.ui;
import android.Manifest;
import android.app.Activity;
@@ -48,27 +48,27 @@ import androidx.fragment.app.Fragment;
import com.netease.nim.uikit.common.util.log.LogUtil;
import com.chwl.app.R;
import com.chwl.library.utils.ResUtil;
-import com.zhihu.matisse.internal.entity.Album;
-import com.zhihu.matisse.internal.entity.CustomItem;
-import com.zhihu.matisse.internal.entity.IncapableCause;
-import com.zhihu.matisse.internal.entity.Item;
-import com.zhihu.matisse.internal.entity.SelectionSpec;
-import com.zhihu.matisse.internal.model.AlbumCollection;
-import com.zhihu.matisse.internal.model.SelectedItemCollection;
-import com.zhihu.matisse.internal.ui.AlbumPreviewActivity;
-import com.zhihu.matisse.internal.ui.BasePreviewActivity;
-import com.zhihu.matisse.internal.ui.MediaSelectionFragment;
-import com.zhihu.matisse.internal.ui.SelectedPreviewActivity;
-import com.zhihu.matisse.internal.ui.adapter.AlbumMediaAdapter;
-import com.zhihu.matisse.internal.ui.adapter.AlbumsAdapter;
-import com.zhihu.matisse.internal.ui.widget.AlbumsSpinner;
-import com.zhihu.matisse.internal.ui.widget.CheckRadioView;
-import com.zhihu.matisse.internal.ui.widget.IncapableDialog;
-import com.zhihu.matisse.internal.utils.MediaStoreCompat;
-import com.zhihu.matisse.internal.utils.PathUtils;
-import com.zhihu.matisse.internal.utils.PhotoMetadataUtils;
-import com.zhihu.matisse.internal.utils.SingleMediaScanner;
-import com.zhihu.matisse.widget.ConfirmPickView;
+import com.example.matisse.internal.entity.Album;
+import com.example.matisse.internal.entity.CustomItem;
+import com.example.matisse.internal.entity.IncapableCause;
+import com.example.matisse.internal.entity.Item;
+import com.example.matisse.internal.entity.SelectionSpec;
+import com.example.matisse.internal.model.AlbumCollection;
+import com.example.matisse.internal.model.SelectedItemCollection;
+import com.example.matisse.internal.ui.AlbumPreviewActivity;
+import com.example.matisse.internal.ui.BasePreviewActivity;
+import com.example.matisse.internal.ui.MediaSelectionFragment;
+import com.example.matisse.internal.ui.SelectedPreviewActivity;
+import com.example.matisse.internal.ui.adapter.AlbumMediaAdapter;
+import com.example.matisse.internal.ui.adapter.AlbumsAdapter;
+import com.example.matisse.internal.ui.widget.AlbumsSpinner;
+import com.example.matisse.internal.ui.widget.CheckRadioView;
+import com.example.matisse.internal.ui.widget.IncapableDialog;
+import com.example.matisse.internal.utils.MediaStoreCompat;
+import com.example.matisse.internal.utils.PathUtils;
+import com.example.matisse.internal.utils.PhotoMetadataUtils;
+import com.example.matisse.internal.utils.SingleMediaScanner;
+import com.example.matisse.widget.ConfirmPickView;
import java.util.ArrayList;
diff --git a/app/src/module_album/java/com/zhihu/matisse/widget/ConfirmPickView.java b/app/src/module_album/java/com/example/matisse/widget/ConfirmPickView.java
similarity index 97%
rename from app/src/module_album/java/com/zhihu/matisse/widget/ConfirmPickView.java
rename to app/src/module_album/java/com/example/matisse/widget/ConfirmPickView.java
index 1ff90c877..7bb0fb06f 100644
--- a/app/src/module_album/java/com/zhihu/matisse/widget/ConfirmPickView.java
+++ b/app/src/module_album/java/com/example/matisse/widget/ConfirmPickView.java
@@ -1,4 +1,4 @@
-package com.zhihu.matisse.widget;
+package com.example.matisse.widget;
import android.content.Context;
diff --git a/app/src/module_album/res/layout/activity_matisse.xml b/app/src/module_album/res/layout/activity_matisse.xml
index 02000a1a6..3433e47b3 100644
--- a/app/src/module_album/res/layout/activity_matisse.xml
+++ b/app/src/module_album/res/layout/activity_matisse.xml
@@ -108,7 +108,7 @@
android:visibility="visible"
tools:showIn="@layout/activity_matisse">
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_community/java/com/chwl/app/community/dynamic/view/DynamicDetailActivity.java b/app/src/module_community/java/com/chwl/app/community/dynamic/view/DynamicDetailActivity.java
index eead2614a..47ad2cd0d 100644
--- a/app/src/module_community/java/com/chwl/app/community/dynamic/view/DynamicDetailActivity.java
+++ b/app/src/module_community/java/com/chwl/app/community/dynamic/view/DynamicDetailActivity.java
@@ -5,7 +5,6 @@ import android.content.Context;
import android.content.Intent;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
-import android.os.Bundle;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
@@ -52,7 +51,7 @@ import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
import com.chwl.app.utils.RegexUtil;
import com.chwl.app.utils.SpannableBuilder;
import com.chwl.app.utils.TimeUiUtils;
-import com.yizhuan.xchat_android_constants.XChatConstants;
+import com.chwl.core.XConstants;
import com.chwl.core.auth.AuthModel;
import com.chwl.core.community.bean.Comment;
import com.chwl.core.community.bean.CommentResult;
@@ -612,7 +611,7 @@ public class DynamicDetailActivity extends BaseViewBindingActivity {
popupWindow.dismiss();
- UIHelper.showReportPage(context, params.getCommentOwnerUid(), XChatConstants.REPORT_TYPE_DYNAMICCOMMENT);
+ UIHelper.showReportPage(context, params.getCommentOwnerUid(), XConstants.REPORT_TYPE_DYNAMICCOMMENT);
});
popupWindow.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
@@ -768,7 +767,7 @@ public class DynamicDetailActivity extends BaseViewBindingActivity {
UIHelper.showReportPage(context, bean.getUid(),
- XChatConstants.REPORT_TYPE_WORLDDYNAMIC);
+ XConstants.REPORT_TYPE_WORLDDYNAMIC);
});
list.add(item);
}
@@ -1141,7 +1140,7 @@ public class DynamicDetailActivity extends BaseViewBindingActivity {
UIHelper.showReportPage(WorldDynamicFragment.this.getActivity(), bean.getUid(),
- XChatConstants.REPORT_TYPE_WORLDDYNAMIC);
+ XConstants.REPORT_TYPE_WORLDDYNAMIC);
});
list.add(item);
}
diff --git a/app/src/module_community/java/com/chwl/app/community/helper/ShareDynamicHelper.java b/app/src/module_community/java/com/chwl/app/community/helper/ShareDynamicHelper.java
index f286c9afa..066dd5b23 100644
--- a/app/src/module_community/java/com/chwl/app/community/helper/ShareDynamicHelper.java
+++ b/app/src/module_community/java/com/chwl/app/community/helper/ShareDynamicHelper.java
@@ -8,7 +8,7 @@ import com.chwl.app.friend.view.SelectFriendActivity;
import com.chwl.app.ui.utils.ImageLoadUtilsV2;
import com.chwl.app.ui.widget.ShareDialog;
import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
-import com.yizhuan.xchat_android_constants.XChatConstants;
+import com.chwl.core.XConstants;
import com.chwl.core.UriProvider;
import com.chwl.core.auth.AuthModel;
import com.chwl.core.community.bean.WorldDynamicBean;
@@ -71,7 +71,7 @@ public class ShareDynamicHelper {
String imageUrl = bean.getShareCover();
int imageWidth = UIUtil.dip2px(BasicConfig.INSTANCE.getAppContext(), 50);
imageUrl = ImageLoadUtilsV2.getSizeUrl(imageUrl, imageWidth);
- String siteUrl = UriProvider.IM_SERVER_URL + XChatConstants.SHARE_WORLD_DYNAMIC_URL +
+ String siteUrl = UriProvider.IM_SERVER_URL + XConstants.SHARE_WORLD_DYNAMIC_URL +
"?uid=" + AuthModel.get().getCurrentUid() +
"&dynamicId=" + bean.getDynamicId() +
"&worldId=" + worldId;
diff --git a/app/src/module_community/java/com/chwl/app/community/photo/BigPagerAdapter.java b/app/src/module_community/java/com/chwl/app/community/photo/BigPagerAdapter.java
index 8f264f308..4699c1b90 100644
--- a/app/src/module_community/java/com/chwl/app/community/photo/BigPagerAdapter.java
+++ b/app/src/module_community/java/com/chwl/app/community/photo/BigPagerAdapter.java
@@ -21,7 +21,7 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentStatePagerAdapter;
-import com.zhihu.matisse.internal.entity.CustomItem;
+import com.example.matisse.internal.entity.CustomItem;
import java.util.ArrayList;
import java.util.List;
diff --git a/app/src/module_community/java/com/chwl/app/community/photo/BigPhotoActivity.java b/app/src/module_community/java/com/chwl/app/community/photo/BigPhotoActivity.java
index ff4a6f4e9..0d40d877b 100644
--- a/app/src/module_community/java/com/chwl/app/community/photo/BigPhotoActivity.java
+++ b/app/src/module_community/java/com/chwl/app/community/photo/BigPhotoActivity.java
@@ -15,7 +15,7 @@ import com.chwl.app.ui.widget.OnPageSelectedListener;
import com.chwl.library.common.util.AlbumUtils;
import com.chwl.library.common.util.ExecutorCenter;
import com.chwl.library.utils.ResUtil;
-import com.zhihu.matisse.internal.entity.CustomItem;
+import com.example.matisse.internal.entity.CustomItem;
import java.util.ArrayList;
import java.util.List;
diff --git a/app/src/module_community/java/com/chwl/app/community/photo/BigPhotoItemFragment.java b/app/src/module_community/java/com/chwl/app/community/photo/BigPhotoItemFragment.java
index e929a1179..4424ee4f1 100644
--- a/app/src/module_community/java/com/chwl/app/community/photo/BigPhotoItemFragment.java
+++ b/app/src/module_community/java/com/chwl/app/community/photo/BigPhotoItemFragment.java
@@ -32,7 +32,7 @@ import com.chwl.app.ui.utils.ImageLoadUtilsV2;
import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
import com.chwl.library.utils.LogUtil;
import com.chwl.library.utils.ResUtil;
-import com.zhihu.matisse.internal.entity.CustomItem;
+import com.example.matisse.internal.entity.CustomItem;
import it.sephiroth.android.library.imagezoom.ImageViewTouch;
import it.sephiroth.android.library.imagezoom.ImageViewTouchBase;
diff --git a/app/src/module_community/java/com/chwl/app/community/photo/PagerOption.java b/app/src/module_community/java/com/chwl/app/community/photo/PagerOption.java
index 00cc33abd..7c6184d4d 100644
--- a/app/src/module_community/java/com/chwl/app/community/photo/PagerOption.java
+++ b/app/src/module_community/java/com/chwl/app/community/photo/PagerOption.java
@@ -1,7 +1,7 @@
package com.chwl.app.community.photo;
-import com.zhihu.matisse.internal.entity.CustomItem;
+import com.example.matisse.internal.entity.CustomItem;
import java.io.Serializable;
diff --git a/app/src/module_community/java/com/chwl/app/community/photo/PhotoAdapter.java b/app/src/module_community/java/com/chwl/app/community/photo/PhotoAdapter.java
index ef6a7f9b2..3349d3d8d 100644
--- a/app/src/module_community/java/com/chwl/app/community/photo/PhotoAdapter.java
+++ b/app/src/module_community/java/com/chwl/app/community/photo/PhotoAdapter.java
@@ -24,7 +24,7 @@ import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
import com.chwl.library.utils.ResUtil;
import com.chwl.library.utils.SingleToastUtil;
import com.chwl.library.utils.file.JXFileUtils;
-import com.zhihu.matisse.internal.entity.CustomItem;
+import com.example.matisse.internal.entity.CustomItem;
import java.io.File;
import java.util.ArrayList;
diff --git a/app/src/module_community/java/com/chwl/app/community/photo/PreviewPhotoActivity.java b/app/src/module_community/java/com/chwl/app/community/photo/PreviewPhotoActivity.java
index 0b194c0f0..a90eaf82e 100644
--- a/app/src/module_community/java/com/chwl/app/community/photo/PreviewPhotoActivity.java
+++ b/app/src/module_community/java/com/chwl/app/community/photo/PreviewPhotoActivity.java
@@ -13,7 +13,7 @@ import com.netease.nim.uikit.common.util.log.LogUtil;
import com.chwl.app.R;
import com.chwl.app.base.BaseActivity;
import com.chwl.app.community.utils.ObjectTypeHelper;
-import com.zhihu.matisse.internal.entity.CustomItem;
+import com.example.matisse.internal.entity.CustomItem;
import java.util.ArrayList;
diff --git a/app/src/module_community/java/com/chwl/app/community/publish/view/PublishActivity.java b/app/src/module_community/java/com/chwl/app/community/publish/view/PublishActivity.java
index cb242e75e..272d8884e 100644
--- a/app/src/module_community/java/com/chwl/app/community/publish/view/PublishActivity.java
+++ b/app/src/module_community/java/com/chwl/app/community/publish/view/PublishActivity.java
@@ -39,7 +39,7 @@ import com.chwl.app.community.publish.presenter.PublishPresenter;
import com.chwl.app.community.utils.ObjectTypeHelper;
import com.chwl.app.ui.widget.dialog.CommonTipDialog;
import com.chwl.app.ui.widget.recyclerview.decoration.GridSpacingItemDecoration;
-import com.yizhuan.xchat_android_constants.XChatConstants;
+import com.chwl.core.XConstants;
import com.chwl.core.Constants;
import com.chwl.core.auth.AuthModel;
import com.chwl.core.community.bean.MiniWorldChooseInfo;
@@ -57,8 +57,8 @@ import com.chwl.library.easypermisssion.EasyPermissions;
import com.chwl.library.easyphoto.utils.settings.SettingsUtils;
import com.chwl.library.utils.ResUtil;
import com.chwl.library.utils.SingleToastUtil;
-import com.zhihu.matisse.Matisse;
-import com.zhihu.matisse.internal.entity.CustomItem;
+import com.example.matisse.Matisse;
+import com.example.matisse.internal.entity.CustomItem;
import java.util.ArrayList;
import java.util.List;
@@ -136,7 +136,7 @@ public class PublishActivity extends BaseMvpActivity {
UIHelper.showReportPage(getActivity(), bean.getUid(),
- XChatConstants.REPORT_TYPE_DYNAMIC_SQUARE);
+ XConstants.REPORT_TYPE_DYNAMIC_SQUARE);
});
list.add(item);
}
diff --git a/app/src/module_community/java/com/chwl/app/community/user_dynamic/UserDynamicFrg.java b/app/src/module_community/java/com/chwl/app/community/user_dynamic/UserDynamicFrg.java
index d850439c0..70818b74f 100644
--- a/app/src/module_community/java/com/chwl/app/community/user_dynamic/UserDynamicFrg.java
+++ b/app/src/module_community/java/com/chwl/app/community/user_dynamic/UserDynamicFrg.java
@@ -16,7 +16,7 @@ import com.chwl.app.community.dynamic.view.DynamicDetailActivity;
import com.chwl.app.community.helper.ShareDynamicHelper;
import com.chwl.app.miniworld.activity.TopicMainActivity;
import com.chwl.app.ui.widget.ButtonItem;
-import com.yizhuan.xchat_android_constants.XChatConstants;
+import com.chwl.core.XConstants;
import com.chwl.core.auth.AuthModel;
import com.chwl.core.community.bean.UserDynamicItem;
import com.chwl.core.community.bean.WorldDynamicBean;
@@ -223,7 +223,7 @@ public class UserDynamicFrg extends BaseMvpFragment {
if (currentUserDynamic != null) {
UIHelper.showReportPage(mContext, currentUserDynamic.getUid(),
- XChatConstants.REPORT_TYPE_PERSONAL_DYNAMIC);
+ XConstants.REPORT_TYPE_PERSONAL_DYNAMIC);
}
});
List buttonItems = new ArrayList<>();
diff --git a/app/src/module_community/java/com/chwl/app/community/utils/Glide4Engine.java b/app/src/module_community/java/com/chwl/app/community/utils/Glide4Engine.java
index 3ee22438a..26a35a165 100644
--- a/app/src/module_community/java/com/chwl/app/community/utils/Glide4Engine.java
+++ b/app/src/module_community/java/com/chwl/app/community/utils/Glide4Engine.java
@@ -23,7 +23,7 @@ import android.widget.ImageView;
import com.bumptech.glide.Glide;
import com.bumptech.glide.Priority;
import com.bumptech.glide.request.RequestOptions;
-import com.zhihu.matisse.engine.ImageEngine;
+import com.example.matisse.engine.ImageEngine;
/**
* {@link ImageEngine} implementation using Glide.
diff --git a/app/src/module_community/java/com/chwl/app/community/utils/ObjectTypeHelper.java b/app/src/module_community/java/com/chwl/app/community/utils/ObjectTypeHelper.java
index 023840b61..d3708bcbc 100644
--- a/app/src/module_community/java/com/chwl/app/community/utils/ObjectTypeHelper.java
+++ b/app/src/module_community/java/com/chwl/app/community/utils/ObjectTypeHelper.java
@@ -1,7 +1,7 @@
package com.chwl.app.community.utils;
import com.chwl.core.community.bean.DynamicMedia;
-import com.zhihu.matisse.internal.entity.CustomItem;
+import com.example.matisse.internal.entity.CustomItem;
import java.util.ArrayList;
import java.util.List;
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 0bc23f99a..14ab4a038 100644
--- a/app/src/module_community/res/layout/activity_big_photo.xml
+++ b/app/src/module_community/res/layout/activity_big_photo.xml
@@ -23,7 +23,7 @@
app:layout_constraintTop_toTopOf="@id/title_bar"
tools:visibility="visible" />
- () {
diff --git a/app/src/module_treasure_box/java/com/chwl/app/treasure_box/activity/TreasureBoxActivity.java b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/activity/TreasureBoxActivity.java
index ae8b48a22..976bc6112 100644
--- a/app/src/module_treasure_box/java/com/chwl/app/treasure_box/activity/TreasureBoxActivity.java
+++ b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/activity/TreasureBoxActivity.java
@@ -45,9 +45,9 @@ import com.chwl.app.treasure_box.widget.dialog.TreasureBoxDialog;
import com.chwl.app.ui.utils.ImageLoadUtils;
import com.chwl.app.utils.KeyBoardUtils;
import com.chwl.app.utils.UserUtils;
-import com.chwl.treasure_box.bean.PrizeNewInfo;
-import com.chwl.treasure_box.bean.UserTicketInfo;
-import com.chwl.treasure_box.model.BoxModel;
+import com.chwl.core.treasure_box.bean.PrizeNewInfo;
+import com.chwl.core.treasure_box.bean.UserTicketInfo;
+import com.chwl.core.treasure_box.model.BoxModel;
import com.chwl.core.DemoCache;
import com.chwl.core.auth.AuthModel;
import com.chwl.core.bean.BaseProtocol;
diff --git a/app/src/module_treasure_box/java/com/chwl/app/treasure_box/activity/TreasureBoxHonourActivity.java b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/activity/TreasureBoxHonourActivity.java
index 0ed7b5276..6dec64c1d 100644
--- a/app/src/module_treasure_box/java/com/chwl/app/treasure_box/activity/TreasureBoxHonourActivity.java
+++ b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/activity/TreasureBoxHonourActivity.java
@@ -26,9 +26,9 @@ import com.chwl.app.databinding.ActivityTreasureBoxHonourBinding;
import com.chwl.app.treasure_box.widget.dialog.BoxMoreDialog;
import com.chwl.app.ui.utils.ImageLoadUtils;
import com.chwl.app.ui.webview.DialogWebViewActivity;
-import com.chwl.treasure_box.bean.PrizeInfo;
-import com.chwl.treasure_box.model.BoxModel;
-import com.chwl.treasure_box.model.IBoxModel;
+import com.chwl.core.treasure_box.bean.PrizeInfo;
+import com.chwl.core.treasure_box.model.BoxModel;
+import com.chwl.core.treasure_box.model.IBoxModel;
import com.chwl.core.DemoCache;
import com.chwl.core.UriProvider;
import com.chwl.core.manager.IMNetEaseManager;
diff --git a/app/src/module_treasure_box/java/com/chwl/app/treasure_box/widget/dialog/BoxLoveLackDialog.kt b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/widget/dialog/BoxLoveLackDialog.kt
index 25179dd3b..1d31245ea 100644
--- a/app/src/module_treasure_box/java/com/chwl/app/treasure_box/widget/dialog/BoxLoveLackDialog.kt
+++ b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/widget/dialog/BoxLoveLackDialog.kt
@@ -11,8 +11,8 @@ import com.chwl.app.base.BaseDialog
import com.chwl.app.databinding.TreasureBoxDialogLoveLackBinding
import com.chwl.app.treasure_box.activity.TreasureBoxActivity.MAX_BUY_QUANTITY_LIMIT
import com.chwl.app.treasure_box.widget.dialog.TreasureBoxDialog.Companion.newInstance
-import com.chwl.treasure_box.bean.UserTicketInfo
-import com.chwl.treasure_box.model.BoxModel
+import com.chwl.core.treasure_box.bean.UserTicketInfo
+import com.chwl.core.treasure_box.model.BoxModel
import com.chwl.core.exception.FailReasonException
import com.chwl.core.utils.StringUtils
import com.chwl.library.common.SpConstants
diff --git a/app/src/module_treasure_box/java/com/chwl/app/treasure_box/widget/dialog/BuyLoveDialog.kt b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/widget/dialog/BuyLoveDialog.kt
index 60a6d7caf..9dba11788 100644
--- a/app/src/module_treasure_box/java/com/chwl/app/treasure_box/widget/dialog/BuyLoveDialog.kt
+++ b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/widget/dialog/BuyLoveDialog.kt
@@ -8,8 +8,8 @@ import com.hjq.toast.ToastUtils
import com.chwl.app.R
import com.chwl.app.base.BaseDialog
import com.chwl.app.databinding.TreasureBoxDialogBuyLoveBinding
-import com.chwl.treasure_box.bean.UserTicketInfo
-import com.chwl.treasure_box.model.BoxModel
+import com.chwl.core.treasure_box.bean.UserTicketInfo
+import com.chwl.core.treasure_box.model.BoxModel
import com.chwl.core.exception.FailReasonException
import com.chwl.library.common.SpConstants
import com.chwl.library.common.util.SPUtils
diff --git a/app/src/module_treasure_box/java/com/chwl/app/treasure_box/widget/dialog/BuyLoveSuccessDialog.kt b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/widget/dialog/BuyLoveSuccessDialog.kt
index b14972355..098672b7c 100644
--- a/app/src/module_treasure_box/java/com/chwl/app/treasure_box/widget/dialog/BuyLoveSuccessDialog.kt
+++ b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/widget/dialog/BuyLoveSuccessDialog.kt
@@ -4,15 +4,10 @@ import android.annotation.SuppressLint
import android.os.Bundle
import android.view.Gravity
import android.view.WindowManager
-import com.chwl.app.R
import com.chwl.app.base.BaseDialog
-import com.chwl.app.databinding.TreasureBoxDialogBuyLoveBinding
import com.chwl.app.databinding.TreasureBoxDialogBuyLoveSuccessBinding
-import com.chwl.treasure_box.bean.UserTicketInfo
-import com.chwl.treasure_box.model.BoxModel
import com.chwl.library.common.SpConstants
import com.chwl.library.common.util.SPUtils
-import org.greenrobot.eventbus.EventBus
/**
* 购买爱心
diff --git a/app/src/module_upgrade_app/java/com/chwl/app/upgrade/AppUpdateDialog.java b/app/src/module_upgrade_app/java/com/chwl/app/upgrade/AppUpdateDialog.java
index a1f31c0e7..810baed08 100644
--- a/app/src/module_upgrade_app/java/com/chwl/app/upgrade/AppUpdateDialog.java
+++ b/app/src/module_upgrade_app/java/com/chwl/app/upgrade/AppUpdateDialog.java
@@ -19,7 +19,7 @@ import androidx.fragment.app.FragmentManager;
import com.orhanobut.logger.Logger;
import com.chwl.app.R;
import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
-import com.yizhuan.xchat_android_constants.XChatConstants;
+import com.chwl.core.XConstants;
import com.chwl.core.Constants;
import com.chwl.core.UriHelper;
import com.chwl.core.upgrade.bean.NewestVersionInfo;
@@ -107,7 +107,7 @@ public class AppUpdateDialog extends DialogFragment implements View.OnClickListe
intent.setAction("android.intent.action.VIEW");
Uri content_url = null;
if (AppMetaDataUtil.getChannelID().equals(Constants.GOOGLE)) {
- content_url = Uri.parse(UriHelper.applyTimestampForUrl(XChatConstants.appDownloadUrl));//拼接上时间戳，避免访问缓存文件
+ content_url = Uri.parse(UriHelper.applyTimestampForUrl(XConstants.appDownloadUrl));//拼接上时间戳，避免访问缓存文件
} else if (newestVersionInfo != null) {
content_url = Uri.parse(newestVersionInfo.getUpdateDownloadLink());
}
diff --git a/core/build.gradle b/core/build.gradle
index 4de7995ac..31a57a9a0 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -30,7 +30,6 @@ android {
main {
java.srcDirs = [
'src/main/java',
- 'src/diff_src_erban/java',
'src/model_smscode/java',
'src/model_public_chat_hall/java',
'src/model_pay/java',
@@ -45,7 +44,6 @@ android {
'src/model_treasure_box/java',
'src/model_community/java',
'src/model_channel_page/java'
-
]
jniLibs.srcDirs = ['libs', 'umeng-app-libs/jniLibs']
}
diff --git a/core/src/main/java/com/chwl/core/Constants.java b/core/src/main/java/com/chwl/core/Constants.java
index c671691e1..bc703bf6a 100644
--- a/core/src/main/java/com/chwl/core/Constants.java
+++ b/core/src/main/java/com/chwl/core/Constants.java
@@ -1,6 +1,5 @@
package com.chwl.core;
-import com.yizhuan.xchat_android_constants.XChatConstants;
import com.chwl.library.common.application.Env;
import com.chwl.library.utils.config.BasicConfig;
import com.chwl.library.utils.pref.CommonPref;
@@ -14,9 +13,9 @@ import java.util.List;
* Created by Administrator on 2017/11/9.
*/
public class Constants {
- public static final String ERBAN_DIR_NAME = XChatConstants.XCHAT_DIR_NAME;
+ public static final String ERBAN_DIR_NAME = XConstants.XCHAT_DIR_NAME;
public static final String nimAppKey = Env.isDebug() ?
- XChatConstants.getNimKeyDebug() : XChatConstants.getNimKeyRelease();
+ XConstants.getNimKeyDebug() : XConstants.getNimKeyRelease();
public static final String nimAppSecret = "da03b83af84a";
/**
* 百度统计
@@ -91,14 +90,14 @@ public class Constants {
public static final int CLIENT_ROLE_BROADCASTER = 1;
public static final int CLIENT_ROLE_AUDIENCE = 2;
- public static final int DRAGON_BAR_ID = XChatConstants.DRAGON_BALL_ID;
+ public static final int DRAGON_BAR_ID = XConstants.DRAGON_BALL_ID;
public static final byte TYPE_JOINED = 1;
public static final byte TYPE_RECOMMEND = 2;
public static final byte TYPE_ALL = 0;
public static final String WXPAY_REFERER = (BuildConfig.DEBUG && CommonPref.instance(BasicConfig.INSTANCE.getAppContext()).getInt(Env.KEY_ENVIRONMENT) == Env.EnvType.Debug.code) ?
- XChatConstants.KEY_REFERER_DEBUG : XChatConstants.KEY_REFERER_RELEASE;
+ XConstants.KEY_REFERER_DEBUG : XConstants.KEY_REFERER_RELEASE;
//相亲模式男神坑位下标
public static final List maleIndex = Arrays.asList(0, 1, 4, 5);
diff --git a/core/src/main/java/com/chwl/core/DemoCache.java b/core/src/main/java/com/chwl/core/DemoCache.java
index a57a98fef..a865ceca4 100644
--- a/core/src/main/java/com/chwl/core/DemoCache.java
+++ b/core/src/main/java/com/chwl/core/DemoCache.java
@@ -7,7 +7,6 @@ import androidx.annotation.Nullable;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.netease.nimlib.sdk.StatusBarNotificationConfig;
-import com.yizhuan.xchat_android_constants.XChatConstants;
import com.chwl.core.auth.AuthModel;
import com.chwl.core.auth.entity.AccountInfo;
import com.chwl.core.auth.entity.TicketInfo;
@@ -320,7 +319,7 @@ public class DemoCache {
Map map = readKickOutRoom();
if (map == null) map = new HashMap<>();
for (Iterator> it = map.entrySet().iterator(); it.hasNext(); ) {
- if (CurrentTimeUtils.getCurrentTime() - it.next().getValue() > XChatConstants.KICK_OUT_ROOM_LIMIT_ENTER_TIME) {
+ if (CurrentTimeUtils.getCurrentTime() - it.next().getValue() > XConstants.KICK_OUT_ROOM_LIMIT_ENTER_TIME) {
it.remove();
}
}
diff --git a/core/src/diff_src_erban/java/com/chwl/core/UriHelper.java b/core/src/main/java/com/chwl/core/UriHelper.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/UriHelper.java
rename to core/src/main/java/com/chwl/core/UriHelper.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/UriProvider.java b/core/src/main/java/com/chwl/core/UriProvider.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/UriProvider.java
rename to core/src/main/java/com/chwl/core/UriProvider.java
diff --git a/core/src/diff_src_erban/java/com/chwl/xchat_android_constants/XChatConstants.java b/core/src/main/java/com/chwl/core/XConstants.java
similarity index 98%
rename from core/src/diff_src_erban/java/com/chwl/xchat_android_constants/XChatConstants.java
rename to core/src/main/java/com/chwl/core/XConstants.java
index 866fb035d..b453d1240 100644
--- a/core/src/diff_src_erban/java/com/chwl/xchat_android_constants/XChatConstants.java
+++ b/core/src/main/java/com/chwl/core/XConstants.java
@@ -1,7 +1,5 @@
-package com.yizhuan.xchat_android_constants;
+package com.chwl.core;
-import com.chwl.core.BuildConfig;
-import com.chwl.core.R;
import com.chwl.library.utils.ResUtil;
import com.chwl.library.utils.codec.DESUtils;
@@ -9,7 +7,7 @@ import com.chwl.library.utils.codec.DESUtils;
* Created by MadisonRong on 09/08/2018.
*/
-public class XChatConstants {
+public class XConstants {
/**
* 包名(各種緩存目錄的根目錄)
diff --git a/core/src/diff_src_erban/java/com/chwl/core/association/bean/ClanListInfo.kt b/core/src/main/java/com/chwl/core/association/bean/ClanListInfo.kt
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/association/bean/ClanListInfo.kt
rename to core/src/main/java/com/chwl/core/association/bean/ClanListInfo.kt
diff --git a/core/src/diff_src_erban/java/com/chwl/core/association/bean/HallListInfo.java b/core/src/main/java/com/chwl/core/association/bean/HallListInfo.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/association/bean/HallListInfo.java
rename to core/src/main/java/com/chwl/core/association/bean/HallListInfo.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/association/bean/MemberExchangeInfo.kt b/core/src/main/java/com/chwl/core/association/bean/MemberExchangeInfo.kt
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/association/bean/MemberExchangeInfo.kt
rename to core/src/main/java/com/chwl/core/association/bean/MemberExchangeInfo.kt
diff --git a/core/src/diff_src_erban/java/com/chwl/core/association/bean/UserLevelInfo.kt b/core/src/main/java/com/chwl/core/association/bean/UserLevelInfo.kt
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/association/bean/UserLevelInfo.kt
rename to core/src/main/java/com/chwl/core/association/bean/UserLevelInfo.kt
diff --git a/core/src/diff_src_erban/java/com/chwl/core/association/model/AssociationModel.kt b/core/src/main/java/com/chwl/core/association/model/AssociationModel.kt
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/association/model/AssociationModel.kt
rename to core/src/main/java/com/chwl/core/association/model/AssociationModel.kt
diff --git a/core/src/diff_src_erban/java/com/chwl/core/audio/AudioModel.java b/core/src/main/java/com/chwl/core/audio/AudioModel.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/audio/AudioModel.java
rename to core/src/main/java/com/chwl/core/audio/AudioModel.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/audio/IAudioModel.java b/core/src/main/java/com/chwl/core/audio/IAudioModel.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/audio/IAudioModel.java
rename to core/src/main/java/com/chwl/core/audio/IAudioModel.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/audio/bean/HistoryVoiceInfo.java b/core/src/main/java/com/chwl/core/audio/bean/HistoryVoiceInfo.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/audio/bean/HistoryVoiceInfo.java
rename to core/src/main/java/com/chwl/core/audio/bean/HistoryVoiceInfo.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/audio/bean/SaveVoiceSuccessResultInfo.java b/core/src/main/java/com/chwl/core/audio/bean/SaveVoiceSuccessResultInfo.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/audio/bean/SaveVoiceSuccessResultInfo.java
rename to core/src/main/java/com/chwl/core/audio/bean/SaveVoiceSuccessResultInfo.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/audio/bean/UserVoiceInfo.java b/core/src/main/java/com/chwl/core/audio/bean/UserVoiceInfo.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/audio/bean/UserVoiceInfo.java
rename to core/src/main/java/com/chwl/core/audio/bean/UserVoiceInfo.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/audio/bean/VoiceCardInfo.java b/core/src/main/java/com/chwl/core/audio/bean/VoiceCardInfo.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/audio/bean/VoiceCardInfo.java
rename to core/src/main/java/com/chwl/core/audio/bean/VoiceCardInfo.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/audio/bean/VoiceMatchInfo.java b/core/src/main/java/com/chwl/core/audio/bean/VoiceMatchInfo.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/audio/bean/VoiceMatchInfo.java
rename to core/src/main/java/com/chwl/core/audio/bean/VoiceMatchInfo.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/channel/ChannelModel.java b/core/src/main/java/com/chwl/core/channel/ChannelModel.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/channel/ChannelModel.java
rename to core/src/main/java/com/chwl/core/channel/ChannelModel.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/channel/IChannelModel.java b/core/src/main/java/com/chwl/core/channel/IChannelModel.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/channel/IChannelModel.java
rename to core/src/main/java/com/chwl/core/channel/IChannelModel.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/earn/bean/ClanHallMemberIncomeTotalInfo.kt b/core/src/main/java/com/chwl/core/earn/bean/ClanHallMemberIncomeTotalInfo.kt
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/earn/bean/ClanHallMemberIncomeTotalInfo.kt
rename to core/src/main/java/com/chwl/core/earn/bean/ClanHallMemberIncomeTotalInfo.kt
diff --git a/core/src/diff_src_erban/java/com/chwl/core/earn/bean/ConfigWithdrawInfo.kt b/core/src/main/java/com/chwl/core/earn/bean/ConfigWithdrawInfo.kt
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/earn/bean/ConfigWithdrawInfo.kt
rename to core/src/main/java/com/chwl/core/earn/bean/ConfigWithdrawInfo.kt
diff --git a/core/src/diff_src_erban/java/com/chwl/core/earn/bean/EarnRecordInfo.kt b/core/src/main/java/com/chwl/core/earn/bean/EarnRecordInfo.kt
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/earn/bean/EarnRecordInfo.kt
rename to core/src/main/java/com/chwl/core/earn/bean/EarnRecordInfo.kt
diff --git a/core/src/diff_src_erban/java/com/chwl/core/earn/bean/GoldRecordInfo.kt b/core/src/main/java/com/chwl/core/earn/bean/GoldRecordInfo.kt
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/earn/bean/GoldRecordInfo.kt
rename to core/src/main/java/com/chwl/core/earn/bean/GoldRecordInfo.kt
diff --git a/core/src/diff_src_erban/java/com/chwl/core/earn/bean/GoldToDiamondInfo.kt b/core/src/main/java/com/chwl/core/earn/bean/GoldToDiamondInfo.kt
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/earn/bean/GoldToDiamondInfo.kt
rename to core/src/main/java/com/chwl/core/earn/bean/GoldToDiamondInfo.kt
diff --git a/core/src/diff_src_erban/java/com/chwl/core/earn/bean/HallMemberGoldFlowInfo.kt b/core/src/main/java/com/chwl/core/earn/bean/HallMemberGoldFlowInfo.kt
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/earn/bean/HallMemberGoldFlowInfo.kt
rename to core/src/main/java/com/chwl/core/earn/bean/HallMemberGoldFlowInfo.kt
diff --git a/core/src/diff_src_erban/java/com/chwl/core/earn/bean/HallMemberGoldFlowTotalInfo.kt b/core/src/main/java/com/chwl/core/earn/bean/HallMemberGoldFlowTotalInfo.kt
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/earn/bean/HallMemberGoldFlowTotalInfo.kt
rename to core/src/main/java/com/chwl/core/earn/bean/HallMemberGoldFlowTotalInfo.kt
diff --git a/core/src/diff_src_erban/java/com/chwl/core/earn/bean/HallVo.kt b/core/src/main/java/com/chwl/core/earn/bean/HallVo.kt
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/earn/bean/HallVo.kt
rename to core/src/main/java/com/chwl/core/earn/bean/HallVo.kt
diff --git a/core/src/diff_src_erban/java/com/chwl/core/earn/bean/RoomTypeInfo.kt b/core/src/main/java/com/chwl/core/earn/bean/RoomTypeInfo.kt
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/earn/bean/RoomTypeInfo.kt
rename to core/src/main/java/com/chwl/core/earn/bean/RoomTypeInfo.kt
diff --git a/core/src/diff_src_erban/java/com/chwl/core/earn/bean/WithdrawAccount.kt b/core/src/main/java/com/chwl/core/earn/bean/WithdrawAccount.kt
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/earn/bean/WithdrawAccount.kt
rename to core/src/main/java/com/chwl/core/earn/bean/WithdrawAccount.kt
diff --git a/core/src/diff_src_erban/java/com/chwl/core/earn/model/EarnModel.kt b/core/src/main/java/com/chwl/core/earn/model/EarnModel.kt
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/earn/model/EarnModel.kt
rename to core/src/main/java/com/chwl/core/earn/model/EarnModel.kt
diff --git a/core/src/diff_src_erban/java/com/chwl/core/helper/AtProxy.java b/core/src/main/java/com/chwl/core/helper/AtProxy.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/helper/AtProxy.java
rename to core/src/main/java/com/chwl/core/helper/AtProxy.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/helper/ImHelperUtils.java b/core/src/main/java/com/chwl/core/helper/ImHelperUtils.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/helper/ImHelperUtils.java
rename to core/src/main/java/com/chwl/core/helper/ImHelperUtils.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/home/IHomeTabMapView.java b/core/src/main/java/com/chwl/core/home/IHomeTabMapView.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/home/IHomeTabMapView.java
rename to core/src/main/java/com/chwl/core/home/IHomeTabMapView.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/home/bean/BannerInfo.java b/core/src/main/java/com/chwl/core/home/bean/BannerInfo.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/home/bean/BannerInfo.java
rename to core/src/main/java/com/chwl/core/home/bean/BannerInfo.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/home/bean/CollectionRoomInfo.java b/core/src/main/java/com/chwl/core/home/bean/CollectionRoomInfo.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/home/bean/CollectionRoomInfo.java
rename to core/src/main/java/com/chwl/core/home/bean/CollectionRoomInfo.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/home/bean/CurrentResourceInfo.kt b/core/src/main/java/com/chwl/core/home/bean/CurrentResourceInfo.kt
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/home/bean/CurrentResourceInfo.kt
rename to core/src/main/java/com/chwl/core/home/bean/CurrentResourceInfo.kt
diff --git a/core/src/diff_src_erban/java/com/chwl/core/home/bean/HomeConcernsInfo.java b/core/src/main/java/com/chwl/core/home/bean/HomeConcernsInfo.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/home/bean/HomeConcernsInfo.java
rename to core/src/main/java/com/chwl/core/home/bean/HomeConcernsInfo.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/home/bean/HomeRoomInfo.java b/core/src/main/java/com/chwl/core/home/bean/HomeRoomInfo.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/home/bean/HomeRoomInfo.java
rename to core/src/main/java/com/chwl/core/home/bean/HomeRoomInfo.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/home/bean/HomeTabMapInfo.java b/core/src/main/java/com/chwl/core/home/bean/HomeTabMapInfo.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/home/bean/HomeTabMapInfo.java
rename to core/src/main/java/com/chwl/core/home/bean/HomeTabMapInfo.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/home/bean/HomeTagInfo.java b/core/src/main/java/com/chwl/core/home/bean/HomeTagInfo.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/home/bean/HomeTagInfo.java
rename to core/src/main/java/com/chwl/core/home/bean/HomeTagInfo.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/home/bean/MainTabInfo.kt b/core/src/main/java/com/chwl/core/home/bean/MainTabInfo.kt
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/home/bean/MainTabInfo.kt
rename to core/src/main/java/com/chwl/core/home/bean/MainTabInfo.kt
diff --git a/core/src/diff_src_erban/java/com/chwl/core/home/bean/MainTabType.java b/core/src/main/java/com/chwl/core/home/bean/MainTabType.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/home/bean/MainTabType.java
rename to core/src/main/java/com/chwl/core/home/bean/MainTabType.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/home/bean/MicUsersBean.java b/core/src/main/java/com/chwl/core/home/bean/MicUsersBean.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/home/bean/MicUsersBean.java
rename to core/src/main/java/com/chwl/core/home/bean/MicUsersBean.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/home/bean/ResourceInfo.kt b/core/src/main/java/com/chwl/core/home/bean/ResourceInfo.kt
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/home/bean/ResourceInfo.kt
rename to core/src/main/java/com/chwl/core/home/bean/ResourceInfo.kt
diff --git a/core/src/diff_src_erban/java/com/chwl/core/home/bean/TabInfo.java b/core/src/main/java/com/chwl/core/home/bean/TabInfo.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/home/bean/TabInfo.java
rename to core/src/main/java/com/chwl/core/home/bean/TabInfo.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/home/bean/TagListInfo.java b/core/src/main/java/com/chwl/core/home/bean/TagListInfo.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/home/bean/TagListInfo.java
rename to core/src/main/java/com/chwl/core/home/bean/TagListInfo.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/home/bean/VisitorInfo.kt b/core/src/main/java/com/chwl/core/home/bean/VisitorInfo.kt
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/home/bean/VisitorInfo.kt
rename to core/src/main/java/com/chwl/core/home/bean/VisitorInfo.kt
diff --git a/core/src/diff_src_erban/java/com/chwl/core/home/event/FollowRoomEvent.java b/core/src/main/java/com/chwl/core/home/event/FollowRoomEvent.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/home/event/FollowRoomEvent.java
rename to core/src/main/java/com/chwl/core/home/event/FollowRoomEvent.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/home/event/OpenRoomMessageInputEvent.kt b/core/src/main/java/com/chwl/core/home/event/OpenRoomMessageInputEvent.kt
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/home/event/OpenRoomMessageInputEvent.kt
rename to core/src/main/java/com/chwl/core/home/event/OpenRoomMessageInputEvent.kt
diff --git a/core/src/diff_src_erban/java/com/chwl/core/home/event/RefreshHomeDataEvent.java b/core/src/main/java/com/chwl/core/home/event/RefreshHomeDataEvent.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/home/event/RefreshHomeDataEvent.java
rename to core/src/main/java/com/chwl/core/home/event/RefreshHomeDataEvent.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/home/event/ShareRoomEvent.java b/core/src/main/java/com/chwl/core/home/event/ShareRoomEvent.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/home/event/ShareRoomEvent.java
rename to core/src/main/java/com/chwl/core/home/event/ShareRoomEvent.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/home/event/VisitorUnreadCountEvent.java b/core/src/main/java/com/chwl/core/home/event/VisitorUnreadCountEvent.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/home/event/VisitorUnreadCountEvent.java
rename to core/src/main/java/com/chwl/core/home/event/VisitorUnreadCountEvent.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/home/model/CollectionRoomModel.java b/core/src/main/java/com/chwl/core/home/model/CollectionRoomModel.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/home/model/CollectionRoomModel.java
rename to core/src/main/java/com/chwl/core/home/model/CollectionRoomModel.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/home/model/CommunityNoticeModel.java b/core/src/main/java/com/chwl/core/home/model/CommunityNoticeModel.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/home/model/CommunityNoticeModel.java
rename to core/src/main/java/com/chwl/core/home/model/CommunityNoticeModel.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/home/model/GameHomeModel.java b/core/src/main/java/com/chwl/core/home/model/GameHomeModel.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/home/model/GameHomeModel.java
rename to core/src/main/java/com/chwl/core/home/model/GameHomeModel.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/home/model/HomeModel.kt b/core/src/main/java/com/chwl/core/home/model/HomeModel.kt
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/home/model/HomeModel.kt
rename to core/src/main/java/com/chwl/core/home/model/HomeModel.kt
diff --git a/core/src/diff_src_erban/java/com/chwl/core/home/model/ICommunityNoticeModel.java b/core/src/main/java/com/chwl/core/home/model/ICommunityNoticeModel.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/home/model/ICommunityNoticeModel.java
rename to core/src/main/java/com/chwl/core/home/model/ICommunityNoticeModel.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/manager/AudioEngineManager.java b/core/src/main/java/com/chwl/core/manager/AudioEngineManager.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/manager/AudioEngineManager.java
rename to core/src/main/java/com/chwl/core/manager/AudioEngineManager.java
diff --git a/core/src/main/java/com/chwl/core/manager/AvRoomDataManager.java b/core/src/main/java/com/chwl/core/manager/AvRoomDataManager.java
index 4e4db3ec7..755edb1a5 100644
--- a/core/src/main/java/com/chwl/core/manager/AvRoomDataManager.java
+++ b/core/src/main/java/com/chwl/core/manager/AvRoomDataManager.java
@@ -23,7 +23,7 @@ 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.chwl.core.R;
-import com.yizhuan.xchat_android_constants.XChatConstants;
+import com.chwl.core.XConstants;
import com.chwl.core.DemoCache;
import com.chwl.core.auth.AuthModel;
import com.chwl.core.bean.RoomQueueInfo;
@@ -1310,7 +1310,7 @@ public final class AvRoomDataManager {
public boolean isLimitEnterRoom(String roomUid) {
initKickOutRoomUids();
Long limitTime = kickOutRoomUids.get(roomUid);
- return limitTime != null && CurrentTimeUtils.getCurrentTime() - limitTime < XChatConstants.KICK_OUT_ROOM_LIMIT_ENTER_TIME;
+ return limitTime != null && CurrentTimeUtils.getCurrentTime() - limitTime < XConstants.KICK_OUT_ROOM_LIMIT_ENTER_TIME;
}
public void addCurrentRoomLimitEnter() {
diff --git a/core/src/diff_src_erban/java/com/chwl/core/manager/BaseEngine.java b/core/src/main/java/com/chwl/core/manager/BaseEngine.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/manager/BaseEngine.java
rename to core/src/main/java/com/chwl/core/manager/BaseEngine.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/manager/EngineType.java b/core/src/main/java/com/chwl/core/manager/EngineType.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/manager/EngineType.java
rename to core/src/main/java/com/chwl/core/manager/EngineType.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/manager/IAudioEngine.java b/core/src/main/java/com/chwl/core/manager/IAudioEngine.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/manager/IAudioEngine.java
rename to core/src/main/java/com/chwl/core/manager/IAudioEngine.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/manager/IMNetEaseManager.java b/core/src/main/java/com/chwl/core/manager/IMNetEaseManager.java
similarity index 99%
rename from core/src/diff_src_erban/java/com/chwl/core/manager/IMNetEaseManager.java
rename to core/src/main/java/com/chwl/core/manager/IMNetEaseManager.java
index 354ae435a..aac1280e4 100644
--- a/core/src/diff_src_erban/java/com/chwl/core/manager/IMNetEaseManager.java
+++ b/core/src/main/java/com/chwl/core/manager/IMNetEaseManager.java
@@ -1,6 +1,6 @@
package com.chwl.core.manager;
-import static com.yizhuan.xchat_android_constants.XChatConstants.SELECT_ANIM_DURATION;
+import static com.chwl.core.XConstants.SELECT_ANIM_DURATION;
import static com.chwl.core.im.custom.bean.CustomAttachment.*;
import android.annotation.SuppressLint;
@@ -59,7 +59,7 @@ import com.netease.nimlib.sdk.msg.model.NIMAntiSpamOption;
import com.netease.nimlib.sdk.util.Entry;
import com.netease.nimlib.sdk.util.api.RequestResult;
import com.orhanobut.logger.Logger;
-import com.yizhuan.xchat_android_constants.XChatConstants;
+import com.chwl.core.XConstants;
import com.chwl.core.BuildConfig;
import com.chwl.core.Constants;
import com.chwl.core.R;
@@ -99,7 +99,6 @@ import com.chwl.core.im.custom.bean.MonsterHuntingResultAttachment;
import com.chwl.core.im.custom.bean.MonsterStatusAttachment;
import com.chwl.core.im.custom.bean.MultiGiftAttachment;
import com.chwl.core.im.custom.bean.NobleAttachment;
-import com.chwl.core.im.custom.bean.RedPackageAttachment;
import com.chwl.core.im.custom.bean.RoomBoxPrizeAttachment;
import com.chwl.core.im.custom.bean.RoomFreeGiftAttachment;
import com.chwl.core.im.custom.bean.RoomFreeGiftMsgBean;
@@ -1787,7 +1786,7 @@ public final class IMNetEaseManager {
}
public ChatRoomMessage getFirstMessageContent() {
- String content = XChatConstants.MESSAGE_VIEW_FIRST_MSG;
+ String content = XConstants.MESSAGE_VIEW_FIRST_MSG;
ChatRoomMessage message = ChatRoomMessageBuilder.createTipMessage(content);
message.setContent(content);
return message;
@@ -1953,7 +1952,7 @@ public final class IMNetEaseManager {
atProxy.reset();
}
NIMAntiSpamOption antiSpamOption = new NIMAntiSpamOption();
- antiSpamOption.antiSpamConfigId = XChatConstants.CHAT_ROOM_ANTI_SPAM_CONFIG_ID;
+ antiSpamOption.antiSpamConfigId = XConstants.CHAT_ROOM_ANTI_SPAM_CONFIG_ID;
chatRoomMessage.setNIMAntiSpamOption(antiSpamOption);
if (AntiSpamUtil.checkLocalAntiSpam(chatRoomMessage)) {
EventBus.getDefault().post(new AntiSpamEvent());
@@ -2774,7 +2773,7 @@ public final class IMNetEaseManager {
public Publisher apply(Throwable throwable) throws Exception {
String error = throwable.getMessage();
if (TextUtils.isEmpty(error)) {
- error = XChatConstants.UNKOWN_ERROR;
+ error = XConstants.UNKOWN_ERROR;
}
if (listener != null) {
listener.onFailed(retryChatRoomMessage.getRetryCount(), error);
@@ -3507,7 +3506,7 @@ public final class IMNetEaseManager {
addMessagesImmediately(message);
}
- content = XChatConstants.ROOM_INTRODUCTION;
+ content = XConstants.ROOM_INTRODUCTION;
message = ChatRoomMessageBuilder.createTipMessage(content);
message.setContent(content);
addMessagesImmediately(message);
diff --git a/core/src/diff_src_erban/java/com/chwl/core/manager/VolumeSetting.java b/core/src/main/java/com/chwl/core/manager/VolumeSetting.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/manager/VolumeSetting.java
rename to core/src/main/java/com/chwl/core/manager/VolumeSetting.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/manager/agora/EngineEventHandler.java b/core/src/main/java/com/chwl/core/manager/agora/EngineEventHandler.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/manager/agora/EngineEventHandler.java
rename to core/src/main/java/com/chwl/core/manager/agora/EngineEventHandler.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/manager/agora/RtcEngineHandler.java b/core/src/main/java/com/chwl/core/manager/agora/RtcEngineHandler.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/manager/agora/RtcEngineHandler.java
rename to core/src/main/java/com/chwl/core/manager/agora/RtcEngineHandler.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/manager/agora/RtcEngineManager.java b/core/src/main/java/com/chwl/core/manager/agora/RtcEngineManager.java
similarity index 98%
rename from core/src/diff_src_erban/java/com/chwl/core/manager/agora/RtcEngineManager.java
rename to core/src/main/java/com/chwl/core/manager/agora/RtcEngineManager.java
index e6f3151f5..94d30592b 100644
--- a/core/src/diff_src_erban/java/com/chwl/core/manager/agora/RtcEngineManager.java
+++ b/core/src/main/java/com/chwl/core/manager/agora/RtcEngineManager.java
@@ -12,7 +12,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.orhanobut.logger.Logger;
-import com.yizhuan.xchat_android_constants.XChatConstants;
+import com.chwl.core.XConstants;
import com.chwl.core.manager.BaseEngine;
import com.chwl.core.music.db.bean.LocalMusicBean;
import com.chwl.core.music.model.PlayerModel;
@@ -55,7 +55,7 @@ public class RtcEngineManager extends BaseEngine {
Logger.t(TAG).d("enterChannel channelId:%d", channelId);
if (mRtcEngine == null) {
try {
- mRtcEngine = RtcEngine.create(BasicConfig.INSTANCE.getAppContext(), XChatConstants.getAgoraKey(), mEngineEventHandler);
+ mRtcEngine = RtcEngine.create(BasicConfig.INSTANCE.getAppContext(), XConstants.getAgoraKey(), mEngineEventHandler);
} catch (Exception e) {
throw new RuntimeException(
"NEED TO check rtc sdk init fatal error\n" + Log.getStackTraceString(e));
diff --git a/core/src/diff_src_erban/java/com/chwl/core/manager/trtc/BaseAdapterImpl.java b/core/src/main/java/com/chwl/core/manager/trtc/BaseAdapterImpl.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/manager/trtc/BaseAdapterImpl.java
rename to core/src/main/java/com/chwl/core/manager/trtc/BaseAdapterImpl.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/manager/trtc/BaseAgoraHandlerInterface.java b/core/src/main/java/com/chwl/core/manager/trtc/BaseAgoraHandlerInterface.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/manager/trtc/BaseAgoraHandlerInterface.java
rename to core/src/main/java/com/chwl/core/manager/trtc/BaseAgoraHandlerInterface.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/manager/trtc/BaseAgoraInterface.java b/core/src/main/java/com/chwl/core/manager/trtc/BaseAgoraInterface.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/manager/trtc/BaseAgoraInterface.java
rename to core/src/main/java/com/chwl/core/manager/trtc/BaseAgoraInterface.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/manager/trtc/IRTCEngine.java b/core/src/main/java/com/chwl/core/manager/trtc/IRTCEngine.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/manager/trtc/IRTCEngine.java
rename to core/src/main/java/com/chwl/core/manager/trtc/IRTCEngine.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/manager/trtc/IRTCEngineHandler.java b/core/src/main/java/com/chwl/core/manager/trtc/IRTCEngineHandler.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/manager/trtc/IRTCEngineHandler.java
rename to core/src/main/java/com/chwl/core/manager/trtc/IRTCEngineHandler.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/manager/trtc/RoomIdHelper.java b/core/src/main/java/com/chwl/core/manager/trtc/RoomIdHelper.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/manager/trtc/RoomIdHelper.java
rename to core/src/main/java/com/chwl/core/manager/trtc/RoomIdHelper.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/manager/trtc/SDKConfig.java b/core/src/main/java/com/chwl/core/manager/trtc/SDKConfig.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/manager/trtc/SDKConfig.java
rename to core/src/main/java/com/chwl/core/manager/trtc/SDKConfig.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/manager/trtc/TRTCEffectManager.java b/core/src/main/java/com/chwl/core/manager/trtc/TRTCEffectManager.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/manager/trtc/TRTCEffectManager.java
rename to core/src/main/java/com/chwl/core/manager/trtc/TRTCEffectManager.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/manager/trtc/TRTCEngineAdapter.java b/core/src/main/java/com/chwl/core/manager/trtc/TRTCEngineAdapter.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/manager/trtc/TRTCEngineAdapter.java
rename to core/src/main/java/com/chwl/core/manager/trtc/TRTCEngineAdapter.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/manager/trtc/TRtcEngineEventHandler.java b/core/src/main/java/com/chwl/core/manager/trtc/TRtcEngineEventHandler.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/manager/trtc/TRtcEngineEventHandler.java
rename to core/src/main/java/com/chwl/core/manager/trtc/TRtcEngineEventHandler.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/manager/trtc/TRtcEngineHandler.java b/core/src/main/java/com/chwl/core/manager/trtc/TRtcEngineHandler.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/manager/trtc/TRtcEngineHandler.java
rename to core/src/main/java/com/chwl/core/manager/trtc/TRtcEngineHandler.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/manager/trtc/TRtcEngineManager.java b/core/src/main/java/com/chwl/core/manager/trtc/TRtcEngineManager.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/manager/trtc/TRtcEngineManager.java
rename to core/src/main/java/com/chwl/core/manager/trtc/TRtcEngineManager.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/manager/trtc/Unsupport.java b/core/src/main/java/com/chwl/core/manager/trtc/Unsupport.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/manager/trtc/Unsupport.java
rename to core/src/main/java/com/chwl/core/manager/trtc/Unsupport.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/manager/trtc/Utils.java b/core/src/main/java/com/chwl/core/manager/trtc/Utils.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/manager/trtc/Utils.java
rename to core/src/main/java/com/chwl/core/manager/trtc/Utils.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/manager/trtc/Version.java b/core/src/main/java/com/chwl/core/manager/trtc/Version.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/manager/trtc/Version.java
rename to core/src/main/java/com/chwl/core/manager/trtc/Version.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/market_verify/IMarketVerifyModel.java b/core/src/main/java/com/chwl/core/market_verify/IMarketVerifyModel.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/market_verify/IMarketVerifyModel.java
rename to core/src/main/java/com/chwl/core/market_verify/IMarketVerifyModel.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/market_verify/MarketVerifyModel.java b/core/src/main/java/com/chwl/core/market_verify/MarketVerifyModel.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/market_verify/MarketVerifyModel.java
rename to core/src/main/java/com/chwl/core/market_verify/MarketVerifyModel.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/market_verify/bean/VersionConfig.java b/core/src/main/java/com/chwl/core/market_verify/bean/VersionConfig.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/market_verify/bean/VersionConfig.java
rename to core/src/main/java/com/chwl/core/market_verify/bean/VersionConfig.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/market_verify/event/MarketVerifyUpdateEvent.java b/core/src/main/java/com/chwl/core/market_verify/event/MarketVerifyUpdateEvent.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/market_verify/event/MarketVerifyUpdateEvent.java
rename to core/src/main/java/com/chwl/core/market_verify/event/MarketVerifyUpdateEvent.java
diff --git a/core/src/main/java/com/chwl/core/pay/PayModel.java b/core/src/main/java/com/chwl/core/pay/PayModel.java
index baacd4480..fa6d496ed 100644
--- a/core/src/main/java/com/chwl/core/pay/PayModel.java
+++ b/core/src/main/java/com/chwl/core/pay/PayModel.java
@@ -6,7 +6,7 @@ import android.content.Context;
import com.alibaba.fastjson.JSONObject;
import com.google.gson.JsonObject;
-import com.yizhuan.xchat_android_constants.XChatConstants;
+import com.chwl.core.XConstants;
import com.chwl.core.R;
import com.chwl.core.auth.AuthModel;
import com.chwl.core.base.BaseModel;
@@ -463,7 +463,7 @@ public class PayModel extends BaseModel implements IPayModel {
if (result.isSuccess()) {
return Single.just(result.getData() == null ? "" : result.getData());
}
- if (result.getCode() == XChatConstants.CODE_IGNORE_TOAST) {
+ if (result.getCode() == XConstants.CODE_IGNORE_TOAST) {
return Single.error(new IgnoreException(ResUtil.getString(R.string.xchat_android_core_pay_paymodel_03)));
}
return Single.error(new Throwable(result.getMessage()));
diff --git a/core/src/diff_src_erban/java/com/chwl/core/retry/ImRetryManager.java b/core/src/main/java/com/chwl/core/retry/ImRetryManager.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/retry/ImRetryManager.java
rename to core/src/main/java/com/chwl/core/retry/ImRetryManager.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/retry/ReconnectListener.java b/core/src/main/java/com/chwl/core/retry/ReconnectListener.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/retry/ReconnectListener.java
rename to core/src/main/java/com/chwl/core/retry/ReconnectListener.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/retry/RetryChatRoomMessage.java b/core/src/main/java/com/chwl/core/retry/RetryChatRoomMessage.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/retry/RetryChatRoomMessage.java
rename to core/src/main/java/com/chwl/core/retry/RetryChatRoomMessage.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/set/bean/ShieldInfo.kt b/core/src/main/java/com/chwl/core/set/bean/ShieldInfo.kt
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/set/bean/ShieldInfo.kt
rename to core/src/main/java/com/chwl/core/set/bean/ShieldInfo.kt
diff --git a/core/src/diff_src_erban/java/com/chwl/core/set/model/SetModel.kt b/core/src/main/java/com/chwl/core/set/model/SetModel.kt
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/set/model/SetModel.kt
rename to core/src/main/java/com/chwl/core/set/model/SetModel.kt
diff --git a/core/src/main/java/com/chwl/core/share/ShareModel.java b/core/src/main/java/com/chwl/core/share/ShareModel.java
index 4c2a9dba3..cccd5e260 100644
--- a/core/src/main/java/com/chwl/core/share/ShareModel.java
+++ b/core/src/main/java/com/chwl/core/share/ShareModel.java
@@ -1,18 +1,10 @@
package com.chwl.core.share;
import android.annotation.SuppressLint;
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
-import android.util.Log;
-import com.netease.nim.uikit.common.util.sys.ClipboardUtil;
import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder;
import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage;
import com.chwl.core.R;
-import com.yizhuan.xchat_android_constants.XChatConstants;
-import com.chwl.core.UriProvider;
-import com.chwl.core.auth.AuthModel;
import com.chwl.core.base.BaseModel;
import com.chwl.core.bean.response.result.ShareRedPacketResult;
import com.chwl.core.im.custom.bean.CustomAttachment;
@@ -23,22 +15,16 @@ import com.chwl.core.room.bean.RoomInfo;
import com.chwl.core.share.bean.ShareCommonInfo;
import com.chwl.core.user.UserModel;
import com.chwl.core.user.bean.UserInfo;
-import com.chwl.core.utils.Logger;
import com.chwl.core.web.bean.WebJsBeanInfo;
import com.chwl.library.net.rxnet.RxNet;
import com.chwl.library.utils.ResUtil;
import com.chwl.library.utils.SingleToastUtil;
-import java.net.URLEncoder;
-import java.util.HashMap;
-
import cn.sharesdk.framework.Platform;
import io.reactivex.Single;
import io.reactivex.SingleEmitter;
import io.reactivex.SingleOnSubscribe;
-import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.functions.Consumer;
-import io.reactivex.schedulers.Schedulers;
import retrofit2.http.POST;
import retrofit2.http.Query;
diff --git a/core/src/diff_src_erban/java/com/chwl/core/sound/model/SoundModel.kt b/core/src/main/java/com/chwl/core/sound/model/SoundModel.kt
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/sound/model/SoundModel.kt
rename to core/src/main/java/com/chwl/core/sound/model/SoundModel.kt
diff --git a/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/Compound.kt b/core/src/main/java/com/chwl/core/treasurefairy/Compound.kt
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/treasurefairy/Compound.kt
rename to core/src/main/java/com/chwl/core/treasurefairy/Compound.kt
diff --git a/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/DrawInfo.kt b/core/src/main/java/com/chwl/core/treasurefairy/DrawInfo.kt
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/treasurefairy/DrawInfo.kt
rename to core/src/main/java/com/chwl/core/treasurefairy/DrawInfo.kt
diff --git a/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/ExchangeGiftInfo.kt b/core/src/main/java/com/chwl/core/treasurefairy/ExchangeGiftInfo.kt
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/treasurefairy/ExchangeGiftInfo.kt
rename to core/src/main/java/com/chwl/core/treasurefairy/ExchangeGiftInfo.kt
diff --git a/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/FairyInfo.kt b/core/src/main/java/com/chwl/core/treasurefairy/FairyInfo.kt
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/treasurefairy/FairyInfo.kt
rename to core/src/main/java/com/chwl/core/treasurefairy/FairyInfo.kt
diff --git a/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/FairyMsgInfoBean.java b/core/src/main/java/com/chwl/core/treasurefairy/FairyMsgInfoBean.java
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/treasurefairy/FairyMsgInfoBean.java
rename to core/src/main/java/com/chwl/core/treasurefairy/FairyMsgInfoBean.java
diff --git a/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/FairyResolveParam.kt b/core/src/main/java/com/chwl/core/treasurefairy/FairyResolveParam.kt
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/treasurefairy/FairyResolveParam.kt
rename to core/src/main/java/com/chwl/core/treasurefairy/FairyResolveParam.kt
diff --git a/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/FairyTestParam.kt b/core/src/main/java/com/chwl/core/treasurefairy/FairyTestParam.kt
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/treasurefairy/FairyTestParam.kt
rename to core/src/main/java/com/chwl/core/treasurefairy/FairyTestParam.kt
diff --git a/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/ForestInfo.kt b/core/src/main/java/com/chwl/core/treasurefairy/ForestInfo.kt
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/treasurefairy/ForestInfo.kt
rename to core/src/main/java/com/chwl/core/treasurefairy/ForestInfo.kt
diff --git a/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/MyFairyInfo.kt b/core/src/main/java/com/chwl/core/treasurefairy/MyFairyInfo.kt
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/treasurefairy/MyFairyInfo.kt
rename to core/src/main/java/com/chwl/core/treasurefairy/MyFairyInfo.kt
diff --git a/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/PrizeInfo.kt b/core/src/main/java/com/chwl/core/treasurefairy/PrizeInfo.kt
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/treasurefairy/PrizeInfo.kt
rename to core/src/main/java/com/chwl/core/treasurefairy/PrizeInfo.kt
diff --git a/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/PropItemInfo.kt b/core/src/main/java/com/chwl/core/treasurefairy/PropItemInfo.kt
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/treasurefairy/PropItemInfo.kt
rename to core/src/main/java/com/chwl/core/treasurefairy/PropItemInfo.kt
diff --git a/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/ResolveInfo.kt b/core/src/main/java/com/chwl/core/treasurefairy/ResolveInfo.kt
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/treasurefairy/ResolveInfo.kt
rename to core/src/main/java/com/chwl/core/treasurefairy/ResolveInfo.kt
diff --git a/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/SendFairyInfo.kt b/core/src/main/java/com/chwl/core/treasurefairy/SendFairyInfo.kt
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/treasurefairy/SendFairyInfo.kt
rename to core/src/main/java/com/chwl/core/treasurefairy/SendFairyInfo.kt
diff --git a/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/TestFairyRecordInfo.kt b/core/src/main/java/com/chwl/core/treasurefairy/TestFairyRecordInfo.kt
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/treasurefairy/TestFairyRecordInfo.kt
rename to core/src/main/java/com/chwl/core/treasurefairy/TestFairyRecordInfo.kt
diff --git a/core/src/diff_src_erban/java/com/chwl/core/treasurefairy/TreasureFairyModel.kt b/core/src/main/java/com/chwl/core/treasurefairy/TreasureFairyModel.kt
similarity index 100%
rename from core/src/diff_src_erban/java/com/chwl/core/treasurefairy/TreasureFairyModel.kt
rename to core/src/main/java/com/chwl/core/treasurefairy/TreasureFairyModel.kt
diff --git a/core/src/main/java/com/chwl/core/utils/APIEncryptUtil.java b/core/src/main/java/com/chwl/core/utils/APIEncryptUtil.java
index 28dc3870c..4759ed5af 100644
--- a/core/src/main/java/com/chwl/core/utils/APIEncryptUtil.java
+++ b/core/src/main/java/com/chwl/core/utils/APIEncryptUtil.java
@@ -1,8 +1,6 @@
package com.chwl.core.utils;
-import com.google.gson.Gson;
-import com.yizhuan.xchat_android_constants.XChatConstants;
-import com.chwl.library.utils.codec.DESUtils;
+import com.chwl.core.XConstants;
import com.chwl.library.utils.codec.MD5Utils;
import java.net.URLEncoder;
@@ -20,8 +18,8 @@ import java.util.Map;
*/
public class APIEncryptUtil {
- private static final String DES_ENCRYPT_KEY_SMS_PARAMS = XChatConstants.DES_ENCRYPT_KEY_SMS_PARAMS;
- private static final String DES_ENCRYPT_KEY_SMS_SIGN = XChatConstants.DES_ENCRYPT_KEY_SMS_SIGN;
+ private static final String DES_ENCRYPT_KEY_SMS_PARAMS = XConstants.DES_ENCRYPT_KEY_SMS_PARAMS;
+ private static final String DES_ENCRYPT_KEY_SMS_SIGN = XConstants.DES_ENCRYPT_KEY_SMS_SIGN;
// /**
diff --git a/core/src/main/java/com/chwl/core/utils/SharedPreferenceUtils.java b/core/src/main/java/com/chwl/core/utils/SharedPreferenceUtils.java
index 47ecd7cc5..fd504d7ed 100644
--- a/core/src/main/java/com/chwl/core/utils/SharedPreferenceUtils.java
+++ b/core/src/main/java/com/chwl/core/utils/SharedPreferenceUtils.java
@@ -3,7 +3,7 @@ package com.chwl.core.utils;
import android.content.Context;
import android.content.SharedPreferences;
-import com.yizhuan.xchat_android_constants.XChatConstants;
+import com.chwl.core.XConstants;
public class SharedPreferenceUtils {
@@ -21,7 +21,7 @@ public class SharedPreferenceUtils {
//请在Application中初始化
public static void init(Context context) {
- preferences = context.getSharedPreferences(XChatConstants.XCHAT_SHARE_PREFERENCE_NAME, Context.MODE_PRIVATE);
+ preferences = context.getSharedPreferences(XConstants.XCHAT_SHARE_PREFERENCE_NAME, Context.MODE_PRIVATE);
}
// 耳伴钻石兑率
diff --git a/core/src/main/java/com/chwl/core/utils/SystemUidUtil.java b/core/src/main/java/com/chwl/core/utils/SystemUidUtil.java
index 8bd823831..78525a1ac 100644
--- a/core/src/main/java/com/chwl/core/utils/SystemUidUtil.java
+++ b/core/src/main/java/com/chwl/core/utils/SystemUidUtil.java
@@ -1,14 +1,14 @@
package com.chwl.core.utils;
-import com.yizhuan.xchat_android_constants.XChatConstants;
+import com.chwl.core.XConstants;
public class SystemUidUtil {
public static boolean isSystemUid(String uid) {
- return XChatConstants.SECRETARY_UID.equals(uid)
- || XChatConstants.SYSTEM_MESSAGE_UID.equals(uid)
- || XChatConstants.MATCH_UID.equals(uid);
+ return XConstants.SECRETARY_UID.equals(uid)
+ || XConstants.SYSTEM_MESSAGE_UID.equals(uid)
+ || XConstants.MATCH_UID.equals(uid);
}
}
diff --git a/core/src/main/java/com/chwl/core/utils/net/DontWarnObserver.java b/core/src/main/java/com/chwl/core/utils/net/DontWarnObserver.java
index 7cc145584..2e138166c 100644
--- a/core/src/main/java/com/chwl/core/utils/net/DontWarnObserver.java
+++ b/core/src/main/java/com/chwl/core/utils/net/DontWarnObserver.java
@@ -2,7 +2,7 @@ package com.chwl.core.utils.net;
import android.text.TextUtils;
-import com.yizhuan.xchat_android_constants.XChatConstants;
+import com.chwl.core.XConstants;
import java.net.UnknownHostException;
@@ -41,10 +41,10 @@ public abstract class DontWarnObserver implements SingleObserver {
error = e.getMessage();
}
if (e instanceof UnknownHostException) {
- error = XChatConstants.NET_ERROR;
+ error = XConstants.NET_ERROR;
}
if (TextUtils.isEmpty(error)) {
- error = XChatConstants.NET_ERROR;
+ error = XConstants.NET_ERROR;
}
accept(null, error);
acceptThrowable(null, e);
diff --git a/core/src/main/java/com/chwl/core/utils/net/ErrorConsumer.java b/core/src/main/java/com/chwl/core/utils/net/ErrorConsumer.java
index b439e74cb..3483fefd5 100644
--- a/core/src/main/java/com/chwl/core/utils/net/ErrorConsumer.java
+++ b/core/src/main/java/com/chwl/core/utils/net/ErrorConsumer.java
@@ -3,7 +3,7 @@ package com.chwl.core.utils.net;
import android.text.TextUtils;
import com.chwl.core.R;
-import com.yizhuan.xchat_android_constants.XChatConstants;
+import com.chwl.core.XConstants;
import com.chwl.core.patriarch.exception.PmRoomLimitException;
import com.chwl.library.rxbus.RxBus;
import com.chwl.library.utils.ResUtil;
@@ -33,7 +33,7 @@ public class ErrorConsumer implements Consumer {
public void accept(Throwable e) throws Exception {
String msg = "";
if (showtoast) {
- RxBus.get().post(XChatConstants.HIDE);
+ RxBus.get().post(XConstants.HIDE);
}
if (e instanceof ServerException) {
if (e.getMessage() != null) {
diff --git a/core/src/main/java/com/chwl/core/utils/net/RxHelper.java b/core/src/main/java/com/chwl/core/utils/net/RxHelper.java
index 922b873ce..77263914c 100644
--- a/core/src/main/java/com/chwl/core/utils/net/RxHelper.java
+++ b/core/src/main/java/com/chwl/core/utils/net/RxHelper.java
@@ -11,7 +11,7 @@ import com.trello.rxlifecycle3.android.FragmentEvent;
import com.trello.rxlifecycle3.components.RxActivity;
import com.trello.rxlifecycle3.components.support.RxAppCompatActivity;
import com.chwl.core.R;
-import com.yizhuan.xchat_android_constants.XChatConstants;
+import com.chwl.core.XConstants;
import com.chwl.core.bean.response.ServiceResult;
import com.chwl.core.exception.FailReasonException;
import com.chwl.core.patriarch.exception.PmRoomLimitException;
@@ -232,24 +232,24 @@ public class RxHelper {
*/
public static SingleTransformer, T> singleMainResult(boolean showLoad) {
if (showLoad) {
- RxBus.get().post(XChatConstants.SHOW);
+ RxBus.get().post(XConstants.SHOW);
}
return observable -> observable.compose(handleSchedulers()).compose(singleResult(showLoad));
}
public static SingleTransformer, T> singleMainResultNoToast() {
- RxBus.get().post(XChatConstants.SHOW);
+ RxBus.get().post(XConstants.SHOW);
return observable -> observable.compose(handleSchedulers()).compose(singleResult(false))
- .doFinally(() -> RxBus.get().post(XChatConstants.HIDE))
+ .doFinally(() -> RxBus.get().post(XConstants.HIDE))
.doOnError((Consumer) throwable -> {
- RxBus.get().post(XChatConstants.HIDE);
+ RxBus.get().post(XConstants.HIDE);
});
}
private static SingleTransformer, T> singleResult(boolean showLoad) {
return upstream -> upstream.flatMap(tBaseBean -> Single.create((SingleOnSubscribe) e -> {
if (showLoad) {
- RxBus.get().post(XChatConstants.HIDE);
+ RxBus.get().post(XConstants.HIDE);
}
if (tBaseBean.isSuccess()) {
if (tBaseBean.getData() == null) {
diff --git a/core/src/model_database_room/java/com/chwl/tutu/database/AppDataBase.java b/core/src/model_database_room/java/com/chwl/core/db/AppDataBase.java
similarity index 57%
rename from core/src/model_database_room/java/com/chwl/tutu/database/AppDataBase.java
rename to core/src/model_database_room/java/com/chwl/core/db/AppDataBase.java
index 852cbf5ec..7d4a6f439 100644
--- a/core/src/model_database_room/java/com/chwl/tutu/database/AppDataBase.java
+++ b/core/src/model_database_room/java/com/chwl/core/db/AppDataBase.java
@@ -1,20 +1,17 @@
-package com.chwl.tutu.database;
+package com.chwl.core.db;
-import androidx.annotation.NonNull;
import androidx.room.Database;
import androidx.room.Room;
import androidx.room.RoomDatabase;
-import androidx.room.migration.Migration;
-import androidx.sqlite.db.SupportSQLiteDatabase;
-import com.yizhuan.xchat_android_constants.XChatConstants;
+import com.chwl.core.XConstants;
import com.chwl.core.music.db.bean.LocalMusicBean;
import com.chwl.core.music.db.bean.SongBean;
import com.chwl.core.music.db.dao.LocalMusicDao;
import com.chwl.core.music.db.dao.SongDao;
import com.chwl.library.utils.config.BasicConfig;
-@Database(entities = {LocalMusicBean.class, SongBean.class}, version = 2, exportSchema = false)
+@Database(entities = {LocalMusicBean.class, SongBean.class}, version = 1, exportSchema = false)
public abstract class AppDataBase extends RoomDatabase {
private static volatile AppDataBase mInstance;
@@ -22,9 +19,8 @@ public abstract class AppDataBase extends RoomDatabase {
if (mInstance == null) {
synchronized (AppDataBase.class) {
if (mInstance == null) {
- mInstance = Room.databaseBuilder(BasicConfig.INSTANCE.getAppContext(), AppDataBase.class, XChatConstants.XCHAT_DATABASE_NAME)
+ mInstance = Room.databaseBuilder(BasicConfig.INSTANCE.getAppContext(), AppDataBase.class, XConstants.XCHAT_DATABASE_NAME)
.fallbackToDestructiveMigration()
- .addMigrations(migration_1_2)
.build();
}
}
@@ -32,17 +28,6 @@ public abstract class AppDataBase extends RoomDatabase {
return mInstance;
}
- //数据库升级
- private static final Migration migration_1_2 = new Migration(1, 2) {
- @Override
- public void migrate(@NonNull SupportSQLiteDatabase database) {
- database.execSQL(
- "ALTER TABLE local_songs"
- + " ADD COLUMN uri TEXT"
- );
- }
- };
-
public abstract LocalMusicDao localMusicDao();
public abstract SongDao songDao();
diff --git a/core/src/model_music/java/com/chwl/core/music/db/model/LocalMusicDbModel.java b/core/src/model_music/java/com/chwl/core/music/db/model/LocalMusicDbModel.java
index e394709da..7280ea942 100644
--- a/core/src/model_music/java/com/chwl/core/music/db/model/LocalMusicDbModel.java
+++ b/core/src/model_music/java/com/chwl/core/music/db/model/LocalMusicDbModel.java
@@ -9,7 +9,7 @@ import android.provider.MediaStore;
import androidx.annotation.Nullable;
-import com.chwl.tutu.database.AppDataBase;
+import com.chwl.core.db.AppDataBase;
import com.chwl.core.base.BaseModel;
import com.chwl.core.music.bean.LocalMusicInfo;
import com.chwl.core.music.db.bean.LocalMusicBean;
diff --git a/core/src/model_music/java/com/chwl/core/music/model/ShareMusicListModel.java b/core/src/model_music/java/com/chwl/core/music/model/ShareMusicListModel.java
index e6707e66b..0cbdb853b 100644
--- a/core/src/model_music/java/com/chwl/core/music/model/ShareMusicListModel.java
+++ b/core/src/model_music/java/com/chwl/core/music/model/ShareMusicListModel.java
@@ -1,7 +1,7 @@
package com.chwl.core.music.model;
import com.chwl.core.R;
-import com.chwl.tutu.database.AppDataBase;
+import com.chwl.core.db.AppDataBase;
import com.chwl.core.Constants;
import com.chwl.core.auth.AuthModel;
import com.chwl.core.base.BaseModel;
diff --git a/core/src/model_treasure_box/java/com/chwl/treasure_box/bean/BoxOpenStatusInfo.java b/core/src/model_treasure_box/java/com/chwl/core/treasure_box/bean/BoxOpenStatusInfo.java
similarity index 94%
rename from core/src/model_treasure_box/java/com/chwl/treasure_box/bean/BoxOpenStatusInfo.java
rename to core/src/model_treasure_box/java/com/chwl/core/treasure_box/bean/BoxOpenStatusInfo.java
index fdf23d794..517eb23ba 100644
--- a/core/src/model_treasure_box/java/com/chwl/treasure_box/bean/BoxOpenStatusInfo.java
+++ b/core/src/model_treasure_box/java/com/chwl/core/treasure_box/bean/BoxOpenStatusInfo.java
@@ -1,4 +1,4 @@
-package com.chwl.treasure_box.bean;
+package com.chwl.core.treasure_box.bean;
import java.io.Serializable;
diff --git a/core/src/model_treasure_box/java/com/chwl/treasure_box/bean/ConfigImgUrl.java b/core/src/model_treasure_box/java/com/chwl/core/treasure_box/bean/ConfigImgUrl.java
similarity index 92%
rename from core/src/model_treasure_box/java/com/chwl/treasure_box/bean/ConfigImgUrl.java
rename to core/src/model_treasure_box/java/com/chwl/core/treasure_box/bean/ConfigImgUrl.java
index 75924046b..a14d07f98 100644
--- a/core/src/model_treasure_box/java/com/chwl/treasure_box/bean/ConfigImgUrl.java
+++ b/core/src/model_treasure_box/java/com/chwl/core/treasure_box/bean/ConfigImgUrl.java
@@ -1,4 +1,4 @@
-package com.chwl.treasure_box.bean;
+package com.chwl.core.treasure_box.bean;
import java.io.Serializable;
diff --git a/core/src/model_treasure_box/java/com/chwl/treasure_box/bean/HonourBuyKeyResultInfo.java b/core/src/model_treasure_box/java/com/chwl/core/treasure_box/bean/HonourBuyKeyResultInfo.java
similarity index 92%
rename from core/src/model_treasure_box/java/com/chwl/treasure_box/bean/HonourBuyKeyResultInfo.java
rename to core/src/model_treasure_box/java/com/chwl/core/treasure_box/bean/HonourBuyKeyResultInfo.java
index d7d547ce6..7406d2a83 100644
--- a/core/src/model_treasure_box/java/com/chwl/treasure_box/bean/HonourBuyKeyResultInfo.java
+++ b/core/src/model_treasure_box/java/com/chwl/core/treasure_box/bean/HonourBuyKeyResultInfo.java
@@ -1,4 +1,4 @@
-package com.chwl.treasure_box.bean;
+package com.chwl.core.treasure_box.bean;
import java.io.Serializable;
diff --git a/core/src/model_treasure_box/java/com/chwl/treasure_box/bean/HonourKeyInfo.java b/core/src/model_treasure_box/java/com/chwl/core/treasure_box/bean/HonourKeyInfo.java
similarity index 93%
rename from core/src/model_treasure_box/java/com/chwl/treasure_box/bean/HonourKeyInfo.java
rename to core/src/model_treasure_box/java/com/chwl/core/treasure_box/bean/HonourKeyInfo.java
index 710c04858..7cf541c1c 100644
--- a/core/src/model_treasure_box/java/com/chwl/treasure_box/bean/HonourKeyInfo.java
+++ b/core/src/model_treasure_box/java/com/chwl/core/treasure_box/bean/HonourKeyInfo.java
@@ -1,4 +1,4 @@
-package com.chwl.treasure_box.bean;
+package com.chwl.core.treasure_box.bean;
import java.io.Serializable;
diff --git a/core/src/model_treasure_box/java/com/chwl/treasure_box/bean/KeyInfo.java b/core/src/model_treasure_box/java/com/chwl/core/treasure_box/bean/KeyInfo.java
similarity index 95%
rename from core/src/model_treasure_box/java/com/chwl/treasure_box/bean/KeyInfo.java
rename to core/src/model_treasure_box/java/com/chwl/core/treasure_box/bean/KeyInfo.java
index f1aebcd08..62f41fcf3 100644
--- a/core/src/model_treasure_box/java/com/chwl/treasure_box/bean/KeyInfo.java
+++ b/core/src/model_treasure_box/java/com/chwl/core/treasure_box/bean/KeyInfo.java
@@ -1,4 +1,4 @@
-package com.chwl.treasure_box.bean;
+package com.chwl.core.treasure_box.bean;
import java.io.Serializable;
diff --git a/core/src/model_treasure_box/java/com/chwl/treasure_box/bean/OpenBoxDrawResult.java b/core/src/model_treasure_box/java/com/chwl/core/treasure_box/bean/OpenBoxDrawResult.java
similarity index 90%
rename from core/src/model_treasure_box/java/com/chwl/treasure_box/bean/OpenBoxDrawResult.java
rename to core/src/model_treasure_box/java/com/chwl/core/treasure_box/bean/OpenBoxDrawResult.java
index fb88a0d83..cd7a69d84 100644
--- a/core/src/model_treasure_box/java/com/chwl/treasure_box/bean/OpenBoxDrawResult.java
+++ b/core/src/model_treasure_box/java/com/chwl/core/treasure_box/bean/OpenBoxDrawResult.java
@@ -1,4 +1,4 @@
-package com.chwl.treasure_box.bean;
+package com.chwl.core.treasure_box.bean;
import java.io.Serializable;
import java.util.List;
diff --git a/core/src/model_treasure_box/java/com/chwl/treasure_box/bean/OpenBoxHonourResult.java b/core/src/model_treasure_box/java/com/chwl/core/treasure_box/bean/OpenBoxHonourResult.java
similarity index 94%
rename from core/src/model_treasure_box/java/com/chwl/treasure_box/bean/OpenBoxHonourResult.java
rename to core/src/model_treasure_box/java/com/chwl/core/treasure_box/bean/OpenBoxHonourResult.java
index ad4408e1c..c787dec4f 100644
--- a/core/src/model_treasure_box/java/com/chwl/treasure_box/bean/OpenBoxHonourResult.java
+++ b/core/src/model_treasure_box/java/com/chwl/core/treasure_box/bean/OpenBoxHonourResult.java
@@ -1,4 +1,4 @@
-package com.chwl.treasure_box.bean;
+package com.chwl.core.treasure_box.bean;
import java.io.Serializable;
import java.util.List;
diff --git a/core/src/model_treasure_box/java/com/chwl/treasure_box/bean/OpenBoxResult.java b/core/src/model_treasure_box/java/com/chwl/core/treasure_box/bean/OpenBoxResult.java
similarity index 94%
rename from core/src/model_treasure_box/java/com/chwl/treasure_box/bean/OpenBoxResult.java
rename to core/src/model_treasure_box/java/com/chwl/core/treasure_box/bean/OpenBoxResult.java
index dd9560851..de6500cf7 100644
--- a/core/src/model_treasure_box/java/com/chwl/treasure_box/bean/OpenBoxResult.java
+++ b/core/src/model_treasure_box/java/com/chwl/core/treasure_box/bean/OpenBoxResult.java
@@ -1,4 +1,4 @@
-package com.chwl.treasure_box.bean;
+package com.chwl.core.treasure_box.bean;
import java.io.Serializable;
import java.util.List;
diff --git a/core/src/model_treasure_box/java/com/chwl/treasure_box/bean/PrizeInfo.java b/core/src/model_treasure_box/java/com/chwl/core/treasure_box/bean/PrizeInfo.java
similarity index 97%
rename from core/src/model_treasure_box/java/com/chwl/treasure_box/bean/PrizeInfo.java
rename to core/src/model_treasure_box/java/com/chwl/core/treasure_box/bean/PrizeInfo.java
index 0b148caa1..ba3f2299d 100644
--- a/core/src/model_treasure_box/java/com/chwl/treasure_box/bean/PrizeInfo.java
+++ b/core/src/model_treasure_box/java/com/chwl/core/treasure_box/bean/PrizeInfo.java
@@ -1,4 +1,4 @@
-package com.chwl.treasure_box.bean;
+package com.chwl.core.treasure_box.bean;
import java.io.Serializable;
diff --git a/core/src/model_treasure_box/java/com/chwl/treasure_box/bean/PrizeNewInfo.java b/core/src/model_treasure_box/java/com/chwl/core/treasure_box/bean/PrizeNewInfo.java
similarity index 96%
rename from core/src/model_treasure_box/java/com/chwl/treasure_box/bean/PrizeNewInfo.java
rename to core/src/model_treasure_box/java/com/chwl/core/treasure_box/bean/PrizeNewInfo.java
index 6376229c4..be6220245 100644
--- a/core/src/model_treasure_box/java/com/chwl/treasure_box/bean/PrizeNewInfo.java
+++ b/core/src/model_treasure_box/java/com/chwl/core/treasure_box/bean/PrizeNewInfo.java
@@ -1,4 +1,4 @@
-package com.chwl.treasure_box.bean;
+package com.chwl.core.treasure_box.bean;
import java.io.Serializable;
diff --git a/core/src/model_treasure_box/java/com/chwl/treasure_box/bean/UserTicketInfo.kt b/core/src/model_treasure_box/java/com/chwl/core/treasure_box/bean/UserTicketInfo.kt
similarity index 78%
rename from core/src/model_treasure_box/java/com/chwl/treasure_box/bean/UserTicketInfo.kt
rename to core/src/model_treasure_box/java/com/chwl/core/treasure_box/bean/UserTicketInfo.kt
index 4aa233270..0378f14e8 100644
--- a/core/src/model_treasure_box/java/com/chwl/treasure_box/bean/UserTicketInfo.kt
+++ b/core/src/model_treasure_box/java/com/chwl/core/treasure_box/bean/UserTicketInfo.kt
@@ -1,4 +1,4 @@
-package com.chwl.treasure_box.bean
+package com.chwl.core.treasure_box.bean
data class UserTicketInfo(
val diamond: Double = 0.0,
diff --git a/core/src/model_treasure_box/java/com/chwl/treasure_box/event/AutoOpenBoxEvent.java b/core/src/model_treasure_box/java/com/chwl/core/treasure_box/event/AutoOpenBoxEvent.java
similarity index 80%
rename from core/src/model_treasure_box/java/com/chwl/treasure_box/event/AutoOpenBoxEvent.java
rename to core/src/model_treasure_box/java/com/chwl/core/treasure_box/event/AutoOpenBoxEvent.java
index c8620ce14..4b7e1032a 100644
--- a/core/src/model_treasure_box/java/com/chwl/treasure_box/event/AutoOpenBoxEvent.java
+++ b/core/src/model_treasure_box/java/com/chwl/core/treasure_box/event/AutoOpenBoxEvent.java
@@ -1,6 +1,6 @@
-package com.chwl.treasure_box.event;
+package com.chwl.core.treasure_box.event;
-import com.chwl.treasure_box.bean.OpenBoxResult;
+import com.chwl.core.treasure_box.bean.OpenBoxResult;
import lombok.Data;
diff --git a/core/src/model_treasure_box/java/com/chwl/treasure_box/event/AutoOpenHonourBoxEvent.java b/core/src/model_treasure_box/java/com/chwl/core/treasure_box/event/AutoOpenHonourBoxEvent.java
similarity index 80%
rename from core/src/model_treasure_box/java/com/chwl/treasure_box/event/AutoOpenHonourBoxEvent.java
rename to core/src/model_treasure_box/java/com/chwl/core/treasure_box/event/AutoOpenHonourBoxEvent.java
index a560c2435..829558d60 100644
--- a/core/src/model_treasure_box/java/com/chwl/treasure_box/event/AutoOpenHonourBoxEvent.java
+++ b/core/src/model_treasure_box/java/com/chwl/core/treasure_box/event/AutoOpenHonourBoxEvent.java
@@ -1,6 +1,6 @@
-package com.chwl.treasure_box.event;
+package com.chwl.core.treasure_box.event;
-import com.chwl.treasure_box.bean.OpenBoxHonourResult;
+import com.chwl.core.treasure_box.bean.OpenBoxHonourResult;
import lombok.Data;
diff --git a/core/src/model_treasure_box/java/com/chwl/treasure_box/event/BoxBuyKeyEvent.java b/core/src/model_treasure_box/java/com/chwl/core/treasure_box/event/BoxBuyKeyEvent.java
similarity index 89%
rename from core/src/model_treasure_box/java/com/chwl/treasure_box/event/BoxBuyKeyEvent.java
rename to core/src/model_treasure_box/java/com/chwl/core/treasure_box/event/BoxBuyKeyEvent.java
index 68e9261e4..69de27ee4 100644
--- a/core/src/model_treasure_box/java/com/chwl/treasure_box/event/BoxBuyKeyEvent.java
+++ b/core/src/model_treasure_box/java/com/chwl/core/treasure_box/event/BoxBuyKeyEvent.java
@@ -1,6 +1,6 @@
-package com.chwl.treasure_box.event;
+package com.chwl.core.treasure_box.event;
-import com.chwl.treasure_box.bean.KeyInfo;
+import com.chwl.core.treasure_box.bean.KeyInfo;
import lombok.Data;
diff --git a/core/src/model_treasure_box/java/com/chwl/treasure_box/event/HonourBoxBuyKeyEvent.java b/core/src/model_treasure_box/java/com/chwl/core/treasure_box/event/HonourBoxBuyKeyEvent.java
similarity index 88%
rename from core/src/model_treasure_box/java/com/chwl/treasure_box/event/HonourBoxBuyKeyEvent.java
rename to core/src/model_treasure_box/java/com/chwl/core/treasure_box/event/HonourBoxBuyKeyEvent.java
index 252def01b..c1a5f5c51 100644
--- a/core/src/model_treasure_box/java/com/chwl/treasure_box/event/HonourBoxBuyKeyEvent.java
+++ b/core/src/model_treasure_box/java/com/chwl/core/treasure_box/event/HonourBoxBuyKeyEvent.java
@@ -1,6 +1,6 @@
-package com.chwl.treasure_box.event;
+package com.chwl.core.treasure_box.event;
-import com.chwl.treasure_box.bean.HonourBuyKeyResultInfo;
+import com.chwl.core.treasure_box.bean.HonourBuyKeyResultInfo;
import lombok.Data;
diff --git a/core/src/model_treasure_box/java/com/chwl/treasure_box/model/BoxModel.java b/core/src/model_treasure_box/java/com/chwl/core/treasure_box/model/BoxModel.java
similarity index 95%
rename from core/src/model_treasure_box/java/com/chwl/treasure_box/model/BoxModel.java
rename to core/src/model_treasure_box/java/com/chwl/core/treasure_box/model/BoxModel.java
index b4fcf3fa5..448328d7a 100644
--- a/core/src/model_treasure_box/java/com/chwl/treasure_box/model/BoxModel.java
+++ b/core/src/model_treasure_box/java/com/chwl/core/treasure_box/model/BoxModel.java
@@ -1,15 +1,15 @@
-package com.chwl.treasure_box.model;
+package com.chwl.core.treasure_box.model;
-import com.chwl.treasure_box.bean.BoxOpenStatusInfo;
-import com.chwl.treasure_box.bean.ConfigImgUrl;
-import com.chwl.treasure_box.bean.HonourBuyKeyResultInfo;
-import com.chwl.treasure_box.bean.HonourKeyInfo;
-import com.chwl.treasure_box.bean.KeyInfo;
-import com.chwl.treasure_box.bean.OpenBoxHonourResult;
-import com.chwl.treasure_box.bean.OpenBoxResult;
-import com.chwl.treasure_box.bean.PrizeInfo;
-import com.chwl.treasure_box.bean.PrizeNewInfo;
-import com.chwl.treasure_box.bean.UserTicketInfo;
+import com.chwl.core.treasure_box.bean.BoxOpenStatusInfo;
+import com.chwl.core.treasure_box.bean.ConfigImgUrl;
+import com.chwl.core.treasure_box.bean.HonourBuyKeyResultInfo;
+import com.chwl.core.treasure_box.bean.HonourKeyInfo;
+import com.chwl.core.treasure_box.bean.KeyInfo;
+import com.chwl.core.treasure_box.bean.PrizeNewInfo;
+import com.chwl.core.treasure_box.bean.UserTicketInfo;
+import com.chwl.core.treasure_box.bean.OpenBoxHonourResult;
+import com.chwl.core.treasure_box.bean.OpenBoxResult;
+import com.chwl.core.treasure_box.bean.PrizeInfo;
import com.chwl.core.R;
import com.chwl.core.auth.AuthModel;
import com.chwl.core.base.BaseModel;
diff --git a/core/src/model_treasure_box/java/com/chwl/treasure_box/model/IBoxModel.java b/core/src/model_treasure_box/java/com/chwl/core/treasure_box/model/IBoxModel.java
similarity index 78%
rename from core/src/model_treasure_box/java/com/chwl/treasure_box/model/IBoxModel.java
rename to core/src/model_treasure_box/java/com/chwl/core/treasure_box/model/IBoxModel.java
index 43b88fad9..0d0fea479 100644
--- a/core/src/model_treasure_box/java/com/chwl/treasure_box/model/IBoxModel.java
+++ b/core/src/model_treasure_box/java/com/chwl/core/treasure_box/model/IBoxModel.java
@@ -1,15 +1,15 @@
-package com.chwl.treasure_box.model;
+package com.chwl.core.treasure_box.model;
-import com.chwl.treasure_box.bean.BoxOpenStatusInfo;
-import com.chwl.treasure_box.bean.ConfigImgUrl;
-import com.chwl.treasure_box.bean.HonourBuyKeyResultInfo;
-import com.chwl.treasure_box.bean.HonourKeyInfo;
-import com.chwl.treasure_box.bean.KeyInfo;
-import com.chwl.treasure_box.bean.OpenBoxHonourResult;
-import com.chwl.treasure_box.bean.OpenBoxResult;
-import com.chwl.treasure_box.bean.PrizeInfo;
-import com.chwl.treasure_box.bean.PrizeNewInfo;
-import com.chwl.treasure_box.bean.UserTicketInfo;
+import com.chwl.core.treasure_box.bean.ConfigImgUrl;
+import com.chwl.core.treasure_box.bean.HonourBuyKeyResultInfo;
+import com.chwl.core.treasure_box.bean.HonourKeyInfo;
+import com.chwl.core.treasure_box.bean.KeyInfo;
+import com.chwl.core.treasure_box.bean.PrizeNewInfo;
+import com.chwl.core.treasure_box.bean.UserTicketInfo;
+import com.chwl.core.treasure_box.bean.BoxOpenStatusInfo;
+import com.chwl.core.treasure_box.bean.OpenBoxHonourResult;
+import com.chwl.core.treasure_box.bean.OpenBoxResult;
+import com.chwl.core.treasure_box.bean.PrizeInfo;
import com.chwl.core.base.IModel;
import com.chwl.core.bean.response.ServiceResult;
@@ -120,8 +120,8 @@ public interface IBoxModel extends IModel {
* 购买至尊蛋钥匙
*/
Single buyHonourKey(long uid,
- int keyNum,
- String ticket);
+ int keyNum,
+ String ticket);
/**
* 至尊蛋本期奖池
diff --git a/core/src/model_treasure_box/java/com/chwl/treasure_box/model/IRadishModel.java b/core/src/model_treasure_box/java/com/chwl/core/treasure_box/model/IRadishModel.java
similarity index 83%
rename from core/src/model_treasure_box/java/com/chwl/treasure_box/model/IRadishModel.java
rename to core/src/model_treasure_box/java/com/chwl/core/treasure_box/model/IRadishModel.java
index c150073d7..5f863b9ec 100644
--- a/core/src/model_treasure_box/java/com/chwl/treasure_box/model/IRadishModel.java
+++ b/core/src/model_treasure_box/java/com/chwl/core/treasure_box/model/IRadishModel.java
@@ -1,9 +1,9 @@
-package com.chwl.treasure_box.model;
+package com.chwl.core.treasure_box.model;
-import com.chwl.treasure_box.bean.BoxOpenStatusInfo;
-import com.chwl.treasure_box.bean.KeyInfo;
-import com.chwl.treasure_box.bean.OpenBoxResult;
-import com.chwl.treasure_box.bean.PrizeInfo;
+import com.chwl.core.treasure_box.bean.KeyInfo;
+import com.chwl.core.treasure_box.bean.BoxOpenStatusInfo;
+import com.chwl.core.treasure_box.bean.OpenBoxResult;
+import com.chwl.core.treasure_box.bean.PrizeInfo;
import com.chwl.core.base.IModel;
import com.chwl.core.bean.response.ServiceResult;
import com.chwl.core.room.treasure_box.bean.BoxRankingInfo;
diff --git a/core/src/model_treasure_box/java/com/chwl/treasure_box/model/RadishModel.java b/core/src/model_treasure_box/java/com/chwl/core/treasure_box/model/RadishModel.java
similarity index 96%
rename from core/src/model_treasure_box/java/com/chwl/treasure_box/model/RadishModel.java
rename to core/src/model_treasure_box/java/com/chwl/core/treasure_box/model/RadishModel.java
index 3f31b5da8..2778584f4 100644
--- a/core/src/model_treasure_box/java/com/chwl/treasure_box/model/RadishModel.java
+++ b/core/src/model_treasure_box/java/com/chwl/core/treasure_box/model/RadishModel.java
@@ -1,10 +1,10 @@
-package com.chwl.treasure_box.model;
+package com.chwl.core.treasure_box.model;
import com.chwl.core.R;
-import com.chwl.treasure_box.bean.BoxOpenStatusInfo;
-import com.chwl.treasure_box.bean.KeyInfo;
-import com.chwl.treasure_box.bean.OpenBoxResult;
-import com.chwl.treasure_box.bean.PrizeInfo;
+import com.chwl.core.treasure_box.bean.KeyInfo;
+import com.chwl.core.treasure_box.bean.BoxOpenStatusInfo;
+import com.chwl.core.treasure_box.bean.OpenBoxResult;
+import com.chwl.core.treasure_box.bean.PrizeInfo;
import com.chwl.core.auth.AuthModel;
import com.chwl.core.base.BaseModel;
import com.chwl.core.bean.response.ServiceResult;
diff --git a/library/build.gradle b/library/build.gradle
index 01e4461cf..07a6a1c9e 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -53,10 +53,6 @@ android {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
- staging {
- minifyEnabled true
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
- }
}
buildToolsVersion = '30.0.3'
}