diff --git a/common/src/main/java/com/yunbao/common/CommonAppConfig.java b/common/src/main/java/com/yunbao/common/CommonAppConfig.java index 04756b1b8..f664e53ff 100644 --- a/common/src/main/java/com/yunbao/common/CommonAppConfig.java +++ b/common/src/main/java/com/yunbao/common/CommonAppConfig.java @@ -23,6 +23,7 @@ import com.yunbao.common.utils.SpUtil; import com.yunbao.common.utils.WordUtil; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -133,6 +134,7 @@ public class CommonAppConfig { private boolean mLaunched;//App是否启动了 private String mJPushAppKey;//极光推送的AppKey private List mUserItemList;//个人中心功能列表 + private List> mYolaUserItemList;//个人中心功能列表 private SparseArray mAnchorFansMedalMap; private String mGiftListJson; private String mWrapListJson; @@ -550,6 +552,42 @@ public class CommonAppConfig { } + /** + * 个人中心功能列表 + */ + public List> geYolatUserItemList() { + if (mYolaUserItemList == null || mYolaUserItemList.size() == 0) { + String userBeanJson = SpUtil.getInstance().getStringValue(SpUtil.USER_INFO); + if (!TextUtils.isEmpty(userBeanJson)) { + JSONObject obj = JSON.parseObject(userBeanJson); + if (obj != null) { + setYolatUserItemList(obj.getString("yola_list")); + } + } + } + return mYolaUserItemList; + } + + public void setYolatUserItemList(String yola_list) { + if (yola_list == null || yola_list.isEmpty()) { + return; + } + + mYolaUserItemList.clear(); + JSONObject obj = JSON.parseObject(yola_list); + + if (obj != null) { + List list1 = JSON.parseArray(obj.getString("user_rights"), UserItemBean.class); + List list2 = JSON.parseArray(obj.getString("creation_center"), UserItemBean.class); + List list3 = JSON.parseArray(obj.getString("other_functions"), UserItemBean.class); + + mYolaUserItemList.add(list1); + mYolaUserItemList.add(list2); + mYolaUserItemList.add(list3); + } + } + + public void setUserItemList(String listString) { UserItemBean[][] arr = JSON.parseObject(listString, UserItemBean[][].class); if (arr != null && arr.length > 0) { diff --git a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java index 7097814e9..7109c9b05 100644 --- a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java @@ -5,7 +5,6 @@ import android.content.ClipboardManager; import android.content.Context; import android.content.Intent; import android.graphics.Outline; -import android.graphics.drawable.Drawable; import android.text.TextUtils; import android.util.Log; import android.view.View; @@ -38,12 +37,10 @@ import com.yunbao.common.activity.WebViewActivity; import com.yunbao.common.bean.GoogleBean; import com.yunbao.common.bean.UserBean; import com.yunbao.common.bean.UserItemBean; -import com.yunbao.common.event.CompleteInformationEvent; import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.http.HttpCallback; import com.yunbao.common.interfaces.CommonCallback; import com.yunbao.common.interfaces.OnItemClickListener; -import com.yunbao.common.manager.APKManager; import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.SVGAViewUtils; @@ -56,7 +53,6 @@ import com.yunbao.live.activity.LiveRecordActivity; import com.yunbao.live.activity.RoomManageActivity; import com.yunbao.live.activity.WebViewActivityMedal; import com.yunbao.live.bean.SlideBean; -import com.yunbao.live.utils.LiveTextRender; import com.yunbao.live.views.CustomMyViewHolder; import com.yunbao.main.R; import com.yunbao.main.activity.EditProfileActivity; @@ -73,8 +69,6 @@ import com.yunbao.main.adapter.MainMeAdapter; import com.yunbao.main.http.MainHttpConsts; import com.yunbao.main.http.MainHttpUtil; -import org.greenrobot.eventbus.EventBus; - import java.math.BigDecimal; import java.net.MalformedURLException; import java.net.URL; @@ -93,21 +87,24 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi private ImageView mAvatar; private TextView mName, tv_level; - private ImageView mSex; - private ImageView mLevelAnchor; - private ImageView mLevel, img_setting; + private ImageView mLevel; + private ImageView img_setting; private TextView mID; - private TextView mFollow; - private TextView mFans; private boolean mPaused; - private RecyclerView mRecyclerView; - private MainMeAdapter mAdapter; + private RecyclerView userRightRecyclerView; + private RecyclerView creationCenterRecyclerView; + private RecyclerView otherFunctionsRecyclerView; + + private MainMeAdapter mUserRightAdapter; + private MainMeAdapter mCreationCenterAdapter; + private MainMeAdapter mOtherFunctionsAdapter; + private TextView signature; private TextView coin, gold, star_coin;//金豆,钻石,星币 private TextView btnCopy; private SVGAImageView gift_svga; private View v_noble; - private FrameLayout lt_noble; + private FrameLayout vipBgView; // private LinearLayout btnUserNoble; private ImageView user_noble_ico, good_nub_ico, img_lv_pic; private TextView user_noble_text, user_noble_time, tv_setting; @@ -115,7 +112,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi private boolean firstInto = true; private Banner banner_me; private LinearLayout lt_advertisement; - private View redPoint; + //private View redPoint; public MainMeViewHolder(Context context, ViewGroup parentView) { super(context, parentView); @@ -123,14 +120,14 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi @Override protected int getLayoutId() { - return R.layout.view_main_me; + return R.layout.view_main_me2; } @SuppressLint("WrongViewCast") @Override public void init() { mAvatar = (ImageView) findViewById(R.id.edit_me_avatar); - redPoint = findViewById(R.id.red_point); + //redPoint = findViewById(R.id.red_point); ViewClicksAntiShake.clicksAntiShake(mAvatar, new ViewClicksAntiShake.ViewClicksCallBack() { @Override public void onViewClicks() { @@ -152,8 +149,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi } }); user_noble_ico = (ImageView) findViewById(R.id.user_noble_ico); - mLevelAnchor = (ImageView) findViewById(R.id.level_anchor); - mLevel = (ImageView) findViewById(R.id.level); + // mLevel = (ImageView) findViewById(R.id.level); tv_level = (TextView) findViewById(R.id.tv_level); good_nub_ico = (ImageView) findViewById(R.id.good_nub_ico); mID = (TextView) findViewById(R.id.id_val); @@ -164,23 +160,22 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi btnCopy = (TextView) findViewById(R.id.btn_copy); user_noble_text = (TextView) findViewById(R.id.user_noble_text); img_setting = (ImageView) findViewById(R.id.img_setting); - v_noble = (View) findViewById(R.id.v_noble); - lt_noble = (FrameLayout) findViewById(R.id.lt_noble); user_noble_time = (TextView) findViewById(R.id.user_noble_time); banner_me = (Banner) findViewById(R.id.banner_me); lt_advertisement = (LinearLayout) findViewById(R.id.lt_advertisement); - img_lv_pic = (ImageView) findViewById(R.id.img_lv_pic); - tv_setting = (TextView) findViewById(R.id.tv_setting); - findViewById(R.id.lt_star_coin).setOnClickListener(this); - findViewById(R.id.btn_coin).setOnClickListener(this); - findViewById(R.id.btn_gold).setOnClickListener(this); + // img_lv_pic = (ImageView) findViewById(R.id.img_lv_pic); + // tv_setting = (TextView) findViewById(R.id.tv_setting); + findViewById(R.id.goldCoinImg).setOnClickListener(this); + findViewById(R.id.diamondImg).setOnClickListener(this); + findViewById(R.id.goldenBeanImg).setOnClickListener(this); - findViewById(R.id.rt_kefu).setOnClickListener(this); - findViewById(R.id.rt_setting).setOnClickListener(this); - findViewById(R.id.lt_noble).setOnClickListener(this); - findViewById(R.id.lt_name).setOnClickListener(this); + // findViewById(R.id.rt_kefu).setOnClickListener(this); + findViewById(R.id.img_setting).setOnClickListener(this); + findViewById(R.id.vipBgView).setOnClickListener(this); + findViewById(R.id.name).setOnClickListener(this); + findViewById(R.id.btn_edit).setOnClickListener(this); findViewById(R.id.signature).setOnClickListener(this); - findViewById(R.id.lt_guard).setOnClickListener(this); + findViewById(R.id.gudBgView).setOnClickListener(this); btnCopy.setOnClickListener(new View.OnClickListener() { @Override @@ -190,22 +185,38 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi Toast.makeText(mContext, "複製成功", Toast.LENGTH_SHORT).show(); } }); - mRecyclerView = (RecyclerView) findViewById(R.id.recyclerView); - mRecyclerView.setHasFixedSize(true); - mRecyclerView.setLayoutManager(new GridLayoutManager(mContext, 4, GridLayoutManager.VERTICAL, false)); + userRightRecyclerView = (RecyclerView) findViewById(R.id.userRightRecyclerView); + userRightRecyclerView.setHasFixedSize(true); + userRightRecyclerView.setLayoutManager(new GridLayoutManager(mContext, 4, GridLayoutManager.VERTICAL, false)); + + + creationCenterRecyclerView= (RecyclerView) findViewById(R.id.creationCenterRecyclerView); + creationCenterRecyclerView.setHasFixedSize(true); + creationCenterRecyclerView.setLayoutManager(new GridLayoutManager(mContext, 4, GridLayoutManager.VERTICAL, false)); + + otherFunctionsRecyclerView= (RecyclerView) findViewById(R.id.otherFunctionsRecyclerView); + otherFunctionsRecyclerView.setHasFixedSize(true); + otherFunctionsRecyclerView.setLayoutManager(new GridLayoutManager(mContext, 4, GridLayoutManager.VERTICAL, false)); + + + banner_me.setOutlineProvider(new ViewOutlineProvider() { @Override public void getOutline(View view, Outline outline) { outline.setRoundRect(0, 0, view.getWidth(), view.getHeight(), 10); } }); - redPoint.setVisibility(APKManager.get().getApkVerNew() ? View.GONE : View.VISIBLE); - ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.complete_information), new ViewClicksAntiShake.ViewClicksCallBack() { - @Override - public void onViewClicks() { - mContext.startActivity(new Intent(mContext, EditProfileActivity.class)); - } - }); + + + + + //redPoint.setVisibility(APKManager.get().getApkVerNew() ? View.GONE : View.VISIBLE); +// ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.complete_information), new ViewClicksAntiShake.ViewClicksCallBack() { +// @Override +// public void onViewClicks() { +// mContext.startActivity(new Intent(mContext, EditProfileActivity.class)); +// } +// }); } @Override @@ -288,7 +299,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi private CommonCallback mCallback = new CommonCallback() { @Override public void callback(UserBean bean) { - List list = CommonAppConfig.getInstance().getUserItemList(); + List> list = CommonAppConfig.getInstance().geYolatUserItemList(); if (bean != null) { showData(bean, list); } @@ -297,7 +308,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi private List mBannerListNew = new ArrayList<>(); - private void showData(UserBean u, List list) { + private void showData(UserBean u, List> list) { mBannerList.clear(); mBannerListNew.clear(); if (!StringUtil.isEmpty(u.getSlide())) { @@ -364,7 +375,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi good_nub_ico.setImageResource(R.mipmap.usercard_good_nub); - ImgLoader.display(mContext, R.mipmap.icon_zhubolv, img_lv_pic); + // ImgLoader.display(mContext, R.mipmap.icon_zhubolv, img_lv_pic); //主播等级 tv_level.setOnClickListener(new View.OnClickListener() { @Override @@ -378,17 +389,17 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi } else { Constants.isAnchor = false; - new LiveTextRender().getLevelImage(mContext, u.getLevel(), new ImgLoader.DrawableCallback() { - @Override - public void onLoadSuccess(Drawable drawable) { - ImgLoader.display2(mContext, drawable, mLevel); - } - - @Override - public void onLoadFailed() { - - } - }); +// new LiveTextRender().getLevelImage(mContext, u.getLevel(), new ImgLoader.DrawableCallback() { +// @Override +// public void onLoadSuccess(Drawable drawable) { +// ImgLoader.display2(mContext, drawable, mLevel); +// } +// +// @Override +// public void onLoadFailed() { +// +// } +// }); //用户等级 tv_level.setOnClickListener(new View.OnClickListener() { @Override @@ -409,9 +420,11 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi good_nub_ico.setVisibility(View.GONE); mID.setText(u.getLiangNameTip()); } - if (list != null && list.size() > 0) { + if (list != null && list.size() > 0 ) { + + List usList= list.get(0); List listNow = new ArrayList<>(); - for (UserItemBean userItemBean : list) { + for (UserItemBean userItemBean : usList) { if (userItemBean.getId() != 21 && userItemBean.getId() != 13) { listNow.add(userItemBean); } else if (userItemBean.getId() == 21) { @@ -420,30 +433,69 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi beanStetting = userItemBean; } } - if (mAdapter == null) { - mAdapter = new MainMeAdapter(mContext, listNow); - mAdapter.setOnItemClickListener(this); - mRecyclerView.setAdapter(mAdapter); + if (mUserRightAdapter == null) { + mUserRightAdapter = new MainMeAdapter(mContext, listNow); + mUserRightAdapter.setOnItemClickListener(this); + userRightRecyclerView.setAdapter(mUserRightAdapter); } else { - mAdapter.setList(listNow); + mUserRightAdapter.setList(listNow); } + + List createList= list.get(1); + List listNow1 = new ArrayList<>(); + for (UserItemBean userItemBean : createList) { + if (userItemBean.getId() != 21 && userItemBean.getId() != 13) { + listNow1.add(userItemBean); + } else if (userItemBean.getId() == 21) { + beanKefu = userItemBean; + } else if (userItemBean.getId() == 13) { + beanStetting = userItemBean; + } + } + if (mCreationCenterAdapter == null) { + mCreationCenterAdapter = new MainMeAdapter(mContext, listNow1); + mCreationCenterAdapter.setOnItemClickListener(this); + creationCenterRecyclerView.setAdapter(mCreationCenterAdapter); + } else { + mCreationCenterAdapter.setList(listNow1); + } + + List otherList= list.get(2); + List listNow2 = new ArrayList<>(); + for (UserItemBean userItemBean : createList) { + if (userItemBean.getId() != 21 && userItemBean.getId() != 13) { + listNow2.add(userItemBean); + } else if (userItemBean.getId() == 21) { + beanKefu = userItemBean; + } else if (userItemBean.getId() == 13) { + beanStetting = userItemBean; + } + } + if (mOtherFunctionsAdapter == null) { + mOtherFunctionsAdapter = new MainMeAdapter(mContext, listNow2); + mOtherFunctionsAdapter.setOnItemClickListener(this); + otherFunctionsRecyclerView.setAdapter(mOtherFunctionsAdapter); + } else { + mOtherFunctionsAdapter.setList(listNow2); + } + } if (beanKefu != null) { } - if (beanStetting != null) { - ImgLoader.display(mContext, beanStetting.getThumb(), img_setting); - tv_setting.setText(beanStetting.getName()); - } +// if (beanStetting != null) { +// ImgLoader.display(mContext, beanStetting.getThumb(), img_setting); +// tv_setting.setText(beanStetting.getName()); +// } Constants.myUid = u.getGoodnum(); Constants.myAvatar = u.getAvatar(); - if (u.getUserInfoComplete() == 1) { - findViewById(R.id.complete_information_radius).setVisibility(View.INVISIBLE); - findViewById(R.id.complete_information).setVisibility(View.INVISIBLE); - } else { - findViewById(R.id.complete_information_radius).setVisibility(View.VISIBLE); - findViewById(R.id.complete_information).setVisibility(View.VISIBLE); - } - EventBus.getDefault().post(new CompleteInformationEvent().setCompleteInformation(findViewById(R.id.complete_information).getVisibility() == View.VISIBLE)); +// if (u.getUserInfoComplete() == 1) { +// findViewById(R.id.complete_information_radius).setVisibility(View.INVISIBLE); +// findViewById(R.id.complete_information).setVisibility(View.INVISIBLE); +// } else { +// findViewById(R.id.complete_information_radius).setVisibility(View.VISIBLE); +// findViewById(R.id.complete_information).setVisibility(View.VISIBLE); +// } +// EventBus.getDefault().post(new CompleteInformationEvent().setCompleteInformation(findViewById(R.id.complete_information).getVisibility() == View.VISIBLE)); } @Override @@ -525,36 +577,36 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi public void onClick(View v) { int i = v.getId(); - if (i == R.id.lt_name) { + if (i == R.id.name ||i==R.id.btn_edit) { mContext.startActivity(new Intent(mContext, EditProfileActivity.class)); } else if (i == R.id.signature) { mContext.startActivity(new Intent(mContext, EditProfileActivity.class)); - } else if (i == R.id.lt_star_coin) { + } else if (i == R.id.goldCoinImg) { Map map_ekv = new HashMap(); map_ekv.put("from", "xb"); MobclickAgent.onEvent(mContext, "my_recharge", map_ekv); mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 1)); - } else if (i == R.id.btn_coin) { + } else if (i == R.id.diamondImg) { Map map_ekv = new HashMap(); map_ekv.put("from", "zs"); MobclickAgent.onEvent(mContext, "my_recharge", map_ekv); mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 0)); - } else if (i == R.id.btn_gold) { + } else if (i == R.id.goldenBeanImg) { MobclickAgent.onEvent(mContext, "my_receive", "充值旁边领取金豆的按钮"); // mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 2)); String url = CommonAppConfig.HOST + "/h5/task/index.html?"; RewardActivity.forward(mContext, url); } else if (i == R.id.rt_kefu) { WebViewActivity.forward(mContext, beanKefu.getHref(), false); - } else if (i == R.id.rt_setting) { + } else if (i == R.id.img_setting) { forwardSetting(); - } else if (i == R.id.lt_noble) { + } else if (i == R.id.vipBgView) { MobclickAgent.onEvent(mContext, "my_noble", "个人中心点贵族"); Constants.isTitle = true; UserBean u = CommonAppConfig.getInstance().getUserBean(); String url = CommonAppConfig.HOST + "/h5/Noble/index.html?nickname=" + u.getUserNiceName() + "&usernobId=" + u.getNoble_id() + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"); ZhuangBanActivity.forward(mContext, url, false); - } else if (i == R.id.lt_guard) { + } else if (i == R.id.gudBgView) { MobclickAgent.onEvent(mContext, "my_guard_btn", "我的-守护点击次数及人数"); Constants.isTitle = true; UserBean u = CommonAppConfig.getInstance().getUserBean(); diff --git a/main/src/main/res/layout/view_main_me2.xml b/main/src/main/res/layout/view_main_me2.xml new file mode 100644 index 000000000..3490f16bd --- /dev/null +++ b/main/src/main/res/layout/view_main_me2.xml @@ -0,0 +1,571 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/main/src/main/res/mipmap-hdpi/ic_yola_diamond.png b/main/src/main/res/mipmap-hdpi/ic_yola_diamond.png new file mode 100644 index 000000000..9418f54bf Binary files /dev/null and b/main/src/main/res/mipmap-hdpi/ic_yola_diamond.png differ diff --git a/main/src/main/res/mipmap-hdpi/ic_yola_edit.png b/main/src/main/res/mipmap-hdpi/ic_yola_edit.png new file mode 100644 index 000000000..fe8acd2af Binary files /dev/null and b/main/src/main/res/mipmap-hdpi/ic_yola_edit.png differ diff --git a/main/src/main/res/mipmap-hdpi/ic_yola_gold_coin.png b/main/src/main/res/mipmap-hdpi/ic_yola_gold_coin.png new file mode 100644 index 000000000..500fa312d Binary files /dev/null and b/main/src/main/res/mipmap-hdpi/ic_yola_gold_coin.png differ diff --git a/main/src/main/res/mipmap-hdpi/ic_yola_golden_bean.png b/main/src/main/res/mipmap-hdpi/ic_yola_golden_bean.png new file mode 100644 index 000000000..82f5e6470 Binary files /dev/null and b/main/src/main/res/mipmap-hdpi/ic_yola_golden_bean.png differ diff --git a/main/src/main/res/mipmap-hdpi/ic_yola_guard.png b/main/src/main/res/mipmap-hdpi/ic_yola_guard.png new file mode 100644 index 000000000..e06553f29 Binary files /dev/null and b/main/src/main/res/mipmap-hdpi/ic_yola_guard.png differ diff --git a/main/src/main/res/mipmap-hdpi/ic_yola_recharge.png b/main/src/main/res/mipmap-hdpi/ic_yola_recharge.png new file mode 100644 index 000000000..69d0e8461 Binary files /dev/null and b/main/src/main/res/mipmap-hdpi/ic_yola_recharge.png differ diff --git a/main/src/main/res/mipmap-hdpi/ic_yola_right_arrow.png b/main/src/main/res/mipmap-hdpi/ic_yola_right_arrow.png new file mode 100644 index 000000000..a2ee997d1 Binary files /dev/null and b/main/src/main/res/mipmap-hdpi/ic_yola_right_arrow.png differ diff --git a/main/src/main/res/mipmap-hdpi/ic_yola_setting.png b/main/src/main/res/mipmap-hdpi/ic_yola_setting.png new file mode 100644 index 000000000..4565d15b0 Binary files /dev/null and b/main/src/main/res/mipmap-hdpi/ic_yola_setting.png differ diff --git a/main/src/main/res/mipmap-hdpi/ic_yola_vip_center.png b/main/src/main/res/mipmap-hdpi/ic_yola_vip_center.png new file mode 100644 index 000000000..bef67b999 Binary files /dev/null and b/main/src/main/res/mipmap-hdpi/ic_yola_vip_center.png differ diff --git a/main/src/main/res/mipmap-xxhdpi/ic_yola_diamond.png b/main/src/main/res/mipmap-xxhdpi/ic_yola_diamond.png new file mode 100644 index 000000000..fdc25a602 Binary files /dev/null and b/main/src/main/res/mipmap-xxhdpi/ic_yola_diamond.png differ diff --git a/main/src/main/res/mipmap-xxhdpi/ic_yola_edit.png b/main/src/main/res/mipmap-xxhdpi/ic_yola_edit.png new file mode 100644 index 000000000..700052053 Binary files /dev/null and b/main/src/main/res/mipmap-xxhdpi/ic_yola_edit.png differ diff --git a/main/src/main/res/mipmap-xxhdpi/ic_yola_gold_coin.png b/main/src/main/res/mipmap-xxhdpi/ic_yola_gold_coin.png new file mode 100644 index 000000000..db7ec849d Binary files /dev/null and b/main/src/main/res/mipmap-xxhdpi/ic_yola_gold_coin.png differ diff --git a/main/src/main/res/mipmap-xxhdpi/ic_yola_golden_bean.png b/main/src/main/res/mipmap-xxhdpi/ic_yola_golden_bean.png new file mode 100644 index 000000000..1c624ac96 Binary files /dev/null and b/main/src/main/res/mipmap-xxhdpi/ic_yola_golden_bean.png differ diff --git a/main/src/main/res/mipmap-xxhdpi/ic_yola_guard.png b/main/src/main/res/mipmap-xxhdpi/ic_yola_guard.png new file mode 100644 index 000000000..d44cbc849 Binary files /dev/null and b/main/src/main/res/mipmap-xxhdpi/ic_yola_guard.png differ diff --git a/main/src/main/res/mipmap-xxhdpi/ic_yola_recharge.png b/main/src/main/res/mipmap-xxhdpi/ic_yola_recharge.png new file mode 100644 index 000000000..67ab4cc3d Binary files /dev/null and b/main/src/main/res/mipmap-xxhdpi/ic_yola_recharge.png differ diff --git a/main/src/main/res/mipmap-xxhdpi/ic_yola_right_arrow.png b/main/src/main/res/mipmap-xxhdpi/ic_yola_right_arrow.png new file mode 100644 index 000000000..ed641a8b3 Binary files /dev/null and b/main/src/main/res/mipmap-xxhdpi/ic_yola_right_arrow.png differ diff --git a/main/src/main/res/mipmap-xxhdpi/ic_yola_setting.png b/main/src/main/res/mipmap-xxhdpi/ic_yola_setting.png new file mode 100644 index 000000000..f7564c912 Binary files /dev/null and b/main/src/main/res/mipmap-xxhdpi/ic_yola_setting.png differ diff --git a/main/src/main/res/mipmap-xxhdpi/ic_yola_vip_center.png b/main/src/main/res/mipmap-xxhdpi/ic_yola_vip_center.png new file mode 100644 index 000000000..567aae042 Binary files /dev/null and b/main/src/main/res/mipmap-xxhdpi/ic_yola_vip_center.png differ diff --git a/main/src/main/res/mipmap-xxxhdpi/ic_yola_diamond.png b/main/src/main/res/mipmap-xxxhdpi/ic_yola_diamond.png new file mode 100644 index 000000000..7a69b3d98 Binary files /dev/null and b/main/src/main/res/mipmap-xxxhdpi/ic_yola_diamond.png differ diff --git a/main/src/main/res/mipmap-xxxhdpi/ic_yola_edit.png b/main/src/main/res/mipmap-xxxhdpi/ic_yola_edit.png new file mode 100644 index 000000000..678542e63 Binary files /dev/null and b/main/src/main/res/mipmap-xxxhdpi/ic_yola_edit.png differ diff --git a/main/src/main/res/mipmap-xxxhdpi/ic_yola_gold_coin.png b/main/src/main/res/mipmap-xxxhdpi/ic_yola_gold_coin.png new file mode 100644 index 000000000..901893d53 Binary files /dev/null and b/main/src/main/res/mipmap-xxxhdpi/ic_yola_gold_coin.png differ diff --git a/main/src/main/res/mipmap-xxxhdpi/ic_yola_golden_bean.png b/main/src/main/res/mipmap-xxxhdpi/ic_yola_golden_bean.png new file mode 100644 index 000000000..4fc027be5 Binary files /dev/null and b/main/src/main/res/mipmap-xxxhdpi/ic_yola_golden_bean.png differ diff --git a/main/src/main/res/mipmap-xxxhdpi/ic_yola_guard.png b/main/src/main/res/mipmap-xxxhdpi/ic_yola_guard.png new file mode 100644 index 000000000..0d5c687fb Binary files /dev/null and b/main/src/main/res/mipmap-xxxhdpi/ic_yola_guard.png differ diff --git a/main/src/main/res/mipmap-xxxhdpi/ic_yola_recharge.png b/main/src/main/res/mipmap-xxxhdpi/ic_yola_recharge.png new file mode 100644 index 000000000..f9425f527 Binary files /dev/null and b/main/src/main/res/mipmap-xxxhdpi/ic_yola_recharge.png differ diff --git a/main/src/main/res/mipmap-xxxhdpi/ic_yola_right_arrow.png b/main/src/main/res/mipmap-xxxhdpi/ic_yola_right_arrow.png new file mode 100644 index 000000000..b53dd3c3a Binary files /dev/null and b/main/src/main/res/mipmap-xxxhdpi/ic_yola_right_arrow.png differ diff --git a/main/src/main/res/mipmap-xxxhdpi/ic_yola_setting.png b/main/src/main/res/mipmap-xxxhdpi/ic_yola_setting.png new file mode 100644 index 000000000..4bc165a44 Binary files /dev/null and b/main/src/main/res/mipmap-xxxhdpi/ic_yola_setting.png differ diff --git a/main/src/main/res/mipmap-xxxhdpi/ic_yola_vip_center.png b/main/src/main/res/mipmap-xxxhdpi/ic_yola_vip_center.png new file mode 100644 index 000000000..7e747bdb4 Binary files /dev/null and b/main/src/main/res/mipmap-xxxhdpi/ic_yola_vip_center.png differ diff --git a/main/src/main/res/values/strings.xml b/main/src/main/res/values/strings.xml index 6cc1f308c..9f536ea88 100644 --- a/main/src/main/res/values/strings.xml +++ b/main/src/main/res/values/strings.xml @@ -108,4 +108,7 @@ Join Guard tasks game + 用戶權益 + 創作中心 + 其他功能