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

修复bug

Browse Source
This commit is contained in:
hch
2024-03-26 09:36:41 +08:00
parent 28f00f1c8a
commit 0324b638fa
7 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
common/src/main/java/com/yunbao/common/CommonAppConfig.java
View File

@@ -119,11 +119,14 @@ public class CommonAppConfig {
private String mAppName;
private Boolean mTiBeautyEnable;//是否使用萌颜 true使用萌颜 false 使用基础美颜
public static List<NewCommunityType> getCommunityTypeList(Context mContext) {
NewCommunityType type0 = new NewCommunityType();
type0.setId(0);
type0.setTalk_name(mContext.getString(R.string.recomment));
public static List<NewCommunityType> getCommunityTypeList(boolean isHome, Context mContext) {
List<NewCommunityType> newCommunityTypeList = new ArrayList<>();
if (isHome) {
NewCommunityType type0 = new NewCommunityType();
type0.setId(0);
type0.setTalk_name(mContext.getString(R.string.recomment));
newCommunityTypeList.add(type0);
}
NewCommunityType type17 = new NewCommunityType();
type17.setId(17);
type17.setTalk_name(mContext.getResources().getString(R.string.main_active_type_01));
@@ -144,8 +147,6 @@ public class CommonAppConfig {
type13.setId(13);
type13.setTalk_name(mContext.getResources().getString(R.string.main_active_type_05));
List<NewCommunityType> newCommunityTypeList = new ArrayList<>();
newCommunityTypeList.add(type0);
newCommunityTypeList.add(type17);
newCommunityTypeList.add(type16);
newCommunityTypeList.add(type15);

2
common/src/main/java/com/yunbao/common/adapter/LabelTagAdapter.java
View File

@@ -36,7 +36,7 @@ public class LabelTagAdapter extends BaseTagAdapter<String, TextView> {
@Override
protected void convert(TextView textView, String item, int position) {
textView.setText(item);
textView.setText("#"+item);
}
public interface OnSureOnClickListener {

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

@@ -255,7 +255,7 @@
<string name="login_auth_success">Login successfully</string>
<string name="login_auth_failure">privilege grant failed</string>
<string name="login_auth_cancle">Authorization cancelled</string>
<string name="live">Live broadcast</string>
<string name="live">Live</string>
<string name="login_tip_4">Log in</string>
<string name="shopmall">shopmall</string>
<string name="recomment">Hot</string>
@@ -426,7 +426,7 @@
<string name="live_pk_time_2">Penalty time</string>
<string name="live_no_data_6">No video</string>
<string name="live_no_data_7">Let\'s release our own video</string>
<string name="main_home">home page</string>
<string name="main_home">Home</string>
<string name="main_near">nearby</string>
<string name="main_list">Ranking</string>
<string name="main_me">My</string>

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

@@ -256,7 +256,7 @@
<string name="login_auth_success">Login successfully</string>
<string name="login_auth_failure">privilege grant failed</string>
<string name="login_auth_cancle">Authorization cancelled</string>
<string name="live">Live broadcast</string>
<string name="live">Live</string>
<string name="login_tip_4">Log in</string>
<string name="shopmall">shopmall</string>
<string name="recomment">Hot</string>
@@ -427,7 +427,7 @@
<string name="live_pk_time_2">Penalty time</string>
<string name="live_no_data_6">No video</string>
<string name="live_no_data_7">Let\'s release our own video</string>
<string name="main_home">home page</string>
<string name="main_home">Home</string>
<string name="main_near">nearby</string>
<string name="main_list">Ranking</string>
<string name="main_me">My</string>