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

Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令

Browse Source
This commit is contained in:
zlzw 2023-12-18 16:34:19 +08:00
commit 728dec9d97
8 changed files with 231 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
common/src/main/java/com/yunbao/common/dialog/OrderLevelPopupWindow.java Normal file
View File

@ -0,0 +1,35 @@
package com.yunbao.common.dialog;
import android.content.Context;
import android.widget.EditText;
import android.widget.TextView;
import androidx.annotation.NonNull;
import com.lxj.xpopup.core.CenterPopupView;
import com.yunbao.common.R;
/**
* 战令等级
*/
public class OrderLevelPopupWindow extends CenterPopupView {
private EditText orderLevel;
private TextView orderLevelDiamond,balanceDiamond;
public OrderLevelPopupWindow(@NonNull Context context) {
super(context);
}
@Override
protected int getImplLayoutId() {
return R.layout.order_level_popup;
}
// 执行初始化操作，比如：findView，设置点击，或者任何你弹窗内的业务逻辑
@Override
protected void onCreate() {
super.onCreate();
orderLevel = findViewById(R.id.tickets_plus_minus);
orderLevelDiamond = findViewById(R.id.order_level_diamond);
balanceDiamond = findViewById(R.id.balance_diamond);
}
}

21
common/src/main/res/drawable/order_level_progress_bg.xml Normal file
View File

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<!--设置ProgressBar背景色-->
<item android:id="@android:id/background">
<shape>
<!--设置ProgressBar进度条圆角半径-->
<corners android:radius="3dp" />
<solid android:color="#B7AFCD" />
</shape>
</item>
<!--设置ProgressBar进度条颜色-->
<item android:id="@android:id/progress">
<clip android:clipOrientation="horizontal">
<shape>
<corners android:radius="3dp" />
<solid android:color="#CE2BFF" />
</shape>
</clip>
</item>
</layer-list>

153
common/src/main/res/layout/order_level_popup.xml Normal file
View File

@ -0,0 +1,153 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="218dp"
android:layout_marginStart="17dp"
android:layout_marginEnd="17dp"
android:background="@drawable/background_order_dialog"
android:orientation="vertical">
<ImageView
android:id="@+id/war_order_close"
android:layout_width="19dp"
android:layout_height="19dp"
android:layout_gravity="end"
android:layout_marginTop="14dp"
android:layout_marginEnd="14dp"
android:src="@mipmap/icon_sud_rule_close" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="2dp"
android:text="@string/order_level"
android:textColor="#0D21B2"
android:textSize="16sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:gravity="center_vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="46dp"
android:text="Lv7"
android:textColor="#CE2BFF"
android:textSize="14sp" />
<ProgressBar
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="221dp"
android:layout_height="6dp"
android:layout_marginStart="7dp"
android:max="100"
android:progress="10"
android:progressDrawable="@drawable/order_level_progress_bg" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="20dp"
android:gravity="center">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/buying_experience_point"
android:textColor="#0D21B2"
android:textSize="14sp" />
<LinearLayout
android:layout_width="90dp"
android:layout_height="25dp"
android:background="@mipmap/backgroud_tickets_plus_minus">
<View
android:id="@+id/sub"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />
<EditText
android:id="@+id/tickets_plus_minus"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="2"
android:gravity="center"
android:background="@null"
android:singleLine="true"
android:text="0"
android:textColor="#000000"
android:textSize="12dp" />
<View
android:id="@+id/add"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />
</LinearLayout>
<TextView
android:id="@+id/order_level_diamond"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="100"
android:textColor="#0D21B2"
android:textSize="11sp" />
<ImageView
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_marginStart="5dp"
android:src="@mipmap/icon_diamond2" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="10dp">
<TextView
android:id="@+id/balance_diamond"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="100"
android:textColor="#0D21B2"
android:textSize="11sp" />
<ImageView
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_marginStart="5dp"
android:src="@mipmap/icon_diamond2" />
</LinearLayout>
<LinearLayout
android:layout_width="116dp"
android:layout_height="38dp"
android:layout_gravity="center"
android:layout_marginTop="10dp"
android:background="@mipmap/button_buying_experience"
android:gravity="center_horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/buying_experience"
android:textColor="#E03600"
android:textSize="14sp" />
</LinearLayout>
</LinearLayout>

