diff --git a/common/src/main/java/com/yunbao/common/adapter/GameTypeItemAdapter.java b/common/src/main/java/com/yunbao/common/adapter/GameTypeItemAdapter.java new file mode 100644 index 000000000..8b042140f --- /dev/null +++ b/common/src/main/java/com/yunbao/common/adapter/GameTypeItemAdapter.java @@ -0,0 +1,137 @@ +package com.yunbao.common.adapter; + +import android.content.Context; +import android.graphics.Typeface; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.RecyclerView; + +import com.yunbao.common.R; +import com.yunbao.common.bean.CustomSidebarChildModel; +import com.yunbao.common.bean.GameTypeItemBean; +import com.yunbao.common.bean.UserItemBean; +import com.yunbao.common.event.SudGameListEvent; +import com.yunbao.common.glide.ImgLoader; +import com.yunbao.common.utils.Bus; +import com.yunbao.common.views.SudTitleSelectViewHolder; + +import net.lucode.hackware.magicindicator.buildins.UIUtil; + +import java.util.List; + +public class GameTypeItemAdapter extends RecyclerView.Adapter implements View.OnClickListener { + + private List itemList; + private Context mContext; + private int mChoice; +// public GameTypeItemAdapter(List itemList, Context context) { +// this.itemList = itemList; +// mContext=context; +// } + + public GameTypeItemAdapter(List customSidebarChildModels, Context context) { + this.itemList = customSidebarChildModels; + mContext = context; + } + + @Override + public void onClick(View v) { + Object object =v.getTag(); + if (object!=null && object instanceof Integer){ + if (mChoice != (int) object) { + mChoice = (int) object; + notifyDataSetChanged(); + if (mChoice == 0){ + Bus.get().post(new SudGameListEvent() + .setInteractionID(0L) + .setId("0") + .setTitle(mContext.getString(R.string.interactive_game_room_all))); + }else { + Bus.get().post(new SudGameListEvent() + .setInteractionID(Long.parseLong(itemList.get(mChoice-1).getSrc())) + .setId(itemList.get(mChoice-1).getId()) + .setTitle(itemList.get(mChoice-1).getTitle())); + } + + } + } + } + + + @NonNull + @Override + public GameTypeViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View itemView = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_game_type_select_view, parent, false); + UIUtil.getScreenWidth(mContext); + itemView.setLayoutParams(new ViewGroup.LayoutParams(UIUtil.getScreenWidth(mContext) / 4, ViewGroup.LayoutParams.WRAP_CONTENT)); + itemView.setOnClickListener(this); + return new GameTypeViewHolder(itemView); + } + + @Override + public void onBindViewHolder(@NonNull GameTypeViewHolder holder, int position) { + holder.itemView.setTag(position); + if (position == 0) { + holder.gameBg.setImageResource(getGameBgResId(position)); + holder.gameName.setText(R.string.interactive_game_room_all); + holder.gameIcon.setImageResource(R.mipmap.ic_yola_game_1); + } else { + CustomSidebarChildModel item = itemList.get(position - 1); + holder.gameBg.setImageResource(getGameBgResId(position)); + ImgLoader.display(holder.gameIcon.getContext(), item.getIcon(), holder.gameIcon); + holder.gameName.setText(item.getTitle()); + } + + if (mChoice == position) { + holder.gameName.setTypeface(null, Typeface.BOLD); + holder.gameName.setTextColor(ContextCompat.getColor(mContext,R.color.color_111111)); + }else { + holder.gameName.setTypeface(null, Typeface.NORMAL); + holder.gameName.setTextColor(ContextCompat.getColor(mContext,R.color.color_605c58)); + } + } + + private int getGameBgResId(int position) { + Integer p = position % 4; + switch (p) { + case 0: + return R.mipmap.ic_yola_game_bg_1; + case 1: + return R.mipmap.ic_yola_game_bg_2; + case 2: + return R.mipmap.ic_yola_game_bg_3; + case 3: + return R.mipmap.ic_yola_game_bg_4; + default: + return R.mipmap.ic_yola_game_bg_1; + } + } + + + @Override + public int getItemCount() { + return itemList.size() + 1; + } + + + + public class GameTypeViewHolder extends RecyclerView.ViewHolder { + + public ImageView gameBg; + public ImageView gameIcon; + public TextView gameName; + + public GameTypeViewHolder(@NonNull View itemView) { + super(itemView); + gameBg = itemView.findViewById(R.id.gameBg); + gameIcon = itemView.findViewById(R.id.gameIcon); + gameName = itemView.findViewById(R.id.gameName); + } + } +} diff --git a/common/src/main/java/com/yunbao/common/bean/GameTypeItemBean.java b/common/src/main/java/com/yunbao/common/bean/GameTypeItemBean.java new file mode 100644 index 000000000..125c7cef4 --- /dev/null +++ b/common/src/main/java/com/yunbao/common/bean/GameTypeItemBean.java @@ -0,0 +1,35 @@ +package com.yunbao.common.bean; + +public class GameTypeItemBean { + + private String gameName; + private String iconUrl; + private int iconId=-1; + private int gameBgResId; + + public GameTypeItemBean(String gameName, String gameIconUrl, int gameBgResId) { + this.gameName = gameName; + this.iconUrl = gameIconUrl; + this.gameBgResId = gameBgResId; + } + + public int getIconId() { + return iconId; + } + + public void setIconId(int iconId) { + this.iconId = iconId; + } + + public String getGameName() { + return gameName; + } + + public String getIconUrl() { + return iconUrl; + } + + public int getGameBgResId() { + return gameBgResId; + } +} diff --git a/common/src/main/java/com/yunbao/common/dialog/SudGameListSelectPopup.java b/common/src/main/java/com/yunbao/common/dialog/SudGameListSelectPopup.java index fbca07bed..092211278 100644 --- a/common/src/main/java/com/yunbao/common/dialog/SudGameListSelectPopup.java +++ b/common/src/main/java/com/yunbao/common/dialog/SudGameListSelectPopup.java @@ -127,14 +127,14 @@ public class SudGameListSelectPopup extends AttachPopupView { } }); } else if (mType == 1) { - selectString.add(getContext().getString(R.string.interactive_game_create_unlimited)); + selectString.add(getContext().getString(R.string.unlimited_threshold)); selectString.add(getContext().getString(R.string.interactive_game_create_0_1)); selectString.add(getContext().getString(R.string.interactive_game_create_1_2)); selectString.add(getContext().getString(R.string.interactive_game_create_5)); selectString.add(getContext().getString(R.string.room_sill0_100)); selectString.add(getContext().getString(R.string.room_sill100_500)); selectString.add(getContext().getString(R.string.room_sill500_m)); - selectSill.put(getContext().getString(R.string.interactive_game_create_unlimited), "0,0,0"); + selectSill.put(getContext().getString(R.string.unlimited_threshold), "0,0,0"); selectSill.put(getContext().getString(R.string.interactive_game_create_0_1), "0,1,3"); selectSill.put(getContext().getString(R.string.interactive_game_create_1_2), "1,5,3"); selectSill.put(getContext().getString(R.string.interactive_game_create_5), "5,0,3"); @@ -161,10 +161,10 @@ public class SudGameListSelectPopup extends AttachPopupView { } }); } else if (mType == 2) { - selectString.add(getContext().getString(R.string.interactive_game_create_unlimited)); + selectString.add(getContext().getString(R.string.unrestricted_players)); selectString.add(getContext().getString(R.string.live_anchor)); selectString.add(getContext().getString(R.string.interactive_game_player)); - selectSill.put(getContext().getString(R.string.interactive_game_create_unlimited), "0"); + selectSill.put(getContext().getString(R.string.unrestricted_players), "0"); selectSill.put(getContext().getString(R.string.live_anchor), "1"); selectSill.put(getContext().getString(R.string.interactive_game_player), "2"); index = 0; diff --git a/common/src/main/java/com/yunbao/common/views/SudGameListViewHolder2.java b/common/src/main/java/com/yunbao/common/views/SudGameListViewHolder2.java new file mode 100644 index 000000000..280da2818 --- /dev/null +++ b/common/src/main/java/com/yunbao/common/views/SudGameListViewHolder2.java @@ -0,0 +1,189 @@ +package com.yunbao.common.views; + +import android.os.Handler; +import android.text.TextUtils; +import android.view.View; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.alibaba.fastjson.JSON; +import com.google.gson.Gson; +import com.lxj.xpopup.XPopup; +import com.makeramen.roundedimageview.RoundedImageView; +import com.yunbao.common.CommonAppConfig; +import com.yunbao.common.R; +import com.yunbao.common.bean.CreateSudRoomModel; +import com.yunbao.common.bean.LiveBean; +import com.yunbao.common.bean.SudRoomListModel; +import com.yunbao.common.event.LiveOpenSudRoomEvent; +import com.yunbao.common.event.LiveSudGamePopupShowOrHideEvent; +import com.yunbao.common.event.SudGameListDissMissEvent; +import com.yunbao.common.event.SudGameListRefreshEvent; +import com.yunbao.common.glide.ImgLoader; +import com.yunbao.common.http.HttpCallback; +import com.yunbao.common.http.LiveHttpUtil; +import com.yunbao.common.http.live.LiveNetManager; +import com.yunbao.common.manager.IMLoginManager; +import com.yunbao.common.utils.Bus; +import com.yunbao.common.utils.LiveRoomCheckLivePresenter; +import com.yunbao.common.utils.RouteUtil; +import com.yunbao.common.utils.ToastUtil; +import com.yunbao.common.views.weight.ViewClicksAntiShake; + +import java.util.Locale; + +public class SudGameListViewHolder2 extends RecyclerView.ViewHolder { + private RoundedImageView mAvatar; + private TextView roomName, playerWeAre, playerWeAre2, goldenBeanNumber; + private RoundedImageView avatarList1, avatarList2, avatarList3, avatarList4, avatarList5; + private ImageView gifImageView; + private ImageView sex, game_icon, gold_coin; + + + public SudGameListViewHolder2(@NonNull View itemView) { + super(itemView); + mAvatar = itemView.findViewById(R.id.avatar); + roomName = itemView.findViewById(R.id.room_name); + playerWeAre = itemView.findViewById(R.id.player_we_are); + playerWeAre2 = itemView.findViewById(R.id.player_we_are_2); + game_icon = itemView.findViewById(R.id.game_icon); + goldenBeanNumber = itemView.findViewById(R.id.golden_bean_number); + gifImageView = itemView.findViewById(R.id.btn_live); + avatarList1 = itemView.findViewById(R.id.avatar_list1); + avatarList2 = itemView.findViewById(R.id.avatar_list2); + avatarList3 = itemView.findViewById(R.id.avatar_list3); + avatarList4 = itemView.findViewById(R.id.avatar_list4); + avatarList5 = itemView.findViewById(R.id.avatar_list5); + gold_coin = itemView.findViewById(R.id.gold_coin); + sex = itemView.findViewById(R.id.sex); + avatarList1.setVisibility(View.GONE); + avatarList2.setVisibility(View.GONE); + avatarList3.setVisibility(View.GONE); + avatarList4.setVisibility(View.GONE); + avatarList5.setVisibility(View.GONE); + } + + public void setData(SudRoomListModel model, boolean isHome) { + ImgLoader.display(itemView.getContext(), model.getAvatar(), mAvatar); + roomName.setText(model.getRoomName()); + playerWeAre.setText(String.format(itemView.getContext().getString(R.string.interactive_game_player_we_are), model.getPlayerTotal())); + playerWeAre2.setText(String.format(itemView.getContext().getString(R.string.interactive_game_player_we_are_2), model.getTotal())); + goldenBeanNumber.setText(model.getGoldenBeanNumber()); + gifImageView.setVisibility(TextUtils.equals(model.getLiveUid(), "0") ? View.GONE : View.VISIBLE); + if (TextUtils.equals(model.getSex(), "1")) { + ImgLoader.display(itemView.getContext(), R.mipmap.icon_sex_man, sex); + } else if (TextUtils.equals(model.getSex(), "2")) { + ImgLoader.display(itemView.getContext(), R.mipmap.icon_sex_woman, sex); + } + if (TextUtils.equals(model.getCurrencyType(), "2")) { + ImgLoader.display(itemView.getContext(), R.mipmap.icon_collectibles, gold_coin); + } else { + ImgLoader.display(itemView.getContext(), R.mipmap.gold_coin, gold_coin); + } + ImgLoader.display(itemView.getContext(), model.getSudgameicon(), game_icon); + ViewClicksAntiShake.clicksAntiShake(itemView.findViewById(R.id.layout), new ViewClicksAntiShake.ViewClicksCallBack() { + @Override + public void onViewClicks() { + LiveNetManager.get(itemView.getContext()).checkRoomStatus(model.getId(), new com.yunbao.common.http.base.HttpCallback() { + @Override + public void onSuccess(CreateSudRoomModel data) { + if (TextUtils.equals(data.getRoomStatus(), "0")) { + if (IMLoginManager.get(itemView.getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { + ToastUtil.show("房间不存在"); + } else { + ToastUtil.show("The room does not exist"); + } + Bus.get().post(new SudGameListRefreshEvent()); + } else { + CreateSudRoomModel createSudRoomModel = new CreateSudRoomModel(); + createSudRoomModel.setSudGameId(model.getSudGameId()); + createSudRoomModel.setSudGameRoomId(model.getSudGameRoomId()); + createSudRoomModel.setAvatar(model.getAvatar()); + createSudRoomModel.setRoomName(model.getRoomName()); + createSudRoomModel.setSudGameName(model.getSudGameName()); + if (isHome) { + if (TextUtils.equals(model.getLiveUid(), "0")) { + if(CommonAppConfig.getInstance().getConfig().isSw()){ + RouteUtil.forwardSwSudGameActivity(new Gson().toJson(createSudRoomModel),true,isHome); + }else{ + RouteUtil.forwardRySudGameActivity(new Gson().toJson(createSudRoomModel),true,isHome); + } + } else { + String yes = "是"; + if (IMLoginManager.get(itemView.getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { + yes = "是"; + } else { + yes = "Yes"; + } + new XPopup.Builder(itemView.getContext()) + .asCustom(new HintCustomPopup(itemView.getContext(), + itemView.getContext().getString(R.string.interactive_game_search_room_currently_live), + itemView.getContext().getString(R.string.interactive_game_search_room_broadcast_room)) + .setLiveOpenOk(yes) + .setLiveOpenCancel(itemView.getContext().getString(R.string.interactive_game_search_room_bhe_game)) + .setCallBack(new HintCustomPopup.HintCustomCallBack() { + @Override + public void onSure() { + LiveHttpUtil.getLiveInfo(model.getLiveUid() + "", new HttpCallback() { + @Override + public void onSuccess(int code, String msg, String[] info) { + if (code == 0 && info.length > 0) { + LiveBean liveBean = JSON.parseObject(info[0], LiveBean.class); + new LiveRoomCheckLivePresenter(itemView.getContext(), liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() { + @Override + public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk,boolean isSw) { + RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveSdk), Integer.parseInt(liveTypeVal),isSw); + new Handler().postDelayed(new Runnable() { + @Override + public void run() { + Bus.get().post(new LiveOpenSudRoomEvent().setCreateSudRoomModel(createSudRoomModel)); + } + }, 1500); + } + + @Override + public void onCheckError(String contextError) { + + } + }); + } else { + RouteUtil.forwardUserHome(itemView.getContext(), model.getLiveUid(), 0); + } + } + }); + } + + @Override + public void onCancel() { + if(CommonAppConfig.getInstance().getConfig().isSw()){ + RouteUtil.forwardSwSudGameActivity(new Gson().toJson(createSudRoomModel),true,isHome); + }else{ + RouteUtil.forwardRySudGameActivity(new Gson().toJson(createSudRoomModel),true,isHome); + } + } + })).show(); + + } + + } else { + + Bus.get().post(new LiveSudGamePopupShowOrHideEvent().setType(0).setCreateSudRoomModel(createSudRoomModel)); + Bus.get().post(new SudGameListDissMissEvent()); + } + } + } + + @Override + public void onError(String error) { + ToastUtil.show(error); + } + }); + + + } + }); + } +} diff --git a/common/src/main/res/layout/item_game_type_select_view.xml b/common/src/main/res/layout/item_game_type_select_view.xml new file mode 100644 index 000000000..9577da7d0 --- /dev/null +++ b/common/src/main/res/layout/item_game_type_select_view.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + diff --git a/common/src/main/res/layout/item_home_sud_game_list2.xml b/common/src/main/res/layout/item_home_sud_game_list2.xml new file mode 100644 index 000000000..d9dde73ae --- /dev/null +++ b/common/src/main/res/layout/item_home_sud_game_list2.xml @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/common/src/main/res/mipmap-hdpi/ic_yola_game_1.png b/common/src/main/res/mipmap-hdpi/ic_yola_game_1.png new file mode 100644 index 000000000..cc09ac3d3 Binary files /dev/null and b/common/src/main/res/mipmap-hdpi/ic_yola_game_1.png differ diff --git a/common/src/main/res/mipmap-hdpi/ic_yola_game_2.png b/common/src/main/res/mipmap-hdpi/ic_yola_game_2.png new file mode 100644 index 000000000..b88cb2ea7 Binary files /dev/null and b/common/src/main/res/mipmap-hdpi/ic_yola_game_2.png differ diff --git a/common/src/main/res/mipmap-hdpi/ic_yola_game_3.png b/common/src/main/res/mipmap-hdpi/ic_yola_game_3.png new file mode 100644 index 000000000..1c3a2e370 Binary files /dev/null and b/common/src/main/res/mipmap-hdpi/ic_yola_game_3.png differ diff --git a/common/src/main/res/mipmap-hdpi/ic_yola_game_4.png b/common/src/main/res/mipmap-hdpi/ic_yola_game_4.png new file mode 100644 index 000000000..75b3f9cca Binary files /dev/null and b/common/src/main/res/mipmap-hdpi/ic_yola_game_4.png differ diff --git a/common/src/main/res/mipmap-hdpi/ic_yola_game_5.png b/common/src/main/res/mipmap-hdpi/ic_yola_game_5.png new file mode 100644 index 000000000..abebba792 Binary files /dev/null and b/common/src/main/res/mipmap-hdpi/ic_yola_game_5.png differ diff --git a/common/src/main/res/mipmap-hdpi/ic_yola_game_6.png b/common/src/main/res/mipmap-hdpi/ic_yola_game_6.png new file mode 100644 index 000000000..11a53a320 Binary files /dev/null and b/common/src/main/res/mipmap-hdpi/ic_yola_game_6.png differ diff --git a/common/src/main/res/mipmap-hdpi/ic_yola_game_7.png b/common/src/main/res/mipmap-hdpi/ic_yola_game_7.png new file mode 100644 index 000000000..44bded121 Binary files /dev/null and b/common/src/main/res/mipmap-hdpi/ic_yola_game_7.png differ diff --git a/common/src/main/res/mipmap-hdpi/ic_yola_game_8.png b/common/src/main/res/mipmap-hdpi/ic_yola_game_8.png new file mode 100644 index 000000000..586be186a Binary files /dev/null and b/common/src/main/res/mipmap-hdpi/ic_yola_game_8.png differ diff --git a/common/src/main/res/mipmap-hdpi/ic_yola_game_bg_1.png b/common/src/main/res/mipmap-hdpi/ic_yola_game_bg_1.png new file mode 100644 index 000000000..17ecbc187 Binary files /dev/null and b/common/src/main/res/mipmap-hdpi/ic_yola_game_bg_1.png differ diff --git a/common/src/main/res/mipmap-hdpi/ic_yola_game_bg_2.png b/common/src/main/res/mipmap-hdpi/ic_yola_game_bg_2.png new file mode 100644 index 000000000..aadf493de Binary files /dev/null and b/common/src/main/res/mipmap-hdpi/ic_yola_game_bg_2.png differ diff --git a/common/src/main/res/mipmap-hdpi/ic_yola_game_bg_3.png b/common/src/main/res/mipmap-hdpi/ic_yola_game_bg_3.png new file mode 100644 index 000000000..697f32a29 Binary files /dev/null and b/common/src/main/res/mipmap-hdpi/ic_yola_game_bg_3.png differ diff --git a/common/src/main/res/mipmap-hdpi/ic_yola_game_bg_4.png b/common/src/main/res/mipmap-hdpi/ic_yola_game_bg_4.png new file mode 100644 index 000000000..8d6d12483 Binary files /dev/null and b/common/src/main/res/mipmap-hdpi/ic_yola_game_bg_4.png differ diff --git a/common/src/main/res/mipmap-hdpi/ic_yola_game_bot_arrow.png b/common/src/main/res/mipmap-hdpi/ic_yola_game_bot_arrow.png new file mode 100644 index 000000000..bbab3402f Binary files /dev/null and b/common/src/main/res/mipmap-hdpi/ic_yola_game_bot_arrow.png differ diff --git a/common/src/main/res/mipmap-hdpi/ic_yola_game_create.png b/common/src/main/res/mipmap-hdpi/ic_yola_game_create.png new file mode 100644 index 000000000..e3d6baee7 Binary files /dev/null and b/common/src/main/res/mipmap-hdpi/ic_yola_game_create.png differ diff --git a/common/src/main/res/mipmap-hdpi/ic_yola_game_dou.png b/common/src/main/res/mipmap-hdpi/ic_yola_game_dou.png new file mode 100644 index 000000000..11bbebb77 Binary files /dev/null and b/common/src/main/res/mipmap-hdpi/ic_yola_game_dou.png differ diff --git a/common/src/main/res/mipmap-hdpi/ic_yola_game_end_2.png b/common/src/main/res/mipmap-hdpi/ic_yola_game_end_2.png new file mode 100644 index 000000000..f1fc10532 Binary files /dev/null and b/common/src/main/res/mipmap-hdpi/ic_yola_game_end_2.png differ diff --git a/common/src/main/res/mipmap-hdpi/ic_yola_game_end_3.png b/common/src/main/res/mipmap-hdpi/ic_yola_game_end_3.png new file mode 100644 index 000000000..30d2ed32b Binary files /dev/null and b/common/src/main/res/mipmap-hdpi/ic_yola_game_end_3.png differ diff --git a/common/src/main/res/mipmap-hdpi/ic_yola_game_end_4.png b/common/src/main/res/mipmap-hdpi/ic_yola_game_end_4.png new file mode 100644 index 000000000..c34b65839 Binary files /dev/null and b/common/src/main/res/mipmap-hdpi/ic_yola_game_end_4.png differ diff --git a/common/src/main/res/mipmap-hdpi/ic_yola_game_end_5.png b/common/src/main/res/mipmap-hdpi/ic_yola_game_end_5.png new file mode 100644 index 000000000..f350b6a31 Binary files /dev/null and b/common/src/main/res/mipmap-hdpi/ic_yola_game_end_5.png differ diff --git a/common/src/main/res/mipmap-hdpi/ic_yola_game_end_6.png b/common/src/main/res/mipmap-hdpi/ic_yola_game_end_6.png new file mode 100644 index 000000000..d011c810a Binary files /dev/null and b/common/src/main/res/mipmap-hdpi/ic_yola_game_end_6.png differ diff --git a/common/src/main/res/mipmap-hdpi/ic_yola_game_end_7.png b/common/src/main/res/mipmap-hdpi/ic_yola_game_end_7.png new file mode 100644 index 000000000..286a04832 Binary files /dev/null and b/common/src/main/res/mipmap-hdpi/ic_yola_game_end_7.png differ diff --git a/common/src/main/res/mipmap-hdpi/ic_yola_game_end_8.png b/common/src/main/res/mipmap-hdpi/ic_yola_game_end_8.png new file mode 100644 index 000000000..7398e756a Binary files /dev/null and b/common/src/main/res/mipmap-hdpi/ic_yola_game_end_8.png differ diff --git a/common/src/main/res/mipmap-hdpi/ic_yola_game_line.png b/common/src/main/res/mipmap-hdpi/ic_yola_game_line.png new file mode 100644 index 000000000..661935639 Binary files /dev/null and b/common/src/main/res/mipmap-hdpi/ic_yola_game_line.png differ diff --git a/common/src/main/res/mipmap-hdpi/ic_yola_game_radus.png b/common/src/main/res/mipmap-hdpi/ic_yola_game_radus.png new file mode 100644 index 000000000..9c6899843 Binary files /dev/null and b/common/src/main/res/mipmap-hdpi/ic_yola_game_radus.png differ diff --git a/common/src/main/res/mipmap-hdpi/ic_yola_game_record.png b/common/src/main/res/mipmap-hdpi/ic_yola_game_record.png new file mode 100644 index 000000000..465eacfdf Binary files /dev/null and b/common/src/main/res/mipmap-hdpi/ic_yola_game_record.png differ diff --git a/common/src/main/res/mipmap-hdpi/ic_yola_game_top_arrow.png b/common/src/main/res/mipmap-hdpi/ic_yola_game_top_arrow.png new file mode 100644 index 000000000..12fb3a05d Binary files /dev/null and b/common/src/main/res/mipmap-hdpi/ic_yola_game_top_arrow.png differ diff --git a/common/src/main/res/mipmap-mdpi/ic_yola_game_1.png b/common/src/main/res/mipmap-mdpi/ic_yola_game_1.png new file mode 100644 index 000000000..743100707 Binary files /dev/null and b/common/src/main/res/mipmap-mdpi/ic_yola_game_1.png differ diff --git a/common/src/main/res/mipmap-mdpi/ic_yola_game_2.png b/common/src/main/res/mipmap-mdpi/ic_yola_game_2.png new file mode 100644 index 000000000..718d770cc Binary files /dev/null and b/common/src/main/res/mipmap-mdpi/ic_yola_game_2.png differ diff --git a/common/src/main/res/mipmap-mdpi/ic_yola_game_3.png b/common/src/main/res/mipmap-mdpi/ic_yola_game_3.png new file mode 100644 index 000000000..57dc5e150 Binary files /dev/null and b/common/src/main/res/mipmap-mdpi/ic_yola_game_3.png differ diff --git a/common/src/main/res/mipmap-mdpi/ic_yola_game_4.png b/common/src/main/res/mipmap-mdpi/ic_yola_game_4.png new file mode 100644 index 000000000..a23838383 Binary files /dev/null and b/common/src/main/res/mipmap-mdpi/ic_yola_game_4.png differ diff --git a/common/src/main/res/mipmap-mdpi/ic_yola_game_5.png b/common/src/main/res/mipmap-mdpi/ic_yola_game_5.png new file mode 100644 index 000000000..e92bff976 Binary files /dev/null and b/common/src/main/res/mipmap-mdpi/ic_yola_game_5.png differ diff --git a/common/src/main/res/mipmap-mdpi/ic_yola_game_6.png b/common/src/main/res/mipmap-mdpi/ic_yola_game_6.png new file mode 100644 index 000000000..95ff62fc9 Binary files /dev/null and b/common/src/main/res/mipmap-mdpi/ic_yola_game_6.png differ diff --git a/common/src/main/res/mipmap-mdpi/ic_yola_game_7.png b/common/src/main/res/mipmap-mdpi/ic_yola_game_7.png new file mode 100644 index 000000000..028b5725a Binary files /dev/null and b/common/src/main/res/mipmap-mdpi/ic_yola_game_7.png differ diff --git a/common/src/main/res/mipmap-mdpi/ic_yola_game_8.png b/common/src/main/res/mipmap-mdpi/ic_yola_game_8.png new file mode 100644 index 000000000..5edda960e Binary files /dev/null and b/common/src/main/res/mipmap-mdpi/ic_yola_game_8.png differ diff --git a/common/src/main/res/mipmap-mdpi/ic_yola_game_bg_1.png b/common/src/main/res/mipmap-mdpi/ic_yola_game_bg_1.png new file mode 100644 index 000000000..539397de0 Binary files /dev/null and b/common/src/main/res/mipmap-mdpi/ic_yola_game_bg_1.png differ diff --git a/common/src/main/res/mipmap-mdpi/ic_yola_game_bg_2.png b/common/src/main/res/mipmap-mdpi/ic_yola_game_bg_2.png new file mode 100644 index 000000000..accca2b2b Binary files /dev/null and b/common/src/main/res/mipmap-mdpi/ic_yola_game_bg_2.png differ diff --git a/common/src/main/res/mipmap-mdpi/ic_yola_game_bg_3.png b/common/src/main/res/mipmap-mdpi/ic_yola_game_bg_3.png new file mode 100644 index 000000000..5914986fd Binary files /dev/null and b/common/src/main/res/mipmap-mdpi/ic_yola_game_bg_3.png differ diff --git a/common/src/main/res/mipmap-mdpi/ic_yola_game_bg_4.png b/common/src/main/res/mipmap-mdpi/ic_yola_game_bg_4.png new file mode 100644 index 000000000..85fffc35b Binary files /dev/null and b/common/src/main/res/mipmap-mdpi/ic_yola_game_bg_4.png differ diff --git a/common/src/main/res/mipmap-mdpi/ic_yola_game_bot_arrow.png b/common/src/main/res/mipmap-mdpi/ic_yola_game_bot_arrow.png new file mode 100644 index 000000000..0e181d433 Binary files /dev/null and b/common/src/main/res/mipmap-mdpi/ic_yola_game_bot_arrow.png differ diff --git a/common/src/main/res/mipmap-mdpi/ic_yola_game_create.png b/common/src/main/res/mipmap-mdpi/ic_yola_game_create.png new file mode 100644 index 000000000..e11cfe370 Binary files /dev/null and b/common/src/main/res/mipmap-mdpi/ic_yola_game_create.png differ diff --git a/common/src/main/res/mipmap-mdpi/ic_yola_game_dou.png b/common/src/main/res/mipmap-mdpi/ic_yola_game_dou.png new file mode 100644 index 000000000..624863fa8 Binary files /dev/null and b/common/src/main/res/mipmap-mdpi/ic_yola_game_dou.png differ diff --git a/common/src/main/res/mipmap-mdpi/ic_yola_game_end_2.png b/common/src/main/res/mipmap-mdpi/ic_yola_game_end_2.png new file mode 100644 index 000000000..d78b03db4 Binary files /dev/null and b/common/src/main/res/mipmap-mdpi/ic_yola_game_end_2.png differ diff --git a/common/src/main/res/mipmap-mdpi/ic_yola_game_end_3.png b/common/src/main/res/mipmap-mdpi/ic_yola_game_end_3.png new file mode 100644 index 000000000..b7ab287b3 Binary files /dev/null and b/common/src/main/res/mipmap-mdpi/ic_yola_game_end_3.png differ diff --git a/common/src/main/res/mipmap-mdpi/ic_yola_game_end_4.png b/common/src/main/res/mipmap-mdpi/ic_yola_game_end_4.png new file mode 100644 index 000000000..805c69919 Binary files /dev/null and b/common/src/main/res/mipmap-mdpi/ic_yola_game_end_4.png differ diff --git a/common/src/main/res/mipmap-mdpi/ic_yola_game_end_5.png b/common/src/main/res/mipmap-mdpi/ic_yola_game_end_5.png new file mode 100644 index 000000000..eb4272b56 Binary files /dev/null and b/common/src/main/res/mipmap-mdpi/ic_yola_game_end_5.png differ diff --git a/common/src/main/res/mipmap-mdpi/ic_yola_game_end_6.png b/common/src/main/res/mipmap-mdpi/ic_yola_game_end_6.png new file mode 100644 index 000000000..68d353efa Binary files /dev/null and b/common/src/main/res/mipmap-mdpi/ic_yola_game_end_6.png differ diff --git a/common/src/main/res/mipmap-mdpi/ic_yola_game_end_7.png b/common/src/main/res/mipmap-mdpi/ic_yola_game_end_7.png new file mode 100644 index 000000000..56348ddf7 Binary files /dev/null and b/common/src/main/res/mipmap-mdpi/ic_yola_game_end_7.png differ diff --git a/common/src/main/res/mipmap-mdpi/ic_yola_game_end_8.png b/common/src/main/res/mipmap-mdpi/ic_yola_game_end_8.png new file mode 100644 index 000000000..d20673009 Binary files /dev/null and b/common/src/main/res/mipmap-mdpi/ic_yola_game_end_8.png differ diff --git a/common/src/main/res/mipmap-mdpi/ic_yola_game_line.png b/common/src/main/res/mipmap-mdpi/ic_yola_game_line.png new file mode 100644 index 000000000..c0ba7e243 Binary files /dev/null and b/common/src/main/res/mipmap-mdpi/ic_yola_game_line.png differ diff --git a/common/src/main/res/mipmap-mdpi/ic_yola_game_radus.png b/common/src/main/res/mipmap-mdpi/ic_yola_game_radus.png new file mode 100644 index 000000000..79759d49d Binary files /dev/null and b/common/src/main/res/mipmap-mdpi/ic_yola_game_radus.png differ diff --git a/common/src/main/res/mipmap-mdpi/ic_yola_game_record.png b/common/src/main/res/mipmap-mdpi/ic_yola_game_record.png new file mode 100644 index 000000000..a67b28c46 Binary files /dev/null and b/common/src/main/res/mipmap-mdpi/ic_yola_game_record.png differ diff --git a/common/src/main/res/mipmap-mdpi/ic_yola_game_top_arrow.png b/common/src/main/res/mipmap-mdpi/ic_yola_game_top_arrow.png new file mode 100644 index 000000000..86c7b28c5 Binary files /dev/null and b/common/src/main/res/mipmap-mdpi/ic_yola_game_top_arrow.png differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_yola_game_1.png b/common/src/main/res/mipmap-xhdpi/ic_yola_game_1.png new file mode 100644 index 000000000..d464e22a3 Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/ic_yola_game_1.png differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_yola_game_2.png b/common/src/main/res/mipmap-xhdpi/ic_yola_game_2.png new file mode 100644 index 000000000..761b37010 Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/ic_yola_game_2.png differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_yola_game_3.png b/common/src/main/res/mipmap-xhdpi/ic_yola_game_3.png new file mode 100644 index 000000000..0de9bc2a0 Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/ic_yola_game_3.png differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_yola_game_4.png b/common/src/main/res/mipmap-xhdpi/ic_yola_game_4.png new file mode 100644 index 000000000..9a0d5a1de Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/ic_yola_game_4.png differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_yola_game_5.png b/common/src/main/res/mipmap-xhdpi/ic_yola_game_5.png new file mode 100644 index 000000000..148f505f0 Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/ic_yola_game_5.png differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_yola_game_6.png b/common/src/main/res/mipmap-xhdpi/ic_yola_game_6.png new file mode 100644 index 000000000..f27075a91 Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/ic_yola_game_6.png differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_yola_game_7.png b/common/src/main/res/mipmap-xhdpi/ic_yola_game_7.png new file mode 100644 index 000000000..0e337c8ca Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/ic_yola_game_7.png differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_yola_game_8.png b/common/src/main/res/mipmap-xhdpi/ic_yola_game_8.png new file mode 100644 index 000000000..51e4793f2 Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/ic_yola_game_8.png differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_yola_game_bg_1.png b/common/src/main/res/mipmap-xhdpi/ic_yola_game_bg_1.png new file mode 100644 index 000000000..a2b7495e8 Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/ic_yola_game_bg_1.png differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_yola_game_bg_2.png b/common/src/main/res/mipmap-xhdpi/ic_yola_game_bg_2.png new file mode 100644 index 000000000..4b1499cd1 Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/ic_yola_game_bg_2.png differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_yola_game_bg_3.png b/common/src/main/res/mipmap-xhdpi/ic_yola_game_bg_3.png new file mode 100644 index 000000000..61b6cd7ca Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/ic_yola_game_bg_3.png differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_yola_game_bg_4.png b/common/src/main/res/mipmap-xhdpi/ic_yola_game_bg_4.png new file mode 100644 index 000000000..62ccab1cb Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/ic_yola_game_bg_4.png differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_yola_game_bot_arrow.png b/common/src/main/res/mipmap-xhdpi/ic_yola_game_bot_arrow.png new file mode 100644 index 000000000..a0743048e Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/ic_yola_game_bot_arrow.png differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_yola_game_create.png b/common/src/main/res/mipmap-xhdpi/ic_yola_game_create.png new file mode 100644 index 000000000..007178f43 Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/ic_yola_game_create.png differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_yola_game_dou.png b/common/src/main/res/mipmap-xhdpi/ic_yola_game_dou.png new file mode 100644 index 000000000..0a842cbe6 Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/ic_yola_game_dou.png differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_yola_game_end_2.png b/common/src/main/res/mipmap-xhdpi/ic_yola_game_end_2.png new file mode 100644 index 000000000..73b018cc5 Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/ic_yola_game_end_2.png differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_yola_game_end_3.png b/common/src/main/res/mipmap-xhdpi/ic_yola_game_end_3.png new file mode 100644 index 000000000..f1e20aef7 Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/ic_yola_game_end_3.png differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_yola_game_end_4.png b/common/src/main/res/mipmap-xhdpi/ic_yola_game_end_4.png new file mode 100644 index 000000000..0390ea8d5 Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/ic_yola_game_end_4.png differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_yola_game_end_5.png b/common/src/main/res/mipmap-xhdpi/ic_yola_game_end_5.png new file mode 100644 index 000000000..64d639479 Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/ic_yola_game_end_5.png differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_yola_game_end_6.png b/common/src/main/res/mipmap-xhdpi/ic_yola_game_end_6.png new file mode 100644 index 000000000..5694773e0 Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/ic_yola_game_end_6.png differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_yola_game_end_7.png b/common/src/main/res/mipmap-xhdpi/ic_yola_game_end_7.png new file mode 100644 index 000000000..6b5b12252 Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/ic_yola_game_end_7.png differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_yola_game_end_8.png b/common/src/main/res/mipmap-xhdpi/ic_yola_game_end_8.png new file mode 100644 index 000000000..71c483a7b Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/ic_yola_game_end_8.png differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_yola_game_line.png b/common/src/main/res/mipmap-xhdpi/ic_yola_game_line.png new file mode 100644 index 000000000..278238c67 Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/ic_yola_game_line.png differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_yola_game_radus.png b/common/src/main/res/mipmap-xhdpi/ic_yola_game_radus.png new file mode 100644 index 000000000..8b00d88a7 Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/ic_yola_game_radus.png differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_yola_game_record.png b/common/src/main/res/mipmap-xhdpi/ic_yola_game_record.png new file mode 100644 index 000000000..1d062c934 Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/ic_yola_game_record.png differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_yola_game_top_arrow.png b/common/src/main/res/mipmap-xhdpi/ic_yola_game_top_arrow.png new file mode 100644 index 000000000..36156fc17 Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/ic_yola_game_top_arrow.png differ diff --git a/common/src/main/res/mipmap-xxhdpi/ic_yola_game_1.png b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_1.png new file mode 100644 index 000000000..2657615cc Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_1.png differ diff --git a/common/src/main/res/mipmap-xxhdpi/ic_yola_game_2.png b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_2.png new file mode 100644 index 000000000..9ef3eaa27 Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_2.png differ diff --git a/common/src/main/res/mipmap-xxhdpi/ic_yola_game_3.png b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_3.png new file mode 100644 index 000000000..3420b2659 Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_3.png differ diff --git a/common/src/main/res/mipmap-xxhdpi/ic_yola_game_4.png b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_4.png new file mode 100644 index 000000000..057197a81 Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_4.png differ diff --git a/common/src/main/res/mipmap-xxhdpi/ic_yola_game_5.png b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_5.png new file mode 100644 index 000000000..b70deda58 Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_5.png differ diff --git a/common/src/main/res/mipmap-xxhdpi/ic_yola_game_6.png b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_6.png new file mode 100644 index 000000000..7f1c4a669 Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_6.png differ diff --git a/common/src/main/res/mipmap-xxhdpi/ic_yola_game_7.png b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_7.png new file mode 100644 index 000000000..1fe5d9cc9 Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_7.png differ diff --git a/common/src/main/res/mipmap-xxhdpi/ic_yola_game_8.png b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_8.png new file mode 100644 index 000000000..36a3a5ea3 Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_8.png differ diff --git a/common/src/main/res/mipmap-xxhdpi/ic_yola_game_bg_1.png b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_bg_1.png new file mode 100644 index 000000000..3627edebf Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_bg_1.png differ diff --git a/common/src/main/res/mipmap-xxhdpi/ic_yola_game_bg_2.png b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_bg_2.png new file mode 100644 index 000000000..0f4d944d0 Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_bg_2.png differ diff --git a/common/src/main/res/mipmap-xxhdpi/ic_yola_game_bg_3.png b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_bg_3.png new file mode 100644 index 000000000..4cbc32759 Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_bg_3.png differ diff --git a/common/src/main/res/mipmap-xxhdpi/ic_yola_game_bg_4.png b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_bg_4.png new file mode 100644 index 000000000..87593f72a Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_bg_4.png differ diff --git a/common/src/main/res/mipmap-xxhdpi/ic_yola_game_bot_arrow.png b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_bot_arrow.png new file mode 100644 index 000000000..7c7ca2968 Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_bot_arrow.png differ diff --git a/common/src/main/res/mipmap-xxhdpi/ic_yola_game_create.png b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_create.png new file mode 100644 index 000000000..b67b7c8bc Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_create.png differ diff --git a/common/src/main/res/mipmap-xxhdpi/ic_yola_game_dou.png b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_dou.png new file mode 100644 index 000000000..f2f8e9eb6 Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_dou.png differ diff --git a/common/src/main/res/mipmap-xxhdpi/ic_yola_game_end_2.png b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_end_2.png new file mode 100644 index 000000000..7e19be2de Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_end_2.png differ diff --git a/common/src/main/res/mipmap-xxhdpi/ic_yola_game_end_3.png b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_end_3.png new file mode 100644 index 000000000..4f564a29b Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_end_3.png differ diff --git a/common/src/main/res/mipmap-xxhdpi/ic_yola_game_end_4.png b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_end_4.png new file mode 100644 index 000000000..8eba82ed8 Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_end_4.png differ diff --git a/common/src/main/res/mipmap-xxhdpi/ic_yola_game_end_5.png b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_end_5.png new file mode 100644 index 000000000..9409cecfa Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_end_5.png differ diff --git a/common/src/main/res/mipmap-xxhdpi/ic_yola_game_end_6.png b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_end_6.png new file mode 100644 index 000000000..4a5e7cf68 Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_end_6.png differ diff --git a/common/src/main/res/mipmap-xxhdpi/ic_yola_game_end_7.png b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_end_7.png new file mode 100644 index 000000000..ba04b287f Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_end_7.png differ diff --git a/common/src/main/res/mipmap-xxhdpi/ic_yola_game_end_8.png b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_end_8.png new file mode 100644 index 000000000..3752aea5c Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_end_8.png differ diff --git a/common/src/main/res/mipmap-xxhdpi/ic_yola_game_line.png b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_line.png new file mode 100644 index 000000000..9f4fae927 Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_line.png differ diff --git a/common/src/main/res/mipmap-xxhdpi/ic_yola_game_radus.png b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_radus.png new file mode 100644 index 000000000..f4b197d24 Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_radus.png differ diff --git a/common/src/main/res/mipmap-xxhdpi/ic_yola_game_record.png b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_record.png new file mode 100644 index 000000000..c2d6e0022 Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_record.png differ diff --git a/common/src/main/res/mipmap-xxhdpi/ic_yola_game_top_arrow.png b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_top_arrow.png new file mode 100644 index 000000000..eca33b91f Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/ic_yola_game_top_arrow.png differ diff --git a/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_1.png b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_1.png new file mode 100644 index 000000000..0c396845a Binary files /dev/null and b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_1.png differ diff --git a/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_2.png b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_2.png new file mode 100644 index 000000000..a508fd0c8 Binary files /dev/null and b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_2.png differ diff --git a/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_3.png b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_3.png new file mode 100644 index 000000000..32bca5098 Binary files /dev/null and b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_3.png differ diff --git a/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_4.png b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_4.png new file mode 100644 index 000000000..c646f21f0 Binary files /dev/null and b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_4.png differ diff --git a/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_5.png b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_5.png new file mode 100644 index 000000000..8832e1380 Binary files /dev/null and b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_5.png differ diff --git a/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_6.png b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_6.png new file mode 100644 index 000000000..ca6300469 Binary files /dev/null and b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_6.png differ diff --git a/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_7.png b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_7.png new file mode 100644 index 000000000..fb6bf2540 Binary files /dev/null and b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_7.png differ diff --git a/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_8.png b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_8.png new file mode 100644 index 000000000..028b9b95b Binary files /dev/null and b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_8.png differ diff --git a/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_bg_1.png b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_bg_1.png new file mode 100644 index 000000000..fe0e5917b Binary files /dev/null and b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_bg_1.png differ diff --git a/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_bg_2.png b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_bg_2.png new file mode 100644 index 000000000..0e9a5dfe8 Binary files /dev/null and b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_bg_2.png differ diff --git a/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_bg_3.png b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_bg_3.png new file mode 100644 index 000000000..dd0fdfba7 Binary files /dev/null and b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_bg_3.png differ diff --git a/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_bg_4.png b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_bg_4.png new file mode 100644 index 000000000..7f9c9600c Binary files /dev/null and b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_bg_4.png differ diff --git a/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_bot_arrow.png b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_bot_arrow.png new file mode 100644 index 000000000..b5384cdad Binary files /dev/null and b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_bot_arrow.png differ diff --git a/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_create.png b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_create.png new file mode 100644 index 000000000..5db45a324 Binary files /dev/null and b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_create.png differ diff --git a/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_dou.png b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_dou.png new file mode 100644 index 000000000..7d3431769 Binary files /dev/null and b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_dou.png differ diff --git a/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_end_2.png b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_end_2.png new file mode 100644 index 000000000..00904aa28 Binary files /dev/null and b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_end_2.png differ diff --git a/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_end_3.png b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_end_3.png new file mode 100644 index 000000000..bfaf78788 Binary files /dev/null and b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_end_3.png differ diff --git a/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_end_4.png b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_end_4.png new file mode 100644 index 000000000..e6bfc80b2 Binary files /dev/null and b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_end_4.png differ diff --git a/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_end_5.png b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_end_5.png new file mode 100644 index 000000000..7aaf3d5cd Binary files /dev/null and b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_end_5.png differ diff --git a/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_end_6.png b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_end_6.png new file mode 100644 index 000000000..d88cca996 Binary files /dev/null and b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_end_6.png differ diff --git a/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_end_7.png b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_end_7.png new file mode 100644 index 000000000..b8ac79961 Binary files /dev/null and b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_end_7.png differ diff --git a/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_end_8.png b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_end_8.png new file mode 100644 index 000000000..f9b26086c Binary files /dev/null and b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_end_8.png differ diff --git a/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_line.png b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_line.png new file mode 100644 index 000000000..7b625eb91 Binary files /dev/null and b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_line.png differ diff --git a/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_radus.png b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_radus.png new file mode 100644 index 000000000..534293a1b Binary files /dev/null and b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_radus.png differ diff --git a/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_record.png b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_record.png new file mode 100644 index 000000000..fb9876078 Binary files /dev/null and b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_record.png differ diff --git a/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_top_arrow.png b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_top_arrow.png new file mode 100644 index 000000000..29c6b090c Binary files /dev/null and b/common/src/main/res/mipmap-xxxhdpi/ic_yola_game_top_arrow.png differ diff --git a/common/src/main/res/values/colors.xml b/common/src/main/res/values/colors.xml index 9104b767d..4c86bbcae 100644 --- a/common/src/main/res/values/colors.xml +++ b/common/src/main/res/values/colors.xml @@ -81,6 +81,7 @@ #111111 #8A8A8A #3D3D3D + #605C58 diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index b11e8d383..d0c2decc7 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -1419,4 +1419,11 @@ Limited ride And limited avatar frame Show Offline Show Read Show Unread + + 用戶權益 + 創作中心 + 其他功能 + 遊戲大廳 + 不限門檻 + 不限玩家 diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeGameViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeGameViewHolder.java index 605e2e89f..1622d6bdb 100644 --- a/main/src/main/java/com/yunbao/main/views/MainHomeGameViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainHomeGameViewHolder.java @@ -12,11 +12,13 @@ import android.widget.ImageView; import android.widget.TextView; import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import com.google.gson.Gson; import com.lxj.xpopup.XPopup; import com.lxj.xpopup.enums.PopupPosition; import com.yunbao.common.activity.AbsActivity; +import com.yunbao.common.adapter.GameTypeItemAdapter; import com.yunbao.live.activity.SudSwGameActivity; import com.yunbao.common.adapter.RefreshAdapter; import com.yunbao.common.adapter.SudGameListAdapter; @@ -62,6 +64,7 @@ import java.util.Locale; public class MainHomeGameViewHolder extends AbsMainHomeChildViewHolder implements OnItemClickListener { private CommonRefreshView mRefreshView; + private RecyclerView topTitleRecyclerView; private ImageView roomGameArrow, roomSillArrow, houseOwnerArrow; private TextView gameTitle, sillTitle, houseOwnerTitle; private long interactionID = 0; @@ -70,6 +73,8 @@ public class MainHomeGameViewHolder extends AbsMainHomeChildViewHolder implement private long animDuration = 500; private String id = "0"; private SudGameListAdapter sudGameListAdapter; + private GameTypeItemAdapter GameTypeAdapter; + private AbsActivity context; public MainHomeGameViewHolder(AbsActivity context, ViewGroup parentView) { @@ -80,7 +85,7 @@ public class MainHomeGameViewHolder extends AbsMainHomeChildViewHolder implement @Override protected int getLayoutId() { - return R.layout.view_main_home_sud_game_list; + return R.layout.view_main_home_sud_game_list2; } @@ -91,10 +96,10 @@ public class MainHomeGameViewHolder extends AbsMainHomeChildViewHolder implement mSill = "0,0,0"; roomHolderType = "0"; id = "0"; - roomGameArrow = (ImageView) findViewById(R.id.room_game_arrow); + // roomGameArrow = (ImageView) findViewById(R.id.room_game_arrow); roomSillArrow = (ImageView) findViewById(R.id.room_sill_arrow); houseOwnerArrow = (ImageView) findViewById(R.id.house_owner_arrow); - gameTitle = (TextView) findViewById(R.id.game_title); + // gameTitle = (TextView) findViewById(R.id.game_title); sillTitle = (TextView) findViewById(R.id.room_sill_text); houseOwnerTitle = (TextView) findViewById(R.id.house_owner_text); mRefreshView = (CommonRefreshView) findViewById(R.id.refreshView); @@ -102,6 +107,8 @@ public class MainHomeGameViewHolder extends AbsMainHomeChildViewHolder implement sudGameListAdapter = new SudGameListAdapter(mContext, true); mRefreshView.setLoadMoreEnable(true); mRefreshView.setRecyclerViewAdapter(sudGameListAdapter); + topTitleRecyclerView = findViewById(R.id.topTitleRecyclerView); + topTitleRecyclerView.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.HORIZONTAL, false)); mRefreshView.setDataHelper(new CommonRefreshView.DataHelper() { @Override public RefreshAdapter getAdapter() { @@ -150,87 +157,87 @@ public class MainHomeGameViewHolder extends AbsMainHomeChildViewHolder implement }); mRefreshView.initData(); mRefreshView.setEmptyLayoutId(R.layout.sud_no_data); - ViewClicksAntiShake.clicksAntiShake(findViewById(com.yunbao.common.R.id.random_start), new ViewClicksAntiShake.ViewClicksCallBack() { - @Override - public void onViewClicks() { - LiveNetManager.get(mContext) - .randomRoom(id, mSill, roomHolderType, new com.yunbao.common.http.base.HttpCallback() { - @Override - public void onSuccess(CreateSudRoomModel data) { - if (data != null) { - Intent intent = new Intent(context, SudSwGameActivity.class); - intent.putExtra("CreateSudRoom", new Gson().toJson(data)); - context.startActivity(intent); - } else { - if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { - ToastUtil.show("当前没有可加入的房间"); - } else { - ToastUtil.show("There are currently no rooms to join"); - } - } - } - - @Override - public void onError(String error) { - if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { - ToastUtil.show("当前没有可加入的房间"); - } else { - ToastUtil.show("There are currently no rooms to join"); - } - } - }); -// List sudRoomListModels = sudGameListAdapter.getList(); -// if (sudRoomListModels.size() > 1) { -// int random = RandomUtil.nextInt(sudRoomListModels.size() - 1); -// CreateSudRoomModel createSudRoomModel = new CreateSudRoomModel(); -// createSudRoomModel.setSudGameId(sudRoomListModels.get(random).getSudGameId()); -// createSudRoomModel.setSudGameRoomId(sudRoomListModels.get(random).getSudGameRoomId()); -// createSudRoomModel.setAvatar(sudRoomListModels.get(random).getAvatar()); -// createSudRoomModel.setRoomName(sudRoomListModels.get(random).getRoomName()); -// createSudRoomModel.setSudGameName(sudRoomListModels.get(random).getSudGameName()); - -// new XPopup.Builder(mContext) -// .enableDrag(false) -// .dismissOnTouchOutside(false) -// .dismissOnBackPressed(false) -// .asCustom(new LiveSudGamePopup(mContext, createSudRoomModel)) -// .show(); - - - } - }); - ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.interactive_game_room_game), new ViewClicksAntiShake.ViewClicksCallBack() { - @Override - public void onViewClicks() { - ObjectAnimator animator = ObjectAnimator.ofFloat(roomGameArrow, "rotation", 0f, 90f); - animator.setDuration(animDuration); - animator.setInterpolator(new LinearInterpolator()); - animator.start(); - XPopup.Builder builder = new XPopup.Builder(mContext).atView(findViewById(com.yunbao.common.R.id.interactive_game_room_game)); - builder.hasShadowBg(false) - .isDestroyOnDismiss(true) - .isLightStatusBar(false) - .popupPosition(PopupPosition.Bottom) - .asCustom(new SudGameListSelectPopup(mContext, 0, customSidebarChildModels, interactionID) - .setOnDismissListener(new DialogInterface.OnDismissListener() { - @Override - public void onDismiss(DialogInterface dialog) { - closeAnimSudGameListEvent(); - } - }) - ) - .show(); - - - } - }); +// ViewClicksAntiShake.clicksAntiShake(findViewById(com.yunbao.common.R.id.random_start), new ViewClicksAntiShake.ViewClicksCallBack() { +// @Override +// public void onViewClicks() { +// LiveNetManager.get(mContext) +// .randomRoom(id, mSill, roomHolderType, new com.yunbao.common.http.base.HttpCallback() { +// @Override +// public void onSuccess(CreateSudRoomModel data) { +// if (data != null) { +// Intent intent = new Intent(context, SudSwGameActivity.class); +// intent.putExtra("CreateSudRoom", new Gson().toJson(data)); +// context.startActivity(intent); +// } else { +// if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { +// ToastUtil.show("当前没有可加入的房间"); +// } else { +// ToastUtil.show("There are currently no rooms to join"); +// } +// } +// } +// +// @Override +// public void onError(String error) { +// if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { +// ToastUtil.show("当前没有可加入的房间"); +// } else { +// ToastUtil.show("There are currently no rooms to join"); +// } +// } +// }); +//// List sudRoomListModels = sudGameListAdapter.getList(); +//// if (sudRoomListModels.size() > 1) { +//// int random = RandomUtil.nextInt(sudRoomListModels.size() - 1); +//// CreateSudRoomModel createSudRoomModel = new CreateSudRoomModel(); +//// createSudRoomModel.setSudGameId(sudRoomListModels.get(random).getSudGameId()); +//// createSudRoomModel.setSudGameRoomId(sudRoomListModels.get(random).getSudGameRoomId()); +//// createSudRoomModel.setAvatar(sudRoomListModels.get(random).getAvatar()); +//// createSudRoomModel.setRoomName(sudRoomListModels.get(random).getRoomName()); +//// createSudRoomModel.setSudGameName(sudRoomListModels.get(random).getSudGameName()); +// +//// new XPopup.Builder(mContext) +//// .enableDrag(false) +//// .dismissOnTouchOutside(false) +//// .dismissOnBackPressed(false) +//// .asCustom(new LiveSudGamePopup(mContext, createSudRoomModel)) +//// .show(); +// +// +// } +// }); +// ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.interactive_game_room_game), new ViewClicksAntiShake.ViewClicksCallBack() { +// @Override +// public void onViewClicks() { +// ObjectAnimator animator = ObjectAnimator.ofFloat(roomGameArrow, "rotation", 0f, 90f); +// animator.setDuration(animDuration); +// animator.setInterpolator(new LinearInterpolator()); +// animator.start(); +// XPopup.Builder builder = new XPopup.Builder(mContext).atView(findViewById(com.yunbao.common.R.id.interactive_game_room_game)); +// builder.hasShadowBg(false) +// .isDestroyOnDismiss(true) +// .isLightStatusBar(false) +// .popupPosition(PopupPosition.Bottom) +// .asCustom(new SudGameListSelectPopup(mContext, 0, customSidebarChildModels, interactionID) +// .setOnDismissListener(new DialogInterface.OnDismissListener() { +// @Override +// public void onDismiss(DialogInterface dialog) { +// closeAnimSudGameListEvent(); +// } +// }) +// ) +// .show(); +// +// +// } +// }); ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.room_sill), new ViewClicksAntiShake.ViewClicksCallBack() { @Override public void onViewClicks() { - ObjectAnimator animator = ObjectAnimator.ofFloat(roomSillArrow, "rotation", 0f, 90f); - animator.setDuration(animDuration); - animator.setInterpolator(new LinearInterpolator()); - animator.start(); +// ObjectAnimator animator = ObjectAnimator.ofFloat(roomSillArrow, "scaleX", 1f, -1f); +// animator.setDuration(animDuration); +// animator.setInterpolator(new LinearInterpolator()); +// animator.start(); XPopup.Builder builder = new XPopup.Builder(mContext).atView(findViewById(com.yunbao.common.R.id.room_sill)); builder.hasShadowBg(false) .isDestroyOnDismiss(true) @@ -247,10 +254,10 @@ public class MainHomeGameViewHolder extends AbsMainHomeChildViewHolder implement ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.house_owner), new ViewClicksAntiShake.ViewClicksCallBack() { @Override public void onViewClicks() { - ObjectAnimator animator = ObjectAnimator.ofFloat(houseOwnerArrow, "rotation", 0f, 90f); - animator.setDuration(animDuration); - animator.setInterpolator(new LinearInterpolator()); - animator.start(); +// ObjectAnimator animator = ObjectAnimator.ofFloat(roomSillArrow, "scaleX", 1f, -1f); +// animator.setDuration(animDuration); +// animator.setInterpolator(new LinearInterpolator()); +// animator.start(); XPopup.Builder builder = new XPopup.Builder(mContext).atView(findViewById(com.yunbao.common.R.id.house_owner)); builder.hasShadowBg(false) .isDestroyOnDismiss(true) @@ -298,6 +305,8 @@ public class MainHomeGameViewHolder extends AbsMainHomeChildViewHolder implement for (CustomSidebarInfoModel datum : data) { if (datum.getType().equals("6")) { customSidebarChildModels = datum.getChild(); + GameTypeAdapter=new GameTypeItemAdapter(customSidebarChildModels,mContext); + topTitleRecyclerView.setAdapter(GameTypeAdapter); return; } } @@ -308,15 +317,15 @@ public class MainHomeGameViewHolder extends AbsMainHomeChildViewHolder implement } }); - ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.sud_rule), new ViewClicksAntiShake.ViewClicksCallBack() { - @Override - public void onViewClicks() { - new XPopup.Builder(mContext) - .enableDrag(false) - .maxWidth(DeviceUtils.getScreenHeight((Activity) mContext) - DpUtil.dp2px(34)) - .asCustom(new SudGameRulePopup(mContext)).show(); - } - }); +// ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.sud_rule), new ViewClicksAntiShake.ViewClicksCallBack() { +// @Override +// public void onViewClicks() { +// new XPopup.Builder(mContext) +// .enableDrag(false) +// .maxWidth(DeviceUtils.getScreenHeight((Activity) mContext) - DpUtil.dp2px(34)) +// .asCustom(new SudGameRulePopup(mContext)).show(); +// } +// }); } private void initData() { @@ -327,20 +336,20 @@ public class MainHomeGameViewHolder extends AbsMainHomeChildViewHolder implement @Subscribe(threadMode = ThreadMode.MAIN) public void onSudGameListEvent(SudGameListEvent event) { interactionID = event.getInteractionID(); - if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { - gameTitle.setText(event.getTitle()); - } else { - if (event.getTitle().contains("All")) { - gameTitle.setText("All"); - } else { - if ((event.getTitle().length() > 6)) { - gameTitle.setText(event.getTitle()); - } else { - gameTitle.setText(event.getTitle()); - } - - } - } +// if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { +// gameTitle.setText(event.getTitle()); +// } else { +// if (event.getTitle().contains("All")) { +// gameTitle.setText("All"); +// } else { +// if ((event.getTitle().length() > 6)) { +// gameTitle.setText(event.getTitle()); +// } else { +// gameTitle.setText(event.getTitle()); +// } +// +// } +// } id = event.getId(); mRefreshView.initData(); @@ -370,24 +379,24 @@ public class MainHomeGameViewHolder extends AbsMainHomeChildViewHolder implement } private void closeAnimSudGameListEvent() { - ObjectAnimator animator = ObjectAnimator.ofFloat(roomGameArrow, "rotation", 90f, 0f); - animator.setDuration(animDuration); - animator.setInterpolator(new LinearInterpolator()); - animator.start(); +// ObjectAnimator animator = ObjectAnimator.ofFloat(roomGameArrow, "rotation", 90f, 0f); +// animator.setDuration(animDuration); +// animator.setInterpolator(new LinearInterpolator()); +// animator.start(); } private void closeAnimSudGameListSillEvent() { - ObjectAnimator backAnimator = ObjectAnimator.ofFloat(roomSillArrow, "rotation", 90f, 0f); - backAnimator.setDuration(animDuration); - backAnimator.setInterpolator(new LinearInterpolator()); - backAnimator.start(); +// ObjectAnimator backAnimator = ObjectAnimator.ofFloat(roomSillArrow, "scaleX", -1f, 1f); +// backAnimator.setDuration(animDuration); +// backAnimator.setInterpolator(new LinearInterpolator()); +// backAnimator.start(); } private void closeAnimRoomHolderTypeEvent() { - ObjectAnimator backAnimator = ObjectAnimator.ofFloat(houseOwnerArrow, "rotation", 90f, 0f); - backAnimator.setDuration(animDuration); - backAnimator.setInterpolator(new LinearInterpolator()); - backAnimator.start(); +// ObjectAnimator backAnimator = ObjectAnimator.ofFloat(roomSillArrow, "scaleX", -1f, 1f); +// backAnimator.setDuration(animDuration); +// backAnimator.setInterpolator(new LinearInterpolator()); +// backAnimator.start(); } diff --git a/main/src/main/res/layout/view_main_home_sud_game_list2.xml b/main/src/main/res/layout/view_main_home_sud_game_list2.xml new file mode 100644 index 000000000..940e931d6 --- /dev/null +++ b/main/src/main/res/layout/view_main_home_sud_game_list2.xml @@ -0,0 +1,173 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/main/src/main/res/values/strings.xml b/main/src/main/res/values/strings.xml index 9f536ea88..71016df0a 100644 --- a/main/src/main/res/values/strings.xml +++ b/main/src/main/res/values/strings.xml @@ -108,7 +108,5 @@ Join Guard tasks game - 用戶權益 - 創作中心 - 其他功能 +