diff --git a/common/src/main/java/com/yunbao/common/dialog/OrderLevelPopupWindow.java b/common/src/main/java/com/yunbao/common/dialog/OrderLevelPopupWindow.java new file mode 100644 index 000000000..50cc3c060 --- /dev/null +++ b/common/src/main/java/com/yunbao/common/dialog/OrderLevelPopupWindow.java @@ -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); + } +} diff --git a/common/src/main/res/drawable/order_level_progress_bg.xml b/common/src/main/res/drawable/order_level_progress_bg.xml new file mode 100644 index 000000000..587aa4c17 --- /dev/null +++ b/common/src/main/res/drawable/order_level_progress_bg.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/common/src/main/res/layout/order_level_popup.xml b/common/src/main/res/layout/order_level_popup.xml new file mode 100644 index 000000000..c3b5da737 --- /dev/null +++ b/common/src/main/res/layout/order_level_popup.xml @@ -0,0 +1,153 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/common/src/main/res/mipmap-xxhdpi/button_buying_experience.png b/common/src/main/res/mipmap-xxhdpi/button_buying_experience.png new file mode 100644 index 000000000..ba6f0a19c Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/button_buying_experience.png differ diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 18b4b5eaa..01dc883b5 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -1409,5 +1409,8 @@ Limited ride And limited avatar frame 禮物價值超 300% 解鎖更多禮物 和全套珍稀裝扮 開通后已達到等級的獎勵將會自動解鎖！ + 我的等級 + 購買經驗值： + 購買 diff --git a/config.gradle b/config.gradle index 5f16c8296..c9e395940 100644 --- a/config.gradle +++ b/config.gradle @@ -21,10 +21,10 @@ ext { baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S", // true表示谷歌支付 false 0 链接包 1 谷歌包 2华为包 - isGooglePlay : 1, + isGooglePlay : 0, //是否上报异常日志 isUploadLog : true, //是否打包成插件包模式 - isPluginModel : false, + isPluginModel : true, ] } diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeCommunityViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeCommunityViewHolder.java index 3dfe440ee..e4323cb35 100644 --- a/main/src/main/java/com/yunbao/main/views/MainHomeCommunityViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainHomeCommunityViewHolder.java @@ -39,6 +39,7 @@ import com.yunbao.common.bean.CoolConfig; import com.yunbao.common.bean.LiveBean; import com.yunbao.common.bean.NativeCallbackModel; import com.yunbao.common.dialog.CinemaTicketPopupWindow; +import com.yunbao.common.dialog.OrderLevelPopupWindow; import com.yunbao.common.event.JavascriptInterfaceEvent; import com.yunbao.common.http.HttpCallback; 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.loadUrl(url); -// findViewById(R.id.native_callback).setOnClickListener(new View.OnClickListener() { -// @Override -// public void onClick(View view) { -// mWebView.post(new Runnable() { -// @Override -// public void run() { -// -// NativeCallbackModel model = new NativeCallbackModel(); -// model.setUid(String.valueOf(IMLoginManager.get(mContext).getUserInfo().getId())); -// String nativeJson = new JsonUtil().toJson(model); -// mWebView.evaluateJavascript("javascript:nativeCallback('" +nativeJson + "')", new ValueCallback() { -// @Override -// public void onReceiveValue(String value) { -// } -// }); -// -// } -// }); -// } -// }); - } + findViewById(R.id.native_callback).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + new XPopup.Builder(mContext) + .enableDrag(false) + .maxWidth(DeviceUtils.getScreenHeight((Activity) mContext) - DpUtil.dp2px(34)) + .asCustom(new OrderLevelPopupWindow(mContext)) + .show(); + } + }); + }//战令等级 public void loadNewUrl() { } diff --git a/main/src/main/res/layout/view_main_encourage.xml b/main/src/main/res/layout/view_main_encourage.xml index d796f713a..aeda3309b 100644 --- a/main/src/main/res/layout/view_main_encourage.xml +++ b/main/src/main/res/layout/view_main_encourage.xml @@ -18,11 +18,11 @@ android:layout_height="3dp" android:progressDrawable="@drawable/bg_horizontal_progressbar" /> - - - - +