BIN
common/src/main/res/mipmap-xxhdpi/button_buying_experience.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 29 KiB

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

@ -1409,5 +1409,8 @@ Limited ride And limited avatar frame</string>
<string name="gift_overvalue3">禮物價值超 300%</string> <string name="gift_overvalue3">禮物價值超 300%</string>
<string name="unlock_more_gifts">解鎖更多禮物 和全套珍稀裝扮</string> <string name="unlock_more_gifts">解鎖更多禮物 和全套珍稀裝扮</string>
<string name="has_reached_level_after_opening">開通后已達到等級的獎勵將會自動解鎖！</string> <string name="has_reached_level_after_opening">開通后已達到等級的獎勵將會自動解鎖！</string>
<string name="order_level">我的等級</string>
<string name="buying_experience_point">購買經驗值：</string>
<string name="buying_experience">購買</string>
</resources> </resources>

4
config.gradle
View File

@ -21,10 +21,10 @@ ext {
baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S", baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",
// true表示谷歌支付 false 0 链接包 1 谷歌包 2华为包 // true表示谷歌支付 false 0 链接包 1 谷歌包 2华为包
isGooglePlay : 1, isGooglePlay : 0,
//是否上报异常日志 //是否上报异常日志
isUploadLog : true, isUploadLog : true,
//是否打包成插件包模式 //是否打包成插件包模式
isPluginModel : false, isPluginModel : true,
] ]
} }

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

@ -39,6 +39,7 @@ import com.yunbao.common.bean.CoolConfig;
import com.yunbao.common.bean.LiveBean; import com.yunbao.common.bean.LiveBean;
import com.yunbao.common.bean.NativeCallbackModel; import com.yunbao.common.bean.NativeCallbackModel;
import com.yunbao.common.dialog.CinemaTicketPopupWindow; import com.yunbao.common.dialog.CinemaTicketPopupWindow;
import com.yunbao.common.dialog.OrderLevelPopupWindow;
import com.yunbao.common.event.JavascriptInterfaceEvent; import com.yunbao.common.event.JavascriptInterfaceEvent;
import com.yunbao.common.http.HttpCallback; import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.http.LiveHttpUtil; import com.yunbao.common.http.LiveHttpUtil;
@ -227,27 +228,17 @@ public class MainHomeCommunityViewHolder extends AbsMainHomeChildViewHolder impl
mWebView.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW); mWebView.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
} }
mWebView.loadUrl(url); mWebView.loadUrl(url);
// findViewById(R.id.native_callback).setOnClickListener(new View.OnClickListener() { findViewById(R.id.native_callback).setOnClickListener(new View.OnClickListener() {
// @Override @Override
// public void onClick(View view) { public void onClick(View view) {
// mWebView.post(new Runnable() { new XPopup.Builder(mContext)
// @Override .enableDrag(false)
// public void run() { .maxWidth(DeviceUtils.getScreenHeight((Activity) mContext) - DpUtil.dp2px(34))
// .asCustom(new OrderLevelPopupWindow(mContext))
// NativeCallbackModel model = new NativeCallbackModel(); .show();
// model.setUid(String.valueOf(IMLoginManager.get(mContext).getUserInfo().getId()));
// String nativeJson = new JsonUtil().toJson(model);
// mWebView.evaluateJavascript("javascript:nativeCallback('" +nativeJson + "')", new ValueCallback<String>() {
// @Override
// public void onReceiveValue(String value) {
// }
// });
//
// }
// });
// }
// });
} }
});
}//战令等级
public void loadNewUrl() { public void loadNewUrl() {
} }

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

@ -18,11 +18,11 @@
android:layout_height="3dp" android:layout_height="3dp"
android:progressDrawable="@drawable/bg_horizontal_progressbar" /> android:progressDrawable="@drawable/bg_horizontal_progressbar" />
<!-- <Button--> <Button
<!-- android:id="@+id/native_callback"--> android:id="@+id/native_callback"
<!-- android:layout_width="wrap_content"--> android:layout_width="wrap_content"
<!-- android:layout_height="wrap_content"--> android:layout_height="wrap_content"
<!-- android:text="nativeCallback" />--> android:text="nativeCallback" />
</RelativeLayout> </RelativeLayout>