diff --git a/app/build.gradle b/app/build.gradle index d7065ed3b..63d9410d9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -178,7 +178,7 @@ android { }else{ server='测试服' } - outputFileName = "[${new Date().format("yyyy-MM-dd HHmmss", TimeZone.getTimeZone("GMT+8"))}]PDLive-${defaultConfig.versionName}-${channel}-${server}-${variant.buildType.name}.apk" + // outputFileName = "[${new Date().format("yyyy-MM-dd HHmmss", TimeZone.getTimeZone("GMT+8"))}]PDLive-${defaultConfig.versionName}-${channel}-${server}-${variant.buildType.name}.apk" } tasks.named("sign${variant.name.capitalize()}Bundle", com.android.build.gradle.internal.tasks.FinalizeBundleTask) { File file = finalBundleFile.asFile.get() diff --git a/common/src/main/java/com/yunbao/common/dialog/OrderLevelPopupWindow.java b/common/src/main/java/com/yunbao/common/dialog/OrderLevelPopupWindow.java index 0d64fa8c4..b190dea90 100644 --- a/common/src/main/java/com/yunbao/common/dialog/OrderLevelPopupWindow.java +++ b/common/src/main/java/com/yunbao/common/dialog/OrderLevelPopupWindow.java @@ -1,5 +1,6 @@ package com.yunbao.common.dialog; +import android.app.Dialog; import android.content.Context; import android.view.View; import android.widget.ProgressBar; @@ -16,6 +17,7 @@ import com.yunbao.common.http.base.HttpCallback; import com.yunbao.common.http.live.LiveNetManager; import com.yunbao.common.interfaces.OnItemClickListener; import com.yunbao.common.manager.IMLoginManager; +import com.yunbao.common.utils.DialogUitl; import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.WordUtil; import com.yunbao.common.views.weight.ViewClicksAntiShake; @@ -33,11 +35,13 @@ public class OrderLevelPopupWindow extends CenterPopupView { private OrderLevelCallback orderLevelCallback; private long maxExp; private BattlePassUserInfoBean userInfoBean; + private Context mContext; public OrderLevelPopupWindow(@NonNull Context context, BattlePassUserInfoBean userInfoBean, int mCurrentExperience, int mTotalExperience, String mCurrentLevel, String mBalance, long maxExp, OrderLevelCallback mOrderLevelCallback) { super(context); + this.mContext = context; this.userInfoBean = userInfoBean; currentExperience = mCurrentExperience; totalExperience = mTotalExperience; @@ -67,7 +71,7 @@ public class OrderLevelPopupWindow extends CenterPopupView { progressBar.setProgress(currentExperience); expText.setText(String.format("%s/%s", userInfoBean.getBattlePassExp(), userInfoBean.getNextLevelExp())); current.setText(String.format("Lv%s", currentLevel)); - balanceDiamond.setText(balance); + balanceDiamond.setText(WordUtil.isNewZh()?"剩餘:":"Balance:"+balance); findViewById(R.id.sub).setOnClickListener(new OnClickListener() { @Override public void onClick(View view) { @@ -75,7 +79,7 @@ public class OrderLevelPopupWindow extends CenterPopupView { if (exp > 100) { BigDecimal buyExpBigDecimal = new BigDecimal(buyExp).subtract(new BigDecimal("100")); buyExp = String.valueOf(buyExpBigDecimal.intValue()); - orderLevelDiamond.setText(String.valueOf(buyExpBigDecimal.floatValue())); + orderLevelDiamond.setText("00 = "+String.valueOf(buyExpBigDecimal.floatValue())); orderLevel.setText(buyExp); } } @@ -87,7 +91,7 @@ public class OrderLevelPopupWindow extends CenterPopupView { if (exp < maxExp && exp < 10000) { BigDecimal buyExpBigDecimal = new BigDecimal(buyExp).add(new BigDecimal("100")); buyExp = String.valueOf(buyExpBigDecimal.intValue()); - orderLevelDiamond.setText(String.valueOf(buyExpBigDecimal.floatValue())); + orderLevelDiamond.setText("00 = "+String.valueOf(buyExpBigDecimal.floatValue())); orderLevel.setText(buyExp); } else if (exp >= maxExp) { ToastUtil.show(WordUtil.isNewZh() ? "经验已滿" : "Experience full"); @@ -125,13 +129,29 @@ public class OrderLevelPopupWindow extends CenterPopupView { }); } }); + ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.tickets_plus_minus), new ViewClicksAntiShake.ViewClicksCallBack() { + @Override + public void onViewClicks() { + DialogUitl.showSimpleInputDialog(mContext, getResources().getString(R.string.buying_experience_point), DialogUitl.INPUT_TYPE_NUMBER, 4, new DialogUitl.SimpleCallback2() { + @Override + public void onCancelClick() { + + } + + @Override + public void onConfirmClick(Dialog dialog, String content) { + orderLevel.setText(content); + } + }); + } + }); IMLoginManager.get(getContext()) .updateUserCoin(new OnItemClickListener() { @Override public void onItemClick(JSONObject bean, int position) { if (bean != null) { balance = bean.getString("coin"); - balanceDiamond.setText(balance); + balanceDiamond.setText(WordUtil.isNewZh()?"剩餘:":"Balance:"+balance); } } }); diff --git a/common/src/main/res/drawable/order_level_progress_bg.xml b/common/src/main/res/drawable/order_level_progress_bg.xml index 587aa4c17..ebd60c369 100644 --- a/common/src/main/res/drawable/order_level_progress_bg.xml +++ b/common/src/main/res/drawable/order_level_progress_bg.xml @@ -14,7 +14,7 @@ - + diff --git a/common/src/main/res/layout/order_level_popup.xml b/common/src/main/res/layout/order_level_popup.xml index 987c2ae67..4f98a2a36 100644 --- a/common/src/main/res/layout/order_level_popup.xml +++ b/common/src/main/res/layout/order_level_popup.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="218dp" + android:layout_height="240dp" android:layout_marginStart="17dp" android:layout_marginEnd="17dp" android:background="@drawable/background_order_dialog" @@ -39,7 +39,7 @@ android:layout_height="wrap_content" android:layout_marginStart="46dp" android:text="Lv7" - android:textColor="#CE2BFF" + android:textColor="#2439B9" android:textSize="14sp" /> - + - - + + + + \ No newline at end of file diff --git a/live/src/main/res/drawable/bg_live_room_sud_hint.xml b/live/src/main/res/drawable/bg_live_room_sud_hint.xml new file mode 100644 index 000000000..bcfe90830 --- /dev/null +++ b/live/src/main/res/drawable/bg_live_room_sud_hint.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/live/src/main/res/drawable/bg_live_room_sud_hint_join.xml b/live/src/main/res/drawable/bg_live_room_sud_hint_join.xml new file mode 100644 index 000000000..d9794df65 --- /dev/null +++ b/live/src/main/res/drawable/bg_live_room_sud_hint_join.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/live/src/main/res/drawable/guard_buy_bottom_bg.png b/live/src/main/res/drawable/guard_buy_bottom_bg.png new file mode 100644 index 000000000..1bb0c6d68 Binary files /dev/null and b/live/src/main/res/drawable/guard_buy_bottom_bg.png differ diff --git a/live/src/main/res/drawable/guard_buy_bottom_bg.xml b/live/src/main/res/drawable/guard_buy_bottom_bg.xml deleted file mode 100644 index 04bb75341..000000000 --- a/live/src/main/res/drawable/guard_buy_bottom_bg.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - \ No newline at end of file diff --git a/live/src/main/res/drawable/guard_buy_center_bg.png b/live/src/main/res/drawable/guard_buy_center_bg.png new file mode 100644 index 000000000..44becfe48 Binary files /dev/null and b/live/src/main/res/drawable/guard_buy_center_bg.png differ diff --git a/live/src/main/res/drawable/guard_buy_center_bg.xml b/live/src/main/res/drawable/guard_buy_center_bg.xml deleted file mode 100644 index 5fd926d13..000000000 --- a/live/src/main/res/drawable/guard_buy_center_bg.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - diff --git a/live/src/main/res/drawable/guard_buy_top_bg.png b/live/src/main/res/drawable/guard_buy_top_bg.png new file mode 100644 index 000000000..fa9ea9daa Binary files /dev/null and b/live/src/main/res/drawable/guard_buy_top_bg.png differ diff --git a/live/src/main/res/drawable/guard_buy_top_bg.xml b/live/src/main/res/drawable/guard_buy_top_bg.xml deleted file mode 100644 index 7b46e52b4..000000000 --- a/live/src/main/res/drawable/guard_buy_top_bg.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - diff --git a/live/src/main/res/drawable/live_dialog_top_guardian_tasks_bg.png b/live/src/main/res/drawable/live_dialog_top_guardian_tasks_bg.png new file mode 100644 index 000000000..3babba344 Binary files /dev/null and b/live/src/main/res/drawable/live_dialog_top_guardian_tasks_bg.png differ diff --git a/live/src/main/res/layout/dialog_live_guard.xml b/live/src/main/res/layout/dialog_live_guard.xml index 53b607437..ecbe80255 100644 --- a/live/src/main/res/layout/dialog_live_guard.xml +++ b/live/src/main/res/layout/dialog_live_guard.xml @@ -9,7 +9,7 @@ android:layout_height="match_parent" android:layout_marginTop="59dp" android:layout_marginBottom="71dp" - android:background="@drawable/background_live_guard"> + android:background="@drawable/guard_buy_top_bg"> - + android:layout_width="48dp" + android:layout_height="20dp" + android:layout_marginTop="6dp" + android:src="@drawable/live_dialog_top_guardian_tasks_bg" + /> @@ -121,11 +121,6 @@ android:textColor="@color/white" android:textSize="12sp" /> - + android:background="@drawable/guard_buy_center_bg"> + android:background="@drawable/guard_buy_bottom_bg"> - - + android:textSize="14sp" /> \ No newline at end of file diff --git a/live/src/main/res/layout/dialog_new_guard.xml b/live/src/main/res/layout/dialog_new_guard.xml index 6130d180e..e8e05bd0c 100644 --- a/live/src/main/res/layout/dialog_new_guard.xml +++ b/live/src/main/res/layout/dialog_new_guard.xml @@ -17,6 +17,36 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"> + + + + + + @@ -143,30 +173,29 @@ android:layout_centerVertical="true" android:layout_marginLeft="10dp" android:drawablePadding="4dp" - android:text="456" android:ellipsize="marquee" android:focusable="true" android:focusableInTouchMode="true" android:marqueeRepeatLimit="marquee_forever" android:scrollHorizontally="true" android:singleLine="true" + android:text="456" android:textColor="#A281FD" android:textSize="11sp" android:visibility="gone" /> - - @@ -195,7 +224,7 @@ android:layout_centerHorizontal="true" android:layout_centerVertical="true" android:scaleType="centerCrop" - android:src="@mipmap/guardian_img_wings" + android:src="@mipmap/guardian_img_wings" android:visibility="visible" app:riv_oval="true" /> @@ -204,7 +233,7 @@ android:id="@+id/gift_svga" android:layout_width="match_parent" android:layout_height="match_parent" - android:src="@mipmap/guardian_img_wings" + android:src="@mipmap/guardian_img_wings" android:visibility="visible" app:autoPlay="true" /> diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml index 63412cec3..4902096e3 100644 --- a/live/src/main/res/layout/view_live_room.xml +++ b/live/src/main/res/layout/view_live_room.xml @@ -1283,8 +1283,8 @@ android:id="@+id/iv_look_full_service_notice_new3" android:layout_width="56dp" android:layout_height="30dp" - android:layout_marginBottom="1dp" - android:layout_marginEnd="5dp"> + android:layout_marginEnd="5dp" + android:layout_marginBottom="1dp"> + android:textSize="12sp" + tools:text="btn" + tools:textColor="@color/white" /> @@ -1515,10 +1515,11 @@ + android:visibility="gone" + tools:visibility="visible"> + + android:layout_height="wrap_content" + android:layout_alignParentBottom="true"> + tools:visibility="visible" /> + android:visibility="gone" /> + android:layout_height="46dp" + android:layout_gravity="end" + android:layout_marginEnd="16dp" + android:layout_marginBottom="5dp" + android:src="@mipmap/turntable_icon" + android:visibility="gone" + tools:visibility="visible" /> + app:indicator_height="8dp" + tools:visibility="visible" /> - + android:paddingStart="5dp" + android:visibility="gone" + tools:visibility="visible"> + + + + - + android:textSize="10sp" + android:visibility="visible" + tools:visibility="visible" /> + + + + + android:layout_marginStart="220dp" + tools:visibility="gone"> Trick instructions Entertainment Tricky has been newly upgraded. Go and set up Tricky content to add more fun to the live broadcast room! Go now + Join + 守護任務 \ No newline at end of file diff --git a/live/src/main/res/values/strings.xml b/live/src/main/res/values/strings.xml index 4421ef568..04f92fff9 100644 --- a/live/src/main/res/values/strings.xml +++ b/live/src/main/res/values/strings.xml @@ -143,4 +143,6 @@ 整蠱說明 娛樂整蠱全新升級,快去設置整蠱内容,給直播間增加更多趣味吧! 立即前往 + 加入 + 守護任務