Skip to content

X
xxsq
Commit 0edab532 authored by 王雪伟's avatar 王雪伟
Browse files
Options

[提交人]：王雪伟 

[提交简述] ：小象省钱
[实现方案] ：加入盲盒类型和会员支付页
parent 2935aad1
Expand all Show whitespace changes
Inline Side-by-side
Showing with 466 additions and 13 deletions
cms/src/main/java/com/zxhl/cms/net/api/IVideoInfoApi.java
View file @ 0edab532
......@@ -82,6 +82,13 @@ public interface IVideoInfoApi {
*/
@GET(NetConfig.User.URL_PAY_CONFIG)
Observable<Response<MemberEntity>> getPayConfig();
/**
* 获取频道列表
*
* @return
*/
@GET(NetConfig.User.URL_PAY_CONFIG)
Observable<Response<MemberEntity>> getPayConfig(@Query("payMode") String payMode);
/**
......
cms/src/main/java/com/zxhl/cms/router/RounterApi.kt
View file @ 0edab532
......@@ -211,6 +211,8 @@ interface RounterApi {
@RounterUri(Constant.scheme + "://member_order")
fun getIntentMemberOrder(): Intent
@RounterUri(Constant.scheme + "://open_member")
fun getIntentOpenMember(): Intent
@RounterUri(Constant.scheme + "://after_login")
fun getIntentAfterLogin(
......
cms/src/main/java/com/zxhl/cms/utils/JumpUtils.java
View file @ 0edab532
......@@ -74,6 +74,17 @@ public class JumpUtils {
}
}
//开会员
public static void OpenMember() {
try {
Intent intent = RounterBus.getRounter(RounterApi.class).getIntentOpenMember();
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
AppContext.get().startActivity(intent);
} catch (Exception e) {
Utils.showToast(AppContext.get(), "该版本暂不支持，请更新版本！");
}
}
public static void AfterLoginJump(String boxid, String needprice, String type, String onePrice, String fivePrice, String newPeople, String page) {
try {
Intent intent = RounterBus.getRounter(RounterApi.class).getIntentAfterLogin(boxid, needprice, type, onePrice, fivePrice, newPeople, page);
......@@ -420,6 +431,7 @@ public class JumpUtils {
Utils.showToast(AppContext.get(), "该版本暂不支持，请更新版本！");
}
}
public static void AbuoutUsJump() {
try {
Intent intent = RounterBus.getRounter(RounterApi.class).getIntentAboutUs();
......
cms/src/main/java/com/zxhl/cms/utils/Utils.java
View file @ 0edab532
......@@ -983,6 +983,32 @@ public class Utils {
return (hour<10?("0"+hour):hour) + ":" + (minutes<10?("0"+minutes):minutes) + ":" + (sencond<10?("0"+sencond):sencond);
}
public static String timeConversion2(int time) {
int hour = 0;
int minutes = 0;
int sencond = 0;
int temp = time % 3600;
if (time > 3600) {
hour = time / 3600;
if (temp != 0) {
if (temp > 60) {
minutes = temp / 60;
if (temp % 60 != 0) {
sencond = temp % 60;
}
} else {
sencond = temp;
}
}
} else {
minutes = time / 60;
if (time % 60 != 0) {
sencond = time % 60;
}
}
return (minutes<10?("0"+minutes):minutes) + ":" + (sencond<10?("0"+sencond):sencond);
}
public static boolean isShouldHideInput(View v, MotionEvent event) {
if (v != null && (v instanceof EditText)) {
int[] leftTop = {0, 0};
......
moduleMain/src/main/AndroidManifest.xml
View file @ 0edab532
......@@ -185,6 +185,18 @@
</intent-filter>
</activity>
<activity android:name=".activity.OpenMemberActivity">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<data
android:host="open_member"
android:scheme="xxsq" />
</intent-filter>
</activity>
</application>
......
moduleMain/src/main/java/com/zxbw/modulemain/activity/OpenMemberActivity.kt 0 → 100644
View file @ 0edab532
package com.zxbw.modulemain.activity
import android.view.View
import com.zxbw.modulemain.R
import com.zxhl.cms.AppContext
import com.zxhl.cms.common.base.BaseActivity
import kotlinx.android.synthetic.main.activity_layout_open_member.*
/**
* @author (wangXuewei)
* @datetime 2022-05-30 14:12 GMT+8
* @detail :
*/
class OpenMemberActivity : BaseActivity() {
override fun before() {
super.before()
setStatusBarBackground(AppContext.get().resources.getColor(R.color.transparent))
}
override fun onClick(v: View?) {
}
override fun layoutID(): Int {
return R.layout.activity_layout_open_member
}
override fun init() {
id_img_open_vip.setOnClickListener {
}
}
}
\ No newline at end of file
moduleMain/src/main/res/layout/activity_layout_member_order.xml
View file @ 0edab532
......@@ -23,6 +23,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/id_vip_order_detail_title_sys_bar_view"
android:layout_marginLeft="16dp"
android:src="@drawable/img_vip_fanhui_icon" />
<TextView
......@@ -59,7 +60,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="26dp"
android:layout_marginRight="16dp"
android:layout_marginEnd="16dp"
android:src="@drawable/img_vip_check_icon" />
<TextView
......@@ -85,7 +86,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="12dp"
android:text="15:00:00"
android:text="15:00"
android:textColor="@color/color_333333"
android:textSize="16sp"
android:textStyle="bold" />
......@@ -117,9 +118,10 @@
android:textStyle="bold" />
<TextView
android:id="@+id/id_tv_vip_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="21元"
android:text=""
android:textColor="@color/color_333333"
android:textSize="16sp" />
......@@ -228,12 +230,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginBottom="95dp"
android:background="@drawable/shape_white_r10"
android:orientation="vertical"
android:paddingLeft="12dp"
android:paddingTop="20dp"
android:paddingRight="12dp"
android:layout_marginBottom="95dp"
android:paddingBottom="8dp">
<LinearLayout
......@@ -272,7 +274,6 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="31dp"
android:layout_alignParentBottom="true"
android:background="@drawable/img_vip_bottom_pay_btn_bg"
android:orientation="horizontal">
......@@ -292,18 +293,20 @@
android:textSize="14sp" />
<TextView
android:id="@+id/id_tv_vip_price2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="13dp"
android:text="21"
android:text=""
android:textColor="#FDDFA5"
android:textSize="18sp"
android:textStyle="bold" />
<TextView
android:id="@+id/id_tv_vip_price3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="限时¥ 21"
android:text="原价¥"
android:textColor="#FDDFA5"
android:textSize="10sp" />
......@@ -311,6 +314,7 @@
</LinearLayout>
<TextView
android:id="@+id/id_tv_open_vip_btn_pay"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
......@@ -321,4 +325,10 @@
android:textStyle="bold" />
</LinearLayout>
<WebView
android:id="@+id/id_member_pay_web_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone" />
</RelativeLayout>
moduleMain/src/main/res/layout/activity_layout_open_member.xml 0 → 100644
View file @ 0edab532
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<ImageView
android:id="@+id/id_img_open_vip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:scaleType="fitXY"
android:src="@drawable/img_open_vip_top" />
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:scaleType="fitXY"
android:src="@drawable/img_open_vip_bottom" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</RelativeLayout>
moduleMain/src/main/res/layout/item_layout_box_goods_view.xml
View file @ 0edab532
......@@ -67,7 +67,7 @@
android:id="@+id/id_tv_box_discount_desc"
android:layout_width="match_parent"
android:layout_height="20dp"
android:gravity="center_vertical"
android:gravity="center"
android:text="已减10元幸运币"
android:textColor="#437EEE"
android:textSize="12sp" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment