yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

中英文修改

Browse Source
This commit is contained in:
18401019693 2023-10-09 16:27:54 +08:00
parent 45ad8a9810
commit 7b62409bf1
29 changed files with 299 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/src/main/java/com/yunbao/common/dialog/SudGameListPopup.java
View File

@ -152,7 +152,7 @@ public class SudGameListPopup extends BottomPopupView {
} }
}); });
mRefreshView.initData(); mRefreshView.initData();
mRefreshView.setEmptyLayoutId(R.layout.sud_no_data); mRefreshView.setEmptyLayoutId(R.layout.sud_no_data1);
ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.random_start), new ViewClicksAntiShake.ViewClicksCallBack() { ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.random_start), new ViewClicksAntiShake.ViewClicksCallBack() {
@Override @Override
public void onViewClicks() { public void onViewClicks() {
@ -168,6 +168,12 @@ public class SudGameListPopup extends BottomPopupView {
.asCustom(new LiveSudGamePopup(getContext(), data)) .asCustom(new LiveSudGamePopup(getContext(), data))
.show(); .show();
dialog.dismiss(); dialog.dismiss();
}else {
if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
ToastUtil.show("当前没有可加入的房间");
} else {
ToastUtil.show("There are currently no rooms to join");
}
} }
} }

5
common/src/main/java/com/yunbao/common/views/LiveNewWishGiftPopup.java
View File

@ -2,6 +2,7 @@ package com.yunbao.common.views;
import android.graphics.Color; import android.graphics.Color;
import android.util.Log; import android.util.Log;
import android.util.TypedValue;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -88,7 +89,7 @@ public class LiveNewWishGiftPopup extends BottomPopupView {
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
TextView wishItem = (TextView) LayoutInflater.from(getContext()) TextView wishItem = (TextView) LayoutInflater.from(getContext())
.inflate(R.layout.view_tablaout_wish_item, null, false); .inflate(R.layout.view_tablaout_wish_item, null, false);
wishItem.setTextSize(TypedValue.COMPLEX_UNIT_SP, 15);
switch (i) { switch (i) {
case 0: case 0:
wishItem.setText(R.string.live_gift); wishItem.setText(R.string.live_gift);
@ -112,7 +113,7 @@ public class LiveNewWishGiftPopup extends BottomPopupView {
View tab = tabs.getChildAt(i); View tab = tabs.getChildAt(i);
LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) tab.getLayoutParams(); LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) tab.getLayoutParams();
layoutParams.setMarginEnd(DpUtil.dp2px(4)); layoutParams.setMarginEnd(DpUtil.dp2px(4));
layoutParams.width = DpUtil.dp2px(58); layoutParams.width = DpUtil.dp2px(90);
tab.setLayoutParams(layoutParams); tab.setLayoutParams(layoutParams);
wishTab.requestLayout(); wishTab.requestLayout();
} }

10
common/src/main/java/com/yunbao/common/views/LiveNewWishListPopup.java
View File

