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

Merge remote-tracking branch 'origin/新潘多拉_6.8.2' into 新潘多拉_6.8.2

Browse Source
This commit is contained in:
ningwenqiang
2024-09-06 14:09:56 +08:00
parent a349e94bf3 ddbce1bdbf
commit 1357eaaac9
13 changed files with 60 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/src/main/java/com/yunbao/common/fragment/LiveDataNowFragment.java
View File

@@ -77,6 +77,9 @@ public class LiveDataNowFragment extends Fragment {
list.add(new LiveDataInfoNowModel(getContext().getString(R.string.live_data_fan_group), data.getFanGroupNum() + ""));
list.add(new LiveDataInfoNowModel(getContext().getString(R.string.live_data_fan_group_rate), data.getFanGroupNumRate() + ""));
adapter.setList(list);
if(onDataResult!=null){
onDataResult.Result(data.getTotalCoin() + "",data.getAcceptNum() + "");
}
}
@Override

1
common/src/main/java/com/yunbao/common/http/PDLiveApi.java
View File

@@ -40,6 +40,7 @@ public interface PDLiveApi {
@Field("user_pass") String passWord,
@Field("uuid_Device") String uuidDevice,
@Field("pushid") String pushid,
@Field("app_from") String PDL,
@Field("lastlogindevice") String lastlogindevice,
@Field("langue") String langue
);

2
common/src/main/java/com/yunbao/common/http/main/MainNetManager.java
View File

@@ -55,7 +55,7 @@ public class MainNetManager {
* @param callback 网络请求回调
*/
public void login(String phoneNum, String pwd, String uuid, HttpCallback<IMLoginModel> callback) {
API.get().pdLiveApi(mContext).loginByManager(phoneNum, pwd, uuid, "", "Android", WordUtil.isNewZh()?"chinese":"english")
API.get().pdLiveApi(mContext).loginByManager(phoneNum, pwd, uuid, "", "PDL","Android", WordUtil.isNewZh()?"chinese":"english")
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Consumer<ResponseModel<IMLoginModel>>() {

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

@@ -45,7 +45,7 @@ public class DateFormatUtil {
public static String getTimeLiveEndString(long time) {
Date date = new Date(time); // 创建Date对象并传入时间戳参数
SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss"); // 设置日期格式
SimpleDateFormat sdf = new SimpleDateFormat("HH:mm"); // 设置日期格式
String formattedDate = sdf.format(date); // 格式化日期字符串
return formattedDate;
}

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

@@ -1054,10 +1054,10 @@
<string name="anchor_agreement_hint">請閱讀並同意《PDLIVE主播協議》</string>
<string name="anchor_hint">《PDLIVE主播協議》</string>
<string name="live_task_new_user_timer">新秀主播時效截止至 </string>
<string name="live_data_coin">鑽石收禮</string>
<string name="live_data_gold">金豆收禮</string>
<string name="live_data_accept">收禮人數</string>
<string name="live_data_enter">進場人數</string>
<string name="live_data_coin">收穫鑽石</string>
<string name="live_data_gold">收穫金豆</string>
<string name="live_data_accept">打賞人數</string>
<string name="live_data_enter">觀看人數</string>
<string name="live_data_attention">新增關注</string>
<string name="live_data_attention_rate">關注轉化率</string>
<string name="live_data_fan_group">新增粉絲團</string>