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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	common/src/main/res/values-zh-rHK/strings.xml
#	common/src/main/res/values-zh-rTW/strings.xml
#	common/src/main/res/values-zh/strings.xml
#	common/src/main/res/values/strings.xml
#	main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java
This commit is contained in:
zlzw
2023-04-19 10:58:02 +08:00
parent 181ff4274c dc5633bcb9
commit 47c3282861
165 changed files with 1961 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
main/src/main/java/com/yunbao/main/activity/BindUserActivity.java
View File

@@ -86,7 +86,7 @@ public class BindUserActivity extends AbsActivity {
@Override
protected void main() {
// setTitle(WordUtil.getString(R.string.reg_register));
// setTitle(mContext.getString(R.string.reg_register));
getPromoCode();
webview = (WebView) findViewById(R.id.webview);
lt_first_bind = (LinearLayout) findViewById(R.id.lt_first_bind);
@@ -107,8 +107,8 @@ public class BindUserActivity extends AbsActivity {
btn_goto_updata = findViewById(R.id.btn_goto_updata);
tv_title = findViewById(R.id.tv_title);
mGetCode = WordUtil.getString(R.string.reg_get_code);
mGetCodeAgain = WordUtil.getString(R.string.reg_get_code_again);
mGetCode =mContext.getString(R.string.reg_get_code);
mGetCodeAgain =mContext.getString(R.string.reg_get_code_again);
mTvCountryCodeClick();
mEditPhone.addTextChangedListener(new TextWatcher() {
@Override
@@ -292,14 +292,14 @@ public class BindUserActivity extends AbsActivity {
private void getMessageCode(String Randstr, String Ticket) {
String phoneNum = mEditPhone.getText().toString().trim();
if (TextUtils.isEmpty(phoneNum)) {
mEditPhone.setError(WordUtil.getString(R.string.reg_input_phone));
mEditPhone.setError(mContext.getString(R.string.reg_input_phone));
mEditPhone.requestFocus();
return;
}
//屏蔽，原因：国外手机号无法校验合法性
// if (!ValidatePhoneUtil.validateMobileNumber(phoneNum))
// {
// mEditPhone.setError(WordUtil.getString(R.string.login_phone_error));
// mEditPhone.setError(mContext.getString(R.string.login_phone_error));
// mEditPhone.requestFocus();
// return;
// }
@@ -330,37 +330,37 @@ public class BindUserActivity extends AbsActivity {
private void register() {
final String phoneNum = mEditPhone.getText().toString().trim();
if (TextUtils.isEmpty(phoneNum)) {
mEditPhone.setError(WordUtil.getString(R.string.reg_input_phone));
mEditPhone.setError(mContext.getString(R.string.reg_input_phone));
mEditPhone.requestFocus();
return;
}
//屏蔽，原因：国外手机号无法校验合法性
// if (!ValidatePhoneUtil.validateMobileNumber(phoneNum)) {
// mEditPhone.setError(WordUtil.getString(R.string.login_phone_error));
// mEditPhone.setError(mContext.getString(R.string.login_phone_error));
// mEditPhone.requestFocus();
// return;
// }
String code = mEditCode.getText().toString().trim();
if (TextUtils.isEmpty(code)) {
mEditCode.setError(WordUtil.getString(R.string.reg_input_code));
mEditCode.setError(mContext.getString(R.string.reg_input_code));
mEditCode.requestFocus();
return;
}
if ("0".equals(isBind)) {
final String pwd = mEditPwd1.getText().toString().trim();
if (TextUtils.isEmpty(pwd)) {
mEditPwd1.setError(WordUtil.getString(R.string.reg_input_pwd_1));
mEditPwd1.setError(mContext.getString(R.string.reg_input_pwd_1));
mEditPwd1.requestFocus();
return;
}
String pwd2 = mEditPwd2.getText().toString().trim();
if (TextUtils.isEmpty(pwd2)) {
mEditPwd2.setError(WordUtil.getString(R.string.reg_input_pwd_2));
mEditPwd2.setError(mContext.getString(R.string.reg_input_pwd_2));
mEditPwd2.requestFocus();
return;
}
if (!pwd.equals(pwd2)) {
mEditPwd2.setError(WordUtil.getString(R.string.reg_pwd_error));
mEditPwd2.setError(mContext.getString(R.string.reg_pwd_error));
mEditPwd2.requestFocus();
return;
}

2
main/src/main/java/com/yunbao/main/activity/CashActivity.java
View File

@@ -132,7 +132,7 @@ public class CashActivity extends AbsActivity implements View.OnClickListener, C
@Override
public void onItemDelete(final CashAccountBean bean, final int position) {
DialogUitl.showSimpleDialog(mContext, WordUtil.getString(R.string.cash_delete), new DialogUitl.SimpleCallback() {
DialogUitl.showSimpleDialog(mContext,mContext.getString(R.string.cash_delete), new DialogUitl.SimpleCallback() {
@Override
public void onConfirmClick(Dialog dialog, String content) {
MainHttpUtil.deleteCashAccount(bean.getId(), new HttpCallback() {

2
main/src/main/java/com/yunbao/main/activity/ChatRoomActivity.java
View File

@@ -305,7 +305,7 @@ public class ChatRoomActivity extends AbsActivity implements KeyBoardHeightChang
// mChatRoomViewHolder.sendLocation(lat, lng, scale, address);
// }
// } else {
// ToastUtil.show(WordUtil.getString(R.string.im_get_location_failed));
// ToastUtil.show(mContext.getString(R.string.im_get_location_failed));
// }
// }
// }

2
main/src/main/java/com/yunbao/main/activity/EditNameActivity.java
View File

@@ -38,7 +38,7 @@ public class EditNameActivity extends AbsActivity implements View.OnClickListene
@Override
protected void main() {
setTitle(WordUtil.getString(R.string.edit_profile_update_nickname));
setTitle(mContext.getString(R.string.edit_profile_update_nickname));
mEditText = (EditText) findViewById(R.id.edit);
mEditText.setFilters(new InputFilter[]{
new InputFilter.LengthFilter(8)

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

@@ -78,7 +78,7 @@ public class EditProfileActivity extends AbsActivity {
@Override
protected void main() {
setTitle(WordUtil.getString(R.string.edit_profile));
setTitle(mContext.getString(R.string.edit_profile));
mAvatar = (ImageView) findViewById(R.id.avatar);
mName = (TextView) findViewById(R.id.name);
mSign = (TextView) findViewById(R.id.sign);

2
main/src/main/java/com/yunbao/main/activity/EditSexActivity.java
View File

@@ -35,7 +35,7 @@ public class EditSexActivity extends AbsActivity implements View.OnClickListener
@Override
protected void main() {
setTitle(WordUtil.getString(R.string.edit_profile_sex));
setTitle(mContext.getString(R.string.edit_profile_sex));
mBtnMale = (RadioButton)findViewById(R.id.btn_male);
mBtnFeMale = (RadioButton)findViewById(R.id.btn_female);
mBtnMale.setOnClickListener(this);

2
main/src/main/java/com/yunbao/main/activity/EditSignActivity.java
View File

@@ -35,7 +35,7 @@ public class EditSignActivity extends AbsActivity implements View.OnClickListene
@Override
protected void main() {
setTitle(WordUtil.getString(R.string.edit_profile_update_sign));
setTitle(mContext.getString(R.string.edit_profile_update_sign));
mEditText = (EditText) findViewById(R.id.edit);
mEditText.setFilters(new InputFilter[]{
new InputFilter.LengthFilter(20)

2
main/src/main/java/com/yunbao/main/activity/EntryActivity.java
View File

@@ -716,7 +716,7 @@ public class EntryActivity extends AppCompatActivity {
if (mBtnClick) {
return;
}
loginLoadingDialog = DialogUitl.loadingDialog(EntryActivity.this, WordUtil.getString(R.string.login_wait));
loginLoadingDialog = DialogUitl.loadingDialog(EntryActivity.this,getString(R.string.login_wait));
loginLoadingDialog.show();
new Timer().schedule(new TimerTask() {
@Override

4
main/src/main/java/com/yunbao/main/activity/FansActivity.java
View File

@@ -60,10 +60,10 @@ public class FansActivity extends AbsActivity implements OnItemClickListener<Sea
}
mRefreshView = findViewById(R.id.refreshView);
if (mToUid.equals(CommonAppConfig.getInstance().getUid())) {
setTitle(WordUtil.getString(R.string.fans_my_fans));
setTitle(mContext.getString(R.string.fans_my_fans));
mRefreshView.setEmptyLayoutId(R.layout.view_no_data_fans);
} else {
setTitle(WordUtil.getString(R.string.fans_ta_fans));
setTitle(mContext.getString(R.string.fans_ta_fans));
mRefreshView.setEmptyLayoutId(R.layout.view_no_data_fans_2);
}
mRefreshView.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.VERTICAL, false));

22
main/src/main/java/com/yunbao/main/activity/FindPwdActivity.java
View File

@@ -74,7 +74,7 @@ public class FindPwdActivity extends AbsActivity {
@Override
protected void main() {
setTitle(WordUtil.getString(R.string.find_pwd_forget));
setTitle(mContext.getString(R.string.find_pwd_forget));
mEditPhone = (EditText) findViewById(R.id.edit_phone);
mEditCode = (EditText) findViewById(R.id.edit_code);
mIvCountryCode =findViewById(R.id.ivCountryCode);
@@ -85,8 +85,8 @@ public class FindPwdActivity extends AbsActivity {
mEditPwd2 = (EditText) findViewById(R.id.edit_pwd_2);
mBtnCode = (TextView) findViewById(R.id.btn_code);
mBtnRegister = findViewById(R.id.btn_register);
mGetCode = WordUtil.getString(R.string.reg_get_code);
mGetCodeAgain = WordUtil.getString(R.string.reg_get_code_again);
mGetCode =mContext.getString(R.string.reg_get_code);
mGetCodeAgain =mContext.getString(R.string.reg_get_code_again);
mTvCountryCodeClick();
mEditPhone.addTextChangedListener(new TextWatcher() {
@Override
@@ -238,13 +238,13 @@ public class FindPwdActivity extends AbsActivity {
private void getCode(String Randstr,String Ticket) {
String phoneNum = mEditPhone.getText().toString().trim();
if (TextUtils.isEmpty(phoneNum)) {
mEditPhone.setError(WordUtil.getString(R.string.reg_input_phone));
mEditPhone.setError(mContext.getString(R.string.reg_input_phone));
mEditPhone.requestFocus();
return;
}
//屏蔽，原因：国外手机号无法校验合法性
// if (!ValidatePhoneUtil.validateMobileNumber(phoneNum)) {
// mEditPhone.setError(WordUtil.getString(R.string.login_phone_error));
// mEditPhone.setError(mContext.getString(R.string.login_phone_error));
// mEditPhone.requestFocus();
// return;
// }
@@ -276,36 +276,36 @@ public class FindPwdActivity extends AbsActivity {
private void register() {
final String phoneNum = mEditPhone.getText().toString().trim();
if (TextUtils.isEmpty(phoneNum)) {
mEditPhone.setError(WordUtil.getString(R.string.reg_input_phone));
mEditPhone.setError(mContext.getString(R.string.reg_input_phone));
mEditPhone.requestFocus();
return;
}
//屏蔽，原因：国外手机号无法校验合法性
// if (!ValidatePhoneUtil.validateMobileNumber(phoneNum)) {
// mEditPhone.setError(WordUtil.getString(R.string.login_phone_error));
// mEditPhone.setError(mContext.getString(R.string.login_phone_error));
// mEditPhone.requestFocus();
// return;
// }
String code = mEditCode.getText().toString().trim();
if (TextUtils.isEmpty(code)) {
mEditCode.setError(WordUtil.getString(R.string.reg_input_code));
mEditCode.setError(mContext.getString(R.string.reg_input_code));
mEditCode.requestFocus();
return;
}
final String pwd = mEditPwd1.getText().toString().trim();
if (TextUtils.isEmpty(pwd)) {
mEditPwd1.setError(WordUtil.getString(R.string.reg_input_pwd_1));
mEditPwd1.setError(mContext.getString(R.string.reg_input_pwd_1));
mEditPwd1.requestFocus();
return;
}
String pwd2 = mEditPwd2.getText().toString().trim();
if (TextUtils.isEmpty(pwd2)) {
mEditPwd2.setError(WordUtil.getString(R.string.reg_input_pwd_2));
mEditPwd2.setError(mContext.getString(R.string.reg_input_pwd_2));
mEditPwd2.requestFocus();
return;
}
if (!pwd.equals(pwd2)) {
mEditPwd2.setError(WordUtil.getString(R.string.reg_pwd_error));
mEditPwd2.setError(mContext.getString(R.string.reg_pwd_error));
mEditPwd2.requestFocus();
return;
}

6
main/src/main/java/com/yunbao/main/activity/FollowActivity.java
View File

@@ -63,12 +63,12 @@ public class FollowActivity extends AbsActivity implements OnItemClickListener<S
}
mRefreshView = findViewById(R.id.refreshView);
if(isBlack == 1){
setTitle(WordUtil.getString(R.string.my_black));
setTitle(mContext.getString(R.string.my_black));
} else if (mToUid.equals(CommonAppConfig.getInstance().getUid())) {
setTitle(WordUtil.getString(R.string.follow_my_follow));
setTitle(mContext.getString(R.string.follow_my_follow));
mRefreshView.setEmptyLayoutId(R.layout.view_no_data_follow);
} else {
setTitle(WordUtil.getString(R.string.follow_ta_follow));
setTitle(mContext.getString(R.string.follow_ta_follow));
mRefreshView.setEmptyLayoutId(R.layout.view_no_data_follow_2);
}
mRefreshView.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.VERTICAL, false));

34
main/src/main/java/com/yunbao/main/activity/LanguageSettingActivity.java
View File

@@ -1,10 +1,13 @@
package com.yunbao.main.activity;
import android.app.Activity;
import android.content.Intent;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.AppManager;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
import com.yunbao.main.R;
@@ -16,6 +19,7 @@ import java.util.Stack;
public class LanguageSettingActivity extends AbsActivity {
private LinearLayout traditionalChinese, english;
private ImageView imgTraditionalChinese, imgEnglish;
private Locale locale;
@Override
protected int getLayoutId() {
@@ -25,6 +29,14 @@ public class LanguageSettingActivity extends AbsActivity {
@Override
protected void main() {
super.main();
locale = IMLoginManager.get(mContext).getLocaleLanguage();
if (locale == Locale.SIMPLIFIED_CHINESE) {
findViewById(R.id.img_english).setVisibility(View.GONE);
findViewById(R.id.img_traditional_chinese).setVisibility(View.VISIBLE);
} else {
findViewById(R.id.img_english).setVisibility(View.VISIBLE);
findViewById(R.id.img_traditional_chinese).setVisibility(View.GONE);
}
traditionalChinese = findViewById(R.id.traditional_chinese);
english = findViewById(R.id.english);
imgEnglish = findViewById(R.id.img_english);
@@ -33,13 +45,23 @@ public class LanguageSettingActivity extends AbsActivity {
ViewClicksAntiShake.clicksAntiShake(traditionalChinese, new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
changeAllActivitysLanguage(Locale.SIMPLIFIED_CHINESE);
locale = Locale.SIMPLIFIED_CHINESE;
findViewById(R.id.img_english).setVisibility(View.GONE);
findViewById(R.id.img_traditional_chinese).setVisibility(View.VISIBLE);
}
});
ViewClicksAntiShake.clicksAntiShake(english, new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
changeAllActivitysLanguage(Locale.US);
locale = new Locale("en", "rUS");
findViewById(R.id.img_english).setVisibility(View.VISIBLE);
findViewById(R.id.img_traditional_chinese).setVisibility(View.GONE);
}
});
ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.complete), new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
changeAllActivitysLanguage(locale);
}
});
}
@@ -47,8 +69,12 @@ public class LanguageSettingActivity extends AbsActivity {
private void changeAllActivitysLanguage(Locale locale) {
Stack<Activity> allActivityStacks = AppManager.getInstance().getAllActivityStacks();
for (int i = 0; i < allActivityStacks.size(); i++) {
LanguageUtil.shiftLanguage(locale, allActivityStacks.get(i),mContext);
if (!(allActivityStacks.get(i) instanceof LanguageSettingActivity)) {
allActivityStacks.get(i).finish();
}
}
IMLoginManager.get(mContext).setLanguage(locale != Locale.SIMPLIFIED_CHINESE);
startActivity(new Intent(mContext, MainActivity.class));
finish();
}
}

4
main/src/main/java/com/yunbao/main/activity/LoginActivity.java
View File

@@ -195,13 +195,13 @@ public class LoginActivity extends AbsActivity {
private void login() {
phoneNum = mEditPhone.getText().toString().trim();
if (TextUtils.isEmpty(phoneNum)) {
mEditPhone.setError(WordUtil.getString(R.string.login_input_phone));
mEditPhone.setError(mContext.getString(R.string.login_input_phone));
mEditPhone.requestFocus();
return;
}
pwd = mEditPwd.getText().toString().trim();
if (TextUtils.isEmpty(pwd)) {
mEditPwd.setError(WordUtil.getString(R.string.login_input_pwd));
mEditPwd.setError(mContext.getString(R.string.login_input_pwd));
mEditPwd.requestFocus();
return;
}

6
main/src/main/java/com/yunbao/main/activity/MainActivity.java
View File

@@ -701,7 +701,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
public void callback(ConfigBean configBean) {
if (configBean != null) {
if (configBean.getMaintainSwitch() == 1) {//开启维护
DialogUitl.showSimpleTipDialog(mContext, WordUtil.getString(R.string.main_maintain_notice), configBean.getMaintainTips());
DialogUitl.showSimpleTipDialog(mContext,mContext.getString(R.string.main_maintain_notice), configBean.getMaintainTips());
}
if (!VersionUtil.isLatest(configBean.getVersion())) {
if (!APKManager.get().getApkVerNew()) {
@@ -724,7 +724,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
* 填写邀请码
*/
private void showInvitationCode() {
DialogUitl.showSimpleInputDialog(mContext, WordUtil.getString(R.string.main_input_invatation_code), new DialogUitl.SimpleCallback() {
DialogUitl.showSimpleInputDialog(mContext,mContext.getString(R.string.main_input_invatation_code), new DialogUitl.SimpleCallback() {
@Override
public void onConfirmClick(final Dialog dialog, final String content) {
if (TextUtils.isEmpty(content)) {
@@ -1042,7 +1042,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
public final int CHOOSE_ANDROID_5 = 200;//Android 5.0以上的
public void startActivityMain(Intent intent, int CHOOSE) {
startActivityForResult(Intent.createChooser(intent, WordUtil.getString(R.string.choose_flie)), CHOOSE);
startActivityForResult(Intent.createChooser(intent,mContext.getString(R.string.choose_flie)), CHOOSE);
}
public void startActivityMain2(Intent intent, int CHOOSE_ANDROID_5) {

4
main/src/main/java/com/yunbao/main/activity/MainListActivity.java
View File

@@ -120,8 +120,8 @@ public class MainListActivity extends AbsActivity implements OnItemClickListener
mIndicator = (MagicIndicator) findViewById(R.id.indicator);
final String[] titles = new String[]{
(WordUtil.getString(R.string.glamour_list)),
(WordUtil.getString(R.string.magnificent_list))
(mContext.getString(R.string.glamour_list)),
(mContext.getString(R.string.magnificent_list))
};
CommonNavigator commonNavigator = new CommonNavigator(mContext);
commonNavigator.setAdapter(new CommonNavigatorAdapter() {

10
main/src/main/java/com/yunbao/main/activity/ModifyPwdActivity.java
View File

@@ -31,7 +31,7 @@ public class ModifyPwdActivity extends AbsActivity implements View.OnClickListen
@Override
protected void main() {
setTitle(WordUtil.getString(R.string.modify_pwd));
setTitle(mContext.getString(R.string.modify_pwd));
mEditOld = (EditText) findViewById(R.id.edit_old);
mEditNew = (EditText)findViewById(R.id.edit_new);
mEditConfirm = (EditText)findViewById(R.id.edit_confirm);
@@ -46,21 +46,21 @@ public class ModifyPwdActivity extends AbsActivity implements View.OnClickListen
private void modify() {
String pwdOld = mEditOld.getText().toString().trim();
if (TextUtils.isEmpty(pwdOld)) {
mEditOld.setError(WordUtil.getString(R.string.modify_pwd_old_1));
mEditOld.setError(mContext.getString(R.string.modify_pwd_old_1));
return;
}
String pwdNew = mEditNew.getText().toString().trim();
if (TextUtils.isEmpty(pwdNew)) {
mEditNew.setError(WordUtil.getString(R.string.modify_pwd_new_1));
mEditNew.setError(mContext.getString(R.string.modify_pwd_new_1));
return;
}
String pwdConfirm = mEditConfirm.getText().toString().trim();
if (TextUtils.isEmpty(pwdConfirm)) {
mEditConfirm.setError(WordUtil.getString(R.string.modify_pwd_confirm_1));
mEditConfirm.setError(mContext.getString(R.string.modify_pwd_confirm_1));
return;
}
if (!pwdNew.equals(pwdConfirm)) {
mEditConfirm.setError(WordUtil.getString(R.string.reg_pwd_error));
mEditConfirm.setError(mContext.getString(R.string.reg_pwd_error));
return;
}
MainHttpUtil.modifyPwd(pwdOld, pwdNew, pwdConfirm, new HttpCallback() {

155
main/src/main/java/com/yunbao/main/activity/MsgSettActivity.java
View File

@@ -1,36 +1,29 @@
package com.yunbao.main.activity;
import androidx.appcompat.app.AppCompatActivity;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.widget.ImageView;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.bean.BaseModel;
import com.yunbao.common.bean.MsgSwitchDetailModel;
import com.yunbao.common.bean.SlideInfoModel;
import com.yunbao.common.http.ResponseData;
import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.http.main.MainNetManager;
import com.yunbao.common.utils.SpUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.live.views.LoadingView;
import com.yunbao.main.R;
import com.yunbao.main.adapter.MainHomeLivesClassAdapter;
import com.yunbao.main.adapter.MsgFollowAdapter;
import java.util.List;
public class MsgSettActivity extends AbsActivity {
ImageView dt_switch,hdd_switch,lt_switch,xt_switch,kb_switch,privateChatMessageSwitch;
public static final String SWITCH_PRIVATE_CHAT_MSG="private_chat_message_switch";
ImageView dt_switch, hdd_switch, lt_switch, xt_switch, kb_switch, privateChatMessageSwitch;
public static final String SWITCH_PRIVATE_CHAT_MSG = "private_chat_message_switch";
RecyclerView follow_list;
@Override
protected int getLayoutId() {
return R.layout.activity_msg_sett;
@@ -39,27 +32,29 @@ public class MsgSettActivity extends AbsActivity {
@Override
protected void main() {
super.main();
setTitle("消息通知");
setTitle(getString(R.string.alerts));
follow_list = (RecyclerView) findViewById(R.id.follow_list);
dt_switch = (ImageView) findViewById(R.id.dt_switch);
hdd_switch= (ImageView) findViewById(R.id.hdd_switch);
hdd_switch = (ImageView) findViewById(R.id.hdd_switch);
lt_switch = (ImageView) findViewById(R.id.lt_switch);
xt_switch= (ImageView) findViewById(R.id.xt_switch);
kb_switch= (ImageView) findViewById(R.id.kb_switch);
privateChatMessageSwitch=findViewById(R.id.private_chat_switch);
xt_switch = (ImageView) findViewById(R.id.xt_switch);
kb_switch = (ImageView) findViewById(R.id.kb_switch);
privateChatMessageSwitch = findViewById(R.id.private_chat_switch);
getData();
dt_switch.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
//打开的
if (dt_switch.getDrawable().getCurrent().getConstantState().equals(getResources().getDrawable(R.mipmap.special_icon_on).getConstantState())){
if(setMsgMasterSwitch("2","1")){
if (dt_switch.getDrawable().getCurrent().getConstantState().equals(getResources().getDrawable(R.mipmap.special_icon_on).getConstantState())) {
if (setMsgMasterSwitch("2", "1")) {
dt_switch.setImageResource(R.mipmap.special_icon_off);
};
}else{
if(setMsgMasterSwitch("1","1")){
}
;
} else {
if (setMsgMasterSwitch("1", "1")) {
dt_switch.setImageResource(R.mipmap.special_icon_on);
};
}
;
}
}
});
@@ -68,14 +63,16 @@ public class MsgSettActivity extends AbsActivity {
@Override
public void onClick(View v) {
//打开的
if (hdd_switch.getDrawable().getCurrent().getConstantState().equals(getResources().getDrawable(R.mipmap.special_icon_on).getConstantState())){
if(setMsgMasterSwitch("2","2")){
if (hdd_switch.getDrawable().getCurrent().getConstantState().equals(getResources().getDrawable(R.mipmap.special_icon_on).getConstantState())) {
if (setMsgMasterSwitch("2", "2")) {
hdd_switch.setImageResource(R.mipmap.special_icon_off);
};
}else{
if(setMsgMasterSwitch("1","2")){
}
;
} else {
if (setMsgMasterSwitch("1", "2")) {
hdd_switch.setImageResource(R.mipmap.special_icon_on);
};
}
;
}
}
});
@@ -84,14 +81,16 @@ public class MsgSettActivity extends AbsActivity {
@Override
public void onClick(View v) {
//打开的
if (lt_switch.getDrawable().getCurrent().getConstantState().equals(getResources().getDrawable(R.mipmap.special_icon_on).getConstantState())){
if(setMsgMasterSwitch("2","3")){
if (lt_switch.getDrawable().getCurrent().getConstantState().equals(getResources().getDrawable(R.mipmap.special_icon_on).getConstantState())) {
if (setMsgMasterSwitch("2", "3")) {
lt_switch.setImageResource(R.mipmap.special_icon_off);
};
}else{
if(setMsgMasterSwitch("1","3")){
}
;
} else {
if (setMsgMasterSwitch("1", "3")) {
lt_switch.setImageResource(R.mipmap.special_icon_on);
};
}
;
}
}
});
@@ -100,14 +99,16 @@ public class MsgSettActivity extends AbsActivity {
@Override
public void onClick(View v) {
//打开的
if (xt_switch.getDrawable().getCurrent().getConstantState().equals(getResources().getDrawable(R.mipmap.special_icon_on).getConstantState())){
if(setMsgMasterSwitch("2","4")){
if (xt_switch.getDrawable().getCurrent().getConstantState().equals(getResources().getDrawable(R.mipmap.special_icon_on).getConstantState())) {
if (setMsgMasterSwitch("2", "4")) {
xt_switch.setImageResource(R.mipmap.special_icon_off);
};
}else{
if(setMsgMasterSwitch("1","4")){
}
;
} else {
if (setMsgMasterSwitch("1", "4")) {
xt_switch.setImageResource(R.mipmap.special_icon_on);
};
}
;
}
}
});
@@ -116,24 +117,24 @@ public class MsgSettActivity extends AbsActivity {
kb_switch.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
int is =1;
int is = 1;
//打开的
if (kb_switch.getDrawable().getCurrent().getConstantState().equals(getResources().getDrawable(R.mipmap.special_icon_on).getConstantState())){
if (kb_switch.getDrawable().getCurrent().getConstantState().equals(getResources().getDrawable(R.mipmap.special_icon_on).getConstantState())) {
is = 2;
}else{
} else {
is = 1;
}
MainNetManager.get(mContext).setBeginShowMsgSwitch(is+"", "1","", new HttpCallback<ResponseData>() {
MainNetManager.get(mContext).setBeginShowMsgSwitch(is + "", "1", "", new HttpCallback<ResponseData>() {
@Override
public void onSuccess(ResponseData data) {
Log.e("ds",data.getCode()+"");
if(data.getCode() == 200 ){
Log.e("ds",kb_switch.getDrawable().getCurrent().getConstantState()+"");
if (kb_switch.getDrawable().getCurrent().getConstantState().equals(getResources().getDrawable(R.mipmap.special_icon_on).getConstantState())){
Log.e("ds", data.getCode() + "");
if (data.getCode() == 200) {
Log.e("ds", kb_switch.getDrawable().getCurrent().getConstantState() + "");
if (kb_switch.getDrawable().getCurrent().getConstantState().equals(getResources().getDrawable(R.mipmap.special_icon_on).getConstantState())) {
kb_switch.setImageResource(R.mipmap.special_icon_off);
follow_list.setVisibility(View.GONE);
}else{
} else {
getData();
}
}
@@ -142,7 +143,7 @@ public class MsgSettActivity extends AbsActivity {
@Override
public void onError(String error) {
Log.e("ds",kb_switch.getDrawable().getCurrent().getConstantState()+"11"+error);
Log.e("ds", kb_switch.getDrawable().getCurrent().getConstantState() + "11" + error);
}
});
@@ -160,12 +161,12 @@ public class MsgSettActivity extends AbsActivity {
}
});*/
privateChatMessageSwitch.setOnClickListener(view -> {
if (privateChatMessageSwitch.getDrawable().getCurrent().getConstantState().equals(getResources().getDrawable(R.mipmap.special_icon_on).getConstantState())){
if (privateChatMessageSwitch.getDrawable().getCurrent().getConstantState().equals(getResources().getDrawable(R.mipmap.special_icon_on).getConstantState())) {
privateChatMessageSwitch.setImageResource(R.mipmap.special_icon_off);
SpUtil.getInstance().setBooleanValue(SWITCH_PRIVATE_CHAT_MSG,false);
}else{
SpUtil.getInstance().setBooleanValue(SWITCH_PRIVATE_CHAT_MSG, false);
} else {
privateChatMessageSwitch.setImageResource(R.mipmap.special_icon_on);
SpUtil.getInstance().setBooleanValue(SWITCH_PRIVATE_CHAT_MSG,true);
SpUtil.getInstance().setBooleanValue(SWITCH_PRIVATE_CHAT_MSG, true);
}
});
@@ -175,59 +176,59 @@ public class MsgSettActivity extends AbsActivity {
}
public void getData(){
public void getData() {
MainNetManager.get(mContext)
.getMsgSwitchDetail(new HttpCallback<MsgSwitchDetailModel>() {
@Override
public void onSuccess(MsgSwitchDetailModel data) {
if(data.getDynamic_msg_switch().equals("2")){
if (data.getDynamic_msg_switch().equals("2")) {
dt_switch.setImageResource(R.mipmap.special_icon_off);
}else{
} else {
dt_switch.setImageResource(R.mipmap.special_icon_on);
}
if(data.getInteraction_show_msg_switch().equals("2")){
if (data.getInteraction_show_msg_switch().equals("2")) {
hdd_switch.setImageResource(R.mipmap.special_icon_off);
}else{
} else {
hdd_switch.setImageResource(R.mipmap.special_icon_on);
}
if(data.getChat_msg_switch().equals("2")){
if (data.getChat_msg_switch().equals("2")) {
lt_switch.setImageResource(R.mipmap.special_icon_off);
}else{
} else {
lt_switch.setImageResource(R.mipmap.special_icon_on);
}
if(data.getChat_msg_switch().equals("2")){
if (data.getChat_msg_switch().equals("2")) {
lt_switch.setImageResource(R.mipmap.special_icon_off);
}else{
} else {
lt_switch.setImageResource(R.mipmap.special_icon_on);
}
if(data.getSystem_msg_switch().equals("2")){
if (data.getSystem_msg_switch().equals("2")) {
xt_switch.setImageResource(R.mipmap.special_icon_off);
}else{
} else {
xt_switch.setImageResource(R.mipmap.special_icon_on);
}
if(data.getSystem_msg_switch().equals("2")){
if (data.getSystem_msg_switch().equals("2")) {
xt_switch.setImageResource(R.mipmap.special_icon_off);
}else{
} else {
xt_switch.setImageResource(R.mipmap.special_icon_on);
}
for(int i = 0; i < data.getFollowList().size();i++) {
if(!data.getFollowList().get(i).getStatus().equals("2")){
for (int i = 0; i < data.getFollowList().size(); i++) {
if (!data.getFollowList().get(i).getStatus().equals("2")) {
kb_switch.setImageResource(R.mipmap.special_icon_on);
follow_list.setVisibility(View.VISIBLE);
break;
}
}
if(SpUtil.getInstance().getBooleanValue(SWITCH_PRIVATE_CHAT_MSG)){
if (SpUtil.getInstance().getBooleanValue(SWITCH_PRIVATE_CHAT_MSG)) {
privateChatMessageSwitch.setImageResource(R.mipmap.special_icon_on);
}else{
} else {
privateChatMessageSwitch.setImageResource(R.mipmap.special_icon_off);
}
@@ -243,14 +244,16 @@ public class MsgSettActivity extends AbsActivity {
}
});
}
boolean ret = false;
public boolean setMsgMasterSwitch(String status,String type){
ret =false;
public boolean setMsgMasterSwitch(String status, String type) {
ret = false;
MainNetManager.get(mContext).setMsgMasterSwitch(status, type, new HttpCallback<ResponseData>() {
@Override
public void onSuccess(ResponseData data) {
if(data.getCode() == 200 ){
if (data.getCode() == 200) {
ret = true;
}

12
main/src/main/java/com/yunbao/main/activity/MyCoinActivity.java
View File

@@ -24,6 +24,7 @@ import com.yunbao.common.http.CommonHttpConsts;
import com.yunbao.common.http.CommonHttpUtil;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.pay.PayCallback;
import com.yunbao.common.pay.PayPresenter;
import com.yunbao.common.utils.StringUtil;
@@ -38,6 +39,7 @@ import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.util.List;
import java.util.Locale;
/**
* Created by cxf on 2018/10/23.
@@ -67,7 +69,7 @@ public class MyCoinActivity extends AbsActivity implements OnItemClickListener<C
@Override
protected void main() {
// setTitle(WordUtil.getString(R.string.wallet));
// setTitle(mContext.getString(R.string.wallet));
mRefreshLayout = findViewById(R.id.refreshLayout);
mRefreshLayout.setColorSchemeResources(com.yunbao.video.R.color.global);
mRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
@@ -97,10 +99,10 @@ public class MyCoinActivity extends AbsActivity implements OnItemClickListener<C
mRecyclerView.addItemDecoration(decoration);
TextView coinNameTextView = findViewById(R.id.coin_name);
coinNameTextView.setText(String.format(WordUtil.getString(R.string.wallet_coin_name), mCoinName));
coinNameTextView.setText(String.format(mContext.getString(R.string.wallet_coin_name), mCoinName));
//我的金币
TextView goldCoinNameTV = findViewById(R.id.tvMyGoldName);
goldCoinNameTV.setText(String.format(WordUtil.getString(R.string.wallet_gold_name), mGoldCoinName));
goldCoinNameTV.setText(String.format(mContext.getString(R.string.wallet_gold_name), mGoldCoinName));
mBalance = findViewById(R.id.coin);
mTvGoldCoinNum = findViewById(R.id.tvGoldCoinNum);
View btnChargeExplain= findViewById(R.id.btn_charge_explain);
@@ -295,10 +297,10 @@ public class MyCoinActivity extends AbsActivity implements OnItemClickListener<C
int i = v.getId();
if (i == R.id.btn_tip) {
//充值协议
WebViewActivity.forward(mContext, HtmlConfig.CHARGE_PRIVCAY);
WebViewActivity.forward(mContext, HtmlConfig.CHARGE_PRIVCAY + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
}else if (i == R.id.btn_charge_explain) {
//充值说明
WebViewActivity.forward(mContext, HtmlConfig.CHARGE_EXPLAIN);
WebViewActivity.forward(mContext, HtmlConfig.CHARGE_EXPLAIN + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
}
}

4
main/src/main/java/com/yunbao/main/activity/MyImpressActivity.java
View File

@@ -34,7 +34,7 @@ public class MyImpressActivity extends AbsActivity {
@Override
protected void main() {
setTitle(WordUtil.getString(R.string.impress));
setTitle(mContext.getString(R.string.impress));
mGroup = (LinearLayout) findViewById(R.id.group);
mTip = (TextView) findViewById(R.id.tip);
MainHttpUtil.getMyImpress(new HttpCallback() {
@@ -66,7 +66,7 @@ public class MyImpressActivity extends AbsActivity {
mGroup.addView(linearLayout);
}
} else {
mTip.setText(WordUtil.getString(R.string.impress_tip_3));
mTip.setText(mContext.getString(R.string.impress_tip_3));
}
}
}

13
main/src/main/java/com/yunbao/main/activity/MyProfitActivity.java
View File

@@ -17,6 +17,7 @@ import com.yunbao.common.HtmlConfig;
import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.activity.WebViewActivity;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.L;
import com.yunbao.common.utils.SpUtil;
import com.yunbao.common.utils.ToastUtil;
@@ -26,6 +27,8 @@ import com.yunbao.main.http.MainHttpConsts;
import com.yunbao.main.http.MainHttpUtil;
import com.yunbao.main.utils.MainIconUtil;
import java.util.Locale;
/**
* Created by cxf on 2018/10/20.
*/
@@ -97,9 +100,9 @@ public class MyProfitActivity extends AbsActivity implements View.OnClickListene
}
});
mVotesName = CommonAppConfig.getInstance().getVotesName();
mAllName.setText(String.format(WordUtil.getString(R.string.profit_tip_1), mVotesName));
mCanName.setText(String.format(WordUtil.getString(R.string.profit_tip_2), mVotesName));
mGetName.setText(String.format(WordUtil.getString(R.string.profit_tip_3), mVotesName));
mAllName.setText(String.format(mContext.getString(R.string.profit_tip_1), mVotesName));
mCanName.setText(String.format(mContext.getString(R.string.profit_tip_2), mVotesName));
mGetName.setText(String.format(mContext.getString(R.string.profit_tip_3), mVotesName));
mBtnCash = findViewById(R.id.btn_cash);
mBtnCash.setOnClickListener(this);
findViewById(R.id.btn_choose_account).setOnClickListener(this);
@@ -156,7 +159,7 @@ public class MyProfitActivity extends AbsActivity implements View.OnClickListene
* 提现记录
*/
private void cashRecord() {
WebViewActivity.forward(mContext, HtmlConfig.CASH_RECORD);
WebViewActivity.forward(mContext, HtmlConfig.CASH_RECORD + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
}
@@ -166,7 +169,7 @@ public class MyProfitActivity extends AbsActivity implements View.OnClickListene
private void cash() {
String votes = mEdit.getText().toString().trim();
if (TextUtils.isEmpty(votes)) {
ToastUtil.show(String.format(WordUtil.getString(R.string.profit_coin_empty), mVotesName));
ToastUtil.show(String.format(mContext.getString(R.string.profit_coin_empty), mVotesName));
return;
}
if (TextUtils.isEmpty(mAccountID)) {

2
main/src/main/java/com/yunbao/main/activity/MyVideoActivity.java
View File

@@ -23,7 +23,7 @@ public class MyVideoActivity extends AbsActivity {
@Override
protected void main() {
setTitle(WordUtil.getString(R.string.video_my_video));
setTitle(mContext.getString(R.string.video_my_video));
mVideoHomeViewHolder = new VideoHomeViewHolder(mContext, (ViewGroup) findViewById(R.id.container), CommonAppConfig.getInstance().getUid());
mVideoHomeViewHolder.addToParent();
mVideoHomeViewHolder.subscribeActivityLifeCycle();

4
main/src/main/java/com/yunbao/main/activity/MyWalletActivity.java
View File

@@ -59,7 +59,7 @@ public class MyWalletActivity extends AbsActivity {
super.main();
mw = MyWalletActivity.this;
setTitle(WordUtil.getString(R.string.wallet));
setTitle(mContext.getString(R.string.wallet));
GoogleBillingUtilNew.getInstance().initGooglePay(mContext);
vp_content = (ViewPager) findViewById(R.id.vp_content);
TextView rView = (TextView) findViewById(R.id.rView);
@@ -107,7 +107,7 @@ public class MyWalletActivity extends AbsActivity {
});
});
final String[] titles = {WordUtil.getString(R.string.diamond), WordUtil.getString(R.string.coins), WordUtil.getString(R.string.golden_beans)};
final String[] titles = {mContext.getString(R.string.diamond),mContext.getString(R.string.coins),mContext.getString(R.string.golden_beans)};
if (getIntent().getStringExtra("tag") != null) {
Log.i("tss", "首充");
if (CommonAppConfig.IS_GOOGLE_PLAY == false) {

2
main/src/main/java/com/yunbao/main/activity/MyWebViewActivity.java
View File

@@ -355,7 +355,7 @@ public class MyWebViewActivity extends AbsActivity {
intent.setData(MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
}
intent.setType("image/*");
startActivityForResult(Intent.createChooser(intent, WordUtil.getString(R.string.choose_flie)), CHOOSE);
startActivityForResult(Intent.createChooser(intent,mContext.getString(R.string.choose_flie)), CHOOSE);
}
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)

2
main/src/main/java/com/yunbao/main/activity/MyWebViewActivity2.java
View File

@@ -267,7 +267,7 @@ public class MyWebViewActivity2 extends AbsActivity {
intent.setData(MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
}
intent.setType("image/*");
startActivityForResult(Intent.createChooser(intent, WordUtil.getString(R.string.choose_flie)), CHOOSE);
startActivityForResult(Intent.createChooser(intent,mContext.getString(R.string.choose_flie)), CHOOSE);
}
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)

16
main/src/main/java/com/yunbao/main/activity/RegisterActivity.java
View File

@@ -125,8 +125,8 @@ public class RegisterActivity extends AbsActivity {
getUuidDevice();
getPromoCode();
mGetCode = WordUtil.getString(R.string.reg_get_code);
mGetCodeAgain = WordUtil.getString(R.string.reg_get_code_again);
mGetCode =mContext.getString(R.string.reg_get_code);
mGetCodeAgain =mContext.getString(R.string.reg_get_code_again);
mTvCountryCodeClick();
mEditPhone.addTextChangedListener(new TextWatcher() {
@Override
@@ -303,7 +303,7 @@ public class RegisterActivity extends AbsActivity {
private void getMessageCode(String Randstr, String Ticket) {
String phoneNum = mEditPhone.getText().toString().trim();
if (TextUtils.isEmpty(phoneNum)) {
mEditPhone.setError(WordUtil.getString(R.string.reg_input_phone));
mEditPhone.setError(mContext.getString(R.string.reg_input_phone));
mEditPhone.requestFocus();
return;
}
@@ -335,30 +335,30 @@ public class RegisterActivity extends AbsActivity {
private void register() {
final String phoneNum = mEditPhone.getText().toString().trim();
if (TextUtils.isEmpty(phoneNum)) {
mEditPhone.setError(WordUtil.getString(R.string.reg_input_phone));
mEditPhone.setError(mContext.getString(R.string.reg_input_phone));
mEditPhone.requestFocus();
return;
}
String code = mEditCode.getText().toString().trim();
if (TextUtils.isEmpty(code)) {
mEditCode.setError(WordUtil.getString(R.string.reg_input_code));
mEditCode.setError(mContext.getString(R.string.reg_input_code));
mEditCode.requestFocus();
return;
}
final String pwd = mEditPwd1.getText().toString().trim();
if (TextUtils.isEmpty(pwd)) {
mEditPwd1.setError(WordUtil.getString(R.string.reg_input_pwd_1));
mEditPwd1.setError(mContext.getString(R.string.reg_input_pwd_1));
mEditPwd1.requestFocus();
return;
}
String pwd2 = mEditPwd2.getText().toString().trim();
if (TextUtils.isEmpty(pwd2)) {
mEditPwd2.setError(WordUtil.getString(R.string.reg_input_pwd_2));
mEditPwd2.setError(mContext.getString(R.string.reg_input_pwd_2));
mEditPwd2.requestFocus();
return;
}
if (!pwd.equals(pwd2)) {
mEditPwd2.setError(WordUtil.getString(R.string.reg_pwd_error));
mEditPwd2.setError(mContext.getString(R.string.reg_pwd_error));
mEditPwd2.requestFocus();
return;
}

2
main/src/main/java/com/yunbao/main/activity/RewardActivity.java
View File

@@ -238,7 +238,7 @@ public class RewardActivity extends AbsActivity {
intent.setData(MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
}
intent.setType("image/*");
startActivityForResult(Intent.createChooser(intent, WordUtil.getString(R.string.choose_flie)), CHOOSE);
startActivityForResult(Intent.createChooser(intent,mContext.getString(R.string.choose_flie)), CHOOSE);
}
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)

8
main/src/main/java/com/yunbao/main/activity/SettingActivity.java
View File

@@ -76,7 +76,7 @@ public class SettingActivity extends AbsActivity implements OnItemClickListener<
@Override
protected void main() {
setTitle(WordUtil.getString(R.string.set_up));
setTitle(mContext.getString(R.string.set_up));
mRecyclerView = (RecyclerView) findViewById(R.id.recyclerView);
studioGiftEffects = findViewById(R.id.studio_gift_effects);
studioRideEffects = findViewById(R.id.studio_ride_effects);
@@ -97,16 +97,16 @@ public class SettingActivity extends AbsActivity implements OnItemClickListener<
List<SettingBean> list = JSON.parseArray(Arrays.toString(info), SettingBean.class);
SettingBean data1 = new SettingBean();
data1.setId(19);
data1.setName(WordUtil.getString(R.string.versions));
data1.setName(mContext.getString(R.string.versions));
list.add(data1);
SettingBean data2 = new SettingBean();
data2.setId(25);
data2.setName(WordUtil.getString(R.string.check_the_new_version));
data2.setName(mContext.getString(R.string.check_the_new_version));
list.add(data2);
SettingBean bean = new SettingBean();
bean.setName(WordUtil.getString(R.string.setting_exit));
bean.setName(mContext.getString(R.string.setting_exit));
bean.setLast(true);
list.add(bean);

2
main/src/main/java/com/yunbao/main/activity/ThreeDistributActivity.java
View File

@@ -196,7 +196,7 @@ public class ThreeDistributActivity extends AbsActivity implements View.OnClickL
intent.setData(MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
}
intent.setType("image/*");
startActivityForResult(Intent.createChooser(intent, WordUtil.getString(com.yunbao.common.R.string.choose_flie)), CHOOSE);
startActivityForResult(Intent.createChooser(intent,mContext.getString(com.yunbao.common.R.string.choose_flie)), CHOOSE);
}
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)

2
main/src/main/java/com/yunbao/main/activity/WeekWebViewActivity.java
View File

@@ -196,7 +196,7 @@ public class WeekWebViewActivity extends AbsActivity {
intent.setData(MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
}
intent.setType("image/*");
startActivityForResult(Intent.createChooser(intent, WordUtil.getString(com.yunbao.common.R.string.choose_flie)), CHOOSE);
startActivityForResult(Intent.createChooser(intent,mContext.getString(com.yunbao.common.R.string.choose_flie)), CHOOSE);
}
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)

2
main/src/main/java/com/yunbao/main/activity/ZhuangBanActivity.java
View File

@@ -195,7 +195,7 @@ public class ZhuangBanActivity extends AbsActivity {
intent.setData(MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
}
intent.setType("image/*");
startActivityForResult(Intent.createChooser(intent, WordUtil.getString(R.string.choose_flie)), CHOOSE);
startActivityForResult(Intent.createChooser(intent,mContext.getString(R.string.choose_flie)), CHOOSE);
}
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)

2
main/src/main/java/com/yunbao/main/adapter/CoinAdapter.java
View File

@@ -50,7 +50,7 @@ public class CoinAdapter extends RecyclerView.Adapter {
mInflater = LayoutInflater.from(context);
mHeadView = mInflater.inflate(R.layout.item_coin_head, null);
mHeadView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
mGiveString = WordUtil.getString(R.string.coin_give);
mGiveString =context.getString(R.string.coin_give);
mOnClickListener = new View.OnClickListener() {
@Override
public void onClick(View v) {

26
main/src/main/java/com/yunbao/main/adapter/MainHomeLivesClassAdapter.java
View File

@@ -3,19 +3,21 @@ package com.yunbao.main.adapter;
import android.annotation.SuppressLint;
import android.content.Context;
import android.graphics.Color;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import android.os.Build;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.yunbao.common.bean.LiveClassBean;
import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.main.R;
import java.util.List;
import java.util.Locale;
public class MainHomeLivesClassAdapter extends RecyclerView.Adapter<MainHomeLivesClassAdapter.Vh> {
@@ -71,6 +73,7 @@ public class MainHomeLivesClassAdapter extends RecyclerView.Adapter<MainHomeLive
class Vh extends RecyclerView.ViewHolder {
TextView mName;
public Vh(View itemView) {
super(itemView);
mName = (TextView) itemView.findViewById(R.id.tv_class_name);
@@ -80,11 +83,22 @@ public class MainHomeLivesClassAdapter extends RecyclerView.Adapter<MainHomeLive
@SuppressLint("NewApi")
void setData(LiveClassBean bean, int position) {
itemView.setTag(position);
mName.setText(bean.getName());
if(position == choice){
Locale locale;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
locale = mContext.getResources().getConfiguration().getLocales().get(0);
} else {
locale = mContext.getResources().getConfiguration().locale;
}
if (locale.getLanguage().equals("zh")) {
mName.setText(bean.getChinese());
} else {
mName.setText(bean.getEnglish());
}
if (position == choice) {
mName.setBackgroundResource(R.drawable.button_ffc621);
mName.setTextColor(Color.parseColor("#FFC621"));
}else{
} else {
mName.setBackgroundResource(R.drawable.button_cbd5e0);
mName.setTextColor(Color.parseColor("#484D68"));
}

4
main/src/main/java/com/yunbao/main/adapter/MainListAdapter.java
View File

@@ -58,8 +58,8 @@ public class MainListAdapter extends RefreshAdapter<ListBean> {
super(context);
mType = type;
mTopList = new ArrayList<>();
mFollow = (WordUtil.getString(R.string.follow));
mFollowing = WordUtil.getString(R.string.following);
mFollow = (mContext.getString(R.string.follow));
mFollowing =mContext.getString(R.string.following);
mItemClickListener = v -> {
Object tag = v.getTag();
if (tag != null && mOnItemClickListener != null) {

4
main/src/main/java/com/yunbao/main/adapter/SearchAdapter.java
View File

@@ -48,8 +48,8 @@ public class SearchAdapter extends RefreshAdapter<SearchUserBean> {
public SearchAdapter(Context context, int from) {
super(context);
mFrom = from;
mFollow = WordUtil.getString(R.string.follow);
mFollowing = WordUtil.getString(R.string.following);
mFollow =mContext.getString(R.string.follow);
mFollowing =mContext.getString(R.string.following);
mFollowClickListener = new View.OnClickListener() {
@Override
public void onClick(View v) {

6
main/src/main/java/com/yunbao/main/dialog/OneLoginDialog.java
View File

@@ -80,11 +80,11 @@ public class OneLoginDialog extends AbsDialogFragment {
return;
}
ImgLoader.displayAvatar(mContext, CommonAppConfig.getInstance().getUserBean().getAvatar(), avatar);
text_username.setText(WordUtil.getString(R.string.edit_profile_nickname) + "：" + bundle.getString("name"));
text_username.setText(mContext.getString(R.string.edit_profile_nickname) + "：" + bundle.getString("name"));
if (!bundle.getString("code").equals("")) {
text_code.setText(WordUtil.getString(R.string.invite_code) + "：" + bundle.getString("code"));
text_code.setText(mContext.getString(R.string.invite_code) + "：" + bundle.getString("code"));
} else {
text_code.setText(WordUtil.getString(R.string.invite_code) + "：無");
text_code.setText(mContext.getString(R.string.invite_code) + "：無");
}
btn_enter.setOnClickListener(new View.OnClickListener() {

7
main/src/main/java/com/yunbao/main/utils/LanguageUtil.java
View File

@@ -7,8 +7,6 @@ import android.content.res.Configuration;
import android.content.res.Resources;
import android.util.DisplayMetrics;
import com.yunbao.main.activity.MainActivity;
import java.lang.reflect.Method;
import java.util.Locale;
@@ -42,9 +40,8 @@ public class LanguageUtil {
DisplayMetrics dm = resources.getDisplayMetrics();
config.locale = locale;
resources.updateConfiguration(config, dm);
if (!(activity instanceof MainActivity)) {
activity.recreate();
}
activity.finish();
}

2
main/src/main/java/com/yunbao/main/views/AbsMainListChildViewHolder.java
View File

@@ -335,7 +335,7 @@ public abstract class AbsMainListChildViewHolder extends AbsMainViewHolder imple
setVisibility(bean.isHide() ? View.GONE : View.VISIBLE, position, mBtnFollow1, mBtnFollow2, mBtnFollow3);
if (bean.getAttention() != 1) {
getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).doChecked(true);
getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setText("+" + WordUtil.getString(R.string.follow));
getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setText("+" +mContext.getString(R.string.follow));
if (isRankOne) {
getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setBackgroundResource(R.drawable.background_ffff79c2);
getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setTextColor(Color.parseColor("#FFFFFF"));

2
main/src/main/java/com/yunbao/main/views/BonusViewHolder.java
View File

@@ -79,7 +79,7 @@ public class BonusViewHolder extends AbsViewHolder implements View.OnClickListen
public void setData(List<BonusBean> list, int day, String continueDay) {
mList = list;
mDay = day;
String s = WordUtil.getString(R.string.bonus_sign_1) + "<font color='#FF6131'>" + continueDay + "</font>" + WordUtil.getString(R.string.bonus_day);
String s =mContext.getString(R.string.bonus_sign_1) + "<font color='#FF6131'>" + continueDay + "</font>" +mContext.getString(R.string.bonus_day);
mDayView.setText(Html.fromHtml(s));
for (int i = 0, length = mItemViews.length; i < length; i++) {
if (i <= mDay - 1) {

16
main/src/main/java/com/yunbao/main/views/MainHomeCommunityViewHolder.java
View File

@@ -1,7 +1,6 @@
package com.yunbao.main.views;
import static android.content.Context.CLIPBOARD_SERVICE;
import static com.yunbao.common.utils.WordUtil.getString;
import android.content.ClipData;
import android.content.ClipboardManager;
@@ -36,14 +35,13 @@ import com.yunbao.common.bean.LiveBean;
import com.yunbao.common.event.JavascriptInterfaceEvent;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.JavascriptInterfaceUtils;
import com.yunbao.common.utils.L;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.live.activity.LiveAudienceActivity;
import com.yunbao.live.http.LiveHttpUtil;
import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
import com.yunbao.live.views.LoadingView;
@@ -59,6 +57,7 @@ import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.util.Arrays;
import java.util.Locale;
/**
* Created by Chen Haoxuan on 2022/3/25.
@@ -88,7 +87,8 @@ public class MainHomeCommunityViewHolder extends AbsMainHomeChildViewHolder impl
@Override
public void init() {
Bus.getOn(this);
String url = HtmlConfig.ENCOURAGE + "?t=" + Math.random() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
String url = HtmlConfig.ENCOURAGE + "?t=" + Math.random() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()
+ "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0");
final LinearLayout rootView = (LinearLayout) findViewById(R.id.rootView);
mProgressBar = (ProgressBar) findViewById(R.id.progressbar);
mWebView = new WebView(mContext);
@@ -269,8 +269,8 @@ public class MainHomeCommunityViewHolder extends AbsMainHomeChildViewHolder impl
intent.setData(MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
}
intent.setType("image/*");
nowMainActivity.startActivityMain(Intent.createChooser(intent, WordUtil.getString(R.string.choose_flie)), CHOOSE);
// startActivityForResult(Intent.createChooser(intent, WordUtil.getString(R.string.choose_flie)), CHOOSE);
nowMainActivity.startActivityMain(Intent.createChooser(intent, mContext.getString(R.string.choose_flie)), CHOOSE);
// startActivityForResult(Intent.createChooser(intent,mContext.getString(R.string.choose_flie)), CHOOSE);
}
@@ -295,7 +295,7 @@ public class MainHomeCommunityViewHolder extends AbsMainHomeChildViewHolder impl
ClipboardManager cm = (ClipboardManager) mContext.getSystemService(CLIPBOARD_SERVICE);
ClipData clipData = ClipData.newPlainText("text", content);
cm.setPrimaryClip(clipData);
ToastUtil.show(getString(R.string.copy_success));
ToastUtil.show(mContext.getString(R.string.copy_success));
}
public void closeFinger() {
@@ -354,7 +354,7 @@ public class MainHomeCommunityViewHolder extends AbsMainHomeChildViewHolder impl
} else if (TextUtils.equals(event.getMethod(), "androidCommunityShare")) {
JSONObject json = JSONObject.parseObject(event.getData());
new SharePopDialog(mContext)
.setShareLink(CommonAppConfig.HOST+json.getString("link"))
.setShareLink(CommonAppConfig.HOST + json.getString("link"))
.setAnchorAvatar(json.getString("avatar"))
.showDialog();
}

3
main/src/main/java/com/yunbao/main/views/MainHomeCsdViewHolder.java
View File

@@ -29,7 +29,6 @@ import com.yunbao.common.bean.LiveBean;
import com.yunbao.main.R;
import static android.content.Context.CLIPBOARD_SERVICE;
import static com.yunbao.common.utils.WordUtil.getString;
/**
* Created by cxf on 2018/9/22.
@@ -145,6 +144,6 @@ public class MainHomeCsdViewHolder extends AbsMainHomeChildViewHolder implements
ClipboardManager cm = (ClipboardManager) mContext.getSystemService(CLIPBOARD_SERVICE);
ClipData clipData = ClipData.newPlainText("text", content);
cm.setPrimaryClip(clipData);
ToastUtil.show(getString(com.yunbao.common.R.string.copy_success));
ToastUtil.show(mContext.getString(com.yunbao.common.R.string.copy_success));
}
}

59
main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java
View File

@@ -5,7 +5,6 @@ import android.animation.ObjectAnimator;
import android.app.Activity;
import android.app.Dialog;
import android.content.Context;
import android.content.Intent;
import android.graphics.Outline;
import android.graphics.drawable.Drawable;
import android.net.Uri;
@@ -48,7 +47,6 @@ import com.yunbao.common.activity.WebViewActivity;
import com.yunbao.common.adapter.RefreshAdapter;
import com.yunbao.common.bean.AnchorRecommendModel;
import com.yunbao.common.bean.BannerBean;
import com.yunbao.common.bean.ConfigBean;
import com.yunbao.common.bean.LiveBean;
import com.yunbao.common.bean.LiveClassBean;
import com.yunbao.common.bean.WeekListBean;
@@ -57,6 +55,7 @@ import com.yunbao.common.custom.ItemDecoration;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.manager.LiveClassManager;
import com.yunbao.common.utils.DialogUitl;
import com.yunbao.common.utils.MicStatusManager;
import com.yunbao.common.utils.RouteUtil;
@@ -80,7 +79,6 @@ import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -293,37 +291,34 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
mClassRecyclerViewTop = (RecyclerView) findViewById(R.id.classRecyclerView_top);
mClassRecyclerViewTop.setHasFixedSize(true);
mClassRecyclerViewTop.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.HORIZONTAL, false));
ConfigBean configBean = CommonAppConfig.getInstance().getConfig();
if (configBean != null) {
List<LiveClassBean> list = configBean.getLiveClass();
if (list != null && list.size() > 0) {
List<LiveClassBean> targetList = new ArrayList<>();
if (list.size() <= 6) {
targetList.addAll(list);
} else {
targetList.addAll(list);
}
final MainHomeLivesClassAdapter topAdapter = new MainHomeLivesClassAdapter(mContext, targetList, false);
topAdapter.setOnItemClickListener(new OnItemClickListener<LiveClassBean>() {
@Override
public void onItemClick(LiveClassBean bean, int position) {
if (!canClick()) {
return;
}
if (position != 0) {
select = bean.getId();
} else {
select = 0;
}
mRefreshView.initData();
topAdapter.choice = position;
topAdapter.notifyDataSetChanged();
List<LiveClassBean> list = new LiveClassManager(mContext).getLiveClass();
if (list != null && list.size() > 0) {
List<LiveClassBean> targetList = new ArrayList<>();
if (list.size() <= 6) {
targetList.addAll(list);
} else {
targetList.addAll(list);
}
final MainHomeLivesClassAdapter topAdapter = new MainHomeLivesClassAdapter(mContext, targetList, false);
topAdapter.setOnItemClickListener(new OnItemClickListener<LiveClassBean>() {
@Override
public void onItemClick(LiveClassBean bean, int position) {
if (!canClick()) {
return;
}
});
if (mClassRecyclerViewTop != null) {
mClassRecyclerViewTop.setAdapter(topAdapter);
if (position != 0) {
select = bean.getId();
} else {
select = 0;
}
mRefreshView.initData();
topAdapter.choice = position;
topAdapter.notifyDataSetChanged();
}
});
if (mClassRecyclerViewTop != null) {
mClassRecyclerViewTop.setAdapter(topAdapter);
}
}
View headView = mAdapter.getHeadView();

3
main/src/main/java/com/yunbao/main/views/MainHomeShopViewHolder.java
View File

@@ -27,7 +27,6 @@ import com.yunbao.main.R;
import com.yunbao.main.utils.BottomBarUtil;
import static android.content.Context.CLIPBOARD_SERVICE;
import static com.yunbao.common.utils.WordUtil.getString;
/**
* Created by cxf on 2018/9/22.
@@ -142,7 +141,7 @@ public class MainHomeShopViewHolder extends AbsMainHomeChildViewHolder implement
ClipboardManager cm = (ClipboardManager) mContext.getSystemService(CLIPBOARD_SERVICE);
ClipData clipData = ClipData.newPlainText("text", content);
cm.setPrimaryClip(clipData);
ToastUtil.show(getString(com.yunbao.common.R.string.copy_success));
ToastUtil.show(mContext.getString(com.yunbao.common.R.string.copy_success));
}
}

6
main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java
View File

@@ -87,9 +87,9 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder {
@Override
protected String[] getTitles() {
return new String[]{
WordUtil.getString(R.string.follow),
WordUtil.getString(R.string.hot),
WordUtil.getString(R.string.recomment),
mContext.getString(R.string.follow),
mContext.getString(R.string.hot),
mContext.getString(R.string.recomment),
};
}

4
main/src/main/java/com/yunbao/main/views/MainListViewHolder.java
View File

@@ -85,8 +85,8 @@ public class MainListViewHolder extends AbsMainViewHolder {
});
mIndicator = (MagicIndicator) findViewById(R.id.indicator);
final String[] titles = new String[]{
WordUtil.getString(R.string.main_list_profit),
WordUtil.getString(R.string.main_list_contribute)
mContext.getString(R.string.main_list_profit),
mContext.getString(R.string.main_list_contribute)
};
CommonNavigator commonNavigator = new CommonNavigator(mContext);
commonNavigator.setAdapter(new CommonNavigatorAdapter() {

3
main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java
View File

@@ -40,6 +40,7 @@ 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;
import com.yunbao.common.utils.StringUtil;
@@ -452,7 +453,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
Log.i("tsa", url);
RewardActivity.forward(mContext, url);
} else if (bean.getId() == 4) {
url = HtmlConfig.SHOP + "?t=" + Math.random() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
url = HtmlConfig.SHOP + "?t=" + Math.random() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0");
WebViewActivity.forward(mContext, url);
} else if (bean.getId() == 3) {//我的等级
Constants.myIntoIndex = 2;

2
main/src/main/java/com/yunbao/main/views/MainNearViewHolder.java
View File

@@ -62,7 +62,7 @@ public class MainNearViewHolder extends AbsMainHomeParentViewHolder {
@Override
protected String[] getTitles() {
return new String[]{
WordUtil.getString(R.string.near)
mContext.getString(R.string.near)
};
}

6
main/src/main/java/com/yunbao/main/views/UserHomeDetailViewHolder.java
View File

@@ -170,7 +170,7 @@ public class UserHomeDetailViewHolder extends AbsUserHomeViewHolder implements V
UserHomeViewHolder2.mSign.setText(userBean.getSignature());
}
if (mVotesName != null) {
mVotesName.setText(StringUtil.contact(CommonAppConfig.getInstance().getVotesName(), WordUtil.getString(R.string.live_user_home_con)));
mVotesName.setText(StringUtil.contact(CommonAppConfig.getInstance().getVotesName(),mContext.getString(R.string.live_user_home_con)));
}
if (mBirthday != null) {
mBirthday.setText(obj.getString("birthday"));
@@ -187,10 +187,10 @@ public class UserHomeDetailViewHolder extends AbsUserHomeViewHolder implements V
UserHomeViewHolder2.mSign.setText(userBean.getSignature());
}
if (mBirthday != null) {
mBirthday.setText(StringUtil.contact(WordUtil.getString(R.string.edit_profile_birthday), "： ", obj.getString("birthday")));
mBirthday.setText(StringUtil.contact(mContext.getString(R.string.edit_profile_birthday), "： ", obj.getString("birthday")));
}
if (mCity != null) {
mCity.setText(StringUtil.contact(WordUtil.getString(R.string.edit_profile_city), "： ", obj.getString("location")));
mCity.setText(StringUtil.contact(mContext.getString(R.string.edit_profile_city), "： ", obj.getString("location")));
}
}

12
main/src/main/java/com/yunbao/main/views/UserHomeViewHolder.java
View File

@@ -205,8 +205,8 @@ public class UserHomeViewHolder extends AbsLivePageViewHolder implements AppBarL
}
});
mVideoString = WordUtil.getString(R.string.video);
mLiveString = WordUtil.getString(R.string.live);
mVideoString =mContext.getString(R.string.video);
mLiveString =mContext.getString(R.string.live);
mIndicator = (MagicIndicator) findViewById(R.id.indicator);
final String[] titles = new String[]{mVideoString, mLiveString};
CommonNavigator commonNavigator = new CommonNavigator(mContext);
@@ -361,8 +361,8 @@ public class UserHomeViewHolder extends AbsLivePageViewHolder implements AppBarL
mID.setText(userBean.getLiangNameTip());
String fansNum = StringUtil.toWan(userBean.getFans());
mBtnFans.setText(fansNum + " " + WordUtil.getString(R.string.fans));
mBtnFollow.setText(StringUtil.toWan(userBean.getFollows()) + " " + WordUtil.getString(R.string.follow));
mBtnFans.setText(fansNum + " " +mContext.getString(R.string.fans));
mBtnFollow.setText(StringUtil.toWan(userBean.getFollows()) + " " +mContext.getString(R.string.follow));
mSign.setText(userBean.getSignature());
mBtnFollow2.setText(obj.getIntValue("isattention") == 1 ? R.string.following : R.string.follow);
mBtnBlack.setText(obj.getIntValue("isblack") == 1 ? R.string.black_ing : R.string.black);
@@ -374,7 +374,7 @@ public class UserHomeViewHolder extends AbsLivePageViewHolder implements AppBarL
mLiveCountTextView.setText(mLiveString + " " + obj.getString("livenums"));
}
showImpress(obj.getString("label"));
mVotesName.setText(appConfig.getVotesName() + WordUtil.getString(R.string.live_user_home_con));
mVotesName.setText(appConfig.getVotesName() +mContext.getString(R.string.live_user_home_con));
mUserHomeSharePresenter.setToUid(mToUid).setToName(toName).setAvatarThumb(userBean.getAvatarThumb()).setFansNum(fansNum);
showContribute(obj.getString("contribute"));
showGuardList(obj.getString("guardlist"));
@@ -396,7 +396,7 @@ public class UserHomeViewHolder extends AbsLivePageViewHolder implements AppBarL
}
if (!mSelf) {
ImpressBean lastBean = new ImpressBean();
lastBean.setName("+ " + WordUtil.getString(R.string.impress_add));
lastBean.setName("+ " +mContext.getString(R.string.impress_add));
lastBean.setColor("#ffdd00");
list.add(lastBean);
} else {

18
main/src/main/java/com/yunbao/main/views/UserHomeViewHolder2.java
View File

@@ -167,7 +167,7 @@ public class UserHomeViewHolder2 extends AbsLivePageViewHolder implements LiveSh
}
String s = WordUtil.getString(R.string.black);
String s =mContext.getString(R.string.black);
@Override
public void init() {
@@ -317,11 +317,11 @@ public class UserHomeViewHolder2 extends AbsLivePageViewHolder implements LiveSh
}
});
mVideoString = WordUtil.getString(R.string.video);
mLiveString = WordUtil.getString(R.string.honor);
mVideoString =mContext.getString(R.string.video);
mLiveString =mContext.getString(R.string.honor);
mIndicator = (MagicIndicator) findViewById(R.id.indicator);
final String[] titles = new String[]{WordUtil.getString(R.string.live_user_home_detail), mLiveString, mVideoString,};
// final String[] titles = new String[]{WordUtil.getString(R.string.live_user_home_detail), mVideoString}; //mxj update 2019-9-19
final String[] titles = new String[]{mContext.getString(R.string.live_user_home_detail), mLiveString, mVideoString,};
// final String[] titles = new String[]{mContext.getString(R.string.live_user_home_detail), mVideoString}; //mxj update 2019-9-19
CommonNavigator commonNavigator = new CommonNavigator(mContext);
commonNavigator.setAdapter(new CommonNavigatorAdapter() {
@@ -516,8 +516,8 @@ public class UserHomeViewHolder2 extends AbsLivePageViewHolder implements LiveSh
}
// mID.setText(" "+userBean.getLiangNameTip());
String fansNum = StringUtil.toWan(userBean.getFans());
mBtnFans.setText(fansNum + " " + WordUtil.getString(R.string.fans));
mBtnFollow.setText(StringUtil.toWan(userBean.getFollows()) + " " + WordUtil.getString(R.string.follow));
mBtnFans.setText(fansNum + " " +mContext.getString(R.string.fans));
mBtnFollow.setText(StringUtil.toWan(userBean.getFollows()) + " " +mContext.getString(R.string.follow));
if (obj.getIntValue("isattention") == 1) {
if (mFollowImage != null) {
@@ -865,8 +865,8 @@ public class UserHomeViewHolder2 extends AbsLivePageViewHolder implements LiveSh
mSex.setImageResource(CommonIconUtil.getSexIcon(userBean.getSex()));
mID.setText(userBean.getLiangNameTip());
String fansNum = StringUtil.toWan(userBean.getFans());
mBtnFans.setText(fansNum + " " + WordUtil.getString(R.string.fans));
mBtnFollow.setText(StringUtil.toWan(userBean.getFollows()) + " " + WordUtil.getString(R.string.follow));
mBtnFans.setText(fansNum + " " +mContext.getString(R.string.fans));
mBtnFollow.setText(StringUtil.toWan(userBean.getFollows()) + " " +mContext.getString(R.string.follow));
if (mDetailViewHolder != null) {
mDetailViewHolder.refreshData(userBean, obj);
}

1
main/src/main/res/layout/activity_language_sett.xml
View File

@@ -32,6 +32,7 @@
android:textStyle="bold" />
<TextView
android:id="@+id/complete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"

24
main/src/main/res/layout/activity_msg_sett.xml
View File

@@ -33,7 +33,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="私聊提示"
android:text="@string/chat_prompt"
android:textColor="#ff1e1f20"
android:textSize="16sp" />
@@ -41,7 +41,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="直播間內的側邊私聊浮標"
android:text="@string/broadcast_oom"
android:textColor="#ffc7c8c9"
android:textSize="12sp" />
</LinearLayout>
@@ -73,7 +73,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="動態消息"
android:text="@string/chat_prompt2"
android:textColor="#ff1e1f20"
android:textSize="16sp" />
@@ -81,7 +81,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="主播發佈新動態通知"
android:text="@string/chat_prompt3"
android:textColor="#ffc7c8c9"
android:textSize="12sp" />
</LinearLayout>
@@ -113,7 +113,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="互動通知"
android:text="@string/chat_prompt4"
android:textColor="#ff1e1f20"
android:textSize="16sp" />
@@ -121,7 +121,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="點讚、評論、鼓勵送禮"
android:text="@string/chat_prompt5"
android:textColor="#ffc7c8c9"
android:textSize="12sp" />
</LinearLayout>
@@ -152,7 +152,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="聊天通知"
android:text="@string/chat_prompt6"
android:textColor="#ff1e1f20"
android:textSize="16sp" />
@@ -160,7 +160,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="用戶聊天訊息"
android:text="@string/chat_prompt7"
android:textColor="#ffc7c8c9"
android:textSize="12sp" />
</LinearLayout>
@@ -192,7 +192,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="系統通知"
android:text="@string/chat_prompt8"
android:textColor="#ff1e1f20"
android:textSize="16sp" />
@@ -200,7 +200,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="新活動、系統消息"
android:text="@string/chat_prompt9"
android:textColor="#ffc7c8c9"
android:textSize="12sp" />
</LinearLayout>
@@ -234,7 +234,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="開播通知"
android:text="@string/chat_prompt10"
android:textColor="#ff1e1f20"
android:textSize="16sp" />
@@ -242,7 +242,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="開啟後獲得直播通知"
android:text="@string/chat_prompt11"
android:textColor="#ffc7c8c9"
android:textSize="12sp" />
</LinearLayout>

2
main/src/main/res/layout/activity_setting.xml
View File

@@ -161,7 +161,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:visibility="gone"
android:visibility="visible"
android:paddingTop="15dp"
android:paddingBottom="25dp">

2
main/src/main/res/layout/view_main_encourage.xml
View File

@@ -8,7 +8,7 @@
android:id="@+id/rootView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"/>
android:orientation="vertical" />
<ProgressBar
android:id="@+id/progressbar"