@ -202,7 +202,7 @@ public class LiveNewWishListPopup extends BottomPopupView {
ViewList.add(zhouXinFragment); ViewList.add(zhouXinFragment);
ViewList.add(lunarWishFragment); ViewList.add(lunarWishFragment);
ViewList.add(seasonalWishFragment); ViewList.add(seasonalWishFragment);
if (TextUtils.equals(ct, "zh")) { if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
wishListTop.setBackgroundResource(R.drawable.wish_list_day_zh); wishListTop.setBackgroundResource(R.drawable.wish_list_day_zh);
} else { } else {
wishListTop.setBackgroundResource(R.drawable.wish_list_day_en); wishListTop.setBackgroundResource(R.drawable.wish_list_day_en);
@ -254,7 +254,7 @@ public class LiveNewWishListPopup extends BottomPopupView {
type = tab.getId() + 1; type = tab.getId() + 1;
switch (type) { switch (type) {
case 1: case 1:
if (TextUtils.equals(ct, "zh")) { if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
wishListTop.setBackgroundResource(R.drawable.wish_list_day_zh); wishListTop.setBackgroundResource(R.drawable.wish_list_day_zh);
} else { } else {
wishListTop.setBackgroundResource(R.drawable.wish_list_day_en); wishListTop.setBackgroundResource(R.drawable.wish_list_day_en);
@ -262,7 +262,7 @@ public class LiveNewWishListPopup extends BottomPopupView {
replacementWish.setText(R.string.replacement_wish_day); replacementWish.setText(R.string.replacement_wish_day);
break; break;
case 2: case 2:
if (TextUtils.equals(ct, "zh")) { if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
wishListTop.setBackgroundResource(R.drawable.wish_list_week_zh); wishListTop.setBackgroundResource(R.drawable.wish_list_week_zh);
} else { } else {
wishListTop.setBackgroundResource(R.drawable.wish_list_week_en); wishListTop.setBackgroundResource(R.drawable.wish_list_week_en);
@ -270,7 +270,7 @@ public class LiveNewWishListPopup extends BottomPopupView {
replacementWish.setText(R.string.replacement_wish_zhou); replacementWish.setText(R.string.replacement_wish_zhou);
break; break;
case 3: case 3:
if (TextUtils.equals(ct, "zh")) { if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
wishListTop.setBackgroundResource(R.drawable.wish_list_lunar_zh); wishListTop.setBackgroundResource(R.drawable.wish_list_lunar_zh);
} else { } else {
wishListTop.setBackgroundResource(R.drawable.wish_list_lunar_en); wishListTop.setBackgroundResource(R.drawable.wish_list_lunar_en);
@ -278,7 +278,7 @@ public class LiveNewWishListPopup extends BottomPopupView {
replacementWish.setText(R.string.replacement_wish_lunar); replacementWish.setText(R.string.replacement_wish_lunar);
break; break;
case 4: case 4:
if (TextUtils.equals(ct, "zh")) { if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
wishListTop.setBackgroundResource(R.drawable.wish_list_seasonal_zh); wishListTop.setBackgroundResource(R.drawable.wish_list_seasonal_zh);
} else { } else {
wishListTop.setBackgroundResource(R.drawable.wish_list_seasonal_en); wishListTop.setBackgroundResource(R.drawable.wish_list_seasonal_en);

2
common/src/main/res/layout/dialog_live_new_wish_list.xml
View File

@ -36,7 +36,7 @@
<TextView <TextView
android:id="@+id/replacement_wish" android:id="@+id/replacement_wish"
android:layout_width="117dp" android:layout_width="140dp"
android:layout_height="31dp" android:layout_height="31dp"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"

1
common/src/main/res/layout/dialog_live_sud_game.xml
View File

@ -66,6 +66,7 @@
android:id="@+id/avatar" android:id="@+id/avatar"
android:layout_width="35dp" android:layout_width="35dp"
android:layout_height="35dp" android:layout_height="35dp"
android:visibility="gone"
android:layout_marginStart="6dp" android:layout_marginStart="6dp"
android:scaleType="centerCrop" android:scaleType="centerCrop"
app:riv_oval="true" /> app:riv_oval="true" />

4
common/src/main/res/layout/hint_custom_popup.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="270dp" android:layout_width="290dp"
android:layout_height="180dp" android:layout_height="200dp"
app:cardCornerRadius="18dp" app:cardCornerRadius="18dp"
app:cardElevation="16dp"> app:cardElevation="16dp">

13
common/src/main/res/layout/sud_no_data1.xml Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:background="#201E1A"
android:textColor="@color/white"
android:text="@string/interactive_game_rooms_oin" />
</androidx.constraintlayout.widget.ConstraintLayout>

8
common/src/main/res/values-en-rUS/string.xml
View File

@ -1104,7 +1104,7 @@ Limited ride And limited avatar frame</string>
<string name="replacement_wish_day">Reset Your: Day</string> <string name="replacement_wish_day">Reset Your: Day</string>
<string name="replacement_wish_zhou">Reset Wish: Week</string> <string name="replacement_wish_zhou">Reset Wish: Week</string>
<string name="replacement_wish_lunar">Reset Wish: Month</string> <string name="replacement_wish_lunar">Reset Wish: Month</string>
<string name="replacement_wish_seasonal">Reset Wish: Month</string> <string name="replacement_wish_seasonal">Reset Wish: seasonal</string>
<string name="replacement_reset_confirmed">Is reset confirmed</string> <string name="replacement_reset_confirmed">Is reset confirmed</string>
<string name="replacement_reset_confirmed_hint">Resetting will empty the wish list, \nregardless of whether the wish is completed or not</string> <string name="replacement_reset_confirmed_hint">Resetting will empty the wish list, \nregardless of whether the wish is completed or not</string>
<string name="replacement_reset_confirmed_sure">Confirm Reset</string> <string name="replacement_reset_confirmed_sure">Confirm Reset</string>
@ -1354,5 +1354,11 @@ Limited ride And limited avatar frame</string>
<string name="interactive_game_search_room_broadcast_room">Whether to enter the live broadcast room</string> <string name="interactive_game_search_room_broadcast_room">Whether to enter the live broadcast room</string>
<string name="interactive_game_search_room_bhe_game">No，only enter the game</string> <string name="interactive_game_search_room_bhe_game">No，only enter the game</string>
<string name="interactive_game_rooms_oin">There are currently no rooms to join</string> <string name="interactive_game_rooms_oin">There are currently no rooms to join</string>
<string name="prank_switch">Turntable prank switch</string>
<string name="see_the_contents_of">After closing, all users will not be able to see the contents of the turntable</string>
<string name="diamonds_every_time">The turntable consumes diamonds every time</string>
<string name="diamonds_every_time_requirement_of">Minimum requirement of 1000 diamonds</string>
<string name="diamonds_every_time_requirement_of_hint">Fill in the content of the prank，Fill in a minimum of 2 words and a maximum of 10 words</string>
<string name="prank_content_yet_hint">You have not set up the prank content yet</string>
</resources> </resources>

6
common/src/main/res/values-zh-rHK/strings.xml
View File

@ -1351,4 +1351,10 @@
<string name="interactive_game_search_room_broadcast_room">是否同步進入主播直播間</string> <string name="interactive_game_search_room_broadcast_room">是否同步進入主播直播間</string>
<string name="interactive_game_search_room_bhe_game">否，僅進入遊戲</string> <string name="interactive_game_search_room_bhe_game">否，僅進入遊戲</string>
<string name="interactive_game_rooms_oin">当前没有可加入的房间</string> <string name="interactive_game_rooms_oin">当前没有可加入的房间</string>
<string name="prank_switch">轉盤整蠱開關</string>
<string name="see_the_contents_of">關閉後所有用戶將無法看到轉盤內容</string>
<string name="diamonds_every_time">轉盤每次消耗鑽石</string>
<string name="diamonds_every_time_requirement_of">最少1,000鑽石起步</string>
<string name="diamonds_every_time_requirement_of_hint">填寫整蠱內容，最少2個字，最多10個字</string>
<string name="prank_content_yet_hint">您目前還未設置整蠱內容</string>
</resources> </resources>

6
common/src/main/res/values-zh-rTW/strings.xml
View File

@ -1350,4 +1350,10 @@
<string name="interactive_game_search_room_broadcast_room">是否同步進入主播直播間</string> <string name="interactive_game_search_room_broadcast_room">是否同步進入主播直播間</string>
<string name="interactive_game_search_room_bhe_game">否，僅進入遊戲</string> <string name="interactive_game_search_room_bhe_game">否，僅進入遊戲</string>
<string name="interactive_game_rooms_oin">当前没有可加入的房间</string> <string name="interactive_game_rooms_oin">当前没有可加入的房间</string>
<string name="prank_switch">轉盤整蠱開關</string>
<string name="see_the_contents_of">關閉後所有用戶將無法看到轉盤內容</string>
<string name="diamonds_every_time">轉盤每次消耗鑽石</string>
<string name="diamonds_every_time_requirement_of">最少1,000鑽石起步</string>
<string name="diamonds_every_time_requirement_of_hint">填寫整蠱內容，最少2個字，最多10個字</string>
<string name="prank_content_yet_hint">您目前還未設置整蠱內容</string>
</resources> </resources>

6
common/src/main/res/values-zh/strings.xml
View File

@ -1350,5 +1350,11 @@
<string name="interactive_game_search_room_broadcast_room">是否同步進入主播直播間</string> <string name="interactive_game_search_room_broadcast_room">是否同步進入主播直播間</string>
<string name="interactive_game_search_room_bhe_game">否，僅進入遊戲</string> <string name="interactive_game_search_room_bhe_game">否，僅進入遊戲</string>
<string name="interactive_game_rooms_oin">当前没有可加入的房间</string> <string name="interactive_game_rooms_oin">当前没有可加入的房间</string>
<string name="prank_switch">轉盤整蠱開關</string>
<string name="see_the_contents_of">關閉後所有用戶將無法看到轉盤內容</string>
<string name="diamonds_every_time">轉盤每次消耗鑽石</string>
<string name="diamonds_every_time_requirement_of">最少1,000鑽石起步</string>
<string name="diamonds_every_time_requirement_of_hint">填寫整蠱內容，最少2個字，最多10個字</string>
<string name="prank_content_yet_hint">您目前還未設置整蠱內容</string>
</resources> </resources>

8
common/src/main/res/values/strings.xml
View File

@ -1104,7 +1104,7 @@ Limited ride And limited avatar frame</string>
<string name="replacement_wish_day">Reset Your: Day</string> <string name="replacement_wish_day">Reset Your: Day</string>
<string name="replacement_wish_zhou">Reset Wish: Week</string> <string name="replacement_wish_zhou">Reset Wish: Week</string>
<string name="replacement_wish_lunar">Reset Wish: Month</string> <string name="replacement_wish_lunar">Reset Wish: Month</string>
<string name="replacement_wish_seasonal">Reset Wish: Month</string> <string name="replacement_wish_seasonal">Reset Wish: seasonal</string>
<string name="replacement_reset_confirmed">Is reset confirmed</string> <string name="replacement_reset_confirmed">Is reset confirmed</string>
<string name="replacement_reset_confirmed_hint">Resetting will empty the wish list, \nregardless of whether the wish is completed or not</string> <string name="replacement_reset_confirmed_hint">Resetting will empty the wish list, \nregardless of whether the wish is completed or not</string>
<string name="replacement_reset_confirmed_sure">Confirm Reset</string> <string name="replacement_reset_confirmed_sure">Confirm Reset</string>
@ -1357,4 +1357,10 @@ Limited ride And limited avatar frame</string>
<string name="interactive_game_search_room_broadcast_room">Whether to enter the live broadcast room</string> <string name="interactive_game_search_room_broadcast_room">Whether to enter the live broadcast room</string>
<string name="interactive_game_search_room_bhe_game">No，only enter the game</string> <string name="interactive_game_search_room_bhe_game">No，only enter the game</string>
<string name="interactive_game_rooms_oin">There are currently no rooms to join</string> <string name="interactive_game_rooms_oin">There are currently no rooms to join</string>
<string name="prank_switch">Turntable prank switch</string>
<string name="see_the_contents_of">After closing, all users will not be able to see the contents of the turntable</string>
<string name="diamonds_every_time">The turntable consumes diamonds every time</string>
<string name="diamonds_every_time_requirement_of">Minimum requirement of 1000 diamonds</string>
<string name="diamonds_every_time_requirement_of_hint">Fill in the content of the prank，Fill in a minimum of 2 words and a maximum of 10 words</string>
<string name="prank_content_yet_hint">You have not set up the prank content yet</string>
</resources> </resources>

4
live/src/main/java/com/yunbao/live/activity/LiveActivity.java
View File

@ -1289,9 +1289,9 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL
//粉絲團粉絲團 //粉絲團粉絲團
//不是粉絲 //不是粉絲
if (LiveAudienceActivity.is_fans != null && LiveAudienceActivity.is_fans.equals("2")) { if (LiveAudienceActivity.is_fans != null && LiveAudienceActivity.is_fans.equals("2")) {
bundle.putString(Constants.URL, CommonAppConfig.HOST + "/h5/live/joinFansClub.html" + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + uid); bundle.putString(Constants.URL, CommonAppConfig.HOST + "/h5/live/joinFansClub.html" + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + uid+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0));
} else { } else {
bundle.putString(Constants.URL, CommonAppConfig.HOST + "/h5/live/fansClub.html" + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + uid); bundle.putString(Constants.URL, CommonAppConfig.HOST + "/h5/live/fansClub.html" + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + uid+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0));
} }
bundle.putString("liveUid", mLiveUid); bundle.putString("liveUid", mLiveUid);
bundle.putString("anchorName", mAncherName); bundle.putString("anchorName", mAncherName);

124
live/src/main/java/com/yunbao/live/adapter/LivePrankRecyclerAdapter.java
View File

@ -8,10 +8,14 @@ import android.view.ViewGroup;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.yunbao.common.bean.PrankGiftBean; import com.yunbao.common.bean.PrankGiftBean;
import com.yunbao.common.bean.PrankTurntableBean; import com.yunbao.common.bean.PrankTurntableBean;
import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.interfaces.OnItemClickListener; import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.DialogUitl; import com.yunbao.common.utils.DialogUitl;
import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil; import com.yunbao.common.utils.WordUtil;
@ -19,9 +23,7 @@ import com.yunbao.live.R;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Locale;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
public class LivePrankRecyclerAdapter extends RecyclerView.Adapter<LivePrankRecyclerAdapter.PrankRecyclerViewHolder> { public class LivePrankRecyclerAdapter extends RecyclerView.Adapter<LivePrankRecyclerAdapter.PrankRecyclerViewHolder> {
public static final int TYPE_TURNTABLE = 0; public static final int TYPE_TURNTABLE = 0;
@ -88,7 +90,7 @@ public class LivePrankRecyclerAdapter extends RecyclerView.Adapter<LivePrankRecy
} }
public boolean getViewTypeOfList() { public boolean getViewTypeOfList() {
return viewType==TYPE_TURNTABLE; return viewType == TYPE_TURNTABLE;
} }
public static abstract class PrankRecyclerViewHolder extends RecyclerView.ViewHolder { public static abstract class PrankRecyclerViewHolder extends RecyclerView.ViewHolder {
@ -145,33 +147,63 @@ public class LivePrankRecyclerAdapter extends RecyclerView.Adapter<LivePrankRecy
probability = itemView.findViewById(R.id.prank_turntable_probability); probability = itemView.findViewById(R.id.prank_turntable_probability);
context = itemView.findViewById(R.id.prank_turntable_val); context = itemView.findViewById(R.id.prank_turntable_val);
context.setOnClickListener(v -> { context.setOnClickListener(v -> {
DialogUitl.showSimpleInputDialog(mContext, "填寫整蠱內容", DialogUitl.INPUT_TYPE_TEXT, 10, new DialogUitl.SimpleCallback() { if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
@Override DialogUitl.showSimpleInputDialog(mContext, "填寫整蠱內容", DialogUitl.INPUT_TYPE_TEXT, 10, new DialogUitl.SimpleCallback() {
public void onConfirmClick(Dialog dialog, String content) { @Override
if(WordUtil.isSpecialChar(content)){ public void onConfirmClick(Dialog dialog, String content) {
ToastUtil.show("整蠱內容不能包含特殊字符"); if (WordUtil.isSpecialChar(content)) {
return; ToastUtil.show("整蠱內容不能包含特殊字符");
} return;
if (content.length() >= 2 && content.length() <= 10) { }
context.setText(content); if (content.length() >= 2 && content.length() <= 10) {
onItemClickListener.onItemClick(content, ((PrankTurntableBean)list.get((Integer) itemView.getTag())).getId()); context.setText(content);
((PrankTurntableBean)list.get((Integer) itemView.getTag())).setContext(content); onItemClickListener.onItemClick(content, ((PrankTurntableBean) list.get((Integer) itemView.getTag())).getId());
dialog.dismiss(); ((PrankTurntableBean) list.get((Integer) itemView.getTag())).setContext(content);
} /*else if (content.length() == 0) { dialog.dismiss();
} /*else if (content.length() == 0) {
context.setText(""); context.setText("");
onItemClickListener.onItemClick(content, ((PrankTurntableBean)list.get((Integer) itemView.getTag())).getId()); onItemClickListener.onItemClick(content, ((PrankTurntableBean)list.get((Integer) itemView.getTag())).getId());
dialog.dismiss(); dialog.dismiss();
} */else { } */ else {
ToastUtil.show("最少2個字，最多10個字"); ToastUtil.show("最少2個字，最多10個字");
}
} }
} });
}); } else {
DialogUitl.showSimpleInputDialog(mContext, "Fill in the content of the prank", DialogUitl.INPUT_TYPE_TEXT, 10, new DialogUitl.SimpleCallback() {
@Override
public void onConfirmClick(Dialog dialog, String content) {
if (WordUtil.isSpecialChar(content)) {
ToastUtil.show("The prank content cannot contain special characters");
return;
}
if (content.length() >= 2 && content.length() <= 10) {
context.setText(content);
onItemClickListener.onItemClick(content, ((PrankTurntableBean) list.get((Integer) itemView.getTag())).getId());
((PrankTurntableBean) list.get((Integer) itemView.getTag())).setContext(content);
dialog.dismiss();
} /*else if (content.length() == 0) {
context.setText("");
onItemClickListener.onItemClick(content, ((PrankTurntableBean)list.get((Integer) itemView.getTag())).getId());
dialog.dismiss();
} */ else {
ToastUtil.show("Fill in a minimum of 2 words and a maximum of 10 words");
}
}
});
}
}); });
} }
public void setDate(PrankTurntableBean bean, int position) { public void setDate(PrankTurntableBean bean, int position) {
title.setText("轉盤" + getChineseNum(bean.getId()) + "號位"); if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
probability.setText(getProbability(bean.getId())); title.setText("轉盤" + getChineseNum(bean.getId()) + "號位");
} else {
title.setText("Turntable" + getChineseNum(bean.getId()));
}
probability.setText(getProbability(bean.getId(), mContext));
context.setText(bean.getContext()); context.setText(bean.getContext());
itemView.setTag(position); itemView.setTag(position);
} }
@ -194,21 +226,39 @@ public class LivePrankRecyclerAdapter extends RecyclerView.Adapter<LivePrankRecy
return ""; return "";
} }
private String getProbability(int id) { private String getProbability(int id, Context mContext) {
switch (id) { if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
case 1: switch (id) {
return "抽取幾率：40%"; case 1:
case 2: return "抽取幾率：40%";
return "抽取幾率：30%"; case 2:
case 3: return "抽取幾率：30%";
return "抽取幾率：15%"; case 3:
case 4: return "抽取幾率：15%";
return "抽取幾率：10%"; case 4:
case 5: return "抽取幾率：10%";
return "抽取幾率：4%"; case 5:
default: return "抽取幾率：4%";
return "抽取幾率：1%"; default:
return "抽取幾率：1%";
}
} else {
switch (id) {
case 1:
return "Extraction probability：40%";
case 2:
return "Extraction probability：30%";
case 3:
return "Extraction probability：15%";
case 4:
return "Extraction probability：10%";
case 5:
return "Extraction probability：4%";
default:
return "Extraction probability：1%";
}
} }
} }
} }
} }

2
live/src/main/java/com/yunbao/live/adapter/LiveReadyClassAdapter.java
View File

@ -16,9 +16,11 @@ import com.yunbao.common.bean.LiveClassBean;
import com.yunbao.common.custom.MyRadioButton; import com.yunbao.common.custom.MyRadioButton;
import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.interfaces.OnItemClickListener; import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.live.R; import com.yunbao.live.R;
import java.util.List; import java.util.List;
import java.util.Locale;
/** /**
* Created by cxf on 2018/10/7. * Created by cxf on 2018/10/7.

114
live/src/main/java/com/yunbao/live/dialog/LivePrankDialogFragment.java
View File

@ -1,7 +1,6 @@
package com.yunbao.live.dialog; package com.yunbao.live.dialog;
import android.app.Dialog; import android.app.Dialog;
import android.graphics.Color;
import android.os.Bundle; import android.os.Bundle;
import android.view.Gravity; import android.view.Gravity;
import android.view.View; import android.view.View;
@ -15,7 +14,6 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.tabs.TabLayout; import com.google.android.material.tabs.TabLayout;
import com.yunbao.common.bean.LiveGiftBean;
import com.yunbao.common.bean.PrankGiftBean; import com.yunbao.common.bean.PrankGiftBean;
import com.yunbao.common.bean.PrankHttpTurntableBean; import com.yunbao.common.bean.PrankHttpTurntableBean;
import com.yunbao.common.bean.PrankTurntableBean; import com.yunbao.common.bean.PrankTurntableBean;
@ -23,6 +21,7 @@ import com.yunbao.common.dialog.AbsDialogFragment;
import com.yunbao.common.http.base.HttpCallback; import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.http.live.LiveNetManager; import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.interfaces.OnItemClickListener; import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.DialogUitl; import com.yunbao.common.utils.DialogUitl;
import com.yunbao.common.utils.DpUtil; import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.StringUtil;
@ -32,6 +31,7 @@ import com.yunbao.live.adapter.LivePrankRecyclerAdapter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Locale;
public class LivePrankDialogFragment extends AbsDialogFragment implements View.OnClickListener { public class LivePrankDialogFragment extends AbsDialogFragment implements View.OnClickListener {
private TabLayout mTabLayout; private TabLayout mTabLayout;
@ -138,10 +138,17 @@ public class LivePrankDialogFragment extends AbsDialogFragment implements View.O
mPrankBtn.setOnClickListener(view -> { mPrankBtn.setOnClickListener(view -> {
if ((int) view.getTag() == 1) { if ((int) view.getTag() == 1) {
if (giftBeans != null && giftBeans.size() >= 20) { if (giftBeans != null && giftBeans.size() >= 20) {
ToastUtil.show("可添加禮物數量達到上限");
if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
ToastUtil.show("可添加禮物數量達到上限");
}else {
ToastUtil.show("The maximum number of gifts that can be added has been ");
}
return; return;
} }
GiftPopDialog dialog = new GiftPopDialog(mContext, new GiftPopDialog.ActionListener() { GiftPopDialog dialog = new GiftPopDialog(mContext, new GiftPopDialog.ActionListener() {
@Override @Override
public void onSelectGift(PrankGiftBean bean) { public void onSelectGift(PrankGiftBean bean) {
@ -167,8 +174,14 @@ public class LivePrankDialogFragment extends AbsDialogFragment implements View.O
private void initTab() { private void initTab() {
TabLayout.Tab turntable = mTabLayout.newTab(); TabLayout.Tab turntable = mTabLayout.newTab();
TabLayout.Tab gift = mTabLayout.newTab(); TabLayout.Tab gift = mTabLayout.newTab();
turntable.setText("轉盤整蠱"); if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
gift.setText("禮物整蠱"); turntable.setText("轉盤整蠱");
gift.setText("禮物整蠱");
}else {
turntable.setText("Turntable prank");
gift.setText("Gift prank");
}
turntable.setTag(0); turntable.setTag(0);
gift.setTag(1); gift.setTag(1);
mTabLayout.addTab(turntable); mTabLayout.addTab(turntable);
@ -185,14 +198,24 @@ public class LivePrankDialogFragment extends AbsDialogFragment implements View.O
mGiftNotDate.setVisibility(View.GONE); mGiftNotDate.setVisibility(View.GONE);
recyclerAdapter.setViewType(LivePrankRecyclerAdapter.TYPE_TURNTABLE); recyclerAdapter.setViewType(LivePrankRecyclerAdapter.TYPE_TURNTABLE);
mPrankBtn.setBackgroundResource(R.drawable.bg_live_prank_turntable_save); mPrankBtn.setBackgroundResource(R.drawable.bg_live_prank_turntable_save);
mPrankBtn.setText("保存設置"); if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
mPrankBtn.setText("保存設置");
} else {
mPrankBtn.setText("Save Settings");
}
mPrankBtn.setTag(0); mPrankBtn.setTag(0);
recyclerAdapter.clearList(); recyclerAdapter.clearList();
initTurntableData(); initTurntableData();
} else { } else {
mTurntableConfigLayout.setVisibility(View.GONE); mTurntableConfigLayout.setVisibility(View.GONE);
mPrankBtn.setBackgroundResource(R.drawable.bg_live_prank_gift_set); mPrankBtn.setBackgroundResource(R.drawable.bg_live_prank_gift_set);
mPrankBtn.setText("添加禮物");
if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
mPrankBtn.setText("添加禮物");
} else {
mPrankBtn.setText("Add gift");
}
mPrankBtn.setTag(1); mPrankBtn.setTag(1);
recyclerAdapter.clearList(); recyclerAdapter.clearList();
mGiftNotDate.setVisibility(View.VISIBLE); mGiftNotDate.setVisibility(View.VISIBLE);
@ -217,7 +240,7 @@ public class LivePrankDialogFragment extends AbsDialogFragment implements View.O
@Override @Override
public void onSuccess(PrankHttpTurntableBean data) { public void onSuccess(PrankHttpTurntableBean data) {
setDate(data); setDate(data);
mCoinTextView.setText(data.getCoin()+""); mCoinTextView.setText(data.getCoin() + "");
} }
@Override @Override
@ -260,7 +283,7 @@ public class LivePrankDialogFragment extends AbsDialogFragment implements View.O
@Override @Override
public void onError(String error) { public void onError(String error) {
ToastUtil.show( R.string.net_error); ToastUtil.show(R.string.net_error);
} }
}); });
} }
@ -296,8 +319,13 @@ public class LivePrankDialogFragment extends AbsDialogFragment implements View.O
} }
private void setPrankConfig() { private void setPrankConfig() {
if(StringUtil.isEmpty(bean.getTurntable1(),bean.getTurntable2(), bean.getTurntable3(),bean.getTurntable4(),bean.getTurntable5(),bean.getTurntable6())){ if (StringUtil.isEmpty(bean.getTurntable1(), bean.getTurntable2(), bean.getTurntable3(), bean.getTurntable4(), bean.getTurntable5(), bean.getTurntable6())) {
ToastUtil.show("保存失败:所有转盘位置必填" );
if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
ToastUtil.show("保存失败:所有转盘位置必填");
} else {
ToastUtil.show("Save failed: all turntable positions must be filled in");
}
return; return;
} }
LiveNetManager.get(mContext).setAnchorPrankTurntable( LiveNetManager.get(mContext).setAnchorPrankTurntable(
@ -313,12 +341,21 @@ public class LivePrankDialogFragment extends AbsDialogFragment implements View.O
new HttpCallback<Object>() { new HttpCallback<Object>() {
@Override @Override
public void onSuccess(Object data) { public void onSuccess(Object data) {
ToastUtil.show("保存成功");
if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
ToastUtil.show("保存成功");
} else {
ToastUtil.show("Save success");
}
} }
@Override @Override
public void onError(String error) { public void onError(String error) {
ToastUtil.show("保存失败:" + error); if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
ToastUtil.show("保存失败:" + error);
} else {
ToastUtil.show("Save failed" + error);
}
} }
} }
); );
@ -335,23 +372,44 @@ public class LivePrankDialogFragment extends AbsDialogFragment implements View.O
mTurntableConfigImageView.setImageResource(R.mipmap.special_icon_off); mTurntableConfigImageView.setImageResource(R.mipmap.special_icon_off);
} }
} else if (id == R.id.switch2_btn) { } else if (id == R.id.switch2_btn) {
DialogUitl.showSimpleInputDialog(mContext, "請輸入數量", DialogUitl.INPUT_TYPE_NUMBER, new DialogUitl.SimpleCallback() { if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
@Override DialogUitl.showSimpleInputDialog(mContext, "請輸入數量", DialogUitl.INPUT_TYPE_NUMBER, new DialogUitl.SimpleCallback() {
public void onConfirmClick(Dialog dialog, String content) { @Override
try { public void onConfirmClick(Dialog dialog, String content) {
int coin = Integer.parseInt(content); try {
if (coin < 1000) { int coin = Integer.parseInt(content);
if (coin < 1000) {
ToastUtil.show("最少1000鑽石");
return;
}
setCoin(Long.parseLong(content));
dialog.dismiss();
} catch (Exception e) {
e.printStackTrace();
ToastUtil.show("最少1000鑽石"); ToastUtil.show("最少1000鑽石");
return;
} }
setCoin(Long.parseLong(content));
dialog.dismiss();
} catch (Exception e) {
e.printStackTrace();
ToastUtil.show("最少1000鑽石");
} }
} });
}); } else {
DialogUitl.showSimpleInputDialog(mContext, "Please enter the quantity", DialogUitl.INPUT_TYPE_NUMBER, new DialogUitl.SimpleCallback() {
@Override
public void onConfirmClick(Dialog dialog, String content) {
try {
int coin = Integer.parseInt(content);
if (coin < 1000) {
ToastUtil.show("Minimum requirement of 1000 diamonds");
return;
}
setCoin(Long.parseLong(content));
dialog.dismiss();
} catch (Exception e) {
e.printStackTrace();
ToastUtil.show("Minimum requirement of 1000 diamonds");
}
}
});
}
} }
} }
} }

2
live/src/main/res/layout/item_anchor_call_me_gift.xml
View File

@ -24,7 +24,7 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/select" android:id="@+id/select"
android:layout_width="92dp" android:layout_width="110dp"
android:layout_height="28dp" android:layout_height="28dp"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"

3
live/src/main/res/layout/item_live_prank_turntable_config.xml
View File

@ -29,11 +29,12 @@
<TextView <TextView
android:id="@+id/prank_turntable_val" android:id="@+id/prank_turntable_val"
android:layout_width="match_parent" android:layout_width="match_parent"
android:singleLine="true"
android:layout_height="43dp" android:layout_height="43dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:background="@drawable/bg_prank_coin" android:background="@drawable/bg_prank_coin"
android:ems="10" android:ems="10"
android:hint="填寫整蠱內容，最少2個字，最多10個字" android:hint="@string/diamonds_every_time_requirement_of_hint"
android:gravity="start|center" android:gravity="start|center"
android:paddingStart="12dp" android:paddingStart="12dp"
android:paddingEnd="12dp" android:paddingEnd="12dp"

26
live/src/main/res/layout/view_live_prank_turntable.xml
View File

@ -7,11 +7,11 @@
<LinearLayout <LinearLayout
android:id="@+id/turntable_layout" android:id="@+id/turntable_layout"
android:layout_marginTop="10dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="visible" android:layout_marginTop="10dp"
android:orientation="vertical"> android:orientation="vertical"
android:visibility="visible">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/turntable_config_layout" android:id="@+id/turntable_config_layout"
@ -23,17 +23,19 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:text="轉盤整蠱開關" android:text="@string/prank_switch"
android:textColor="#A992FF" android:textColor="#A992FF"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/switch1_desc_text" android:id="@+id/switch1_desc_text"
android:layout_width="wrap_content" android:layout_width="330dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:text="關閉後所有用戶將無法看到轉盤內容" android:ellipsize="end"
android:singleLine="true"
android:text="@string/see_the_contents_of"
android:textColor="#B3B3B3" android:textColor="#B3B3B3"
android:textSize="10sp" android:textSize="10sp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -57,10 +59,12 @@
<TextView <TextView
android:id="@+id/switch2_title_text" android:id="@+id/switch2_title_text"
android:layout_width="wrap_content" android:layout_width="290dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:text="轉盤每次消耗鑽石" android:ellipsize="end"
android:singleLine="true"
android:text="@string/diamonds_every_time"
android:textColor="#A992FF" android:textColor="#A992FF"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@ -70,7 +74,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:text="最少1,000鑽石起步" android:text="@string/diamonds_every_time_requirement_of"
android:textColor="#B3B3B3" android:textColor="#B3B3B3"
android:textSize="10sp" android:textSize="10sp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -106,7 +110,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="250dp" android:layout_height="250dp"
android:gravity="center" android:gravity="center"
android:visibility="gone" android:text="您目前還未設置整蠱內容"
android:textColor="#BFBFBF" android:textColor="#BFBFBF"
android:text="您目前還未設置整蠱內容" /> android:visibility="gone" />
</LinearLayout> </LinearLayout>

BIN
live/src/main/res/mipmap-b+en+us/btn_attention.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

BIN
live/src/main/res/mipmap-b+en+us/ic_live_float_call_me.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
live/src/main/res/mipmap-b+en+us/ic_live_user_mailbox.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 75 KiB

BIN
live/src/main/res/mipmap-b+en+us/icon_cange.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.2 KiB

BIN
live/src/main/res/mipmap-b+en+us/report_add.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

2
live/src/main/res/values-en/strings.xml
View File

@ -79,7 +79,7 @@
<string name="live_anchor_edit_call_me_not_gift_toash">No gift selected</string> <string name="live_anchor_edit_call_me_not_gift_toash">No gift selected</string>
<string name="live_anchor_edit_call_me_letter_title">Letter Content</string> <string name="live_anchor_edit_call_me_letter_title">Letter Content</string>
<string name="live_anchor_edit_call_me_letter_content">The most romantic thing I can think of is to grow old with you, to collect all the laughs along the way, and to talk about them later in a rocking chair.</string> <string name="live_anchor_edit_call_me_letter_content">The most romantic thing I can think of is to grow old with you, to collect all the laughs along the way, and to talk about them later in a rocking chair.</string>
<string name="live_ready_anchor_call_me">Contact details</string> <string name="live_ready_anchor_call_me">Contact</string>
<string name="live_anchor_say_title">Editors Goddess says</string> <string name="live_anchor_say_title">Editors Goddess says</string>
<string name="live_anchor_say_edit_hint">Please enter the words the goddess wants to say, limited to 16 words.</string> <string name="live_anchor_say_edit_hint">Please enter the words the goddess wants to say, limited to 16 words.</string>
<string name="live_anchor_say_select_style">Select Style</string> <string name="live_anchor_say_select_style">Select Style</string>

3
main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java
View File

@ -44,6 +44,7 @@ import com.yunbao.common.utils.ProcessImageUtil;
import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.CompleteInformationPopup; import com.yunbao.common.views.CompleteInformationPopup;
import com.yunbao.common.views.UpdateSexPopup; import com.yunbao.common.views.UpdateSexPopup;
import com.yunbao.common.views.weight.ViewClicksAntiShake; import com.yunbao.common.views.weight.ViewClicksAntiShake;
@ -446,7 +447,7 @@ public class EditProfileActivity extends AbsActivity {
} }
Constants.myIntoIndex = 2; Constants.myIntoIndex = 2;
Intent intent = new Intent(mContext, MyWebViewActivity2.class); Intent intent = new Intent(mContext, MyWebViewActivity2.class);
intent.putExtra(Constants.URL, CommonAppConfig.HOST + "/h5/table/Modify-information.html" + "?token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid()); intent.putExtra(Constants.URL, CommonAppConfig.HOST + "/h5/table/Modify-information.html" + "?token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0));
startActivity(intent); startActivity(intent);
} }

7
main/src/main/java/com/yunbao/main/views/MainHomeGameViewHolder.java
View File

@ -144,6 +144,7 @@ public class MainHomeGameViewHolder extends AbsMainHomeChildViewHolder implement
} }
}); });
mRefreshView.initData(); mRefreshView.initData();
mRefreshView.setEmptyLayoutId(R.layout.sud_no_data);
ViewClicksAntiShake.clicksAntiShake(findViewById(com.yunbao.common.R.id.random_start), new ViewClicksAntiShake.ViewClicksCallBack() { ViewClicksAntiShake.clicksAntiShake(findViewById(com.yunbao.common.R.id.random_start), new ViewClicksAntiShake.ViewClicksCallBack() {
@Override @Override
public void onViewClicks() { public void onViewClicks() {
@ -155,6 +156,12 @@ public class MainHomeGameViewHolder extends AbsMainHomeChildViewHolder implement
Intent intent = new Intent(context, SudGameActivity.class); Intent intent = new Intent(context, SudGameActivity.class);
intent.putExtra("CreateSudRoom", new Gson().toJson(data)); intent.putExtra("CreateSudRoom", new Gson().toJson(data));
context.startActivity(intent); context.startActivity(intent);
}else {
if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
ToastUtil.show("当前没有可加入的房间");
} else {
ToastUtil.show("There are currently no rooms to join");
}
} }
} }

68
main/src/main/res/layout/activity_modify_pwd.xml
View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<include layout="@layout/view_title"/> <include layout="@layout/view_title" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -13,108 +13,97 @@
android:background="@color/white" android:background="@color/white"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="15dp" android:paddingLeft="15dp"
android:paddingRight="15dp" android:paddingRight="15dp">
>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="60dp"
android:orientation="horizontal" android:orientation="horizontal">
>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="110dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:text="@string/modify_pwd_old" android:text="@string/modify_pwd_old"
android:textColor="@color/textColor" android:textColor="@color/textColor"
android:textSize="16sp" android:textSize="13sp" />
/>
<EditText <EditText
android:id="@+id/edit_old" android:id="@+id/edit_old"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginLeft="80dp" android:layout_marginLeft="110dp"
android:background="@null" android:background="@null"
android:hint="@string/modify_pwd_old_1" android:hint="@string/modify_pwd_old_1"
android:inputType="textPassword" android:inputType="textPassword"
android:textColor="@color/textColor" android:textColor="@color/textColor"
android:textColorHint="@color/gray3" android:textColorHint="@color/gray3"
android:textSize="16sp" android:textSize="16sp" />
/>
</RelativeLayout> </RelativeLayout>
<View <View style="@style/line2" />
style="@style/line2"
/>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="60dp"
android:orientation="horizontal" android:orientation="horizontal">
>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="110dp"
android:gravity="center"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:text="@string/modify_pwd_new" android:text="@string/modify_pwd_new"
android:textColor="@color/textColor" android:textColor="@color/textColor"
android:textSize="16sp" android:textSize="13sp" />
/>
<EditText <EditText
android:id="@+id/edit_new" android:id="@+id/edit_new"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginLeft="80dp" android:layout_marginLeft="110dp"
android:background="@null" android:background="@null"
android:hint="@string/modify_pwd_new_1" android:hint="@string/modify_pwd_new_1"
android:inputType="textPassword" android:inputType="textPassword"
android:textColor="@color/textColor" android:textColor="@color/textColor"
android:textColorHint="@color/gray3" android:textColorHint="@color/gray3"
android:textSize="16sp" android:textSize="16sp" />
/>
</RelativeLayout> </RelativeLayout>
<View <View style="@style/line2" />
style="@style/line2"
/>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="60dp"
android:orientation="horizontal" android:orientation="horizontal">
>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="110dp"
android:gravity="center"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:text="@string/modify_pwd_confirm" android:text="@string/modify_pwd_confirm"
android:textColor="@color/textColor" android:textColor="@color/textColor"
android:textSize="16sp" android:textSize="13sp" />
/>
<EditText <EditText
android:id="@+id/edit_confirm" android:id="@+id/edit_confirm"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentEnd="true"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_marginLeft="80dp" android:layout_alignParentEnd="true"
android:layout_marginLeft="110dp"
android:background="@null" android:background="@null"
android:hint="@string/modify_pwd_confirm_1" android:hint="@string/modify_pwd_confirm_1"
android:inputType="textPassword" android:inputType="textPassword"
android:textColor="@color/textColor" android:textColor="@color/textColor"
android:textColorHint="@color/gray3" android:textColorHint="@color/gray3"
android:textSize="16sp" android:textSize="16sp" />
/>
</RelativeLayout> </RelativeLayout>
@ -125,12 +114,11 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_marginLeft="30dp" android:layout_marginLeft="30dp"
android:layout_marginRight="30dp"
android:layout_marginTop="30dp" android:layout_marginTop="30dp"
android:layout_marginRight="30dp"
android:background="@drawable/login_btn" android:background="@drawable/login_btn"
android:gravity="center" android:gravity="center"
android:text="@string/modify_pwd_confirm_2" android:text="@string/modify_pwd_confirm_2"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="16sp" android:textSize="16sp" />
/>
</LinearLayout> </LinearLayout>

4
main/src/main/res/layout/view_search_recommend_body.xml
View File

@ -15,8 +15,8 @@
<ImageView <ImageView
android:id="@+id/change_batch" android:id="@+id/change_batch"
android:layout_width="wrap_content" android:layout_width="65dp"
android:layout_height="wrap_content" android:layout_height="22dp"
android:layout_gravity="center_vertical|right" android:layout_gravity="center_vertical|right"
android:background="@mipmap/icon_cange" /> android:background="@mipmap/icon_cange" />