diff --git a/app/src/main/java/com/yizhuan/erban/audio/VoiceMatchActivity.java b/app/src/main/java/com/yizhuan/erban/audio/VoiceMatchActivity.java index 636172882..dea837c8d 100644 --- a/app/src/main/java/com/yizhuan/erban/audio/VoiceMatchActivity.java +++ b/app/src/main/java/com/yizhuan/erban/audio/VoiceMatchActivity.java @@ -30,7 +30,6 @@ import com.yizhuan.erban.base.TitleBar; import com.yizhuan.erban.common.widget.dialog.DialogManager; import com.yizhuan.erban.databinding.ActivityVoiceMatchBinding; import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity; -import com.yizhuan.erban.ui.widget.higuide.TuTuGuideHelper; import com.yizhuan.xchat_android_core.audio.AudioModel; import com.yizhuan.xchat_android_core.audio.bean.HistoryVoiceInfo; import com.yizhuan.xchat_android_core.audio.bean.VoiceMatchInfo; @@ -38,10 +37,8 @@ import com.yizhuan.xchat_android_core.auth.AuthModel; import com.yizhuan.xchat_android_core.music.model.PlayerModel; import com.yizhuan.xchat_android_core.user.UserModel; import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.ActivityUtil; import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_library.utils.ListUtils; import com.yizhuan.xchat_android_library.utils.ResUtil; import com.yizhuan.xchat_android_library.utils.SingleToastUtil; @@ -160,23 +157,6 @@ public class VoiceMatchActivity extends BaseViewBindingActivity { - if (!ActivityUtil.isValidContext(context)) { - return; - } - TuTuGuideHelper guideHelper = new TuTuGuideHelper(context); - guideHelper.createHiGuide(() -> guideHelper.createVoiceMatchGuide(binding.svgaGroupVoiceLike, binding.layoutMyVoiceEntrance)); - TuTuGuideHelper.setNoNeedHiGuide(TuTuGuideHelper.KEY_GUIDE_VOICE_MATCH); - }, 500); - } - private void queryHistoryVoice() { AudioModel.get().queryHistoryVoice(AuthModel.get().getCurrentUid()) .compose(bindUntilEvent(ActivityEvent.DESTROY)) @@ -377,10 +357,6 @@ public class VoiceMatchActivity extends BaseViewBindingActivity { - if (throwable != null) { - throwable.printStackTrace(); - } else if (monsterHuntingResultServiceResult != null && monsterHuntingResultServiceResult.isSuccess()) { - if (monsterHuntingResultServiceResult.getData() != null) { - displayResult(monsterHuntingResultServiceResult.getData()); - } - } else if (monsterHuntingResultServiceResult != null && !monsterHuntingResultServiceResult.isSuccess()) { - SingleToastUtil.showToast(monsterHuntingResultServiceResult.getMessage()); - } - }); - } - } - - public void displayResult(MonsterHuntingResult monsterHuntingResult) { - Log.e(TAG, "displayResult() called with: monsterHuntingReward = [" + monsterHuntingResult + "]"); - // 幸运儿 - MonsterHunter luckDog = monsterHuntingResult.getLuckyDog(); - if (luckDog != null) { - ImageLoadUtils.loadAvatar(getContext(), luckDog.getAvatar(), avatarView, true); - usernameView.setText(luckDog.getNick()); - userIdView.setText(String.format(Locale.getDefault(), getContext().getString(R.string.text_user_id), - luckDog.getErbanNo())); - impactValueView.setText(luckDog.getHurt()); - } - // 获得的奖励 - List awards = monsterHuntingResult.getAwards(); - if (awards != null) { - rewardCountView.setText(String.format(Locale.getDefault(), - rewardCountView.getText().toString(), awards.size())); - rewardsAdapter = new MonsterHuntingRewardsAdapter(awards, getContext()); - rewardRecyclerView.setAdapter(rewardsAdapter); - rewardRecyclerView.setLayoutManager(new LinearLayoutManager(getContext(), OrientationHelper.HORIZONTAL, false)); - moreRewardView.setVisibility(View.GONE); - } - } - - public void show(FragmentManager fragmentManager) { - this.show(fragmentManager, TAG); - } - - @Override - public void show(FragmentManager manager, String tag) { - if (manager.findFragmentByTag(tag) == null) { - manager.beginTransaction() - .add(this, tag) - .commitAllowingStateLoss(); - } - } - - @Override - public void onClick(View v) { - switch (v.getId()) { - case R.id.iv_monster_hunting_exit: - dismissAllowingStateLoss(); - if (getActivity() != null) { - getActivity().finish(); - } - break; - - case R.id.rl_check_damage: - UIHelper.showMonsterResult(getContext(), String.valueOf(MonsterDataManager.get().getCurrentRoomMonsterInfo().getMonsterId())); - break; - } - } -} diff --git a/app/src/main/java/com/yizhuan/erban/radish/task/activity/TaskCenterActivity.java b/app/src/main/java/com/yizhuan/erban/radish/task/activity/TaskCenterActivity.java index 896874fb6..74c184325 100644 --- a/app/src/main/java/com/yizhuan/erban/radish/task/activity/TaskCenterActivity.java +++ b/app/src/main/java/com/yizhuan/erban/radish/task/activity/TaskCenterActivity.java @@ -3,10 +3,7 @@ package com.yizhuan.erban.radish.task.activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.view.View; import android.view.ViewStub; -import android.widget.ImageView; -import android.widget.TextView; import androidx.fragment.app.Fragment; import androidx.viewpager.widget.ViewPager; @@ -24,7 +21,6 @@ import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper; import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; import com.yizhuan.xchat_android_core.radish.task.bean.PrizeAnim; import com.yizhuan.xchat_android_core.radish.task.bean.TaskInfo; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; import com.yizhuan.xchat_android_library.utils.ResUtil; @@ -43,11 +39,6 @@ public class TaskCenterActivity extends BaseMvpActivity - llTaskTtartContainer.setVisibility(View.GONE)); - tv_skip_guide.setVisibility(View.VISIBLE); - llTaskTtartContainer.setOnClickListener(v -> { - if (indexTips < topTipsRes.length) { - if (indexTips == topTipsRes.length - 1) { - tv_skip_guide.setVisibility(View.GONE); - } else { - tv_skip_guide.setVisibility(View.VISIBLE); - } - ivTipsTop.setImageResource(topTipsRes[indexTips++]); - } else { - llTaskTtartContainer.setVisibility(View.GONE); - } - }); - } - } diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpMpDialog.kt b/app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpMpDialog.kt deleted file mode 100644 index c3b421796..000000000 --- a/app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpMpDialog.kt +++ /dev/null @@ -1,58 +0,0 @@ -package com.yizhuan.erban.relation.cp.dialog - -import android.content.Context -import android.text.Editable -import android.view.View -import com.yizhuan.erban.R -import com.yizhuan.erban.databinding.DialogCpMpBinding -import com.yizhuan.erban.treasure_box.widget.dialog.BaseBindingDialog -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes -import com.yizhuan.xchat_android_library.utils.TextWatcherWrapper - -@ActLayoutRes(R.layout.dialog_cp_mp) -class CpMpDialog(context: Context, private val type: Int) : - BaseBindingDialog(context), - View.OnClickListener { - //type:0 申请 1 定制 - override fun init() { - binding.pageType = type - binding.click = this - // binding.data = ? - binding.editCpMpCustomized.addTextChangedListener(textWatcher) - } - - override fun onClick(v: View) { - when (v.id) { - R.id.btn_require_current -> { - //申请名牌 - } - R.id.btn_require_next -> { - //申请名牌 - } - R.id.iv_cp_mp_customized -> { - //定制名牌 - } - } - } - - override fun onDetachedFromWindow() { - super.onDetachedFromWindow() - binding.editCpMpCustomized.removeTextChangedListener(textWatcher) - } - - private val textWatcher = object : TextWatcherWrapper() { - private var hasEnabled = false - override fun afterTextChanged(editable: Editable?) { - super.afterTextChanged(editable) - if (editable?.length ?: 0 > 0) { - if (!hasEnabled) { - binding.customizeEnable = true - hasEnabled = true - } - } else { - binding.customizeEnable = false - hasEnabled = false - } - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/actions/ChatterBoxAction.java b/app/src/main/java/com/yizhuan/erban/ui/im/actions/ChatterBoxAction.java deleted file mode 100644 index f47461722..000000000 --- a/app/src/main/java/com/yizhuan/erban/ui/im/actions/ChatterBoxAction.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.yizhuan.erban.ui.im.actions; - -import android.os.Handler; - -import com.netease.nim.uikit.business.session.actions.BaseAction; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.widget.higuide.TuTuGuideHelper; -import com.yizhuan.xchat_android_core.im.chatterbox.ChatterBoxHelper; -import com.yizhuan.xchat_android_core.im.chatterbox.HideInputEvent; - -import org.greenrobot.eventbus.EventBus; - -public class ChatterBoxAction extends BaseAction { - - private long lastClick = 0L; - public static String sessionId; - - public ChatterBoxAction() { - super(R.drawable.chat_icon_say, R.string.chat_action); - } - - @Override - public void onClick() { - long currentClick = System.currentTimeMillis(); - - if (currentClick - lastClick > 1000L) { - - EventBus.getDefault().post(new HideInputEvent()); - lastClick = currentClick; - - if (TuTuGuideHelper.isNeedHiGuide(TuTuGuideHelper.KEY_GUIDE_CHATTER_BOX)) { - new Handler().post(() -> { - TuTuGuideHelper helper = new TuTuGuideHelper(getActivity()); - helper.createHiGuide(() -> helper.createDiceOverLayer()); - TuTuGuideHelper.setNoNeedHiGuide(TuTuGuideHelper.KEY_GUIDE_CHATTER_BOX); - }); - } - ChatterBoxHelper.topicBoxCanSend(); - - } - } -} diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserInfoCarAdapter.java b/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserInfoCarAdapter.java deleted file mode 100644 index a607909ad..000000000 --- a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserInfoCarAdapter.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.yizhuan.erban.ui.user.adapter; - -import static com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo.STATUS_OFF_SHELF; -import static com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo.STATUS_OUT_OF_DATE; - -import android.content.Context; -import android.widget.ImageView; - -import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.bean.CarButtonInfo; -import com.yizhuan.xchat_android_core.bean.UserInfoItem; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; - -import java.util.List; - -public class UserInfoCarAdapter extends UserTabBaseAdapter { - - public UserInfoCarAdapter(Context context, List data) { - super(context, data); - - addItemType(UserInfoItem.TYPE_CAR_ITEM, R.layout.user_info_my_car_item); - addItemType(UserInfoItem.TYPE_CAR_BUTTON, R.layout.layout_car_button); - addItemType(UserInfoItem.TYPE_CAR_EMPTY, R.layout.user_info_car_empty); - - } - - @Override - protected void convert(BaseViewHolder helper, UserInfoItem item) { - if (item == null) - return; - - super.convert(helper, item); - - switch (item.getItemType()) { - case UserInfoItem.TYPE_CAR_ITEM: - setCarItem(helper, item); - break; - - case UserInfoItem.TYPE_CAR_BUTTON: - setCarButton(helper, item); - break; - - case UserInfoItem.TYPE_CAR_EMPTY: - break; - } - - } - - private void setCarItem(BaseViewHolder helper, UserInfoItem item) { - - CarInfo carInfo = (CarInfo) item.getData(); - - if (carInfo == null) - return; - - int resId = -1; - if (carInfo.getStatus() == STATUS_OUT_OF_DATE) { - resId = R.drawable.ic_car_expire; - } else if (carInfo.getStatus() == STATUS_OFF_SHELF) { - resId = R.drawable.ic_car_down; - } - - helper.setVisible(R.id.user_info_car_flag, - carInfo.getStatus() == STATUS_OUT_OF_DATE || carInfo.getStatus() == STATUS_OFF_SHELF) - .addOnClickListener(R.id.user_info_car_pic); - if (resId != -1) { - helper.setImageResource(R.id.user_info_car_flag, resId); - } - ImageView carPic = helper.getView(R.id.user_info_car_pic); - ImageLoadUtils.loadImage(mContext, carInfo.getPic(), carPic); - } - - private void setCarButton(BaseViewHolder helper, UserInfoItem item) { - CarButtonInfo carButtonInfo = (CarButtonInfo) item.getData(); - if (carButtonInfo == null) - return; - - helper.setText(R.id.tv_send_car, carButtonInfo.getContext()).addOnClickListener(R.id.tv_send_car); - - } - -} diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/fragment/UserInfoCarFragment.java b/app/src/main/java/com/yizhuan/erban/ui/user/fragment/UserInfoCarFragment.java deleted file mode 100644 index 7e5bf636d..000000000 --- a/app/src/main/java/com/yizhuan/erban/ui/user/fragment/UserInfoCarFragment.java +++ /dev/null @@ -1,235 +0,0 @@ -package com.yizhuan.erban.ui.user.fragment; - -import android.graphics.Rect; -import android.os.Bundle; -import android.view.View; - -import androidx.annotation.Nullable; -import androidx.lifecycle.Observer; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.trello.rxlifecycle3.android.FragmentEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingFragment; -import com.yizhuan.erban.databinding.LayoutUserCarStoreBinding; -import com.yizhuan.erban.decoration.view.DecorationStoreActivity; -import com.yizhuan.erban.decoration.view.MyDecorationActivity; -import com.yizhuan.erban.ui.user.adapter.UserInfoCarAdapter; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.CarButtonInfo; -import com.yizhuan.xchat_android_core.bean.GiftTitleInfo; -import com.yizhuan.xchat_android_core.bean.UserInfoItem; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.decoration.car.CarModel; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; -import com.yizhuan.xchat_android_core.user.UserInfoUiMgr; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.SizeUtils; - -import java.util.ArrayList; -import java.util.List; - -import io.reactivex.SingleObserver; -import io.reactivex.disposables.Disposable; - -@ActLayoutRes(R.layout.layout_user_car_store) -public class UserInfoCarFragment extends BaseBindingFragment { - - private long userId; - - private UserInfoCarAdapter mUserInfoCarAdapter; - private List mList = new ArrayList<>(); - private Observer mObserver; - - public static UserInfoCarFragment newInstance() { - return new UserInfoCarFragment(); - } - - @Override - public void onActivityCreated(@Nullable Bundle savedInstanceState) { - super.onActivityCreated(savedInstanceState); - - mObserver = new Observer() { - @Override - public void onChanged(@Nullable Long o) { - if (o != null) { - userId = o; - } - - } - }; - UserInfoUiMgr.get().registerUid(this, mObserver); - } - - @Override - public void setUserVisibleHint(boolean isVisibleToUser) { - super.setUserVisibleHint(isVisibleToUser); - - if (isVisibleToUser) { - initData(); - } - } - - @Override - protected void onInitArguments(Bundle bundle) { - super.onInitArguments(bundle); - } - - @Override - public void onSetListener() { - super.onSetListener(); - } - - @Override - public void initiate() { - - mBinding.rvCar.setLayoutManager(new GridLayoutManager(mContext, 2)); - - final int px = SizeUtils.dp2px(mContext, 15); - int spanCount = ((GridLayoutManager) mBinding.rvCar.getLayoutManager()).getSpanCount(); - mBinding.rvCar.addItemDecoration(new RecyclerView.ItemDecoration() { - @Override - public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) { - super.getItemOffsets(outRect, view, parent, state); - int pos = parent.getChildAdapterPosition(view); - - if (pos == 0) { - outRect.set(-px, 0, 0, 0); - - } else { - - int left, right; - if ((pos - 1) % spanCount == 0) { //第一列 - left = 0; - right = px / 2; - } else { - left = px / 2; - right = 0; - } - outRect.set(left, 0, right, px); - - } - } - }); - - mUserInfoCarAdapter = new UserInfoCarAdapter(mContext, mList); - mUserInfoCarAdapter.bindToRecyclerView(mBinding.rvCar); - mUserInfoCarAdapter.setSpanSizeLookup(new BaseQuickAdapter.SpanSizeLookup() { - @Override - public int getSpanSize(GridLayoutManager gridLayoutManager, int position) { - - List list = mUserInfoCarAdapter.getData(); - if (ListUtils.isListEmpty(list)) - return 2; - - UserInfoItem userInfoItem = list.get(position); - int type = userInfoItem.getItemType(); - if (type == UserInfoItem.TYPE_TITLE - || type == UserInfoItem.TYPE_CAR_BUTTON - || type == UserInfoItem.TYPE_CAR_EMPTY - || type == UserInfoItem.TYPE_DIV) { - return 2; - - } else - return 1; - } - }); - - mUserInfoCarAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() { - @Override - public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) { - List list = mUserInfoCarAdapter.getData(); - if (ListUtils.isListEmpty(list)) - return; - - UserInfoItem userInfoItem = list.get(position); - if (userInfoItem.getItemType() == UserInfoItem.TYPE_CAR_ITEM) { - - if (AuthModel.get().getCurrentUid() == userId) { - MyDecorationActivity.start(mContext, 1); - - } else { - CarInfo carInfo = (CarInfo) userInfoItem.getData(); - if (carInfo.getStatus() == CarInfo.STATUS_OFF_SHELF) { - toast(R.string.car_user_info_off_shelf); - } else { - DecorationStoreActivity.start(mContext, DecorationStoreActivity.TAB_CAR); - } - } - - } else if (userInfoItem.getItemType() == UserInfoItem.TYPE_CAR_BUTTON) { - DecorationStoreActivity.start(mContext, DecorationStoreActivity.TAB_CAR); - } - } - }); - } - - private void initData() { - // 获取车库数据 - CarModel.get().getUserCarsV2(userId) - .compose(bindUntilEvent(FragmentEvent.DESTROY_VIEW)) - .subscribe(new SingleObserver>>() { - @Override - public void onSubscribe(Disposable d) { - - } - - @Override - public void onSuccess(ServiceResult> listServiceResult) { - if (listServiceResult.isSuccess()) { - getGarageCarsSuccessView(listServiceResult.getData()); - } - } - - @Override - public void onError(Throwable e) { - - } - }); - } - - private void getGarageCarsSuccessView(List carInfoList) { - mList.clear(); - - if (ListUtils.isListEmpty(carInfoList)) { - initCarTitle(0); - - UserInfoItem emptyItem = new UserInfoItem(UserInfoItem.TYPE_CAR_EMPTY); - mList.add(emptyItem); - - } else { - initCarTitle(carInfoList.size()); - - for (CarInfo carInfo : carInfoList) { - UserInfoItem carItem = new UserInfoItem<>(UserInfoItem.TYPE_CAR_ITEM, carInfo); - mList.add(carItem); - } - - } - - CarButtonInfo carButtonInfo = new CarButtonInfo(); - if (AuthModel.get().getCurrentUid() == userId) { - carButtonInfo.setContext(ResUtil.getString(R.string.ui_user_userinfocarfragment_01)); - } else { - carButtonInfo.setContext(ResUtil.getString(R.string.ui_user_userinfocarfragment_02)); - } - UserInfoItem carButtonItem = new UserInfoItem<>(UserInfoItem.TYPE_CAR_BUTTON, carButtonInfo); - mList.add(carButtonItem); - mUserInfoCarAdapter.setNewData(mList); - mUserInfoCarAdapter.notifyDataSetChanged(); - } - - private void initCarTitle(int size) { - GiftTitleInfo giftTitleInfo = new GiftTitleInfo(); - giftTitleInfo.setTitle(ResUtil.getString(R.string.ui_user_userinfocarfragment_03)); - giftTitleInfo.setNum(String.valueOf(size)); - UserInfoItem userInfoItem = new UserInfoItem<>(UserInfoItem.TYPE_TITLE, giftTitleInfo); - mList.add(userInfoItem); - - } - -} diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/TuTuGuideHelper.java b/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/TuTuGuideHelper.java deleted file mode 100644 index 38484297d..000000000 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/TuTuGuideHelper.java +++ /dev/null @@ -1,393 +0,0 @@ -package com.yizhuan.erban.ui.widget.higuide; - -import android.app.Activity; -import android.app.Dialog; -import android.content.Context; -import android.graphics.RectF; -import android.text.TextUtils; -import android.view.Gravity; -import android.view.View; -import android.view.ViewGroup; -import android.widget.FrameLayout; -import android.widget.ImageView; - -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.utils.ActivityUtil; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_library.utils.ListUtils; - -import java.util.ArrayList; -import java.util.List; - - -/** - * create by lvzebiao @2019/5/21 - */ -public class TuTuGuideHelper { - - public final static String KEY_GUIDE_CHATTER_BOX = "key_guide_chatter_box"; - - /** - * 是否需要显示声音匹配的引导 - */ - public final static String KEY_GUIDE_VOICE_MATCH = "key_guide_voice_match"; - - /** - * 话题首页引导 - */ - public final static String KEY_GUIDE_MINI_WORLD_MAIN = "key_guide_mini_world_main"; - /** - * 话题客态页引导-未加入世界 - */ - public final static String KEY_GUIDE_MINI_WORLD_DETAIL_GUEST = "key_guide_mini_world_detail_guest"; - /** - * 话题客态页引导-已加入世界 - */ - public final static String KEY_GUIDE_MINI_WORLD_DETAIL_MEMBER = "key_guide_mini_world_detail_member"; - - private ViewGroup mRootView; - - private TuTuGuideView guideParent; - - private Context context; - - public TuTuGuideHelper(Context context) { - this.context = context; - if (!ActivityUtil.isValidContext(context)) { - return; - } - View contentView = ((Activity) context).findViewById(android.R.id.content); - if (contentView instanceof ViewGroup) { - mRootView = (ViewGroup) contentView; - } - } - - public TuTuGuideHelper(Context context, Dialog dialog) { - this.context = context; - if (!ActivityUtil.isValidContext(context)) { - return; - } - if (dialog == null || dialog.getWindow() == null) { - return; - } - View contentView = dialog.getWindow().getDecorView(); - if (contentView instanceof ViewGroup) { - mRootView = (ViewGroup) contentView; - } - } - - /** - * 创建高亮引导的通用入口 - */ - public void createHiGuide(IGuideLayoutListener listener) { - createHiGuide(listener, null); - } - - public void createHiGuide(IGuideLayoutListener listener, TuTuGuideView.IGuideShowFinishListener showFinishListener) { - try { - if (mRootView == null) { - return; - } - guideParent = new TuTuGuideView(context); - mRootView.addView(guideParent, createLayoutParams()); - mRootView.post(() -> { - try { - if (listener == null) { - return; - } - List list = listener.onCreateList(); - if (ListUtils.isListEmpty(list)) { - return; - } - for (OverLayer overLayer : list) { - guideParent.addOverLayer(overLayer); - } - start(); - } catch (Exception ex) { - ex.printStackTrace(); - } - }); - if (showFinishListener != null) { - guideParent.setShowFinishListener(showFinishListener); - } - } catch (Exception ex) { - ex.printStackTrace(); - } - - } - - public interface IGuideLayoutListener { - List onCreateList(); - } - - public List createVoiceMatchGuide(View likeButtonView, View myVoiceView) { - List list = new ArrayList<>(); - if (likeButtonView == null) { - return list; - } - // 喜欢按钮 高亮 - OverLayer overLayer = new OverLayer(); - list.add(overLayer); - - LightConfig lightConfig; - lightConfig = new LightConfig(likeButtonView); - int radius = UIUtil.dip2px(context, 1) + likeButtonView.getWidth() / 2; - lightConfig.setRadius(new float[]{radius, radius, radius, radius, radius, radius, radius, radius}); - lightConfig.setHPadding(UIUtil.dip2px(context, 1)); - lightConfig.setVPadding(UIUtil.dip2px(context, 1)); - HiLightInfo info; - info = calcHiLightInfo(lightConfig); - if (info == null) { - return list; - } - List hiLightInfoList; - hiLightInfoList = new ArrayList<>(); - hiLightInfoList.add(info); - overLayer.addHiLightInfo(hiLightInfoList); - - ImageView imageView; - imageView = new ImageView(context); - imageView.setScaleType(ImageView.ScaleType.FIT_CENTER); - imageView.setImageResource(R.drawable.icon_guide_to_like_voice_tips); - FrameLayout.LayoutParams params = new FrameLayout.LayoutParams( - UIUtil.dip2px(context, 216), UIUtil.dip2px(context, 96) - ); - params.gravity = Gravity.END; - params.rightMargin = UIUtil.dip2px(context, 60); - params.topMargin = (int) info.getRectF().top - UIUtil.dip2px(context, 21) - UIUtil.dip2px(context, 96); - imageView.setLayoutParams(params); - overLayer.addTipsView(imageView); - - params = createNextParams(context); - params.gravity = Gravity.END; - params.rightMargin = UIUtil.dip2px(context, 60); - params.topMargin = (int) info.getRectF().top - UIUtil.dip2px(context, 138) - UIUtil.dip2px(context, 34); - overLayer.setNextParams(params); - - overLayer.setNeedSkip(true); - // 我的声音入口 高亮 - if (myVoiceView == null) { - return list; - } - overLayer = new OverLayer(); - list.add(overLayer); - - lightConfig = new LightConfig(myVoiceView); - radius = UIUtil.dip2px(context, 25); - lightConfig.setRadius(new float[]{radius, radius, 0, 0, 0, 0, radius, radius}); - float leftPadding = myVoiceView.getWidth() / 3 * 1.8f; - lightConfig.setLeftPadding((int) -leftPadding); - info = calcHiLightInfo(lightConfig); - if (info == null) { - return list; - } - hiLightInfoList = new ArrayList<>(); - hiLightInfoList.add(info); - overLayer.addHiLightInfo(hiLightInfoList); - - imageView = new ImageView(context); - imageView.setScaleType(ImageView.ScaleType.FIT_CENTER); - imageView.setImageResource(R.drawable.icon_guide_to_record_voice_tips); - params = new FrameLayout.LayoutParams( - UIUtil.dip2px(context, 190), UIUtil.dip2px(context, 97) - ); - params.gravity = Gravity.END; - params.rightMargin = UIUtil.dip2px(context, 36); - params.topMargin = (int) info.getRectF().bottom + UIUtil.dip2px(context, 21); - imageView.setLayoutParams(params); - overLayer.addTipsView(imageView); - - params = createKnowedParams(context); - params.gravity = Gravity.END; - params.rightMargin = UIUtil.dip2px(context, 36); - params.topMargin = (int) info.getRectF().bottom + UIUtil.dip2px(context, 139); - overLayer.setKnowedParams(params); - - return list; - } - - public List createMiniWorldGuestPageGuestGuide(View addWorldLayout) { - List list = new ArrayList<>(); - if (addWorldLayout == null) { - return list; - } - // 底部布局 高亮 - OverLayer overLayer = new OverLayer(); - list.add(overLayer); - - LightConfig lightConfig; - lightConfig = new LightConfig(addWorldLayout); - int radius = UIUtil.dip2px(context, 5) + addWorldLayout.getWidth() / 2; - lightConfig.setRadius(new float[]{radius, radius, radius, radius, radius, radius, radius, radius}); - lightConfig.setHPadding(UIUtil.dip2px(context, 5)); - lightConfig.setVPadding(UIUtil.dip2px(context, 5)); - HiLightInfo info = calcHiLightInfo(lightConfig); - if (info == null) { - return list; - } - List hiLightInfoList = new ArrayList<>(); - hiLightInfoList.add(info); - overLayer.addHiLightInfo(hiLightInfoList); - - ImageView imageView; - imageView = new ImageView(context); - imageView.setScaleType(ImageView.ScaleType.FIT_CENTER); - imageView.setImageResource(R.drawable.icon_guide_to_add_world_tips); - FrameLayout.LayoutParams params = new FrameLayout.LayoutParams( - UIUtil.dip2px(context, 277), UIUtil.dip2px(context, 115) - ); - params.gravity = Gravity.END; - params.rightMargin = UIUtil.dip2px(context, 60); - params.topMargin = (int) info.getRectF().top - UIUtil.dip2px(context, 25) - UIUtil.dip2px(context, 115); - imageView.setLayoutParams(params); - overLayer.addTipsView(imageView); - - params = createKnowedParams(context); - params.gravity = Gravity.END; - params.rightMargin = UIUtil.dip2px(context, 60); - params.topMargin = (int) info.getRectF().top - UIUtil.dip2px(context, 45) - UIUtil.dip2px(context, 34); - overLayer.setKnowedParams(params); - return list; - } - - public List createMiniWorldGuestPageMemberGuide(View memberChatLayout) { - List list = new ArrayList<>(); - if (memberChatLayout == null) { - return list; - } - // 底部布局 高亮 - OverLayer overLayer = new OverLayer(); - list.add(overLayer); - - LightConfig lightConfig; - lightConfig = new LightConfig(memberChatLayout); - int radius = UIUtil.dip2px(context, 5) + memberChatLayout.getWidth() / 2; - lightConfig.setRadius(new float[]{radius, radius, radius, radius, radius, radius, radius, radius}); - lightConfig.setHPadding(UIUtil.dip2px(context, 30)); - lightConfig.setVPadding(UIUtil.dip2px(context, 5)); - HiLightInfo info = calcHiLightInfo(lightConfig); - if (info == null) { - return list; - } - List hiLightInfoList = new ArrayList<>(); - hiLightInfoList.add(info); - overLayer.addHiLightInfo(hiLightInfoList); - - ImageView imageView; - imageView = new ImageView(context); - imageView.setScaleType(ImageView.ScaleType.FIT_CENTER); - imageView.setImageResource(R.drawable.icon_guide_to_chat_in_world_tips); - FrameLayout.LayoutParams params = new FrameLayout.LayoutParams( - UIUtil.dip2px(context, 278), UIUtil.dip2px(context, 114) - ); - params.gravity = Gravity.END; - params.rightMargin = UIUtil.dip2px(context, 60); - params.topMargin = (int) info.getRectF().top - UIUtil.dip2px(context, 25) - UIUtil.dip2px(context, 114); - imageView.setLayoutParams(params); - overLayer.addTipsView(imageView); - - params = createKnowedParams(context); - params.gravity = Gravity.END; - params.rightMargin = UIUtil.dip2px(context, 60); - params.topMargin = (int) info.getRectF().top - UIUtil.dip2px(context, 45) - UIUtil.dip2px(context, 34); - overLayer.setKnowedParams(params); - return list; - } - - /** - * 根据需要的配置，计算好高亮的区域信息 - * - * @param lightConfig - * @return - */ - private HiLightInfo calcHiLightInfo(LightConfig lightConfig) { - if (lightConfig == null || lightConfig.getView() == null) { - return null; - } - View hiLightView = lightConfig.getView(); - int[] parentLoca = new int[2]; - guideParent.getLocationOnScreen(parentLoca); - int[] lightLoca = new int[2]; - hiLightView.getLocationOnScreen(lightLoca); - HiLightInfo info = new HiLightInfo(); - int top = lightLoca[1] - parentLoca[1] - lightConfig.getTopPadding(); - int left = lightLoca[0] - parentLoca[0] - lightConfig.getLeftPadding(); - int bottom = top + hiLightView.getHeight() + lightConfig.getTopPadding() + lightConfig.getBottomPadding(); - int right = left + lightConfig.getLeftPadding() + lightConfig.getRightPadding() + hiLightView.getWidth(); - RectF rectF = new RectF(left, top, right, bottom); - info.setRectF(rectF); - if (lightConfig.getRadius() != null) { - info.setRadis(lightConfig.getRadius()); - info.setShapeType(HiLightInfo.ROUND_RECT); - } else { - info.setShapeType(HiLightInfo.NORMAL_RECT); - } - return info; - } - - public List createDiceOverLayer() { - List list = new ArrayList<>(); - //第一层 - OverLayer overLayer = new OverLayer(); - View view = View.inflate(context, R.layout.layout_dice_guide, null); - view.setLayoutParams(createLayoutParams()); - overLayer.addTipsView(view); - - list.add(overLayer); - - return list; - } - - public static ViewGroup.LayoutParams createLayoutParams() { - return new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, - ViewGroup.LayoutParams.MATCH_PARENT); - } - - public static FrameLayout.LayoutParams createSkipParams(Context context) { - return new FrameLayout.LayoutParams( - UIUtil.dip2px(context, 46), UIUtil.dip2px(context, 25) - ); - } - - public static FrameLayout.LayoutParams createKnowedParams(Context context) { - return new FrameLayout.LayoutParams( - UIUtil.dip2px(context, 76), UIUtil.dip2px(context, 34) - ); - } - - public static FrameLayout.LayoutParams createNextParams(Context context) { - return new FrameLayout.LayoutParams( - UIUtil.dip2px(context, 76), UIUtil.dip2px(context, 34) - ); - } - - public void start() { - if (mRootView == null || guideParent == null) { - return; - } - guideParent.next(); - } - - - public static boolean isNeedHiGuide(String type) { - boolean result = true; - if (TextUtils.isEmpty(type)) { - return false; - } - Boolean cache = (Boolean) SharedPreferenceUtils.get(type, true); - if (cache != null) { - result = cache; - } -// return result; - return false;// 20190727 所有新手引导去掉 - } - - public static void setNoNeedHiGuide(String type) { - if (TextUtils.isEmpty(type)) { - return; - } - SharedPreferenceUtils.put(type, false); - } - -} diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/TuTuGuideView.java b/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/TuTuGuideView.java deleted file mode 100644 index e9deac749..000000000 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/TuTuGuideView.java +++ /dev/null @@ -1,170 +0,0 @@ -package com.yizhuan.erban.ui.widget.higuide; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Path; -import android.util.TypedValue; -import android.view.Gravity; -import android.view.View; -import android.view.ViewGroup; -import android.widget.FrameLayout; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; - -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; - -import java.util.ArrayList; -import java.util.List; - -/** - * create by lvzebiao @2019/5/21 - */ -public class TuTuGuideView extends FrameLayout { - - private int currentPage; - - private Path lightPath; - - private Path bgPath; - - private Paint paint; - - private Context context; - - public TuTuGuideView(@NonNull Context context) { - super(context); - this.context = context; - lightPath = new Path(); - lightPath.addRect(0, 0, 0, 0, Path.Direction.CW); - - bgPath = new Path(); - //init Paint - paint = new Paint(); - paint.setColor(context.getResources().getColor(R.color.black_transparent_65)); - paint.setAntiAlias(true); - paint.setDither(true); - setWillNotDraw(false); - - lightList = new ArrayList<>(); - layerList = new ArrayList<>(); - setOnClickListener(v -> next()); - - } - - @Override - protected void onDraw(Canvas canvas) { - super.onDraw(canvas); - bgPath.reset(); - bgPath.addRect(0, 0, getWidth(), getHeight(), Path.Direction.CW); - - //添加高亮 - if (lightList != null) { - for (HiLightInfo info : lightList) { - lightPath.reset(); - if (info.getShapeType() == HiLightInfo.ROUND_RECT) { - lightPath.addRoundRect(info.getRectF(), info.getRadis(), Path.Direction.CW); - } else { - lightPath.addRect(info.getRectF(), Path.Direction.CW); - } - bgPath.op(lightPath, Path.Op.XOR); - } - } - canvas.drawPath(bgPath, paint); - } - - public void addOverLayer(OverLayer overLayer) { - layerList.add(overLayer); - } - - public void remove() { - ViewGroup parent = (ViewGroup) getParent(); - if (parent != null) { - parent.removeView(TuTuGuideView.this); - } - } - - public void show() { - invalidate(); - } - - private List lightList; - - private List layerList; - - public void next() { - removeAllViews(); - if (currentPage < layerList.size()) { - OverLayer overLayer = layerList.get(currentPage); - - lightList = overLayer.hiLightInfoList; - for (View index : overLayer.tipsViewList) { - addView(index); - } - if (overLayer.needSkip) { - TextView textView = new TextView(context); - textView.setText(R.string.skip_guide); - int padding = UIUtil.dip2px(context, 5); - textView.setPadding(padding, padding, padding, padding); - textView.setGravity(Gravity.CENTER); - textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 13); - textView.setTextColor(context.getResources().getColor(R.color.white_transparent_30)); - textView.setOnClickListener(v -> { - remove();// 跳过 - if (showFinishListener != null) { - showFinishListener.onSkip(); - } - }); - FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, - ViewGroup.LayoutParams.WRAP_CONTENT); - params.gravity = Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL; - params.bottomMargin = UIUtil.dip2px(context, 60); - addView(textView, params); - } - if (overLayer.knowedParams != null) { - ImageView imageView = new ImageView(context); - imageView.setImageResource(R.drawable.icon_guide_knowed); - imageView.setScaleType(ImageView.ScaleType.FIT_CENTER); - addView(imageView, overLayer.knowedParams); - } - if (overLayer.nextParams != null) { - ImageView imageView = new ImageView(context); - imageView.setImageResource(R.drawable.icon_guide_next); - imageView.setScaleType(ImageView.ScaleType.FIT_CENTER); - addView(imageView, overLayer.nextParams); - } - invalidate(); - currentPage++; - } else { - remove();// 全部展示完毕 - if (showFinishListener != null) { - showFinishListener.onGuideFinish(); - } - } - - } - - private IGuideShowFinishListener showFinishListener; - - public void setShowFinishListener(IGuideShowFinishListener showFinishListener) { - this.showFinishListener = showFinishListener; - } - - public interface IGuideShowFinishListener { - /** - * 跳过 - */ - void onSkip(); - - /** - * 引导图已经全部展示完毕 - */ - default void onGuideFinish() { - - } - } - -} diff --git a/app/src/main/res/drawable-xhdpi/dice_guide.webp b/app/src/main/res/drawable-xhdpi/dice_guide.webp deleted file mode 100644 index 18a208d3f..000000000 Binary files a/app/src/main/res/drawable-xhdpi/dice_guide.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_car_expire.webp b/app/src/main/res/drawable-xhdpi/ic_car_expire.webp deleted file mode 100644 index d3ac94a6e..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_car_expire.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_exchange_tip.webp b/app/src/main/res/drawable-xhdpi/icon_exchange_tip.webp deleted file mode 100644 index 1d78e35a1..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_exchange_tip.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_guide_logo_left_bottom.png b/app/src/main/res/drawable-xhdpi/icon_guide_logo_left_bottom.png deleted file mode 100644 index f12d76113..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_guide_logo_left_bottom.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/monster_default_image.webp b/app/src/main/res/drawable-xhdpi/monster_default_image.webp deleted file mode 100644 index 09cec52f6..000000000 Binary files a/app/src/main/res/drawable-xhdpi/monster_default_image.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/monster_escape_background.webp b/app/src/main/res/drawable-xhdpi/monster_escape_background.webp deleted file mode 100644 index 6577f8225..000000000 Binary files a/app/src/main/res/drawable-xhdpi/monster_escape_background.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/monster_escape_confirm.webp b/app/src/main/res/drawable-xhdpi/monster_escape_confirm.webp deleted file mode 100644 index 9d1b93dfa..000000000 Binary files a/app/src/main/res/drawable-xhdpi/monster_escape_confirm.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/monster_hunting_check_damage.webp b/app/src/main/res/drawable-xhdpi/monster_hunting_check_damage.webp deleted file mode 100644 index e4e5d98e3..000000000 Binary files a/app/src/main/res/drawable-xhdpi/monster_hunting_check_damage.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/monster_hunting_exit.webp b/app/src/main/res/drawable-xhdpi/monster_hunting_exit.webp deleted file mode 100644 index 53114bbde..000000000 Binary files a/app/src/main/res/drawable-xhdpi/monster_hunting_exit.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/monster_hunting_introduction.webp b/app/src/main/res/drawable-xhdpi/monster_hunting_introduction.webp deleted file mode 100644 index d1adf78d0..000000000 Binary files a/app/src/main/res/drawable-xhdpi/monster_hunting_introduction.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/monster_hunting_lucky_man_background.webp b/app/src/main/res/drawable-xhdpi/monster_hunting_lucky_man_background.webp deleted file mode 100644 index 7e48e2953..000000000 Binary files a/app/src/main/res/drawable-xhdpi/monster_hunting_lucky_man_background.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/monster_hunting_result_background.webp b/app/src/main/res/drawable-xhdpi/monster_hunting_result_background.webp deleted file mode 100644 index 2669a0ca8..000000000 Binary files a/app/src/main/res/drawable-xhdpi/monster_hunting_result_background.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/monster_hunting_reward_background.webp b/app/src/main/res/drawable-xhdpi/monster_hunting_reward_background.webp deleted file mode 100644 index 008b7bbaa..000000000 Binary files a/app/src/main/res/drawable-xhdpi/monster_hunting_reward_background.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/cover_task_top_first.webp b/app/src/main/res/drawable-xxhdpi/cover_task_top_first.webp deleted file mode 100644 index f5861b69e..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/cover_task_top_first.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/cover_task_top_fourth.webp b/app/src/main/res/drawable-xxhdpi/cover_task_top_fourth.webp deleted file mode 100644 index 854923fb2..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/cover_task_top_fourth.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/cover_task_top_second.webp b/app/src/main/res/drawable-xxhdpi/cover_task_top_second.webp deleted file mode 100644 index 2dbe47c3e..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/cover_task_top_second.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/cover_task_top_third.webp b/app/src/main/res/drawable-xxhdpi/cover_task_top_third.webp deleted file mode 100644 index e78d06834..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/cover_task_top_third.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/dice_guide.webp b/app/src/main/res/drawable-xxhdpi/dice_guide.webp deleted file mode 100644 index c5cb72b87..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/dice_guide.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_guide_to_like_voice_tips.webp b/app/src/main/res/drawable-xxhdpi/icon_guide_to_like_voice_tips.webp deleted file mode 100644 index edf3bebe4..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/icon_guide_to_like_voice_tips.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_guide_to_record_voice_tips.webp b/app/src/main/res/drawable-xxhdpi/icon_guide_to_record_voice_tips.webp deleted file mode 100644 index 93d7bd229..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/icon_guide_to_record_voice_tips.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_gv_start_bottom_0.webp b/app/src/main/res/drawable-xxhdpi/icon_gv_start_bottom_0.webp deleted file mode 100644 index b6bd5fe39..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/icon_gv_start_bottom_0.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_gv_start_middle_0.webp b/app/src/main/res/drawable-xxhdpi/icon_gv_start_middle_0.webp deleted file mode 100644 index febfc1389..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/icon_gv_start_middle_0.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_gv_start_top_0.webp b/app/src/main/res/drawable-xxhdpi/icon_gv_start_top_0.webp deleted file mode 100644 index ca162b187..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/icon_gv_start_top_0.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_gv_start_top_1.webp b/app/src/main/res/drawable-xxhdpi/icon_gv_start_top_1.webp deleted file mode 100644 index a8f05b83a..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/icon_gv_start_top_1.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_gv_start_top_2.webp b/app/src/main/res/drawable-xxhdpi/icon_gv_start_top_2.webp deleted file mode 100644 index 63d49c9d9..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/icon_gv_start_top_2.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_gv_status_bar.webp b/app/src/main/res/drawable-xxhdpi/icon_gv_status_bar.webp deleted file mode 100644 index 35c20cabb..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/icon_gv_status_bar.webp and /dev/null differ diff --git a/app/src/main/res/layout/activity_monster_hunting.xml b/app/src/main/res/layout/activity_monster_hunting.xml deleted file mode 100644 index 0c8fb75db..000000000 --- a/app/src/main/res/layout/activity_monster_hunting.xml +++ /dev/null @@ -1,235 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/car_dialog_show_guide.xml b/app/src/main/res/layout/car_dialog_show_guide.xml deleted file mode 100644 index 0d6c9eec7..000000000 --- a/app/src/main/res/layout/car_dialog_show_guide.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_cp_mp.xml b/app/src/main/res/layout/dialog_cp_mp.xml deleted file mode 100644 index be1cac4ba..000000000 --- a/app/src/main/res/layout/dialog_cp_mp.xml +++ /dev/null @@ -1,181 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/dialog_monster_escape.xml b/app/src/main/res/layout/dialog_monster_escape.xml deleted file mode 100644 index edd030a9f..000000000 --- a/app/src/main/res/layout/dialog_monster_escape.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_monster_hunting_reward.xml b/app/src/main/res/layout/dialog_monster_hunting_reward.xml deleted file mode 100644 index 0933ed680..000000000 --- a/app/src/main/res/layout/dialog_monster_hunting_reward.xml +++ /dev/null @@ -1,182 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/layout_car_button.xml b/app/src/main/res/layout/layout_car_button.xml deleted file mode 100644 index c50ae60ac..000000000 --- a/app/src/main/res/layout/layout_car_button.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/layout/layout_dice_guide.xml b/app/src/main/res/layout/layout_dice_guide.xml deleted file mode 100644 index 989b0d1f5..000000000 --- a/app/src/main/res/layout/layout_dice_guide.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/layout_pk_board_view.xml b/app/src/main/res/layout/layout_pk_board_view.xml index 70a6a0b87..2c1ee38b5 100644 --- a/app/src/main/res/layout/layout_pk_board_view.xml +++ b/app/src/main/res/layout/layout_pk_board_view.xml @@ -13,7 +13,6 @@ android:layout_width="match_parent" android:layout_height="60dp" android:background="@mipmap/bg_pk_board" - app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/layout_user_car_store.xml b/app/src/main/res/layout/layout_user_car_store.xml deleted file mode 100644 index 474aa0bc8..000000000 --- a/app/src/main/res/layout/layout_user_car_store.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/monster_impact_value_view.xml b/app/src/main/res/layout/monster_impact_value_view.xml deleted file mode 100644 index c2166f15e..000000000 --- a/app/src/main/res/layout/monster_impact_value_view.xml +++ /dev/null @@ -1,12 +0,0 @@ - - \ No newline at end of file diff --git a/app/src/main/res/layout/user_info_car_empty.xml b/app/src/main/res/layout/user_info_car_empty.xml deleted file mode 100644 index dfbd13ed3..000000000 --- a/app/src/main/res/layout/user_info_car_empty.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/user_info_my_car_item.xml b/app/src/main/res/layout/user_info_my_car_item.xml deleted file mode 100644 index f0ecce093..000000000 --- a/app/src/main/res/layout/user_info_my_car_item.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/vs_gift_value_first_show_layout.xml b/app/src/main/res/layout/vs_gift_value_first_show_layout.xml deleted file mode 100644 index 50c3d48e7..000000000 --- a/app/src/main/res/layout/vs_gift_value_first_show_layout.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/wallet_fragment_jewel.xml b/app/src/main/res/layout/wallet_fragment_jewel.xml deleted file mode 100644 index fdf2c7fff..000000000 --- a/app/src/main/res/layout/wallet_fragment_jewel.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - -