diff --git a/common/src/main/java/com/yunbao/common/dialog/PromotionElitePopupWindow.java b/common/src/main/java/com/yunbao/common/dialog/PromotionElitePopupWindow.java
new file mode 100644
index 000000000..91ae7d785
--- /dev/null
+++ b/common/src/main/java/com/yunbao/common/dialog/PromotionElitePopupWindow.java
@@ -0,0 +1,27 @@
+package com.yunbao.common.dialog;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import com.lxj.xpopup.core.CenterPopupView;
+import com.yunbao.common.R;
+
+/**
+ * 升級精英/尊享戰令
+ */
+public class PromotionElitePopupWindow extends CenterPopupView {
+ public PromotionElitePopupWindow(@NonNull Context context) {
+ super(context);
+ }
+ @Override
+ protected int getImplLayoutId() {
+ return R.layout.promotion_elite_popup;
+ }
+
+ // 执行初始化操作，比如：findView，设置点击，或者任何你弹窗内的业务逻辑
+ @Override
+ protected void onCreate() {
+ super.onCreate();
+ }
+}
diff --git a/common/src/main/res/drawable/background_order_dialog.xml b/common/src/main/res/drawable/background_order_dialog.xml
new file mode 100644
index 000000000..51b11b8ab
--- /dev/null
+++ b/common/src/main/res/drawable/background_order_dialog.xml
@@ -0,0 +1,22 @@
+
+
+ -
+
+
+ -
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/common/src/main/res/drawable/background_order_dialog_out_layout.png b/common/src/main/res/drawable/background_order_dialog_out_layout.png
new file mode 100644
index 000000000..571cb8b81
Binary files /dev/null and b/common/src/main/res/drawable/background_order_dialog_out_layout.png differ
diff --git a/common/src/main/res/layout/promotion_elite_popup.xml b/common/src/main/res/layout/promotion_elite_popup.xml
new file mode 100644
index 000000000..a7ab027c5
--- /dev/null
+++ b/common/src/main/res/layout/promotion_elite_popup.xml
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/common/src/main/res/mipmap-xxhdpi/button_enjoy.png b/common/src/main/res/mipmap-xxhdpi/button_enjoy.png
new file mode 100644
index 000000000..bd38b1ee0
Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/button_enjoy.png differ
diff --git a/common/src/main/res/mipmap-xxhdpi/button_quintessence.png b/common/src/main/res/mipmap-xxhdpi/button_quintessence.png
new file mode 100644
index 000000000..35f1107fb
Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/button_quintessence.png differ
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index b8c3434d1..ff8db88b7 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -1396,4 +1396,6 @@ Limited ride And limited avatar frame
1.One star coin can be exchanged for one ticket. You can customize the exchange quantity according to your needs. Once the ticket is exchanged, it cannot be revoked. Please confirm in advance;
2.One ticket can be used to watch one episode of a short drama. After successful redemption, you can return to the viewing page and use the ticket to continue watching the movie;
3.Ticket prohibit illegal activities such as offline trading and acquisitions, and PDLIVE will crack down severely on various profit-making trading activities.
+ 升級精英/尊享戰令
+ 可領取海量積分，兌換更多獎勵
diff --git a/config.gradle b/config.gradle
index 9cee3cf51..5f16c8296 100644
--- a/config.gradle
+++ b/config.gradle
@@ -9,9 +9,9 @@ ext {
]
manifestPlaceholders = [
//正式、
- serverHost : "https://napi.yaoulive.com",
+// serverHost : "https://napi.yaoulive.com",
// 测试
- //serverHost : " https://ceshi.yaoulive.com",
+ serverHost : " https://ceshi.yaoulive.com",
//百度语音识别
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 d9c58e538..8728cacd4 100644
--- a/main/src/main/java/com/yunbao/main/views/MainHomeCommunityViewHolder.java
+++ b/main/src/main/java/com/yunbao/main/views/MainHomeCommunityViewHolder.java
@@ -3,7 +3,6 @@ package com.yunbao.main.views;
import static android.content.Context.CLIPBOARD_SERVICE;
import android.app.Activity;
-import android.app.Dialog;
import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.Context;
@@ -31,23 +30,18 @@ import androidx.annotation.RequiresApi;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.lxj.xpopup.XPopup;
-import com.momo.mcamera.util.JsonUtil;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.Constants;
import com.yunbao.common.HtmlConfig;
-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.PromotionElitePopupWindow;
import com.yunbao.common.event.JavascriptInterfaceEvent;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.http.LiveHttpUtil;
-import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.DeviceUtils;
-import com.yunbao.common.utils.DialogUitl;
import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.JavascriptInterfacePlayLetUtils;
import com.yunbao.common.utils.JavascriptInterfaceUtils;
@@ -58,7 +52,6 @@ import com.yunbao.common.utils.ToastUtil;
import com.yunbao.live.views.LoadingView;
import com.yunbao.main.R;
import com.yunbao.main.activity.MainActivity;
-import com.yunbao.main.activity.MyWalletActivity;
import com.yunbao.main.dialog.EncourageDialog;
import com.yunbao.main.utils.BottomBarUtil;
import com.yunbao.share.ui.SharePopDialog;
@@ -393,59 +386,65 @@ public class MainHomeCommunityViewHolder extends AbsMainHomeChildViewHolder impl
.setAnchorAvatar(json.getString("avatar"))
.showDialog();
} else if (TextUtils.equals(event.getMethod(), "postWeakBalance")) {
- LiveNetManager.get(mContext).
- getCoolConfig(new com.yunbao.common.http.base.HttpCallback() {
- @Override
- public void onSuccess(CoolConfig data) {
- new XPopup.Builder(mContext)
- .enableDrag(false)
- .maxWidth(DeviceUtils.getScreenHeight((Activity) mContext) - DpUtil.dp2px(34))
- .asCustom(new CinemaTicketPopupWindow(mContext, data.setTicketCount(event.getCoolConfig().getTicketCount()), new CinemaTicketPopupWindow.CinemaTicketPopupWindowCallBack() {
- @Override
- public void onCallBack(String data) {
- if (TextUtils.equals(data, "2")) {
- DialogUitl.showSimpleDialog(mContext, mContext.getString(com.yunbao.live.R.string.live_coin_not_enough), false,
- new DialogUitl.SimpleCallback2() {
- @Override
- public void onConfirmClick(Dialog dialog, String content) {
- mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 1));
- }
+ new XPopup.Builder(mContext)
+ .enableDrag(false)
+ .maxWidth(DeviceUtils.getScreenHeight((Activity) mContext) - DpUtil.dp2px(34))
+ .asCustom(new PromotionElitePopupWindow(mContext))
+ .show();
- @Override
- public void onCancelClick() {
+// LiveNetManager.get(mContext).
+// getCoolConfig(new com.yunbao.common.http.base.HttpCallback() {
+// @Override
+// public void onSuccess(CoolConfig data) {
+// new XPopup.Builder(mContext)
+// .enableDrag(false)
+// .maxWidth(DeviceUtils.getScreenHeight((Activity) mContext) - DpUtil.dp2px(34))
+// .asCustom(new CinemaTicketPopupWindow(mContext, data.setTicketCount(event.getCoolConfig().getTicketCount()), new CinemaTicketPopupWindow.CinemaTicketPopupWindowCallBack() {
+// @Override
+// public void onCallBack(String data) {
+// if (TextUtils.equals(data, "2")) {
+// DialogUitl.showSimpleDialog(mContext, mContext.getString(com.yunbao.live.R.string.live_coin_not_enough), false,
+// new DialogUitl.SimpleCallback2() {
+// @Override
+// public void onConfirmClick(Dialog dialog, String content) {
+// mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 1));
+// }
+//
+// @Override
+// public void onCancelClick() {
+//
+// }
+// });
+// } else if (TextUtils.equals(data, "1")) {
+// 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) {
+// }
+// });
+//
+// }
+// });
+// }
+//
+// }
+// })).show();
+// }
+//
+// @Override
+// public void onError (String error){
+// ToastUtil.show(error);
+// }
+// });
- }
- });
- } else if (TextUtils.equals(data, "1")) {
- 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) {
- }
- });
-
- }
- });
- }
-
- }
- })).show();
- }
-
- @Override
- public void onError(String error) {
- ToastUtil.show(error);
- }
- });
-
- }
- }
+ }
+}
}
-}
+ }