moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:调整部分模块包目录

Browse Source
This commit is contained in:
Max
2023-11-23 21:18:49 +08:00
parent 46ba8d2db3
commit 7b773d0558
242 changed files with 382 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/AndroidManifest.xml
View File

@@ -784,13 +784,13 @@
android:name=".community.photo.BigPhotoActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.zhihu.matisse.ui.MatisseActivity"
android:name="com.example.matisse.ui.MatisseActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.zhihu.matisse.internal.ui.AlbumPreviewActivity"
android:name="com.example.matisse.internal.ui.AlbumPreviewActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.zhihu.matisse.internal.ui.SelectedPreviewActivity"
android:name="com.example.matisse.internal.ui.SelectedPreviewActivity"
android:screenOrientation="portrait" /> <!-- 房间内私聊 -->
<activity
android:name=".ui.wallet.sendgold.SendGoldActivity"

4
app/src/main/java/com/chwl/app/application/XChatApplication.java
View File

@@ -46,7 +46,7 @@ import com.chwl.app.common.util.AppLifeCycleHelper;
import com.chwl.app.module_hall.HallDataManager;
import com.chwl.app.radish.wallet.RadishWalletManager;
import com.chwl.app.utils.PushMessageHandler;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.chwl.core.XConstants;
import com.chwl.core.Constants;
import com.chwl.core.DemoCache;
import com.chwl.core.UriProvider;
@@ -399,7 +399,7 @@ public class XChatApplication extends BaseApp {
Map<String, String> httpParams = new ConcurrentHashMap<>();
httpParams.put("os", "android");
httpParams.put("osVersion", Build.VERSION.RELEASE);
httpParams.put("app", XChatConstants.APP_MARK);
httpParams.put("app", XConstants.APP_MARK);
httpParams.put("ispType", String.valueOf(SystemUtils.getIspType(context)));
httpParams.put("netType", String.valueOf(SystemUtils.getNetworkType(context)));
httpParams.put("model", SystemUtils.getPhoneModel());

4
app/src/main/java/com/chwl/app/audio/view/BottleLayout.java
View File

@@ -23,7 +23,7 @@ import com.chwl.app.audio.helper.VmSoundManager;
import com.chwl.app.common.widget.CircleImageView;
import com.chwl.app.ui.utils.ImageLoadUtils;
import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.chwl.core.XConstants;
import com.chwl.core.audio.bean.VoiceMatchInfo;
import com.chwl.core.auth.AuthModel;
import com.chwl.core.utils.SharedPreferenceUtils;
@@ -428,7 +428,7 @@ public class BottleLayout extends FrameLayout {
ivReport.setOnClickListener(view -> {
// 跳转到举报页面
UIHelper.showReportPage(context, info.getUid(), XChatConstants.REPORT_TYPE_VOICE);
UIHelper.showReportPage(context, info.getUid(), XConstants.REPORT_TYPE_VOICE);
});
}

4
app/src/main/java/com/chwl/app/avroom/dialog/RoomOperationDialog.java
View File

@@ -33,7 +33,7 @@ import com.chwl.app.ui.widget.recyclerview.decoration.ColorDecoration;
import com.chwl.app.ui.widget.recyclerview.layoutmanager.FullyGridLayoutManager;
import com.chwl.app.vip.dialog.VipBroadcastDialog;
import com.chwl.app.room_chat.activity.RoomInviteFansActivity;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.chwl.core.XConstants;
import com.chwl.core.auth.AuthModel;
import com.chwl.core.im.custom.bean.RoomPkBean;
import com.chwl.core.manager.AvRoomDataManager;
@@ -676,7 +676,7 @@ public class RoomOperationDialog extends BottomSheetDialog {
UIHelper.showReportPage(
context,
roomInfo.getUid(),
XChatConstants.REPORT_TYPE_ROOM
XConstants.REPORT_TYPE_ROOM
);
dialogManager.dismissDialog();
dismiss();

6
app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt
View File

@@ -76,7 +76,7 @@ import com.chwl.app.ui.widget.rollviewpager.hintview.ColorPointHintView
import com.chwl.app.utils.KeyBoardUtils
import com.chwl.app.music.widget.MusicPlayerView
import com.chwl.app.room_chat.activity.RoomMsgActivity
import com.yizhuan.xchat_android_constants.XChatConstants
import com.chwl.core.XConstants
import com.chwl.core.Constants
import com.chwl.core.DemoCache
import com.chwl.core.UriProvider
@@ -1188,8 +1188,8 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
private fun addOpenDatingTips() {
if (AvRoomDataManager.get().isDatingMode && !isDatingMode && AvRoomDataManager.get().isManager) {
val tipMessage =
ChatRoomMessageBuilder.createTipMessage(XChatConstants.DATING_TIPS_OPEN)
tipMessage.content = XChatConstants.DATING_TIPS_OPEN
ChatRoomMessageBuilder.createTipMessage(XConstants.DATING_TIPS_OPEN)
tipMessage.content = XConstants.DATING_TIPS_OPEN
IMNetEaseManager.get().addMessages(tipMessage)
}
}

2
app/src/main/java/com/chwl/app/avroom/helper/AnimHelper.java
View File

@@ -1,6 +1,6 @@
package com.chwl.app.avroom.helper;
import static com.yizhuan.xchat_android_constants.XChatConstants.SELECT_ANIM_DURATION;
import static com.chwl.core.XConstants.SELECT_ANIM_DURATION;
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;

14
app/src/main/java/com/chwl/app/avroom/widget/MessageView.java
View File

@@ -90,7 +90,7 @@ import com.chwl.app.ui.widget.RecyclerViewNoViewpagerScroll;
import com.chwl.app.ui.widget.UserInfoDialog;
import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
import com.chwl.app.utils.RegexUtil;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.chwl.core.XConstants;
import com.chwl.core.DemoCache;
import com.chwl.core.auth.AuthModel;
import com.chwl.core.bean.attachmsg.RoomQueueMsgAttachment;
@@ -801,13 +801,13 @@ public class MessageView extends FrameLayout {
// 房間通告
if (ResUtil.getString(R.string.avroom_widget_messageview_03).equals(contentText)) {
setUpdateGiftEffectMsg(tvContent);
} else if (XChatConstants.ROOM_INTRODUCTION.equals(contentText) || contentText.contains(IMNetEaseManager.ROOM_INTRO_TAG)) {
} else if (XConstants.ROOM_INTRODUCTION.equals(contentText) || contentText.contains(IMNetEaseManager.ROOM_INTRO_TAG)) {
tvContent.setTextColor(ContextCompat.getColor(mContext, R.color.white));
tvContent.setText(contentText);
} else if (XChatConstants.DATING_TIPS_OPEN.equals(contentText) ||
contentText.contains(XChatConstants.DATING_TIPS_IN) ||
contentText.contains(XChatConstants.DATING_TIPS_NEW) ||
contentText.contains(XChatConstants.DATING_TIPS_PUBLIC)) {
} else if (XConstants.DATING_TIPS_OPEN.equals(contentText) ||
contentText.contains(XConstants.DATING_TIPS_IN) ||
contentText.contains(XConstants.DATING_TIPS_NEW) ||
contentText.contains(XConstants.DATING_TIPS_PUBLIC)) {
//相親模式提示文案用特殊的顏色
tvContent.setTextColor(ContextCompat.getColor(mContext, R.color.color_fe5d7f));
tvContent.setText(contentText);
@@ -3069,7 +3069,7 @@ public class MessageView extends FrameLayout {
}
} else {
String content = chatRoomMessage.getContent();
if (!TextUtils.isEmpty(content) && content.equals(XChatConstants.ROOM_INTRODUCTION))
if (!TextUtils.isEmpty(content) && content.equals(XConstants.ROOM_INTRODUCTION))
if (onClick != null) {
onClick.onShowRoomIntroduction();
}

4
app/src/main/java/com/chwl/app/avroom/widget/RoomEffectBoxView.kt
View File

@@ -37,7 +37,7 @@ import com.chwl.app.ui.utils.loadAnim
import com.chwl.app.ui.widget.SimpleAnimListener
import com.chwl.app.ui.widget.drawgift.DrawGiftPlayHelper
import com.chwl.app.utils.SpannableBuilder
import com.yizhuan.xchat_android_constants.XChatConstants
import com.chwl.core.XConstants
import com.chwl.core.auth.AuthModel
import com.chwl.core.decoration.car.bean.CarInfo
import com.chwl.core.im.custom.bean.*
@@ -901,7 +901,7 @@ class RoomEffectBoxView @JvmOverloads constructor(
if (datingNotifyInfo.hasSelectUser && !datingNotifyInfo.hasHeart) {
showHeartAnim(datingNotifyInfo.position, datingNotifyInfo.targetPosition)
return@flatMap Single.timer(
XChatConstants.SELECT_ANIM_DURATION.toLong(),
XConstants.SELECT_ANIM_DURATION.toLong(),
TimeUnit.MILLISECONDS
).map { info }
}

4
app/src/main/java/com/chwl/app/avroom/widget/RoomEffectView.kt
View File

@@ -44,7 +44,7 @@ import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil
import com.chwl.app.utils.MsgBuilder
import com.chwl.app.utils.RegexUtil
import com.chwl.app.utils.SpannableBuilder
import com.yizhuan.xchat_android_constants.XChatConstants
import com.chwl.core.XConstants
import com.chwl.core.auth.AuthModel
import com.chwl.core.decoration.car.bean.CarInfo
import com.chwl.core.im.custom.bean.*
@@ -1597,7 +1597,7 @@ class RoomEffectView @JvmOverloads constructor(
if (datingNotifyInfo.hasSelectUser && !datingNotifyInfo.hasHeart) {
showHeartAnim(datingNotifyInfo.position, datingNotifyInfo.targetPosition)
return@flatMap Single.timer(
XChatConstants.SELECT_ANIM_DURATION.toLong(),
XConstants.SELECT_ANIM_DURATION.toLong(),
TimeUnit.MILLISECONDS
).map { info }
}

6
app/src/main/java/com/chwl/app/base/BaseActivity.java
View File

@@ -95,7 +95,7 @@ import com.chwl.app.ui.widget.dialog.AllServiceVipLevelUPDialog;
import com.chwl.app.ui.widget.dialog.OpenNobleGlobalNoticeDialog;
import com.chwl.app.utils.UserUtils;
import com.chwl.app.mentoring_relationship.dialog.GrabApprenticesNoticeDialog;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.chwl.core.XConstants;
import com.chwl.core.Constants;
import com.chwl.core.UriProvider;
import com.chwl.core.bean.BaseProtocol;
@@ -542,9 +542,9 @@ public abstract class BaseActivity extends RxAppCompatActivity
RxBus.get().toFlowable(String.class)
.compose(bindUntilEvent(ActivityEvent.PAUSE))
.subscribe((s) -> {
if (XChatConstants.SHOW.equals(s)) {
if (XConstants.SHOW.equals(s)) {
getDialogManager().showProgressDialog(this, ResUtil.getString(R.string.erban_base_baseactivity_01), true);
} else if (XChatConstants.HIDE.equals(s)) {
} else if (XConstants.HIDE.equals(s)) {
getDialogManager().dismissDialog();
}
}, throwable -> {

5
app/src/main/java/com/chwl/app/bills/activities/ChargeBillsActivity.java
View File

@@ -1,7 +1,6 @@
package com.chwl.app.bills.activities;
import android.annotation.SuppressLint;
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
@@ -15,7 +14,7 @@ import com.chwl.app.databinding.ActivityBillsBinding;
import com.chwl.app.ui.pay.ChargeActivity;
import com.chwl.app.ui.webview.CommonWebViewActivity;
import com.chwl.app.ui.widget.RecyclerViewNoBugLinearLayoutManager;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.chwl.core.XConstants;
import com.chwl.core.Constants;
import com.chwl.core.UriProvider;
import com.chwl.core.bills.BillModel;
@@ -151,7 +150,7 @@ public class ChargeBillsActivity extends BillBaseActivity<ActivityBillsBinding>
adapter.addData(billItemEntities);
} else {
if (mCurrentCounter == Constants.PAGE_START) {
showNoData(R.drawable.icon_common_failure, XChatConstants.EMPTY_RECORD_AND_THREE_MONTHS_TIPSS);
showNoData(R.drawable.icon_common_failure, XConstants.EMPTY_RECORD_AND_THREE_MONTHS_TIPSS);
} else {
adapter.loadMoreEnd(true);
}

4
app/src/main/java/com/chwl/app/bills/fragmemt/GiftIncomeFragment.java
View File

@@ -13,7 +13,7 @@ import com.chwl.app.bills.adapter.GiftIncomeAdapter;
import com.chwl.app.bills.presenter.GiftIncomePresenter;
import com.chwl.app.bills.view.IGiftIncomeView;
import com.chwl.app.ui.widget.RecyclerViewNoBugLinearLayoutManager;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.chwl.core.XConstants;
import com.chwl.core.Constants;
import com.chwl.core.bills.bean.BillItemEntity;
import com.chwl.core.bills.bean.IncomeInfo;
@@ -124,7 +124,7 @@ public class GiftIncomeFragment extends BaseBillsFragment<IGiftIncomeView, GiftI
adapter.addData(billItemEntities);
} else {
if (mCurrentCounter == Constants.PAGE_START) {
showNoData(R.drawable.icon_common_failure, XChatConstants.EMPTY_RECORD_AND_THREE_MONTHS_TIPSS);
showNoData(R.drawable.icon_common_failure, XConstants.EMPTY_RECORD_AND_THREE_MONTHS_TIPSS);
} else {
adapter.loadMoreEnd(true);
}

4
app/src/main/java/com/chwl/app/bills/fragmemt/GiftOutputFragment.java
View File

@@ -13,7 +13,7 @@ import com.chwl.app.bills.adapter.GiftExpendAdapter;
import com.chwl.app.bills.presenter.GiftOutputPresenter;
import com.chwl.app.bills.view.IGiftOutputView;
import com.chwl.app.ui.widget.RecyclerViewNoBugLinearLayoutManager;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.chwl.core.XConstants;
import com.chwl.core.Constants;
import com.chwl.core.bills.bean.BillItemEntity;
import com.chwl.core.bills.bean.ExpendInfo;
@@ -125,7 +125,7 @@ public class GiftOutputFragment extends BaseBillsFragment<IGiftOutputView, GiftO
adapter.addData(billItemEntities);
} else {
if (mCurrentCounter == Constants.PAGE_START) {
showNoData(R.drawable.icon_common_failure, XChatConstants.EMPTY_RECORD_AND_THREE_MONTHS_TIPSS);
showNoData(R.drawable.icon_common_failure, XConstants.EMPTY_RECORD_AND_THREE_MONTHS_TIPSS);
} else {
adapter.loadMoreEnd(true);
}

4
app/src/main/java/com/chwl/app/bills/fragmemt/WithdrawBillsFragment.java
View File

@@ -19,7 +19,7 @@ import com.chwl.app.bills.event.TopEvent;
import com.chwl.app.common.NoDataFragment;
import com.chwl.app.databinding.FragmentXrexylerviewBinding;
import com.chwl.app.ui.widget.RecyclerViewNoBugLinearLayoutManager;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.chwl.core.XConstants;
import com.chwl.core.Constants;
import com.chwl.core.bills.BillModel;
import com.chwl.core.bills.bean.BillItemEntity;
@@ -157,7 +157,7 @@ public class WithdrawBillsFragment extends BaseBindingFragment<FragmentXrexylerv
adapter.addData(billItemEntities);
} else {
if (mCurrentCounter == 1) {
showNoData(R.drawable.icon_common_failure, XChatConstants.EMPTY_RECORD_AND_THREE_MONTHS_TIPSS);
showNoData(R.drawable.icon_common_failure, XConstants.EMPTY_RECORD_AND_THREE_MONTHS_TIPSS);
} else {
adapter.loadMoreEnd(true);
}

8
app/src/main/java/com/chwl/app/radish/task/fragment/TaskCenterFragment.java
View File

@@ -20,7 +20,7 @@ import com.chwl.app.radish.task.view.ITaskCenterViewFrg;
import com.chwl.app.ui.im.RouterHandler;
import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
import com.chwl.app.ui.widget.recyclerview.decoration.HorizontalDecoration;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.chwl.core.XConstants;
import com.chwl.core.radish.task.ITaskModel;
import com.chwl.core.radish.task.TaskModel;
import com.chwl.core.radish.task.bean.TaskInfo;
@@ -85,7 +85,7 @@ public class TaskCenterFragment extends BaseMvpFragment<ITaskCenterViewFrg, Task
}
final TaskInfo item = info;
if (!item.isSupport()) {
SingleToastUtil.showToast(XChatConstants.UPDATE_VERSION_TIPS);
SingleToastUtil.showToast(XConstants.UPDATE_VERSION_TIPS);
return;
}
if (item.getStatus() == TaskInfo.STATUS_FINISHED_NOT_RECEIVE) {
@@ -115,7 +115,7 @@ public class TaskCenterFragment extends BaseMvpFragment<ITaskCenterViewFrg, Task
if (item.getSkipType() == TaskInfo.SHIP_TYPE_APP) {
boolean result = RouterHandler.handle(mContext, item.getRouterType(), item.getRouterValue());
if (!result) {
SingleToastUtil.showToast(XChatConstants.UPDATE_VERSION_TIPS);
SingleToastUtil.showToast(XConstants.UPDATE_VERSION_TIPS);
return;
}
@@ -127,7 +127,7 @@ public class TaskCenterFragment extends BaseMvpFragment<ITaskCenterViewFrg, Task
record = true;
} else
SingleToastUtil.showToast(XChatConstants.UPDATE_VERSION_TIPS);
SingleToastUtil.showToast(XConstants.UPDATE_VERSION_TIPS);
if (record) {

4
app/src/main/java/com/chwl/app/ui/im/avtivity/AddBlackListActivity.java
View File

@@ -19,7 +19,7 @@ import com.chwl.app.common.widget.dialog.DialogManager;
import com.chwl.app.ui.user.activity.UserInfoActivity;
import com.chwl.app.ui.utils.ImageLoadUtils;
import com.chwl.app.utils.RegexUtil;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.chwl.core.XConstants;
import com.chwl.core.user.UserModel;
import com.chwl.library.base.factory.CreatePresenter;
import com.chwl.library.utils.JavaUtil;
@@ -105,7 +105,7 @@ public class AddBlackListActivity extends BaseMvpActivity<IAddBlackListView, Add
e.printStackTrace();
}
} else if (v.getId() == R.id.tv_report) {
UIHelper.showReportPage(context, JavaUtil.str2long(account), XChatConstants.REPORT_TYPE_CHAT);
UIHelper.showReportPage(context, JavaUtil.str2long(account), XConstants.REPORT_TYPE_CHAT);
}
}

10
app/src/main/java/com/chwl/app/ui/user/activity/UserInfoActivity.java
View File

@@ -7,7 +7,6 @@ import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.Context;
import android.content.Intent;
import android.graphics.drawable.Drawable;
import android.os.CountDownTimer;
import android.text.TextUtils;
import android.view.View;
@@ -15,7 +14,6 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.core.content.ContextCompat;
import androidx.core.widget.NestedScrollView;
import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProvider;
@@ -67,7 +65,7 @@ import com.chwl.app.ui.widget.rollviewpager.RollPagerView;
import com.chwl.app.ui.widget.rollviewpager.adapter.StaticPagerAdapterWrapper;
import com.chwl.app.utils.RegexUtil;
import com.chwl.app.vip.util.VipHelper;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.chwl.core.XConstants;
import com.chwl.core.Constants;
import com.chwl.core.auth.AuthModel;
import com.chwl.core.bean.RoomQueueInfo;
@@ -180,8 +178,8 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
if (bottomViewLayout != null)
bottomViewLayout.setVisibility(View.GONE);
} else {
if (String.valueOf(userId).equals(XChatConstants.SECRETARY_UID) ||
String.valueOf(userId).equals(XChatConstants.SYSTEM_MESSAGE_UID)) {
if (String.valueOf(userId).equals(XConstants.SECRETARY_UID) ||
String.valueOf(userId).equals(XConstants.SYSTEM_MESSAGE_UID)) {
identityState = IdentityState.NON;
} else {
identityState = IdentityState.OTHER;
@@ -517,7 +515,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
getDialogManager(), account);
buttonItems.add(blackListItem);
}
ButtonItem reportItem = ButtonItemFactory.createReportItem(context, userInfo.getUid(), XChatConstants.REPORT_TYPE_PERSONAL);
ButtonItem reportItem = ButtonItemFactory.createReportItem(context, userInfo.getUid(), XConstants.REPORT_TYPE_PERSONAL);
buttonItems.add(reportItem);
new CommonPopupDialog(this, "", buttonItems, getString(R.string.cancel), false).show();
}

4
app/src/main/java/com/chwl/app/ui/user/fragment/UserInfoDynamicFragment.kt
View File

@@ -16,7 +16,7 @@ import com.chwl.app.ui.user.adapter.UserInfoDynamicAdapter
import com.chwl.app.ui.user.viewmodel.UserInfoViewModel
import com.chwl.app.ui.widget.ButtonItem
import com.chwl.app.ui.widget.recyclerview.decoration.HorizontalDecoration
import com.yizhuan.xchat_android_constants.XChatConstants
import com.chwl.core.XConstants
import com.chwl.core.auth.AuthModel
import com.chwl.core.community.bean.WorldDynamicBean
import com.chwl.core.community.dynamic.DynamicModel
@@ -104,7 +104,7 @@ class UserInfoDynamicFragment : BaseViewBindingFragment<FragmentUserinfoDynamicB
) {
UIHelper.showReportPage(
mContext, bean.uid,
XChatConstants.REPORT_TYPE_DYNAMIC_SQUARE
XConstants.REPORT_TYPE_DYNAMIC_SQUARE
)
}
list.add(item)

4
app/src/main/java/com/chwl/app/ui/user/fragment/UserInfoInfoFragment.kt
View File

@@ -16,7 +16,7 @@ import com.chwl.app.module_hall.hall.activity.ModuleHallActivity
import com.chwl.app.ui.user.adapter.UserInfoDynamicAdapter
import com.chwl.app.ui.user.viewmodel.UserInfoViewModel
import com.chwl.app.ui.widget.ButtonItem
import com.yizhuan.xchat_android_constants.XChatConstants
import com.chwl.core.XConstants
import com.chwl.core.auth.AuthModel
import com.chwl.core.community.bean.WorldDynamicBean
import com.chwl.core.community.dynamic.DynamicModel
@@ -174,7 +174,7 @@ class UserInfoInfoFragment : BaseViewBindingFragment<FragmentUserinfoUserinfoBin
) {
UIHelper.showReportPage(
mContext, bean.uid,
XChatConstants.REPORT_TYPE_DYNAMIC_SQUARE
XConstants.REPORT_TYPE_DYNAMIC_SQUARE
)
}
list.add(item)

4
app/src/main/java/com/chwl/app/ui/webview/JSInterface.java
View File

@@ -32,7 +32,7 @@ import com.chwl.app.ui.webview.event.H5NotifyClientEvent;
import com.chwl.app.ui.webview.event.ShowNavEvent;
import com.chwl.app.ui.webview.event.TaroPayResultEvent;
import com.chwl.app.ui.widget.ShareDialog;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.chwl.core.XConstants;
import com.chwl.core.Constants;
import com.chwl.core.UriProvider;
import com.chwl.core.auth.AuthModel;
@@ -466,7 +466,7 @@ public class JSInterface {
JSONObject jsonObject = new JSONObject();
jsonObject.put("os", "android");
jsonObject.put("osVersion", Build.VERSION.RELEASE);
jsonObject.put("app", XChatConstants.APP_MARK);
jsonObject.put("app", XConstants.APP_MARK);
jsonObject.put("ispType", String.valueOf(SystemUtils.getIspType(context)));
jsonObject.put("netType", String.valueOf(SystemUtils.getNetworkType(context)));
jsonObject.put("model", SystemUtils.getPhoneModel());

4
app/src/main/java/com/chwl/app/ui/webview/SimpleJSInterface.java
View File

@@ -10,7 +10,7 @@ import com.alibaba.fastjson.JSONObject;
import com.orhanobut.logger.Logger;
import com.tencent.vasdolly.helper.ChannelReaderUtil;
import com.chwl.app.application.XChatApplication;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.chwl.core.XConstants;
import com.chwl.core.Constants;
import com.chwl.library.utils.AppUtils;
import com.chwl.library.utils.VersionUtil;
@@ -106,7 +106,7 @@ public class SimpleJSInterface {
public String getDeviceInfo() {
JSONObject jsonObject = new JSONObject();
jsonObject.put("os", "android");
jsonObject.put("app", XChatConstants.APP_MARK);
jsonObject.put("app", XConstants.APP_MARK);
jsonObject.put("appVersion", VersionUtil.getLocalName(context));
jsonObject.put("appVersionCode", String.valueOf(AppUtils.getVersionCode(context)));
jsonObject.put("channel", getChannel());

4
app/src/main/java/com/chwl/app/ui/widget/UserInfoDialog.java
View File

@@ -47,7 +47,7 @@ import com.chwl.app.ui.utils.ImageLoadUtils;
import com.chwl.app.utils.RegexUtil;
import com.chwl.app.view.GenderAgeTextView;
import com.chwl.app.vip.util.VipHelper;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.chwl.core.XConstants;
import com.chwl.core.Constants;
import com.chwl.core.auth.AuthModel;
import com.chwl.core.bean.RoomMicInfo;
@@ -782,7 +782,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
dismiss();
break;
case R.id.tv_report:
UIHelper.showReportPage(context, uid, XChatConstants.REPORT_TYPE_USERCARD);
UIHelper.showReportPage(context, uid, XConstants.REPORT_TYPE_USERCARD);
dismiss();
break;
case R.id.fl_avatar_layout:

6
app/src/module_album/java/com/zhihu/matisse/Matisse.java → app/src/module_album/java/com/example/matisse/Matisse.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.zhihu.matisse;
package com.example.matisse;
import android.app.Activity;
import android.content.Intent;
@@ -22,8 +22,8 @@ import android.net.Uri;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import com.zhihu.matisse.internal.entity.CustomItem;
import com.zhihu.matisse.ui.MatisseActivity;
import com.example.matisse.internal.entity.CustomItem;
import com.example.matisse.ui.MatisseActivity;
import java.lang.ref.WeakReference;
import java.util.List;

4
app/src/module_album/java/com/zhihu/matisse/MimeType.java → app/src/module_album/java/com/example/matisse/MimeType.java
View File

@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.zhihu.matisse;
package com.example.matisse;
import android.content.ContentResolver;
import android.net.Uri;
@@ -23,7 +23,7 @@ import android.webkit.MimeTypeMap;
import androidx.collection.ArraySet;
import com.zhihu.matisse.internal.utils.PhotoMetadataUtils;
import com.example.matisse.internal.utils.PhotoMetadataUtils;
import java.util.Arrays;
import java.util.EnumSet;

26
app/src/module_album/java/com/zhihu/matisse/SelectionCreator.java → app/src/module_album/java/com/example/matisse/SelectionCreator.java
View File

@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.zhihu.matisse;
package com.example.matisse;
import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_BEHIND;
import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR;
@@ -44,13 +44,13 @@ import androidx.annotation.RequiresApi;
import androidx.annotation.StyleRes;
import androidx.fragment.app.Fragment;
import com.zhihu.matisse.engine.ImageEngine;
import com.zhihu.matisse.filter.Filter;
import com.zhihu.matisse.internal.entity.CaptureStrategy;
import com.zhihu.matisse.internal.entity.SelectionSpec;
import com.zhihu.matisse.listener.OnCheckedListener;
import com.zhihu.matisse.listener.OnSelectedListener;
import com.zhihu.matisse.ui.MatisseActivity;
import com.example.matisse.engine.ImageEngine;
import com.example.matisse.filter.Filter;
import com.example.matisse.internal.entity.CaptureStrategy;
import com.example.matisse.internal.entity.SelectionSpec;
import com.example.matisse.listener.OnCheckedListener;
import com.example.matisse.listener.OnSelectedListener;
import com.example.matisse.ui.MatisseActivity;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -119,11 +119,11 @@ public final class SelectionCreator {
* Theme for media selecting Activity.
* <p>
* 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.
* <p>
* 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}

6
app/src/module_album/java/com/zhihu/matisse/engine/ImageEngine.java → app/src/module_album/java/com/example/matisse/engine/ImageEngine.java
View File

@@ -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 {

4
app/src/module_album/java/com/zhihu/matisse/engine/impl/GlideEngine.java → app/src/module_album/java/com/example/matisse/engine/impl/GlideEngine.java
View File

@@ -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.

10
app/src/module_album/java/com/zhihu/matisse/filter/Filter.java → app/src/module_album/java/com/example/matisse/filter/Filter.java
View File

@@ -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;

4
app/src/module_album/java/com/zhihu/matisse/internal/entity/Album.java → app/src/module_album/java/com/example/matisse/internal/entity/Album.java
View File

@@ -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<Album> CREATOR = new Creator<Album>() {

2
app/src/module_album/java/com/zhihu/matisse/internal/entity/CaptureStrategy.java → app/src/module_album/java/com/example/matisse/internal/entity/CaptureStrategy.java
View File

@@ -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;

2
app/src/module_album/java/com/zhihu/matisse/internal/entity/CustomItem.java → app/src/module_album/java/com/example/matisse/internal/entity/CustomItem.java
View File

@@ -1,4 +1,4 @@
package com.zhihu.matisse.internal.entity;
package com.example.matisse.internal.entity;
import android.os.Parcel;
import android.os.Parcelable;

4
app/src/module_album/java/com/zhihu/matisse/internal/entity/IncapableCause.java → app/src/module_album/java/com/example/matisse/internal/entity/IncapableCause.java
View File

@@ -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;

4
app/src/module_album/java/com/zhihu/matisse/internal/entity/Item.java → app/src/module_album/java/com/example/matisse/internal/entity/Item.java
View File

@@ -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<Item> CREATOR = new Creator<Item>() {

14
app/src/module_album/java/com/zhihu/matisse/internal/entity/SelectionSpec.java → app/src/module_album/java/com/example/matisse/internal/entity/SelectionSpec.java
View File

@@ -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;

8
app/src/module_album/java/com/zhihu/matisse/internal/loader/AlbumLoader.java → app/src/module_album/java/com/example/matisse/internal/loader/AlbumLoader.java
View File

@@ -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;

10
app/src/module_album/java/com/zhihu/matisse/internal/loader/AlbumMediaLoader.java → app/src/module_album/java/com/example/matisse/internal/loader/AlbumMediaLoader.java
View File

@@ -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.

4
app/src/module_album/java/com/zhihu/matisse/internal/model/AlbumCollection.java → app/src/module_album/java/com/example/matisse/internal/model/AlbumCollection.java
View File

@@ -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;

6
app/src/module_album/java/com/zhihu/matisse/internal/model/AlbumMediaCollection.java → app/src/module_album/java/com/example/matisse/internal/model/AlbumMediaCollection.java
View File

@@ -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;

16
app/src/module_album/java/com/zhihu/matisse/internal/model/SelectedItemCollection.java → app/src/module_album/java/com/example/matisse/internal/model/SelectedItemCollection.java
View File

@@ -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;

12
app/src/module_album/java/com/zhihu/matisse/internal/ui/AlbumPreviewActivity.java → app/src/module_album/java/com/example/matisse/internal/ui/AlbumPreviewActivity.java
View File

@@ -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;

26
app/src/module_album/java/com/zhihu/matisse/internal/ui/BasePreviewActivity.java → app/src/module_album/java/com/example/matisse/internal/ui/BasePreviewActivity.java
View File

@@ -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 {

18
app/src/module_album/java/com/zhihu/matisse/internal/ui/MediaSelectionFragment.java → app/src/module_album/java/com/example/matisse/internal/ui/MediaSelectionFragment.java
View File

@@ -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,

10
app/src/module_album/java/com/zhihu/matisse/internal/ui/PreviewItemFragment.java → app/src/module_album/java/com/example/matisse/internal/ui/PreviewItemFragment.java
View File

@@ -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;

8
app/src/module_album/java/com/zhihu/matisse/internal/ui/SelectedPreviewActivity.java → app/src/module_album/java/com/example/matisse/internal/ui/SelectedPreviewActivity.java
View File

@@ -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;

16
app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/AlbumMediaAdapter.java → app/src/module_album/java/com/example/matisse/internal/ui/adapter/AlbumMediaAdapter.java
View File

@@ -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<RecyclerView.ViewHolder> implements

6
app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/AlbumsAdapter.java → app/src/module_album/java/com/example/matisse/internal/ui/adapter/AlbumsAdapter.java
View File

@@ -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 {

6
app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/PreviewPagerAdapter.java → app/src/module_album/java/com/example/matisse/internal/ui/adapter/PreviewPagerAdapter.java
View File

@@ -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;

2
app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/RecyclerViewCursorAdapter.java → app/src/module_album/java/com/example/matisse/internal/ui/adapter/RecyclerViewCursorAdapter.java
View File

@@ -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;

6
app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/AlbumsSpinner.java → app/src/module_album/java/com/example/matisse/internal/ui/widget/AlbumsSpinner.java
View File

@@ -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 {

2
app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/CheckRadioView.java → app/src/module_album/java/com/example/matisse/internal/ui/widget/CheckRadioView.java
View File

@@ -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;

2
app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/CheckView.java → app/src/module_album/java/com/example/matisse/internal/ui/widget/CheckView.java
View File

@@ -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;

2
app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/IncapableDialog.java → app/src/module_album/java/com/example/matisse/internal/ui/widget/IncapableDialog.java
View File

@@ -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;

6
app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/MediaGrid.java → app/src/module_album/java/com/example/matisse/internal/ui/widget/MediaGrid.java
View File

@@ -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 {

2
app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/MediaGridInset.java → app/src/module_album/java/com/example/matisse/internal/ui/widget/MediaGridInset.java
View File

@@ -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;

2
app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/PreviewViewPager.java → app/src/module_album/java/com/example/matisse/internal/ui/widget/PreviewViewPager.java
View File

@@ -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;

2
app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/RoundedRectangleImageView.java → app/src/module_album/java/com/example/matisse/internal/ui/widget/RoundedRectangleImageView.java
View File

@@ -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;

2
app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/SquareFrameLayout.java → app/src/module_album/java/com/example/matisse/internal/ui/widget/SquareFrameLayout.java
View File

@@ -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;

2
app/src/module_album/java/com/zhihu/matisse/internal/utils/ExifInterfaceCompat.java → app/src/module_album/java/com/example/matisse/internal/utils/ExifInterfaceCompat.java
View File

@@ -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;

4
app/src/module_album/java/com/zhihu/matisse/internal/utils/MediaStoreCompat.java → app/src/module_album/java/com/example/matisse/internal/utils/MediaStoreCompat.java
View File

@@ -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;

2
app/src/module_album/java/com/zhihu/matisse/internal/utils/PathUtils.java → app/src/module_album/java/com/example/matisse/internal/utils/PathUtils.java
View File

@@ -1,4 +1,4 @@
package com.zhihu.matisse.internal.utils;
package com.example.matisse.internal.utils;
import android.content.ContentUris;
import android.content.Context;

12
app/src/module_album/java/com/zhihu/matisse/internal/utils/PhotoMetadataUtils.java → app/src/module_album/java/com/example/matisse/internal/utils/PhotoMetadataUtils.java
View File

@@ -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;

2
app/src/module_album/java/com/zhihu/matisse/internal/utils/Platform.java → app/src/module_album/java/com/example/matisse/internal/utils/Platform.java
View File

@@ -1,4 +1,4 @@
package com.zhihu.matisse.internal.utils;
package com.example.matisse.internal.utils;
import android.os.Build;

2
app/src/module_album/java/com/zhihu/matisse/internal/utils/SingleMediaScanner.java → app/src/module_album/java/com/example/matisse/internal/utils/SingleMediaScanner.java
View File

@@ -1,4 +1,4 @@
package com.zhihu.matisse.internal.utils;
package com.example.matisse.internal.utils;
import android.content.Context;
import android.media.MediaScannerConnection;

2
app/src/module_album/java/com/zhihu/matisse/internal/utils/UIUtils.java → app/src/module_album/java/com/example/matisse/internal/utils/UIUtils.java
View File

@@ -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;

2
app/src/module_album/java/com/zhihu/matisse/listener/OnCheckedListener.java → app/src/module_album/java/com/example/matisse/listener/OnCheckedListener.java
View File

@@ -1,4 +1,4 @@
package com.zhihu.matisse.listener;
package com.example.matisse.listener;
/**

2
app/src/module_album/java/com/zhihu/matisse/listener/OnFragmentInteractionListener.java → app/src/module_album/java/com/example/matisse/listener/OnFragmentInteractionListener.java
View File

@@ -1,4 +1,4 @@
package com.zhihu.matisse.listener;
package com.example.matisse.listener;
/**
* PreViewItemFragment 和 BasePreViewActivity 通信的接口 ，为了方便拿到 ImageViewTouch 的点击事件

2
app/src/module_album/java/com/zhihu/matisse/listener/OnSelectedListener.java → app/src/module_album/java/com/example/matisse/listener/OnSelectedListener.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.zhihu.matisse.listener;
package com.example.matisse.listener;
import android.net.Uri;

44
app/src/module_album/java/com/zhihu/matisse/ui/MatisseActivity.java → app/src/module_album/java/com/example/matisse/ui/MatisseActivity.java
View File

@@ -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;

2
app/src/module_album/java/com/zhihu/matisse/widget/ConfirmPickView.java → app/src/module_album/java/com/example/matisse/widget/ConfirmPickView.java
View File

@@ -1,4 +1,4 @@
package com.zhihu.matisse.widget;
package com.example.matisse.widget;
import android.content.Context;

4
app/src/module_album/res/layout/activity_matisse.xml
View File

@@ -108,7 +108,7 @@
android:visibility="visible"
tools:showIn="@layout/activity_matisse">
<com.zhihu.matisse.internal.ui.widget.CheckRadioView
<com.example.matisse.internal.ui.widget.CheckRadioView
android:id="@+id/original"
android:layout_width="16dp"
android:layout_height="16dp"
@@ -163,7 +163,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<com.zhihu.matisse.widget.ConfirmPickView
<com.example.matisse.widget.ConfirmPickView
android:id="@+id/tv_confirm_pick"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"

8
app/src/module_album/res/layout/activity_media_preview.xml
View File

@@ -19,7 +19,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.zhihu.matisse.internal.ui.widget.PreviewViewPager
<com.example.matisse.internal.ui.widget.PreviewViewPager
android:id="@+id/pager"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -72,7 +72,7 @@
tools:showIn="@layout/activity_matisse">
<com.zhihu.matisse.internal.ui.widget.CheckRadioView
<com.example.matisse.internal.ui.widget.CheckRadioView
android:id="@+id/original"
android:src="@drawable/ic_preview_radio_off"
android:layout_gravity="center_vertical"
@@ -107,7 +107,7 @@
<com.zhihu.matisse.widget.ConfirmPickView
<com.example.matisse.widget.ConfirmPickView
android:id="@+id/button_apply"
android:layout_gravity="center_vertical|end"
android:layout_width="55dp"
@@ -126,7 +126,7 @@
android:layout_margin="8dp"
android:fitsSystemWindows="true">
<com.zhihu.matisse.internal.ui.widget.CheckView
<com.example.matisse.internal.ui.widget.CheckView
android:id="@+id/check_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

2
app/src/module_album/res/layout/album_list_item.xml
View File

@@ -18,7 +18,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/album_item_height">
<com.zhihu.matisse.internal.ui.widget.RoundedRectangleImageView
<com.example.matisse.internal.ui.widget.RoundedRectangleImageView
android:id="@+id/album_cover"
android:layout_width="40dp"
android:layout_height="40dp"

2
app/src/module_album/res/layout/media_grid_content.xml
View File

@@ -21,7 +21,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
<com.zhihu.matisse.internal.ui.widget.CheckView
<com.example.matisse.internal.ui.widget.CheckView
android:id="@+id/check_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

2
app/src/module_album/res/layout/media_grid_item.xml
View File

@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<com.zhihu.matisse.internal.ui.widget.MediaGrid
<com.example.matisse.internal.ui.widget.MediaGrid
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"

4
app/src/module_album/res/layout/photo_capture_item.xml
View File

@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<com.zhihu.matisse.internal.ui.widget.SquareFrameLayout
<com.example.matisse.internal.ui.widget.SquareFrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -27,4 +27,4 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</com.zhihu.matisse.internal.ui.widget.SquareFrameLayout>
</com.example.matisse.internal.ui.widget.SquareFrameLayout>

9
app/src/module_community/java/com/chwl/app/community/dynamic/view/DynamicDetailActivity.java
View File

@@ -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<ActivityDynam
tvReport.setOnClickListener(v1 -> {
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<ActivityDynam
if (!UserModel.get().isMyseft(bean.getUid())) {
ButtonItem item = new ButtonItem(getString(R.string.me_report_dynamic), () -> {
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<ActivityDynam
private boolean isBindPhone() {
UserInfo userInfo = UserModel.get().getCacheLoginUserInfo();
if (userInfo == null) {
SingleToastUtil.showToast(XChatConstants.EMPTY_USER_INFO_TIPS);
SingleToastUtil.showToast(XConstants.EMPTY_USER_INFO_TIPS);
return false;
}
return true;

4
app/src/module_community/java/com/chwl/app/community/dynamic/view/WorldDynamicFragment.java
View File

@@ -21,7 +21,7 @@ import com.chwl.app.community.helper.ShareDynamicHelper;
import com.chwl.app.miniworld.activity.MiniWorldGuestPageActivity;
import com.chwl.app.ui.widget.ButtonItem;
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.auth.AuthModel;
import com.chwl.core.community.bean.WorldDynamicBean;
import com.chwl.core.community.bean.WorldDynamicListResult;
@@ -153,7 +153,7 @@ public class WorldDynamicFragment extends BaseMvpFragment<IWorldDynamicView, Wor
if (!UserModel.get().isMyseft(bean.getUid())) {
ButtonItem item = new ButtonItem(ResUtil.getString(R.string.dynamic_view_worlddynamicfragment_01), () -> {
UIHelper.showReportPage(WorldDynamicFragment.this.getActivity(), bean.getUid(),
XChatConstants.REPORT_TYPE_WORLDDYNAMIC);
XConstants.REPORT_TYPE_WORLDDYNAMIC);
});
list.add(item);
}

4
app/src/module_community/java/com/chwl/app/community/helper/ShareDynamicHelper.java
View File

@@ -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;

2
app/src/module_community/java/com/chwl/app/community/photo/BigPagerAdapter.java
View File

@@ -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;

2
app/src/module_community/java/com/chwl/app/community/photo/BigPhotoActivity.java
View File

@@ -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;

2
app/src/module_community/java/com/chwl/app/community/photo/BigPhotoItemFragment.java
View File

@@ -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;

2
app/src/module_community/java/com/chwl/app/community/photo/PagerOption.java
View File

@@ -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;

2
app/src/module_community/java/com/chwl/app/community/photo/PhotoAdapter.java
View File

@@ -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;

2
app/src/module_community/java/com/chwl/app/community/photo/PreviewPhotoActivity.java
View File

@@ -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;

8
app/src/module_community/java/com/chwl/app/community/publish/view/PublishActivity.java
View File

@@ -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<IPublishView, PublishPresen
private static boolean beforeStart(DialogManager manager) {
UserInfo userInfo = UserModel.get().getCacheLoginUserInfo();
if (userInfo == null) {
SingleToastUtil.showToast(XChatConstants.EMPTY_USER_INFO_TIPS);
SingleToastUtil.showToast(XConstants.EMPTY_USER_INFO_TIPS);
return true;
} else {

4
app/src/module_community/java/com/chwl/app/community/square/SquareDynamicFragment.java
View File

@@ -33,7 +33,7 @@ import com.chwl.app.miniworld.listener.DoubleClickCheckListener;
import com.chwl.app.miniworld.presenter.MiniWorldCategoryPresenter;
import com.chwl.app.miniworld.view.IMiniWorldCategoryView;
import com.chwl.app.ui.widget.ButtonItem;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.chwl.core.XConstants;
import com.chwl.core.auth.AuthModel;
import com.chwl.core.community.CommunityConstant;
import com.chwl.core.community.bean.WorldDynamicBean;
@@ -168,7 +168,7 @@ public class SquareDynamicFragment extends BaseMvpFragment<IMiniWorldCategoryVie
if (!UserModel.get().isMyseft(bean.getUid())) {
ButtonItem item = new ButtonItem(getString(R.string.me_report_dynamic), () -> {
UIHelper.showReportPage(getActivity(), bean.getUid(),
XChatConstants.REPORT_TYPE_DYNAMIC_SQUARE);
XConstants.REPORT_TYPE_DYNAMIC_SQUARE);
});
list.add(item);
}

4
app/src/module_community/java/com/chwl/app/community/user_dynamic/UserDynamicFrg.java
View File

@@ -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<IUserDynamicView, UserDynami
ButtonItem buttonItem1 = new ButtonItem(ResUtil.getString(R.string.community_user_dynamic_userdynamicfrg_09), () -> {
if (currentUserDynamic != null) {
UIHelper.showReportPage(mContext, currentUserDynamic.getUid(),
XChatConstants.REPORT_TYPE_PERSONAL_DYNAMIC);
XConstants.REPORT_TYPE_PERSONAL_DYNAMIC);
}
});
List<ButtonItem> buttonItems = new ArrayList<>();

2
app/src/module_community/java/com/chwl/app/community/utils/Glide4Engine.java
View File

@@ -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.

2
app/src/module_community/java/com/chwl/app/community/utils/ObjectTypeHelper.java
View File

@@ -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;

2
app/src/module_community/res/layout/activity_big_photo.xml
View File

@@ -23,7 +23,7 @@
app:layout_constraintTop_toTopOf="@id/title_bar"
tools:visibility="visible" />
<com.zhihu.matisse.internal.ui.widget.PreviewViewPager
<com.example.matisse.internal.ui.widget.PreviewViewPager
android:id="@+id/pager"
android:layout_width="match_parent"
android:layout_height="0dp"

4
app/src/module_mini_world/java/com/chwl/app/miniworld/activity/MiniWorldGuestPageActivity.java
View File

@@ -60,7 +60,7 @@ import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator;
import com.chwl.app.ui.widget.recyclerview.decoration.VerticalDecoration;
import com.chwl.app.utils.AppBarStateChangeListener;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.chwl.core.XConstants;
import com.chwl.core.UriProvider;
import com.chwl.core.auth.AuthModel;
import com.chwl.core.home.bean.TabInfo;
@@ -405,7 +405,7 @@ public class MiniWorldGuestPageActivity extends BaseMvpActivity<IMiniWorldGuestP
dismissPopupMenu();
long ownerUid = getMvpPresenter().getOwnerUid();
if (ownerUid != -1) {
UIHelper.showReportPage(context, ownerUid, XChatConstants.REPORT_TYPE_WORLD);
UIHelper.showReportPage(context, ownerUid, XConstants.REPORT_TYPE_WORLD);
}
} else if (id == R.id.tv_world_guest_page_quit) {// 退出话题
dismissPopupMenu();

4
app/src/module_mini_world/java/com/chwl/app/miniworld/activity/TopicMainActivity.java
View File

@@ -43,7 +43,7 @@ import com.chwl.app.ui.widget.magicindicator.MagicIndicator;
import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper;
import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.chwl.core.XConstants;
import com.chwl.core.auth.AuthModel;
import com.chwl.core.home.bean.TabInfo;
import com.chwl.core.manager.IMNetEaseManager;
@@ -200,7 +200,7 @@ public class TopicMainActivity extends BaseMvpActivity<IMiniWorldGuestPage, Mini
dismissPopupMenu();
long ownerUid = getMvpPresenter().getOwnerUid();
if (ownerUid != -1) {
UIHelper.showReportPage(context, ownerUid, XChatConstants.REPORT_TYPE_WORLD);
UIHelper.showReportPage(context, ownerUid, XConstants.REPORT_TYPE_WORLD);
}
} else if (id == R.id.tv_world_guest_page_quit) {// 退出话题
dismissPopupMenu();

2
app/src/module_music/java/com/chwl/app/music/presenter/LocalMusicListPresenter.java
View File

@@ -3,7 +3,7 @@ package com.chwl.app.music.presenter;
import android.annotation.SuppressLint;
import com.chwl.app.base.BaseMvpPresenter;
import com.chwl.tutu.database.AppDataBase;
import com.chwl.core.db.AppDataBase;
import com.chwl.core.Constants;
import com.chwl.core.music.db.bean.LocalMusicBean;
import com.chwl.core.music.db.model.LocalMusicDbModel;

2
app/src/module_music/java/com/chwl/app/music/presenter/ShareMusicListPresenter.java
View File

@@ -3,7 +3,7 @@ package com.chwl.app.music.presenter;
import android.annotation.SuppressLint;
import com.chwl.app.base.BaseMvpPresenter;
import com.chwl.tutu.database.AppDataBase;
import com.chwl.core.db.AppDataBase;
import com.chwl.core.Constants;
import com.chwl.core.music.bean.ShareMusicInfo;
import com.chwl.core.music.db.bean.LocalMusicBean;

6
app/src/module_treasure_box/java/com/chwl/app/shipantics/PullRadishActivity.java
View File

@@ -22,9 +22,9 @@ import com.chwl.app.base.BaseBindingActivity;
import com.chwl.app.common.svga.SimpleSvgaCallback;
import com.chwl.app.databinding.ActivityPullRadishBinding;
import com.chwl.app.ui.webview.DialogWebViewActivity;
import com.chwl.treasure_box.bean.PrizeInfo;
import com.chwl.treasure_box.model.IBoxModel;
import com.chwl.treasure_box.model.RadishModel;
import com.chwl.core.treasure_box.bean.PrizeInfo;
import com.chwl.core.treasure_box.model.IBoxModel;
import com.chwl.core.treasure_box.model.RadishModel;
import com.chwl.core.DemoCache;
import com.chwl.core.UriProvider;
import com.chwl.core.manager.IMNetEaseManager;

2
app/src/module_treasure_box/java/com/chwl/app/shipantics/RadishRankingPresenter.java
View File

@@ -2,7 +2,7 @@ package com.chwl.app.shipantics;
import com.chwl.app.R;
import com.chwl.app.base.BaseMvpPresenter;
import com.chwl.treasure_box.model.RadishModel;
import com.chwl.core.treasure_box.model.RadishModel;
import com.chwl.core.Constants;
import com.chwl.core.room.treasure_box.bean.BoxRankingInfo;
import com.chwl.library.utils.ResUtil;

4
app/src/module_treasure_box/java/com/chwl/app/shipantics/RadishResultDialog.kt
View File

@@ -12,8 +12,8 @@ import com.chwl.app.base.BaseDialog
import com.chwl.app.databinding.DialogRadishResultBinding
import com.chwl.app.ui.utils.RVDelegate
import com.chwl.app.ui.utils.load
import com.chwl.treasure_box.bean.OpenBoxResult
import com.chwl.treasure_box.bean.PrizeInfo
import com.chwl.core.treasure_box.bean.OpenBoxResult
import com.chwl.core.treasure_box.bean.PrizeInfo
class RadishResultDialog :
BaseDialog<DialogRadishResultBinding>() {

6
app/src/module_treasure_box/java/com/chwl/app/treasure_box/activity/TreasureBoxActivity.java
View File

@@ -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;

6
app/src/module_treasure_box/java/com/chwl/app/treasure_box/activity/TreasureBoxHonourActivity.java
View File

@@ -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;

4
app/src/module_treasure_box/java/com/chwl/app/treasure_box/widget/dialog/BoxLoveLackDialog.kt
View File

@@ -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

Some files were not shown because too many files have changed in this diff Show More