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

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

@@ -383,7 +383,7 @@ public class CommonAppConfig {
public String getAppName() {
if (TextUtils.isEmpty(mAppName)) {
int res = CommonAppContext.sInstance.getResources().getIdentifier("app_name", "string", "myname.pdlive.shayu");
mAppName = WordUtil.getString(res);
mAppName =WordUtil.getString(res);
}
return mAppName;
}

2
common/src/main/java/com/yunbao/common/activity/AbsActivity.java
View File

@@ -27,6 +27,7 @@ import androidx.appcompat.app.AppCompatActivity;
import com.yunbao.common.R;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.interfaces.LifeCycleListener;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.ClickUtil;
import java.util.ArrayList;
@@ -48,6 +49,7 @@ public abstract class AbsActivity extends AppCompatActivity {
Resources res = super.getResources();
Configuration config = new Configuration();
config.setToDefaults();
config.locale = IMLoginManager.get(this).getLocaleLanguage();
res.updateConfiguration(config, res.getDisplayMetrics());
return res;
}

2
common/src/main/java/com/yunbao/common/activity/ErrorActivity.java
View File

@@ -60,6 +60,6 @@ public class ErrorActivity extends AbsActivity {
ClipboardManager clipboardManager = (ClipboardManager) mContext.getSystemService(Context.CLIPBOARD_SERVICE);
ClipData clipData = ClipData.newPlainText("text", mErrorInfo);
clipboardManager.setPrimaryClip(clipData);
ToastUtil.show(WordUtil.getString(R.string.copy_success));
ToastUtil.show(mContext.getString(R.string.copy_success));
}
}

2
common/src/main/java/com/yunbao/common/activity/WebViewActivity.java
View File

@@ -186,7 +186,7 @@ public class WebViewActivity 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
common/src/main/java/com/yunbao/common/adapter/ChatChargeCoinAdapter.java
View File

@@ -41,7 +41,7 @@ public class ChatChargeCoinAdapter extends RecyclerView.Adapter<ChatChargeCoinAd
mList = list;
mCoinName = CommonAppConfig.getInstance().getCoinName();
mGoldCoinName = CommonAppConfig.getInstance().getGoldCoinName();
mGiveString = WordUtil.getString(R.string.coin_give);
mGiveString = context.getString(R.string.coin_give);
mOnClickListener = new View.OnClickListener() {
@Override
public void onClick(View v) {

20
common/src/main/java/com/yunbao/common/bean/LiveClassBean.java
View File

@@ -14,6 +14,26 @@ public class LiveClassBean {
private boolean isAll;
private String des;
private boolean checked;
private String chinese;
private String english;
public String getChinese() {
return chinese;
}
public LiveClassBean setChinese(String chinese) {
this.chinese = chinese;
return this;
}
public String getEnglish() {
return english;
}
public LiveClassBean setEnglish(String english) {
this.english = english;
return this;
}
public int getId() {
return id;

2
common/src/main/java/com/yunbao/common/bean/LiveTaskModel.java
View File

@@ -87,7 +87,7 @@ public class LiveTaskModel extends BaseModel {
public String getEndTime() {
if (!StringUtil.isEmpty(endTime)) {
endTime = WordUtil.getString(R.string.live_task_new_user_timer) + new SimpleDateFormat("yyyy/MM/dd HH:mm", Locale.getDefault()).format(new Date(Long.parseLong(endTime) * 1000));
endTime =WordUtil.getString(R.string.live_task_new_user_timer) + new SimpleDateFormat("yyyy/MM/dd HH:mm", Locale.getDefault()).format(new Date(Long.parseLong(endTime) * 1000));
}
return endTime;
}

2
common/src/main/java/com/yunbao/common/bean/UserBean.java
View File

@@ -489,7 +489,7 @@ public class UserBean implements Parcelable {
if (this.liang != null) {
String liangName = this.liang.getName();
if (!TextUtils.isEmpty(liangName) && !"0".equals(liangName)) {
// return WordUtil.getString(R.string.live_liang) + ":" + liangName;
// returnmContext.getString(R.string.live_liang) + ":" + liangName;
return liangName;
}
}

4
common/src/main/java/com/yunbao/common/dialog/LiveChargeDialogFragment.java
View File

@@ -138,8 +138,8 @@ public class LiveChargeDialogFragment extends AbsDialogFragment implements View.
private void showMoney(CoinBean bean) {
mCheckedCoinBean = bean;
if (mCheckedCoinBean != null && mBtnCharge != null) {
// mBtnCharge.setText(String.format(WordUtil.getString(R.string.chat_charge_tip), mCheckedCoinBean.getMoney()));
mBtnCharge.setText(String.format(WordUtil.getString(R.string.chat_charge_tip)));
// mBtnCharge.setText(String.format(mContext.getString(R.string.chat_charge_tip), mCheckedCoinBean.getMoney()));
mBtnCharge.setText(String.format(mContext.getString(R.string.chat_charge_tip)));
}
}

5
common/src/main/java/com/yunbao/common/dialog/MessageLongClickPopuwindow.java
View File

@@ -28,7 +28,6 @@ import io.rong.message.RecallNotificationMessage;
import io.rong.message.TextMessage;
import static android.content.Context.CLIPBOARD_SERVICE;
import static com.yunbao.common.utils.WordUtil.getString;
/**
* 消息長按彈窗
@@ -123,7 +122,7 @@ public class MessageLongClickPopuwindow implements View.OnClickListener {
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));
}
}
@@ -135,7 +134,7 @@ public class MessageLongClickPopuwindow implements View.OnClickListener {
IMCenter.getInstance().recallMessage(message, "撤回成功", new RongIMClient.ResultCallback<RecallNotificationMessage>() {
@Override
public void onSuccess(RecallNotificationMessage recallNotificationMessage) {
ToastUtil.show(getString(R.string.withdraw_success));
ToastUtil.show(mContext.getString(R.string.withdraw_success));
//删除草稿信息
IMCenter.getInstance().clearTextMessageDraft(message.getConversationType(), message.getTargetId(), null);
}

7
common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java
View File

@@ -19,6 +19,7 @@ import com.yunbao.common.event.FollowEvent;
import com.yunbao.common.interfaces.CommonCallback;
import com.yunbao.common.manager.APKManager;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.manager.LiveClassManager;
import com.yunbao.common.manager.NewLevelManager;
import com.yunbao.common.utils.L;
import com.yunbao.common.utils.MD5Util;
@@ -156,7 +157,7 @@ public class CommonHttpUtil {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
locale = context.getResources().getConfiguration().getLocales().get(0);
} else {
locale = context.getResources().getConfiguration().locale;
locale = IMLoginManager.get(context).getLocaleLanguage();
}
if (locale.getLanguage().equals("zh")) {
lang = "chinese";
@@ -202,6 +203,10 @@ public class CommonHttpUtil {
JSONArray levelArray = obj.getJSONArray("levelanchor_new");
new NewLevelManager(context).UpAnchorDataLevel(levelArray.toJSONString());
}
if (obj.containsKey("liveclass")) {//缓存直播间分类
JSONArray levelArray = obj.getJSONArray("liveclass");
new LiveClassManager(context).UpDataLiveClass(levelArray.toJSONString());
}
if (obj.containsKey("apk_ver")) {
APKManager.get().setApkVer(obj.getString("apk_ver"));
}

17
common/src/main/java/com/yunbao/common/manager/IMLoginManager.java
View File

@@ -23,6 +23,8 @@ import com.yunbao.common.views.floatingview.APPEasyFloat;
import org.greenrobot.eventbus.EventBus;
import java.util.Locale;
/**
* 登录者信息管理
*/
@@ -46,6 +48,20 @@ public class IMLoginManager extends BaseCacheManager {
private final String STATUS_ANCHOR_SAY = "anchorSay";
private final String STATUS_ANCHOR_CALL = "anchorCallMe";
private final String KEY_LANGUAGE = "language";
public void setLanguage(boolean isEnglish) {
put(KEY_LANGUAGE, isEnglish);
}
public Locale getLocaleLanguage() {
if (!getBoolean(KEY_LANGUAGE, false)) {
return Locale.SIMPLIFIED_CHINESE;
} else {
return new Locale("en", "rUS");
}
}
public void setDefaultBubbleUrl(String defaultBubbleUrl) {
put(keyDefaultBubbleUrl, defaultBubbleUrl);
}
@@ -55,7 +71,6 @@ public class IMLoginManager extends BaseCacheManager {
}
public void setXiaJBG(boolean xjbg) {
put(xiaJBG, xjbg);
}

42
common/src/main/java/com/yunbao/common/manager/LiveClassManager.java Normal file
View File

@@ -0,0 +1,42 @@
package com.yunbao.common.manager;
import android.content.Context;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.yunbao.common.bean.LiveClassBean;
import com.yunbao.common.bean.NewLevelModel;
import com.yunbao.common.manager.base.BaseCacheManager;
import java.util.ArrayList;
import java.util.List;
public class LiveClassManager extends BaseCacheManager {
private final String KEY_LIVE_CLASS = "keyLiveClass";
private List<LiveClassBean> liveClass = new ArrayList<>();
public LiveClassManager(Context context) {
super(context);
}
/**
* 缓存等级图标
*
* @param json
*/
public void UpDataLiveClass(String json) {
liveClass = new Gson().fromJson(json, new TypeToken<List<LiveClassBean>>() {
}.getType());
put(KEY_LIVE_CLASS, liveClass);
}
/**
* 获取等级数据
*
* @return
*/
public List<LiveClassBean> getLiveClass() {
return getList(KEY_LIVE_CLASS, new TypeToken<List<LiveClassBean>>() {
}.getType());
}
}

2
common/src/main/java/com/yunbao/common/utils/DialogUitl.java
View File

@@ -309,7 +309,7 @@ public class DialogUitl {
if (v.getId() == R.id.btn_confirm) {
if (callback != null) {
if (c.getTime().getTime() > new Date().getTime()) {
ToastUtil.show(WordUtil.getString(R.string.edit_profile_right_date));
ToastUtil.show(context.getString(R.string.edit_profile_right_date));
} else {
String result = DateFormat.format("yyyy-MM-dd", c).toString();
callback.onConfirmClick(result);

5
common/src/main/java/com/yunbao/common/utils/RouteUtil.java
View File

@@ -10,6 +10,9 @@ import com.yunbao.common.CommonAppContext;
import com.yunbao.common.Constants;
import com.yunbao.common.HtmlConfig;
import com.yunbao.common.bean.LiveBean;
import com.yunbao.common.manager.IMLoginManager;
import java.util.Locale;
/**
* Created by cxf on 2019/2/25.
@@ -109,7 +112,7 @@ public class RouteUtil {
if (!"".equals(Constants.chatActionUrl)) {
url = Constants.chatActionUrl;
}
Constants.myUrl = url + "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&t=" + System.currentTimeMillis();
Constants.myUrl = url + "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&t=" + System.currentTimeMillis() + "&isZh=" + ((IMLoginManager.get(context).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0");
ARouter.getInstance().build(PATH_MYWEBVIEWACTIVTITY)
.withString(Constants.URL, url)
.navigation();

24
common/src/main/java/com/yunbao/common/utils/VersionUtil.java
View File

@@ -48,10 +48,10 @@ public class VersionUtil {
//不强更
if (configBean.getForceUpdate() != 1) {
DialogUitl.Builder builder = new DialogUitl.Builder(context);
builder.setTitle(WordUtil.getString(R.string.version_update))
builder.setTitle(context.getString(R.string.version_update))
.setContent(configBean.getUpdateDes())
.setConfrimString(WordUtil.getString(R.string.version_immediate_use))
.setCancelString(WordUtil.getString(R.string.version_not_update))
.setConfrimString(context.getString(R.string.version_immediate_use))
.setCancelString(context.getString(R.string.version_not_update))
.setCancelable(false)
.setClickCallback(new DialogUitl.SimpleCallback2() {
public void onCancelClick() {
@@ -79,10 +79,10 @@ public class VersionUtil {
.show();
} else {
DialogUitl.Builder builder = new DialogUitl.Builder(context);
builder.setTitle(WordUtil.getString(R.string.version_update))
builder.setTitle(context.getString(R.string.version_update))
.setContent(configBean.getUpdateDes())
.setConfrimString(WordUtil.getString(R.string.version_immediate_use))
.setCancelString(WordUtil.getString(R.string.version_not_update))
.setConfrimString(context.getString(R.string.version_immediate_use))
.setCancelString(context.getString(R.string.version_not_update))
.setCancelable(false)
.setClickCallback(new DialogUitl.SimpleCallback2() {
public void onCancelClick() {
@@ -109,10 +109,10 @@ public class VersionUtil {
//谷歌强制更新
if (configBean.getGoogle_isup().equals("1")) {
DialogUitl.Builder builder = new DialogUitl.Builder(context);
builder.setTitle(WordUtil.getString(R.string.version_update))
builder.setTitle(context.getString(R.string.version_update))
.setContent(configBean.getUpdateDes())
.setConfrimString(WordUtil.getString(R.string.version_immediate_use))
.setCancelString(WordUtil.getString(R.string.version_not_update))
.setConfrimString(context.getString(R.string.version_immediate_use))
.setCancelString(context.getString(R.string.version_not_update))
.setCancelable(false)
.setClickCallback(new DialogUitl.SimpleCallback2() {
public void onCancelClick() {
@@ -132,10 +132,10 @@ public class VersionUtil {
//谷歌不强制
} else {
DialogUitl.Builder builder = new DialogUitl.Builder(context);
builder.setTitle(WordUtil.getString(R.string.version_update))
builder.setTitle(context.getString(R.string.version_update))
.setContent(configBean.getUpdateDes())
.setConfrimString(WordUtil.getString(R.string.version_immediate_use))
.setCancelString(WordUtil.getString(R.string.version_not_update))
.setConfrimString(context.getString(R.string.version_immediate_use))
.setCancelString(context.getString(R.string.version_not_update))
.setCancelable(false)
.setClickCallback(new DialogUitl.SimpleCallback2() {
public void onCancelClick() {

1142
common/src/main/res/values-en-rUS/string.xml Normal file
View File

File diff suppressed because it is too large Load Diff

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

@@ -1125,4 +1125,19 @@
<string name="live_room_chat_fount_size_high">大</string>
<string name="dialog_live_fount_title">選擇字號大小</string>
<string name="dialog_fount_submit">確認</string>
<string name="chat_prompt">私聊提示</string>
<string name="broadcast_oom">直播間內的側邊私聊浮標</string>
<string name="chat_prompt2">動態消息</string>
<string name="chat_prompt3">主播發佈新動態通知</string>
<string name="chat_prompt4">互動通知</string>
<string name="chat_prompt5">點讚、評論、鼓勵送禮</string>
<string name="chat_prompt6">聊天通知</string>
<string name="chat_prompt7">用戶聊天訊息</string>
<string name="chat_prompt8">系統通知</string>
<string name="chat_prompt9">新活動、系統消息</string>
<string name="chat_prompt10">開播通知</string>
<string name="chat_prompt11">開啟後獲得直播通知</string>
<string name="PK_Ladder_Race">PK天梯赛</string>
<string name="party_studio">是否確認前往對方直播間？</string>
</resources>

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

@@ -1125,4 +1125,18 @@
<string name="live_room_chat_fount_size_high">大</string>
<string name="dialog_live_fount_title">選擇字號大小</string>
<string name="dialog_fount_submit">確認</string>
<string name="chat_prompt">私聊提示</string>
<string name="broadcast_oom">直播間內的側邊私聊浮標</string>
<string name="chat_prompt2">動態消息</string>
<string name="chat_prompt3">主播發佈新動態通知</string>
<string name="chat_prompt4">互動通知</string>
<string name="chat_prompt5">點讚、評論、鼓勵送禮</string>
<string name="chat_prompt6">聊天通知</string>
<string name="chat_prompt7">用戶聊天訊息</string>
<string name="chat_prompt8">系統通知</string>
<string name="chat_prompt9">新活動、系統消息</string>
<string name="chat_prompt10">開播通知</string>
<string name="chat_prompt11">開啟後獲得直播通知</string>
<string name="PK_Ladder_Race">PK天梯赛</string>
</resources>

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

@@ -1125,4 +1125,19 @@
<string name="live_room_chat_fount_size_high">大</string>
<string name="dialog_live_fount_title">選擇字號大小</string>
<string name="dialog_fount_submit">確認</string>
<string name="chat_prompt">私聊提示</string>
<string name="broadcast_oom">直播間內的側邊私聊浮標</string>
<string name="chat_prompt2">動態消息</string>
<string name="chat_prompt3">主播發佈新動態通知</string>
<string name="chat_prompt4">互動通知</string>
<string name="chat_prompt5">點讚、評論、鼓勵送禮</string>
<string name="chat_prompt6">聊天通知</string>
<string name="chat_prompt7">用戶聊天訊息</string>
<string name="chat_prompt8">系統通知</string>
<string name="chat_prompt9">新活動、系統消息</string>
<string name="chat_prompt10">開播通知</string>
<string name="chat_prompt11">開啟後獲得直播通知</string>
<string name="PK_Ladder_Race">PK天梯赛</string>
<string name="party_studio">是否確認前往對方直播間？</string>
</resources>

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

@@ -1132,4 +1132,18 @@ Limited ride And limited avatar frame</string>
<string name="dialog_live_fount_title">Select font size</string>
<string name="dialog_fount_submit">confirm</string>
<string name="chat_prompt">Private chat prompt</string>
<string name="broadcast_oom">A private buoy on the side of the broadcast room</string>
<string name="chat_prompt2">Dynamic message</string>
<string name="chat_prompt3">The anchor posts a new dynamic notification</string>
<string name="chat_prompt4">Interactive notification</string>
<string name="chat_prompt5">Like, comment, and encourage gifts</string>
<string name="chat_prompt6">Chat notification</string>
<string name="chat_prompt7">User chat message</string>
<string name="chat_prompt8">System notification</string>
<string name="chat_prompt9">New activity, system message</string>
<string name="chat_prompt10">Broadcast notice</string>
<string name="PK_Ladder_Race">PK Ladder Race</string>
<string name="chat_prompt11">Get live notification after opening</string>
<string name="party_studio">Confirm whether to go to the other party\'s studio？</string>
</resources>