Browse Source

1.Rewards详情界面搭建
2.Rewards购买确认界面搭建
3.Rewards支付成功界面搭建
4.Me界面搭建

Administrator 2 years ago
parent
commit
0c966f7b89
73 changed files with 2618 additions and 112 deletions
  1. 552 52
      cpt_main/src/main/res/layout/fragment_profile.xml
  2. 37 33
      cpt_parttime/src/main/res/layout/activity_settings.xml
  3. 3 0
      cpt_rewards/build.gradle
  4. 6 0
      cpt_rewards/src/main/AndroidManifest.xml
  5. 24 1
      cpt_rewards/src/main/java/com/hongyegroup/cpt_rewards/ui/RewardsActivity.kt
  6. 70 0
      cpt_rewards/src/main/java/com/hongyegroup/cpt_rewards/ui/RewardsConfirmActivity.kt
  7. 108 0
      cpt_rewards/src/main/java/com/hongyegroup/cpt_rewards/ui/RewardsDetailActivity.kt
  8. 46 0
      cpt_rewards/src/main/java/com/hongyegroup/cpt_rewards/ui/RewardsPaymentSuccessActivity.kt
  9. 122 0
      cpt_rewards/src/main/java/com/hongyegroup/cpt_rewards/widget/PointsPaymentDialog.java
  10. BIN
      cpt_rewards/src/main/res/drawable-xhdpi/iv_promotion_rewards_address.webp
  11. BIN
      cpt_rewards/src/main/res/drawable-xhdpi/iv_promotion_rewards_instruction.webp
  12. BIN
      cpt_rewards/src/main/res/drawable-xhdpi/iv_promotion_rewards_jia.webp
  13. BIN
      cpt_rewards/src/main/res/drawable-xhdpi/iv_promotion_rewards_jian.webp
  14. BIN
      cpt_rewards/src/main/res/drawable-xhdpi/iv_promotion_rewards_package.webp
  15. BIN
      cpt_rewards/src/main/res/drawable-xhdpi/iv_promotion_rewards_qr_code.webp
  16. BIN
      cpt_rewards/src/main/res/drawable-xhdpi/iv_promotion_rewards_redeem_at.webp
  17. BIN
      cpt_rewards/src/main/res/drawable-xhdpi/iv_promotion_rewards_redeem_from.webp
  18. BIN
      cpt_rewards/src/main/res/drawable-xhdpi/iv_promotion_rewards_redeemable_on.webp
  19. BIN
      cpt_rewards/src/main/res/drawable-xhdpi/iv_promotion_rewards_redemption_notice.webp
  20. BIN
      cpt_rewards/src/main/res/drawable-xhdpi/iv_promotion_rewards_reservation.webp
  21. BIN
      cpt_rewards/src/main/res/drawable-xhdpi/iv_promotion_rewards_reviews.webp
  22. BIN
      cpt_rewards/src/main/res/drawable-xhdpi/iv_promotion_rewards_share.webp
  23. BIN
      cpt_rewards/src/main/res/drawable-xhdpi/iv_promotion_rewards_transaction.webp
  24. BIN
      cpt_rewards/src/main/res/drawable-xhdpi/iv_promotion_rewards_verification_code.webp
  25. BIN
      cpt_rewards/src/main/res/drawable-xhdpi/iv_rewards_payment_success_paid_icon.webp
  26. BIN
      cpt_rewards/src/main/res/drawable-xhdpi/iv_rewards_payment_success_top_bg.webp
  27. BIN
      cpt_rewards/src/main/res/drawable-xxhdpi/iv_promotion_rewards_address.webp
  28. BIN
      cpt_rewards/src/main/res/drawable-xxhdpi/iv_promotion_rewards_instruction.webp
  29. BIN
      cpt_rewards/src/main/res/drawable-xxhdpi/iv_promotion_rewards_jia.webp
  30. BIN
      cpt_rewards/src/main/res/drawable-xxhdpi/iv_promotion_rewards_jian.webp
  31. BIN
      cpt_rewards/src/main/res/drawable-xxhdpi/iv_promotion_rewards_package.webp
  32. BIN
      cpt_rewards/src/main/res/drawable-xxhdpi/iv_promotion_rewards_qr_code.webp
  33. BIN
      cpt_rewards/src/main/res/drawable-xxhdpi/iv_promotion_rewards_redeem_at.webp
  34. BIN
      cpt_rewards/src/main/res/drawable-xxhdpi/iv_promotion_rewards_redeem_from.webp
  35. BIN
      cpt_rewards/src/main/res/drawable-xxhdpi/iv_promotion_rewards_redeemable_on.webp
  36. BIN
      cpt_rewards/src/main/res/drawable-xxhdpi/iv_promotion_rewards_redemption_notice.webp
  37. BIN
      cpt_rewards/src/main/res/drawable-xxhdpi/iv_promotion_rewards_reservation.webp
  38. BIN
      cpt_rewards/src/main/res/drawable-xxhdpi/iv_promotion_rewards_reviews.webp
  39. BIN
      cpt_rewards/src/main/res/drawable-xxhdpi/iv_promotion_rewards_share.webp
  40. BIN
      cpt_rewards/src/main/res/drawable-xxhdpi/iv_promotion_rewards_transaction.webp
  41. BIN
      cpt_rewards/src/main/res/drawable-xxhdpi/iv_promotion_rewards_verification_code.webp
  42. BIN
      cpt_rewards/src/main/res/drawable-xxhdpi/iv_rewards_payment_success_paid_icon.webp
  43. BIN
      cpt_rewards/src/main/res/drawable-xxhdpi/iv_rewards_payment_success_top_bg.webp
  44. 8 0
      cpt_rewards/src/main/res/drawable/shape_rewards_gray_5conner_bg.xml
  45. 8 0
      cpt_rewards/src/main/res/drawable/shape_rewards_white_15conner_bg.xml
  46. 10 0
      cpt_rewards/src/main/res/drawable/shape_rewards_white_bottom_15conner_bg.xml
  47. 10 0
      cpt_rewards/src/main/res/drawable/shape_rewards_white_top_15conner_bg.xml
  48. 367 0
      cpt_rewards/src/main/res/layout/activity_rewards_confirm.xml
  49. 772 0
      cpt_rewards/src/main/res/layout/activity_rewards_detail.xml
  50. 335 0
      cpt_rewards/src/main/res/layout/activity_rewards_payment_success.xml
  51. 26 26
      cpt_rewards/src/main/res/layout/activity_rewards_search.xml
  52. 71 0
      cpt_rewards/src/main/res/layout/dialog_points_payment.xml
  53. BIN
      cs_cptServices/src/main/res/drawable-xhdpi/iv_freelancer_default_photo.png
  54. BIN
      cs_cptServices/src/main/res/drawable-xhdpi/iv_me_app_setting.webp
  55. BIN
      cs_cptServices/src/main/res/drawable-xhdpi/iv_me_help_center.webp
  56. BIN
      cs_cptServices/src/main/res/drawable-xhdpi/iv_me_invite_friends.webp
  57. BIN
      cs_cptServices/src/main/res/drawable-xhdpi/iv_me_pet_farming_bg.webp
  58. BIN
      cs_cptServices/src/main/res/drawable-xhdpi/iv_payment_dialog_delete.webp
  59. BIN
      cs_cptServices/src/main/res/drawable-xhdpi/iv_profile_edit.webp
  60. BIN
      cs_cptServices/src/main/res/drawable-xhdpi/iv_promotion_detail_address_icon.webp
  61. BIN
      cs_cptServices/src/main/res/drawable-xhdpi/iv_promotion_home_default_picture.png
  62. BIN
      cs_cptServices/src/main/res/drawable-xxhdpi/iv_me_app_setting.webp
  63. BIN
      cs_cptServices/src/main/res/drawable-xxhdpi/iv_me_help_center.webp
  64. BIN
      cs_cptServices/src/main/res/drawable-xxhdpi/iv_me_invite_friends.webp
  65. BIN
      cs_cptServices/src/main/res/drawable-xxhdpi/iv_me_pet_farming_bg.webp
  66. BIN
      cs_cptServices/src/main/res/drawable-xxhdpi/iv_profile_edit.webp
  67. BIN
      cs_cptServices/src/main/res/drawable-xxhdpi/iv_promotion_detail_address_icon.webp
  68. 7 0
      cs_cptServices/src/main/res/drawable/shape_border_line.xml
  69. 10 0
      cs_cptServices/src/main/res/drawable/shape_gray_bg_with_blue_border_line_5conner.xml
  70. 7 0
      cs_cptServices/src/main/res/drawable/shape_profile_red_3round.xml
  71. 8 0
      cs_cptServices/src/main/res/drawable/shape_promotion_detail_image_count.xml
  72. 7 0
      cs_cptServices/src/main/res/drawable/transparent_bg_selector.xml
  73. 4 0
      cs_cptServices/src/main/res/values/colors.xml

+ 552 - 52
cpt_main/src/main/res/layout/fragment_profile.xml

@@ -2,8 +2,8 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:binding="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:ignore="RtlHardcoded">
+    xmlns:tool="http://schemas.android.com/tool"
+    tool:ignore="RtlHardcoded">
 
     <data>
 
@@ -17,67 +17,567 @@
 
     </data>
 
-    <LinearLayout
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/white"
-        android:orientation="vertical">
+        android:layout_height="match_parent">
 
-        <com.guadou.lib_baselib.view.titlebar.StatusbarGrayView
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="match_parent"
+            android:background="#FAFDFF"
+            android:orientation="vertical">
 
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_46dp">
-
-            <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="个人状态页面"
-                android:textColor="@color/black"
-                android:textSize="@dimen/d_18sp" />
-
-            <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="right|center_vertical"
-                android:layout_marginRight="@dimen/d_15dp"
-                android:text="全部已读"
-                android:textColor="@color/profile_red"
-                android:textSize="@dimen/d_16sp" />
-
-        </FrameLayout>
+            <com.scwang.smart.refresh.layout.SmartRefreshLayout
+                android:id="@+id/refresh_layout_profile"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@color/white"
+                app:srlAccentColor="#03A3FE"
+                app:srlEnablePreviewInEditMode="false"
+                app:srlPrimaryColor="@color/app_blue">
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_0.7dp"
-            android:background="@color/divider_color_ee" />
+                <com.scwang.smart.refresh.header.ClassicsHeader
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:srlAccentColor="@color/white" />
 
-        <com.scwang.smart.refresh.layout.SmartRefreshLayout
-            android:id="@+id/refresh_layout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            app:srlEnablePreviewInEditMode="true"
-            app:srlPrimaryColor="@color/white">
+                <ScrollView
+                    android:id="@+id/profilr_scroll_root"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:overScrollMode="never"
+                    android:scrollbars="none">
 
-            <com.scwang.smart.refresh.header.ClassicsHeader
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical">
 
+                        <!--    头部     -->
+                        <FrameLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="center"
-                android:text="我的页面" />
+                            <!--     弧形的渐变    -->
+                            <View
+                                android:layout_width="match_parent"
+                                android:layout_height="@dimen/d_150dp"
+                                android:background="@drawable/shape_gradient_proifle_title_bottom" />
+
+                            <LinearLayout
+                                android:id="@+id/frame_profile_banner"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_5dp"
+                                android:layout_marginTop="@dimen/d_40dp"
+                                android:layout_marginRight="@dimen/d_5dp"
+                                android:background="@drawable/profile_white_shadow_comm_bg"
+                                android:orientation="vertical">
+
+                                <androidx.constraintlayout.widget.ConstraintLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center_horizontal"
+                                    android:layout_marginTop="@dimen/d_40dp"
+                                    android:gravity="center"
+                                    android:orientation="horizontal">
+
+                                    <com.guadou.lib_baselib.font_text_view.TextViewBold
+                                        android:id="@+id/text_view_full_name"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:maxWidth="200dp"
+                                        android:layout_centerInParent="true"
+                                        android:gravity="center"
+                                        android:text="-"
+                                        android:textColor="@color/profile_black_28394a"
+                                        android:textSize="24sp"
+                                        app:layout_constraintBottom_toBottomOf="parent"
+                                        app:layout_constraintLeft_toLeftOf="parent"
+                                        app:layout_constraintRight_toRightOf="parent"
+                                        app:layout_constraintTop_toTopOf="parent" />
+
+                                    <ImageView
+                                        android:id="@+id/button_edit_profile"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginLeft="@dimen/d_13dp"
+                                        android:layout_marginTop="@dimen/d_4dp"
+                                        android:layout_toRightOf="@id/text_view_full_name"
+                                        android:src="@drawable/iv_profile_edit"
+                                        app:layout_constraintBottom_toBottomOf="@id/text_view_full_name"
+                                        app:layout_constraintLeft_toRightOf="@id/text_view_full_name"
+                                        app:layout_constraintTop_toTopOf="@id/text_view_full_name" />
+
+                                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                                <com.guadou.lib_baselib.font_text_view.TextViewRegular
+                                    android:id="@+id/text_view_email_address"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center_horizontal"
+                                    android:layout_marginLeft="@dimen/d_15dp"
+                                    android:layout_marginRight="@dimen/d_15dp"
+                                    android:gravity="center"
+                                    android:text="-"
+                                    android:textColor="#8098B2"
+                                    android:textSize="13.8dp" />
+
+                                <com.guadou.lib_baselib.font_text_view.TextViewRegular
+                                    android:id="@+id/text_view_joined_date"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center_horizontal"
+                                    android:layout_marginLeft="@dimen/d_15dp"
+                                    android:layout_marginRight="@dimen/d_15dp"
+                                    android:gravity="center"
+                                    android:text="-"
+                                    android:textColor="#8098B2"
+                                    android:textSize="13.8dp" />
+
+                                <RelativeLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="@dimen/d_9dp">
+
+                                    <com.guadou.lib_baselib.font_text_view.TextViewRegular
+                                        android:id="@+id/text_view_profile_points"
+                                        android:layout_width="105dp"
+                                        android:layout_height="25dp"
+                                        android:layout_centerHorizontal="true"
+                                        android:background="@drawable/shape_5round_main_blue"
+                                        android:gravity="center"
+                                        android:text="- Credits"
+                                        android:textColor="@color/white"
+                                        android:textSize="13.5dp" />
+
+                                    <ImageView
+                                        android:id="@+id/button_help_points"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_centerVertical="true"
+                                        android:layout_gravity="center_vertical"
+                                        android:layout_marginLeft="@dimen/d_9dp"
+                                        android:layout_toRightOf="@id/text_view_profile_points"
+                                        android:contentDescription="@string/null_data"
+                                        android:src="@drawable/help_blue" />
+
+                                </RelativeLayout>
+
+
+                                <androidx.constraintlayout.widget.ConstraintLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="@dimen/d_10dp"
+                                    android:orientation="horizontal"
+                                    android:paddingLeft="@dimen/d_15dp"
+                                    android:paddingRight="@dimen/d_15dp"
+                                    android:paddingBottom="@dimen/d_23dp">
+
+                                    <!--pending jobs-->
+                                    <LinearLayout
+                                        android:id="@+id/ll_padding_job"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="match_parent"
+                                        android:layout_weight="1.2"
+                                        android:gravity="center"
+                                        android:orientation="vertical"
+                                        android:padding="@dimen/d_5dp"
+                                        app:layout_constraintBottom_toBottomOf="parent"
+                                        app:layout_constraintLeft_toLeftOf="parent"
+                                        app:layout_constraintTop_toTopOf="parent">
+
+                                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                            android:id="@+id/text_view_pending_jobs_count"
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:text="@string/null_data"
+                                            android:textColor="@color/profile_black_28394a"
+                                            android:textSize="@dimen/d_17sp"
+                                            tool:ignore="TooDeepLayout"
+                                            tool:text="789" />
+
+                                        <com.guadou.lib_baselib.font_text_view.TextViewRegular
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:layout_marginTop="@dimen/d_3dp"
+                                            android:text="朋友圈发布"
+                                            android:textColor="#8098B2"
+                                            android:textSize="13.8dp" />
+
+                                    </LinearLayout>
+
+
+                                    <!--completed jobs-->
+                                    <LinearLayout
+                                        android:id="@+id/ll_completed_job"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="match_parent"
+                                        android:layout_weight="1"
+                                        android:gravity="center"
+                                        android:orientation="vertical"
+                                        android:padding="@dimen/d_5dp"
+                                        app:layout_constraintBottom_toBottomOf="parent"
+                                        app:layout_constraintLeft_toRightOf="@id/ll_padding_job"
+                                        app:layout_constraintRight_toLeftOf="@id/ll_rewards_box"
+                                        app:layout_constraintTop_toTopOf="parent">
+
+                                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                            android:id="@+id/text_view_completed_jobs_count"
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:text="@string/null_data"
+                                            android:textColor="@color/profile_black_28394a"
+                                            android:textSize="@dimen/d_17sp"
+                                            tool:text="789" />
+
+                                        <com.guadou.lib_baselib.font_text_view.TextViewRegular
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:layout_marginTop="@dimen/d_3dp"
+                                            android:text="已关注"
+                                            android:textColor="#8098B2"
+                                            android:textSize="13.8dp" />
+
+                                    </LinearLayout>
+
+
+                                    <!--Rewards-->
+                                    <androidx.constraintlayout.widget.ConstraintLayout
+                                        android:id="@+id/ll_rewards_box"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="match_parent"
+                                        android:layout_weight="1"
+                                        android:gravity="center"
+                                        android:padding="@dimen/d_5dp"
+                                        app:layout_constraintBottom_toBottomOf="parent"
+                                        app:layout_constraintRight_toRightOf="parent"
+                                        app:layout_constraintTop_toTopOf="parent">
+
+                                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                            android:id="@+id/text_view_money_earned"
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:text="@string/null_data"
+                                            android:textColor="@color/profile_black_28394a"
+                                            android:textSize="@dimen/d_17sp"
+                                            app:layout_constraintBottom_toTopOf="@id/tv_text_rewards"
+                                            app:layout_constraintLeft_toLeftOf="parent"
+                                            app:layout_constraintRight_toRightOf="parent"
+                                            app:layout_constraintTop_toTopOf="parent"
+                                            tool:text="789" />
+
+                                        <com.guadou.lib_baselib.font_text_view.TextViewRegular
+                                            android:id="@+id/tv_text_rewards"
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:layout_centerHorizontal="true"
+                                            android:layout_marginTop="@dimen/d_3dp"
+                                            android:text="粉丝"
+                                            android:textColor="#8098B2"
+                                            android:textSize="13.8dp"
+                                            app:layout_constraintBottom_toBottomOf="parent"
+                                            app:layout_constraintLeft_toLeftOf="parent"
+                                            app:layout_constraintRight_toRightOf="parent"
+                                            app:layout_constraintTop_toBottomOf="@id/text_view_money_earned" />
+
+                                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                            </LinearLayout>
+
+
+                            <com.guadou.lib_baselib.view.CircleImageView
+                                android:id="@+id/image_view_profile_photo"
+                                android:layout_width="@dimen/d_70dp"
+                                android:layout_height="@dimen/d_70dp"
+                                android:layout_gravity="center_horizontal"
+                                android:layout_marginTop="@dimen/d_5dp"
+                                android:scaleType="centerCrop"
+                                android:src="@drawable/im_default_head"
+                                app:civ_border_color="@color/white"
+                                app:civ_border_overlay="true"
+                                app:civ_border_width="@dimen/d_1dp" />
+
+
+                        </FrameLayout>
+
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_marginLeft="@dimen/d_5dp"
+                            android:layout_marginRight="@dimen/d_5dp"
+                            android:background="@drawable/profile_white_shadow_comm_bg"
+                            android:orientation="vertical"
+                            android:paddingBottom="@dimen/d_20dp">
+
+
+                            <com.guadou.lib_baselib.font_text_view.TextViewBold
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_22dp"
+                                android:layout_marginTop="@dimen/d_22dp"
+                                android:layout_marginBottom="@dimen/d_12dp"
+                                android:gravity="center"
+                                android:text="我的服务"
+                                android:textColor="@color/profile_black_28394a"
+                                android:textSize="@dimen/d_18dp" />
+
+
+
+                            <!--  邀请好友   -->
+                            <RelativeLayout
+                                android:id="@+id/ll_me_invite_and_earn"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:background="@drawable/transparent_bg_selector"
+                                android:clickable="true"
+                                android:orientation="horizontal"
+                                android:paddingLeft="@dimen/d_25dp"
+                                android:paddingTop="@dimen/d_15dp"
+                                android:paddingRight="@dimen/d_25dp"
+                                android:paddingBottom="@dimen/d_15dp"
+                                android:visibility="visible">
+
+                                <ImageView
+                                    android:id="@+id/iv_me_gift"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:src="@drawable/iv_me_invite_friends" />
+
+                                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                    android:id="@+id/tv_invite_text"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginStart="@dimen/d_15dp"
+                                    android:layout_marginLeft="@dimen/d_15dp"
+                                    android:layout_toRightOf="@id/iv_me_gift"
+                                    android:text="邀请朋友赚奖励"
+                                    android:textColor="@color/black"
+                                    android:textSize="@dimen/d_14sp" />
+
+                                <TextView
+                                    android:id="@+id/tv_me_invite_new"
+                                    android:layout_width="33dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginLeft="@dimen/d_10dp"
+                                    android:layout_toRightOf="@id/tv_invite_text"
+                                    android:background="@drawable/iv_me_pet_farming_bg"
+                                    android:gravity="center"
+                                    android:paddingBottom="1.2dp"
+                                    android:text="新"
+                                    android:textColor="@color/white"
+                                    android:textSize="@dimen/d_9sp"
+                                    android:visibility="gone"
+                                    tool:visibility="visible" />
+
+                                <ImageView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentRight="true"
+                                    android:layout_centerVertical="true"
+                                    android:src="@drawable/back_more_black" />
+
+                            </RelativeLayout>
+
+
+
+
+                            <!--Promotions (隐藏了)-->
+                            <!--                        <RelativeLayout-->
+                            <!--                            android:id="@+id/rl_me_promotion"-->
+                            <!--                            android:layout_width="match_parent"-->
+                            <!--                            android:layout_height="wrap_content"-->
+                            <!--                            android:background="@drawable/transparent_bg_selector"-->
+                            <!--                            android:clickable="true"-->
+                            <!--                            android:orientation="horizontal"-->
+                            <!--                            android:paddingLeft="@dimen/d_25dp"-->
+                            <!--                            android:paddingTop="@dimen/d_15dp"-->
+                            <!--                            android:paddingRight="@dimen/d_25dp"-->
+                            <!--                            android:paddingBottom="@dimen/d_15dp"-->
+                            <!--                            android:visibility="gone">-->
+
+                            <!--                            <ImageView-->
+                            <!--                                android:id="@+id/iv_me_promotion"-->
+                            <!--                                android:layout_width="@dimen/d_20dp"-->
+                            <!--                                android:layout_height="@dimen/d_20dp"-->
+                            <!--                                android:contentDescription="@string/customer_support"-->
+                            <!--                                android:src="@drawable/iv_me_promotions" />-->
+
+                            <!--                            <com.guadou.componentservice.font_text_view.TextViewRegular-->
+                            <!--                                android:layout_width="wrap_content"-->
+                            <!--                                android:layout_height="wrap_content"-->
+                            <!--                                android:layout_marginStart="@dimen/d_15dp"-->
+                            <!--                                android:layout_marginLeft="@dimen/d_15dp"-->
+                            <!--                                android:layout_toRightOf="@id/iv_me_promotion"-->
+                            <!--                                android:text="@string/my_promotions"-->
+                            <!--                                android:textColor="@color/black"-->
+                            <!--                                android:textSize="@dimen/me_text_size" />-->
+
+                            <!--                            <ImageView-->
+                            <!--                                android:id="@+id/iv_promotion_back"-->
+                            <!--                                android:layout_width="wrap_content"-->
+                            <!--                                android:layout_height="wrap_content"-->
+                            <!--                                android:layout_alignParentRight="true"-->
+                            <!--                                android:layout_centerVertical="true"-->
+                            <!--                                android:src="@drawable/iv_back" />-->
+
+                            <!--                        </RelativeLayout>-->
+
+
+
+                            <!--Operation Executive Evaluation 评分隐藏-->
+                            <!--                        <RelativeLayout-->
+                            <!--                            android:id="@+id/rl_me_evaluation"-->
+                            <!--                            android:layout_width="match_parent"-->
+                            <!--                            android:layout_height="wrap_content"-->
+                            <!--                            android:background="@drawable/transparent_bg_selector"-->
+                            <!--                            android:clickable="true"-->
+                            <!--                            android:orientation="horizontal"-->
+                            <!--                            android:paddingLeft="@dimen/d_25dp"-->
+                            <!--                            android:paddingTop="@dimen/d_15dp"-->
+                            <!--                            android:paddingRight="@dimen/d_25dp"-->
+                            <!--                            android:paddingBottom="@dimen/d_15dp"-->
+                            <!--                            android:visibility="gone">-->
+
+                            <!--                            <ImageView-->
+                            <!--                                android:id="@+id/iv_me_evaluation"-->
+                            <!--                                android:layout_width="@dimen/d_20dp"-->
+                            <!--                                android:layout_height="@dimen/d_20dp"-->
+                            <!--                                android:contentDescription="@string/customer_support"-->
+                            <!--                                android:src="@drawable/iv_me_evaluation" />-->
+
+                            <!--                            <com.guadou.componentservice.font_text_view.TextViewRegular-->
+                            <!--                                android:layout_width="wrap_content"-->
+                            <!--                                android:layout_height="wrap_content"-->
+                            <!--                                android:layout_marginStart="@dimen/d_15dp"-->
+                            <!--                                android:layout_marginLeft="@dimen/d_15dp"-->
+                            <!--                                android:layout_toRightOf="@+id/iv_me_evaluation"-->
+                            <!--                                android:text="@string/operation_executive_evaluation"-->
+                            <!--                                android:textColor="@color/black"-->
+                            <!--                                android:textSize="@dimen/me_text_size" />-->
+
+                            <!--                            <ImageView-->
+                            <!--                                android:id="@+id/iv_me_evaluation_back"-->
+                            <!--                                android:layout_width="wrap_content"-->
+                            <!--                                android:layout_height="wrap_content"-->
+                            <!--                                android:layout_alignParentRight="true"-->
+                            <!--                                android:layout_centerVertical="true"-->
+                            <!--                                android:src="@drawable/iv_back" />-->
+
+
+                            <!--                        </RelativeLayout>-->
+
+
+                            <!-- Help Center  -->
+                            <RelativeLayout
+                                android:id="@+id/button_customer_support"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:background="@drawable/transparent_bg_selector"
+                                android:clickable="true"
+                                android:orientation="horizontal"
+                                android:paddingLeft="@dimen/d_25dp"
+                                android:paddingTop="@dimen/d_15dp"
+                                android:paddingRight="@dimen/d_25dp"
+                                android:paddingBottom="@dimen/d_15dp">
+
+                                <ImageView
+                                    android:id="@+id/iv_customer_support_black"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:src="@drawable/iv_me_help_center" />
+
+                                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginStart="@dimen/d_15dp"
+                                    android:layout_marginLeft="@dimen/d_15dp"
+                                    android:layout_toRightOf="@id/iv_customer_support_black"
+                                    android:text="帮助中心"
+                                    android:textColor="@color/profile_black_28394a"
+                                    android:textSize="@dimen/d_14sp" />
+
+                                <ImageView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentRight="true"
+                                    android:layout_centerVertical="true"
+                                    android:src="@drawable/back_more_black" />
+
+                            </RelativeLayout>
+
+
+                            <!-- Setting  -->
+                            <RelativeLayout
+                                android:id="@+id/button_setting"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:background="@drawable/transparent_bg_selector"
+                                android:clickable="true"
+                                android:orientation="horizontal"
+                                android:paddingLeft="@dimen/d_25dp"
+                                android:paddingTop="@dimen/d_15dp"
+                                android:paddingRight="@dimen/d_25dp"
+                                android:paddingBottom="@dimen/d_15dp">
+
+                                <ImageView
+                                    android:id="@+id/iv_setting_black"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:src="@drawable/iv_me_app_setting" />
+
+                                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginStart="@dimen/d_15dp"
+                                    android:layout_marginLeft="@dimen/d_15dp"
+                                    android:layout_toRightOf="@id/iv_setting_black"
+                                    android:text="设置"
+                                    android:textColor="@color/profile_black_28394a"
+                                    android:textSize="@dimen/d_14sp" />
+
+                                <ImageView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentRight="true"
+                                    android:layout_centerVertical="true"
+                                    android:src="@drawable/back_more_black" />
+
+                            </RelativeLayout>
+
+                        </LinearLayout>
+
+                    </LinearLayout>
+
+                </ScrollView>
+
+            </com.scwang.smart.refresh.layout.SmartRefreshLayout>
+
+        </LinearLayout>
+
+
+        <View
+            android:id="@+id/view_progress_bg"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/progress_background"
+            android:clickable="true"
+            android:visibility="gone" />
 
-        </com.scwang.smart.refresh.layout.SmartRefreshLayout>
+        <ProgressBar
+            android:id="@+id/progress_bar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:indeterminate="true"
+            android:indeterminateTint="@color/colorAccent"
+            android:indeterminateTintMode="src_atop"
+            android:visibility="gone" />
 
-    </LinearLayout>
+    </FrameLayout>
 
 
 </layout>

+ 37 - 33
cpt_parttime/src/main/res/layout/activity_settings.xml

@@ -28,6 +28,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/d_15dp"
+            android:visibility="gone"
             android:orientation="horizontal">
 
             <com.guadou.lib_baselib.font_text_view.TextViewMedium
@@ -54,22 +55,23 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/d_1dp"
+            android:visibility="gone"
             android:background="@color/page_bg" />
 
-        <!--FAQ-->
+        <!--重置密码-->
         <LinearLayout
-            android:id="@+id/ll_setting_faq"
+            android:id="@+id/ll_setting_reset_psd"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:padding="@dimen/d_15dp"
-            android:visibility="visible">
+            binding:clicks="@{click.resetPassword}"
+            android:padding="@dimen/d_15dp">
 
             <TextView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="常用问题"
+                android:text="重置密码"
                 android:textColor="@color/black"
                 android:textSize="@dimen/d_14sp" />
 
@@ -81,25 +83,25 @@
                 android:src="@drawable/iv_back" />
 
         </LinearLayout>
-
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/d_1dp"
             android:background="@color/page_bg" />
 
-        <!--Privacy Policy-->
+        <!--FAQ-->
         <LinearLayout
-            android:id="@+id/ll_setting_privacy_policy"
+            android:id="@+id/ll_setting_faq"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:padding="@dimen/d_15dp">
+            android:padding="@dimen/d_15dp"
+            android:visibility="visible">
 
             <TextView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="隐私条款"
+                android:text="常用问题"
                 android:textColor="@color/black"
                 android:textSize="@dimen/d_14sp" />
 
@@ -115,9 +117,12 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/d_1dp"
+            android:visibility="visible"
             android:background="@color/page_bg" />
 
+        <!--账户注销-->
         <LinearLayout
+            android:id="@+id/ll_clear_cache"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
@@ -127,26 +132,17 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="版本号"
+                android:text="账户注销"
                 android:textColor="@color/black"
                 android:textSize="@dimen/d_14sp" />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginRight="@dimen/d_2dp"
-                android:text="V"
-                android:textColor="@color/profile_red"
-                android:textSize="@dimen/d_14sp" />
-
-            <TextView
-                android:id="@+id/text_view_version_no"
+            <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/d_10dp"
                 android:layout_marginRight="@dimen/d_10dp"
-                android:textColor="@color/profile_red"
-                android:textSize="@dimen/d_14sp" />
+                android:src="@drawable/iv_back" />
+
 
         </LinearLayout>
 
@@ -156,20 +152,19 @@
             android:background="@color/page_bg" />
 
 
-        <!--重置密码-->
+        <!--Privacy Policy-->
         <LinearLayout
-            android:id="@+id/ll_setting_reset_psd"
+            android:id="@+id/ll_setting_privacy_policy"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            binding:clicks="@{click.resetPassword}"
             android:padding="@dimen/d_15dp">
 
             <TextView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="重置密码"
+                android:text="隐私条款"
                 android:textColor="@color/black"
                 android:textSize="@dimen/d_14sp" />
 
@@ -181,13 +176,13 @@
                 android:src="@drawable/iv_back" />
 
         </LinearLayout>
+
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/d_1dp"
             android:background="@color/page_bg" />
 
         <LinearLayout
-            android:id="@+id/ll_clear_cache"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
@@ -197,26 +192,35 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="帮助中心"
+                android:text="版本号"
                 android:textColor="@color/black"
                 android:textSize="@dimen/d_14sp" />
 
-            <ImageView
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="@dimen/d_2dp"
+                android:text="V"
+                android:textColor="@color/profile_red"
+                android:textSize="@dimen/d_14sp" />
+
+            <TextView
+                android:id="@+id/text_view_version_no"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/d_10dp"
                 android:layout_marginRight="@dimen/d_10dp"
-                android:src="@drawable/iv_back" />
-
+                android:textColor="@color/profile_red"
+                android:textSize="@dimen/d_14sp" />
 
         </LinearLayout>
 
-
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/d_1dp"
             android:background="@color/page_bg" />
 
+
         <TextView
             android:id="@+id/button_logout"
             android:layout_width="match_parent"

+ 3 - 0
cpt_rewards/build.gradle

@@ -2,4 +2,7 @@ apply from: "../module_default_config.gradle"
 
 dependencies {
 
+    //九宫格控件
+    implementation project(':cs_ninegrid')
+
 }

+ 6 - 0
cpt_rewards/src/main/AndroidManifest.xml

@@ -12,6 +12,12 @@
 
         <activity android:name=".ui.RewardsSearchActivity"/>
 
+        <activity android:name=".ui.RewardsDetailActivity"/>
+
+        <activity android:name=".ui.RewardsConfirmActivity"/>
+
+        <activity android:name=".ui.RewardsPaymentSuccessActivity"/>
+
     </application>
 
 </manifest>

+ 24 - 1
cpt_rewards/src/main/java/com/hongyegroup/cpt_rewards/ui/RewardsActivity.kt

@@ -14,18 +14,34 @@ import com.hongyegroup.cpt_rewards.mvvm.RewardsViewModel
 
 class RewardsActivity : BaseVDBActivity<RewardsViewModel, ActivityRewardsBinding>() {
 
+    val mClickProxy by lazy { ClickProxy() }
+
     companion object {
+
         fun startInstance() {
             val context = CommUtils.getContext()
             val intent = Intent(context, RewardsActivity::class.java)
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
             context.startActivity(intent)
         }
+
     }
 
     override fun init(savedInstanceState: Bundle?) {
 
         initView()
+        initListener()
+
+    }
+
+    private fun initListener() {
+
+        mViewModel.mRecommendAdapter.setOnItemClickListener{ adapter, view, position ->
+
+            mClickProxy.gotoRewardsDetail()
+
+        }
+
 
     }
 
@@ -86,7 +102,7 @@ class RewardsActivity : BaseVDBActivity<RewardsViewModel, ActivityRewardsBinding
     override fun getDataBindingConfig(): DataBindingConfig {
 
         return DataBindingConfig(R.layout.activity_rewards, BR.viewModel, mViewModel)
-            .addBindingParams(BR.click,ClickProxy())
+            .addBindingParams(BR.click,mClickProxy)
 
     }
 
@@ -113,5 +129,12 @@ class RewardsActivity : BaseVDBActivity<RewardsViewModel, ActivityRewardsBinding
 
         }
 
+        //跳转到Rewards详情
+        fun gotoRewardsDetail(){
+
+            RewardsDetailActivity.startInstance()
+
+        }
+
     }
 }

+ 70 - 0
cpt_rewards/src/main/java/com/hongyegroup/cpt_rewards/ui/RewardsConfirmActivity.kt

@@ -0,0 +1,70 @@
+package com.hongyegroup.cpt_rewards.ui
+
+import android.content.Intent
+import android.os.Bundle
+import androidx.databinding.ViewDataBinding
+import com.guadou.lib_baselib.base.activity.BaseVDBActivity
+import com.guadou.lib_baselib.base.vm.BaseViewModel
+import com.guadou.lib_baselib.bean.DataBindingConfig
+import com.guadou.lib_baselib.engine.toastSuccess
+import com.guadou.lib_baselib.utils.CommUtils
+import com.hongyegroup.cpt_rewards.BR
+import com.hongyegroup.cpt_rewards.R
+import com.hongyegroup.cpt_rewards.databinding.ActivityRewardsConfirmBinding
+import com.hongyegroup.cpt_rewards.widget.PointsPaymentDialog
+
+class RewardsConfirmActivity : BaseVDBActivity<BaseViewModel, ActivityRewardsConfirmBinding>() {
+
+    val mClickProxy by lazy { ClickProxy() }
+
+    companion object {
+
+        fun startInstance() {
+            val context = CommUtils.getContext()
+            val intent = Intent(context, RewardsConfirmActivity::class.java)
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            context.startActivity(intent)
+        }
+
+    }
+
+    override fun init(savedInstanceState: Bundle?) {
+
+    }
+
+    override fun getDataBindingConfig(): DataBindingConfig {
+
+        return DataBindingConfig(R.layout.activity_rewards_confirm)
+            .addBindingParams(BR.click, mClickProxy)
+
+    }
+
+    override fun startObserve() {
+
+    }
+
+    /**
+     * DataBinding事件处理
+     */
+    inner class ClickProxy {
+
+        //显示Rewards支付确认弹框
+        fun showRewardsConfirmDialog() {
+
+
+//            start(PromotionRewardsPaymentSuccessFragment.newInstance(null));
+//            val total: Int = mPresenter.mCount * mPresenter.mDetailData.point.toInt()
+
+            val pointsPaymentDialog = PointsPaymentDialog(100)
+
+            pointsPaymentDialog.setOnClickPointsPaymentDialogListener(PointsPaymentDialog.OnClickPointsPaymentListener {
+
+                RewardsPaymentSuccessActivity.startInstance()
+
+            })
+            pointsPaymentDialog.show(supportFragmentManager, "point_payment_dialog")
+
+        }
+
+    }
+}

+ 108 - 0
cpt_rewards/src/main/java/com/hongyegroup/cpt_rewards/ui/RewardsDetailActivity.kt

@@ -0,0 +1,108 @@
+package com.hongyegroup.cpt_rewards.ui
+
+import android.content.Intent
+import android.os.Bundle
+import androidx.databinding.ViewDataBinding
+import com.guadou.lib_baselib.base.activity.BaseVDBActivity
+import com.guadou.lib_baselib.base.vm.BaseViewModel
+import com.guadou.lib_baselib.bean.DataBindingConfig
+import com.guadou.lib_baselib.utils.CommUtils
+import com.guadou.lib_baselib.view.MyScrollView
+import com.hongyegroup.cpt_rewards.BR
+import com.hongyegroup.cpt_rewards.R
+import com.hongyegroup.cpt_rewards.databinding.ActivityRewardsDetailBinding
+
+class RewardsDetailActivity : BaseVDBActivity<BaseViewModel, ActivityRewardsDetailBinding>() {
+
+    var mHeight = 0f
+    val mClickProxy by lazy { ClickProxy() }
+
+    companion object {
+        fun startInstance() {
+            val context = CommUtils.getContext()
+            val intent = Intent(context, RewardsDetailActivity::class.java)
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            context.startActivity(intent)
+        }
+    }
+
+    override fun init(savedInstanceState: Bundle?) {
+
+        initView()
+        initListener()
+
+    }
+
+
+    override fun getDataBindingConfig(): DataBindingConfig {
+
+        return DataBindingConfig(R.layout.activity_rewards_detail)
+            .addBindingParams(BR.click, mClickProxy)
+
+    }
+
+    private fun initView() {
+
+        CommUtils.getHandler().postDelayed(Runnable {
+
+            mHeight = mBinding.clPromotionRewardsDetails.height.toFloat()
+
+        }, 100)
+
+    }
+
+    private fun initListener() {
+
+        mBinding.scrollViewPromotionRewardsDetail.setOnScrollListener(MyScrollView.OnScrollListener {
+
+            if (it >= 0 && it <= mHeight) {
+                var percent = 0f
+                if (mHeight != 0f) {
+                    percent = it / mHeight
+                }
+                mBinding.llPromotionRewardsDetailTitle.setBackgroundColor(evaluate(percent, CommUtils.getColor(R.color.transparent), CommUtils.getColor(R.color.white)))
+
+            } else {
+                mBinding.llPromotionRewardsDetailTitle.setBackgroundColor(CommUtils.getColor(R.color.white))
+            }
+
+
+        })
+
+    }
+
+    /**
+     * 根据百分比和起始颜色和结束颜色 计算当前的RGBA颜色
+     */
+    fun evaluate(fraction: Float, startValue: Int, endValue: Int): Int {
+        val startA = startValue shr 24 and 0xff
+        val startR = startValue shr 16 and 0xff
+        val startG = startValue shr 8 and 0xff
+        val startB = startValue and 0xff
+        val endA = endValue shr 24 and 0xff
+        val endR = endValue shr 16 and 0xff
+        val endG = endValue shr 8 and 0xff
+        val endB = endValue and 0xff
+        return startA + (fraction * (endA - startA)).toInt() shl 24 or
+                (startR + (fraction * (endR - startR)).toInt() shl 16) or
+                (startG + (fraction * (endG - startG)).toInt() shl 8) or
+                startB + (fraction * (endB - startB)).toInt()
+    }
+
+
+    override fun startObserve() {
+
+    }
+
+    inner class ClickProxy {
+
+        //跳转到兑换确认界面
+        fun gotoRewardsConfirmActivity() {
+
+            RewardsConfirmActivity.startInstance()
+
+        }
+
+    }
+
+}

+ 46 - 0
cpt_rewards/src/main/java/com/hongyegroup/cpt_rewards/ui/RewardsPaymentSuccessActivity.kt

@@ -0,0 +1,46 @@
+package com.hongyegroup.cpt_rewards.ui
+
+import android.content.Intent
+import android.os.Bundle
+import com.guadou.lib_baselib.base.activity.BaseVDBActivity
+import com.guadou.lib_baselib.base.vm.BaseViewModel
+import com.guadou.lib_baselib.bean.DataBindingConfig
+import com.guadou.lib_baselib.utils.CommUtils
+import com.hongyegroup.cpt_rewards.R
+import com.hongyegroup.cpt_rewards.databinding.ActivityRewardsPaymentSuccessBinding
+
+class RewardsPaymentSuccessActivity : BaseVDBActivity<BaseViewModel, ActivityRewardsPaymentSuccessBinding>() {
+
+    val mClickProxy by lazy { ClickProxy() }
+
+    companion object {
+
+        fun startInstance() {
+            val context = CommUtils.getContext()
+            val intent = Intent(context, RewardsPaymentSuccessActivity::class.java)
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            context.startActivity(intent)
+        }
+
+    }
+
+    override fun init(savedInstanceState: Bundle?) {
+
+    }
+
+    override fun getDataBindingConfig(): DataBindingConfig {
+
+        return DataBindingConfig(R.layout.activity_rewards_payment_success)
+
+    }
+
+    override fun startObserve() {
+
+    }
+
+    /**
+     * DataBinding事件处理
+     */
+    inner class ClickProxy {}
+
+}

+ 122 - 0
cpt_rewards/src/main/java/com/hongyegroup/cpt_rewards/widget/PointsPaymentDialog.java

@@ -0,0 +1,122 @@
+package com.hongyegroup.cpt_rewards.widget;
+
+import android.annotation.SuppressLint;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Bundle;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.style.ForegroundColorSpan;
+import android.text.style.RelativeSizeSpan;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.guadou.lib_baselib.utils.CommUtils;
+import com.hongyegroup.cpt_rewards.R;
+
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+
+public class PointsPaymentDialog extends DialogFragment {
+
+    private ImageView mDeleteIv;
+    private TextView mPayNowTv;
+    private int mTotalPoint;
+
+    private OnClickPointsPaymentListener mListener;
+
+    public PointsPaymentDialog(int totalPoint) {
+
+        mTotalPoint = totalPoint;
+
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+
+        getDialog().requestWindowFeature(Window.FEATURE_NO_TITLE);
+        Objects.requireNonNull(getDialog().getWindow()).setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+
+        View inflateView = inflater.inflate(R.layout.dialog_points_payment, null);
+
+        return inflateView;
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        mDeleteIv = view.findViewById(R.id.iv_dialog_points_payment_delete);
+        mPayNowTv = view.findViewById(R.id.iv_dialog_points_payment_pay_now);
+        TextView mDesTv = view.findViewById(R.id.tv_dialog_points_payment_des);
+
+        String pointStr = String.valueOf(mTotalPoint);
+
+        String splitStr="确定要花";
+        String desStr = "确定要花" + pointStr + "积分兑换商品吗?";
+        SpannableString spannableString = new SpannableString(desStr);
+        spannableString.setSpan(new RelativeSizeSpan(1.2f), splitStr.length(), splitStr.length() + pointStr.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+        spannableString.setSpan(new ForegroundColorSpan(CommUtils.getColor(R.color.profile_red)), splitStr.length(), splitStr.length() + pointStr.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+        mDesTv.setText(spannableString);
+
+        initListener();
+
+    }
+
+    @SuppressLint("CheckResult")
+    private void initListener() {
+
+        //点击Delete
+
+        mDeleteIv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+
+                dismiss();
+
+            }
+        });
+
+        //点击Pay Now
+        mPayNowTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+
+                if (mListener != null) {
+
+                    mListener.OnClickPayNowListener();
+
+                }
+
+                dismiss();
+
+            }
+        });
+
+    }
+
+    public void setOnClickPointsPaymentDialogListener(OnClickPointsPaymentListener listener) {
+
+        if (listener != null) {
+
+            mListener = listener;
+        }
+
+    }
+
+    public interface OnClickPointsPaymentListener {
+
+        void OnClickPayNowListener();
+
+    }
+
+}

BIN
cpt_rewards/src/main/res/drawable-xhdpi/iv_promotion_rewards_address.webp


BIN
cpt_rewards/src/main/res/drawable-xhdpi/iv_promotion_rewards_instruction.webp


BIN
cpt_rewards/src/main/res/drawable-xhdpi/iv_promotion_rewards_jia.webp


BIN
cpt_rewards/src/main/res/drawable-xhdpi/iv_promotion_rewards_jian.webp


BIN
cpt_rewards/src/main/res/drawable-xhdpi/iv_promotion_rewards_package.webp


BIN
cpt_rewards/src/main/res/drawable-xhdpi/iv_promotion_rewards_qr_code.webp


BIN
cpt_rewards/src/main/res/drawable-xhdpi/iv_promotion_rewards_redeem_at.webp


BIN
cpt_rewards/src/main/res/drawable-xhdpi/iv_promotion_rewards_redeem_from.webp


BIN
cpt_rewards/src/main/res/drawable-xhdpi/iv_promotion_rewards_redeemable_on.webp


BIN
cpt_rewards/src/main/res/drawable-xhdpi/iv_promotion_rewards_redemption_notice.webp


BIN
cpt_rewards/src/main/res/drawable-xhdpi/iv_promotion_rewards_reservation.webp


BIN
cpt_rewards/src/main/res/drawable-xhdpi/iv_promotion_rewards_reviews.webp


BIN
cpt_rewards/src/main/res/drawable-xhdpi/iv_promotion_rewards_share.webp


BIN
cpt_rewards/src/main/res/drawable-xhdpi/iv_promotion_rewards_transaction.webp


BIN
cpt_rewards/src/main/res/drawable-xhdpi/iv_promotion_rewards_verification_code.webp


BIN
cpt_rewards/src/main/res/drawable-xhdpi/iv_rewards_payment_success_paid_icon.webp


BIN
cpt_rewards/src/main/res/drawable-xhdpi/iv_rewards_payment_success_top_bg.webp


BIN
cpt_rewards/src/main/res/drawable-xxhdpi/iv_promotion_rewards_address.webp


BIN
cpt_rewards/src/main/res/drawable-xxhdpi/iv_promotion_rewards_instruction.webp


BIN
cpt_rewards/src/main/res/drawable-xxhdpi/iv_promotion_rewards_jia.webp


BIN
cpt_rewards/src/main/res/drawable-xxhdpi/iv_promotion_rewards_jian.webp


BIN
cpt_rewards/src/main/res/drawable-xxhdpi/iv_promotion_rewards_package.webp


BIN
cpt_rewards/src/main/res/drawable-xxhdpi/iv_promotion_rewards_qr_code.webp


BIN
cpt_rewards/src/main/res/drawable-xxhdpi/iv_promotion_rewards_redeem_at.webp


BIN
cpt_rewards/src/main/res/drawable-xxhdpi/iv_promotion_rewards_redeem_from.webp


BIN
cpt_rewards/src/main/res/drawable-xxhdpi/iv_promotion_rewards_redeemable_on.webp


BIN
cpt_rewards/src/main/res/drawable-xxhdpi/iv_promotion_rewards_redemption_notice.webp


BIN
cpt_rewards/src/main/res/drawable-xxhdpi/iv_promotion_rewards_reservation.webp


BIN
cpt_rewards/src/main/res/drawable-xxhdpi/iv_promotion_rewards_reviews.webp


BIN
cpt_rewards/src/main/res/drawable-xxhdpi/iv_promotion_rewards_share.webp


BIN
cpt_rewards/src/main/res/drawable-xxhdpi/iv_promotion_rewards_transaction.webp


BIN
cpt_rewards/src/main/res/drawable-xxhdpi/iv_promotion_rewards_verification_code.webp


BIN
cpt_rewards/src/main/res/drawable-xxhdpi/iv_rewards_payment_success_paid_icon.webp


BIN
cpt_rewards/src/main/res/drawable-xxhdpi/iv_rewards_payment_success_top_bg.webp


+ 8 - 0
cpt_rewards/src/main/res/drawable/shape_rewards_gray_5conner_bg.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/page_bg_f4" />
+    <corners android:radius="@dimen/d_5dp" />
+
+</shape>

+ 8 - 0
cpt_rewards/src/main/res/drawable/shape_rewards_white_15conner_bg.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+    <corners android:radius="@dimen/d_15dp" />
+
+</shape>

+ 10 - 0
cpt_rewards/src/main/res/drawable/shape_rewards_white_bottom_15conner_bg.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+    <corners
+        android:bottomLeftRadius="@dimen/d_15dp"
+        android:bottomRightRadius="@dimen/d_15dp" />
+
+</shape>

+ 10 - 0
cpt_rewards/src/main/res/drawable/shape_rewards_white_top_15conner_bg.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+    <corners
+        android:topLeftRadius="@dimen/d_15dp"
+        android:topRightRadius="@dimen/d_15dp" />
+
+</shape>

+ 367 - 0
cpt_rewards/src/main/res/layout/activity_rewards_confirm.xml

@@ -0,0 +1,367 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:binding="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="click"
+            type="com.hongyegroup.cpt_rewards.ui.RewardsConfirmActivity.ClickProxy" />
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/page_bg_f4"
+        android:orientation="vertical">
+
+        <com.guadou.lib_baselib.view.titlebar.EasyTitleBar
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:Easy_title="确认详情" />
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:overScrollMode="never"
+            android:scrollbars="none">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/shape_rewards_white_bottom_15conner_bg"
+                    android:orientation="vertical">
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:layout_marginTop="@dimen/d_15dp"
+                        android:layout_marginRight="@dimen/d_15dp">
+
+                        <com.guadou.cs_cptservices.widget.CustomRound6ImageView
+                            android:id="@+id/iv_promotion_rewards_confirm_image"
+                            android:layout_width="match_parent"
+                            android:layout_height="0dp"
+                            android:src="@color/gray"
+                            app:conner_radius_left_bottom="0dp"
+                            app:conner_radius_left_top="@dimen/d_8dp"
+                            app:conner_radius_right_bottom="0dp"
+                            app:conner_radius_right_top="@dimen/d_8dp"
+                            app:layout_constraintDimensionRatio="345:228"
+                            app:layout_constraintLeft_toLeftOf="parent"
+                            app:layout_constraintRight_toRightOf="parent"
+                            tools:ignore="MissingConstraints" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:id="@+id/tv_promotion_rewards_confirm_title"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:layout_marginTop="@dimen/d_20dp"
+                        android:layout_marginBottom="@dimen/d_20dp"
+                        android:text="Cute children multifunctional umbrella"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/d_16sp" />
+
+                </LinearLayout>
+
+
+                <!--分割线-->
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_10dp"
+                    android:src="@color/page_bg_f4" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/shape_rewards_white_15conner_bg"
+                    android:orientation="vertical">
+
+                    <!--Redeem deal at-->
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:paddingTop="@dimen/d_15dp"
+                        android:paddingBottom="@dimen/d_15dp">
+
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_15dp"
+                            android:src="@drawable/iv_promotion_rewards_redeem_at" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewLight
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_10dp"
+                            android:text="Redeem deal at"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/d_16sp" />
+
+                    </LinearLayout>
+
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/d_1dp"
+                        android:src="@color/page_bg_f4" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewLight
+                        android:id="@+id/tv_promotion_rewards_confirm_redeem_location"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d_15dp"
+                        android:layout_marginBottom="@dimen/d_15dp"
+                        android:paddingLeft="@dimen/d_15dp"
+                        android:text="Available in 2 more locations"
+                        android:textColor="@color/dark_gray_text"
+                        android:textSize="@dimen/d_14sp" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewRegular
+                        android:id="@+id/tv_promotion_rewards_confirm_more_location"
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/d_40dp"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:layout_marginRight="@dimen/d_15dp"
+                        android:layout_marginBottom="@dimen/d_20dp"
+                        android:background="@drawable/shape_gray_bg_with_blue_border_line_5conner"
+                        android:gravity="center"
+                        android:text="更多兑换地址"
+                        android:textColor="@color/app_blue" />
+
+                </LinearLayout>
+
+                <!--分割线-->
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_10dp"
+                    android:src="@color/page_bg_f4" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/shape_rewards_white_15conner_bg"
+                    android:orientation="vertical">
+
+                    <!--Redeem from-->
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:paddingTop="@dimen/d_15dp"
+                        android:paddingBottom="@dimen/d_15dp">
+
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_15dp"
+                            android:src="@drawable/iv_promotion_rewards_redeem_from" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewLight
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_10dp"
+                            android:text="兑换时间:"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/d_16sp" />
+
+                    </LinearLayout>
+
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/d_1dp"
+                        android:src="@color/page_bg_f4" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewLight
+                        android:id="@+id/tv_promotion_rewards_confirm_redeem_from"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d_15dp"
+                        android:layout_marginBottom="@dimen/d_15dp"
+                        android:paddingLeft="@dimen/d_15dp"
+                        android:text="17 Mar 2020 until 15 Jul 2020"
+                        android:textColor="@color/dark_gray_text"
+                        android:textSize="@dimen/d_14sp" />
+
+                </LinearLayout>
+
+                <!--分割线-->
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_10dp"
+                    android:src="@color/page_bg_f4" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/shape_rewards_white_15conner_bg"
+                    android:orientation="vertical">
+
+                    <!--Quantity-->
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal"
+                        android:paddingLeft="@dimen/d_15dp"
+                        android:paddingTop="@dimen/d_15dp"
+                        android:paddingRight="@dimen/d_15dp"
+                        android:paddingBottom="@dimen/d_15dp">
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewLight
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:text="数量:"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/d_15sp" />
+
+                        <ImageView
+                            android:id="@+id/iv_promotion_rewards_confirm_minus"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:padding="@dimen/d_5dp"
+                            android:src="@drawable/iv_promotion_rewards_jian" />
+
+                        <TextView
+                            android:id="@+id/tv_promotion_rewards_confirm_count"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_10dp"
+                            android:layout_marginRight="@dimen/d_10dp"
+                            android:text="1"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/d_17sp" />
+
+                        <ImageView
+                            android:id="@+id/iv_promotion_rewards_confirm_plus"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:padding="@dimen/d_5dp"
+                            android:src="@drawable/iv_promotion_rewards_jia" />
+
+                    </LinearLayout>
+
+                    <!--分割线-->
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/d_1dp"
+                        android:src="@color/page_bg_f4" />
+
+                    <!--Points-->
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal"
+                        android:paddingLeft="@dimen/d_15dp"
+                        android:paddingTop="@dimen/d_15dp"
+                        android:paddingRight="@dimen/d_15dp"
+                        android:paddingBottom="@dimen/d_15dp">
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewLight
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:text="积分:"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/d_15sp" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewLight
+                            android:id="@+id/tv_promotion_rewards_confirm_original_point"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="350"
+                            android:textColor="@color/gray_9a"
+                            android:textSize="@dimen/d_14sp" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewBold
+                            android:id="@+id/tv_promotion_rewards_confirm_point"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_8dp"
+                            android:text="300"
+                            android:textColor="@color/app_blue"
+                            android:textSize="@dimen/d_17sp" />
+
+                    </LinearLayout>
+
+                    <!--分割线-->
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/d_1dp"
+                        android:src="@color/page_bg_f4" />
+
+                    <!--Amount:-->
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal"
+                        android:paddingLeft="@dimen/d_15dp"
+                        android:paddingTop="@dimen/d_15dp"
+                        android:paddingRight="@dimen/d_15dp"
+                        android:paddingBottom="@dimen/d_15dp">
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewLight
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:text="总计:"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/d_15sp" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewBold
+                            android:id="@+id/tv_promotion_rewards_confirm_total"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_8dp"
+                            android:text="600"
+                            android:textColor="@color/profile_red"
+                            android:textSize="@dimen/d_17sp" />
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/page_bg_f4"
+                    android:paddingTop="@dimen/d_20dp"
+                    android:paddingBottom="@dimen/d_20dp">
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewLight
+                        android:id="@+id/tv_promotion_rewards_detail_confirm"
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/d_40dp"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:layout_marginRight="@dimen/d_15dp"
+                        android:background="@color/app_blue"
+                        android:gravity="center"
+                        android:text="确认"
+                        binding:clicks="@{click.showRewardsConfirmDialog}"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/d_15sp" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </ScrollView>
+
+    </LinearLayout>
+
+</layout>

+ 772 - 0
cpt_rewards/src/main/res/layout/activity_rewards_detail.xml

@@ -0,0 +1,772 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:binding="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="MissingDefaultResource">
+
+    <data>
+
+        <variable
+            name="click"
+            type="com.hongyegroup.cpt_rewards.ui.RewardsDetailActivity.ClickProxy" />
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/transparent"
+        android:orientation="vertical">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:background="@color/page_bg_f4">
+
+            <com.guadou.lib_baselib.view.MyScrollView
+                android:id="@+id/scroll_view_promotion_rewards_detail"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:overScrollMode="never"
+                android:scrollbars="none">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/shape_rewards_white_bottom_15conner_bg"
+                        android:orientation="vertical">
+
+                        <!--顶部图片-->
+                        <androidx.constraintlayout.widget.ConstraintLayout
+                            android:id="@+id/cl_promotion_rewards_details"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+
+                            <ImageView
+                                android:layout_width="match_parent"
+                                android:layout_height="0dp"
+                                android:layout_centerInParent="true"
+                                android:background="@drawable/iv_freelancer_default_photo"
+                                android:scaleType="centerCrop"
+                                app:layout_constraintDimensionRatio="375:248"
+                                tools:ignore="MissingConstraints" />
+
+                            <androidx.viewpager.widget.ViewPager
+                                android:id="@+id/view_pager_promotion_rewards_detail"
+                                android:layout_width="match_parent"
+                                android:layout_height="0dp"
+                                app:layout_constraintDimensionRatio="375:248"
+                                tools:ignore="MissingConstraints" />
+
+                            <LinearLayout
+                                android:layout_width="52dp"
+                                android:layout_height="@dimen/d_25dp"
+                                android:layout_marginBottom="@dimen/d_15dp"
+                                android:background="@drawable/shape_promotion_detail_image_count"
+                                android:gravity="center"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintRight_toRightOf="parent"
+                                tools:ignore="MissingConstraints">
+
+                                <com.guadou.lib_baselib.font_text_view.TextViewLight
+                                    android:id="@+id/tv_promotion_rewards_detail_cur_num"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="-"
+                                    android:textColor="@color/white"
+                                    android:textSize="@dimen/d_15sp" />
+
+                                <com.guadou.lib_baselib.font_text_view.TextViewLight
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="/"
+                                    android:textColor="@color/white"
+                                    android:textSize="@dimen/d_13sp" />
+
+                                <com.guadou.lib_baselib.font_text_view.TextViewLight
+                                    android:id="@+id/tv_promotion_rewards_detail_total_num"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="-"
+                                    android:textColor="@color/white"
+                                    android:textSize="@dimen/d_13sp" />
+
+                            </LinearLayout>
+
+                        </androidx.constraintlayout.widget.ConstraintLayout>
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                            android:id="@+id/tv_promotion_rewards_detail_title"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_15dp"
+                            android:layout_marginTop="@dimen/d_10dp"
+                            android:layout_marginRight="@dimen/d_10dp"
+                            android:ellipsize="end"
+                            android:maxLines="2"
+                            android:text="-"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/d_18sp" />
+
+                        <!--Points-->
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/d_5dp"
+                            android:orientation="horizontal">
+
+                            <com.guadou.lib_baselib.font_text_view.TextViewBold
+                                android:id="@+id/tv_promotion_rewards_detail_point"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_15dp"
+                                android:text="-"
+                                android:textColor="@color/profile_red"
+                                android:textSize="@dimen/d_20sp" />
+
+                            <com.guadou.lib_baselib.font_text_view.TextViewLight
+                                android:id="@+id/tv_promotion_rewards_detail_original_point"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_5dp"
+                                android:text="-"
+                                android:textColor="@color/item_light_gray"
+                                android:textSize="@dimen/d_12sp" />
+
+                            <com.guadou.lib_baselib.font_text_view.TextViewLight
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_5dp"
+                                android:text="积分"
+                                android:textColor="@color/item_light_gray"
+                                android:textSize="@dimen/d_14sp" />
+
+                            <com.guadou.lib_baselib.font_text_view.TextViewLight
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_5dp"
+                                android:layout_weight="1"
+                                android:gravity="right"
+                                android:text="发布日期:"
+                                android:textColor="@color/item_light_gray"
+                                android:textSize="@dimen/d_12sp" />
+
+                            <com.guadou.lib_baselib.font_text_view.TextViewLight
+                                android:id="@+id/tv_promotion_rewards_detail_publish_date"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_2dp"
+                                android:layout_marginRight="@dimen/d_15dp"
+                                android:text="-"
+                                android:textColor="@color/item_light_gray"
+                                android:textSize="@dimen/d_12sp" />
+
+                        </LinearLayout>
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewLight
+                            android:id="@+id/tv_promotion_rewards_detail_des"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_15dp"
+                            android:layout_marginTop="@dimen/d_5dp"
+                            android:layout_marginRight="@dimen/d_15dp"
+                            android:text="-"
+                            android:textColor="@color/dark_gray_text"
+                            android:textSize="@dimen/d_14sp" />
+
+                        <!--Redeem From-->
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/d_10dp"
+                            android:gravity="center_vertical">
+
+                            <ImageView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_15dp"
+                                android:src="@drawable/iv_promotion_rewards_redeem_from" />
+
+                            <com.guadou.lib_baselib.font_text_view.TextViewLight
+                                android:id="@+id/tv_promotion_rewards_detail_redeem_date"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_10dp"
+                                android:text="Redeem From -"
+                                android:textColor="@color/black"
+                                android:textSize="@dimen/d_14sp" />
+
+                        </LinearLayout>
+
+                        <!--No reservation required-->
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/d_10dp"
+                            android:layout_marginBottom="@dimen/d_15dp"
+                            android:gravity="center_vertical">
+
+                            <ImageView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_15dp"
+                                android:src="@drawable/iv_promotion_rewards_reservation" />
+
+                            <com.guadou.lib_baselib.font_text_view.TextViewLight
+                                android:id="@+id/tv_promotion_rewards_detail_reservation"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_10dp"
+                                android:text="不需要提前预约。"
+                                android:textColor="@color/black"
+                                android:textSize="@dimen/d_14sp" />
+
+                        </LinearLayout>
+
+                    </LinearLayout>
+
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/d_10dp"
+                        android:src="@color/page_bg_f4" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/shape_rewards_white_15conner_bg"
+                        android:orientation="vertical">
+
+
+                        <!--Redeem deal at-->
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal"
+                            android:paddingLeft="@dimen/d_15dp"
+                            android:paddingTop="@dimen/d_10dp"
+                            android:paddingRight="@dimen/d_15dp"
+                            android:paddingBottom="@dimen/d_10dp">
+
+                            <ImageView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:src="@drawable/iv_promotion_rewards_redeem_at" />
+
+                            <com.guadou.lib_baselib.font_text_view.TextViewLight
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_10dp"
+                                android:text="兑换地址"
+                                android:textColor="@color/black"
+                                android:textSize="@dimen/d_16sp" />
+
+
+                        </LinearLayout>
+
+                        <!--分割线-->
+                        <ImageView
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/d_1dp"
+                            android:layout_marginBottom="@dimen/d_15dp"
+                            android:src="@color/page_bg_f4" />
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal"
+                            android:paddingLeft="@dimen/d_15dp"
+                            android:paddingRight="@dimen/d_15dp">
+
+                            <FrameLayout
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:background="@drawable/shape_border_line"
+                                android:padding="0.5dp">
+
+                                <ImageView
+                                    android:id="@+id/iv_promotion_rewards_detail_employer_logo"
+                                    android:layout_width="@dimen/d_90dp"
+                                    android:layout_height="@dimen/d_60dp"
+                                    android:layout_gravity="center"
+                                    android:src="@drawable/iv_promotion_home_default_picture"
+                                    android:scaleType="centerCrop" />
+
+                            </FrameLayout>
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_10dp"
+                                android:orientation="vertical">
+
+                                <com.guadou.lib_baselib.font_text_view.TextViewLight
+                                    android:id="@+id/tv_promotion_rewards_detail_employer_name"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:text="-"
+                                    android:textColor="@color/black"
+                                    android:textSize="@dimen/d_15sp" />
+
+                                <LinearLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="@dimen/d_8dp">
+
+                                    <ImageView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:src="@drawable/iv_promotion_detail_address_icon" />
+
+                                    <com.guadou.lib_baselib.font_text_view.TextViewLight
+                                        android:id="@+id/tv_promotion_rewards_detail_employer_address"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginLeft="@dimen/d_8dp"
+                                        android:text="-"
+                                        android:textColor="@color/gray_text"
+                                        android:textSize="@dimen/d_14sp" />
+
+                                </LinearLayout>
+
+                            </LinearLayout>
+
+                        </LinearLayout>
+
+                        <!--分割线-->
+                        <ImageView
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/d_1dp"
+                            android:layout_marginTop="@dimen/d_15dp"
+                            android:src="@color/page_bg_f4" />
+
+                        <!--Location-->
+                        <LinearLayout
+                            android:id="@+id/ll_promotion_rewards_detail_redeemable_location"
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/d_50dp"
+                            android:gravity="center_vertical">
+
+                            <com.guadou.lib_baselib.font_text_view.TextViewLight
+                                android:id="@+id/tv_promotion_rewards_detail_location_count"
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_15dp"
+                                android:layout_weight="1"
+                                android:text="Also redeemable in 1 more location"
+                                android:textColor="@color/black"
+                                android:textSize="@dimen/d_16sp" />
+
+                            <ImageView
+                                android:id="@+id/iv_promotion_rewards_detail_location_right_arrow"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginRight="@dimen/d_15dp"
+                                android:src="@drawable/iv_back"
+                                app:tint="@color/center_gray" />
+
+                        </LinearLayout>
+
+                    </LinearLayout>
+
+                    <!--分割线-->
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/d_10dp"
+                        android:src="@color/page_bg_f4" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/shape_rewards_white_15conner_bg"
+                        android:orientation="vertical">
+
+
+                        <!--package-->
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal"
+                            android:paddingLeft="@dimen/d_15dp"
+                            android:paddingTop="@dimen/d_10dp"
+                            android:paddingRight="@dimen/d_15dp"
+                            android:paddingBottom="@dimen/d_10dp">
+
+                            <ImageView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:src="@drawable/iv_promotion_rewards_package" />
+
+                            <com.guadou.lib_baselib.font_text_view.TextViewLight
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_10dp"
+                                android:text="套餐详情"
+                                android:textColor="@color/black"
+                                android:textSize="@dimen/d_16sp" />
+
+
+                        </LinearLayout>
+
+                        <!--分割线-->
+                        <ImageView
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/d_1dp"
+                            android:src="@color/page_bg_f4" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewLight
+                            android:id="@+id/tv_promotion_rewards_detail_package"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_15dp"
+                            android:layout_marginTop="@dimen/d_15dp"
+                            android:layout_marginRight="@dimen/d_15dp"
+                            android:layout_marginBottom="@dimen/d_15dp"
+                            android:text="-"
+                            android:textColor="@color/dark_gray_text"
+                            android:textSize="@dimen/d_15sp" />
+
+                    </LinearLayout>
+
+                    <!--分割线-->
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/d_10dp"
+                        android:src="@color/page_bg_f4" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/shape_rewards_white_15conner_bg"
+                        android:orientation="vertical">
+
+                        <!--Redemption Notice-->
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal"
+                            android:paddingLeft="@dimen/d_15dp"
+                            android:paddingTop="@dimen/d_10dp"
+                            android:paddingRight="@dimen/d_15dp"
+                            android:paddingBottom="@dimen/d_10dp">
+
+                            <ImageView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:src="@drawable/iv_promotion_rewards_redemption_notice" />
+
+                            <com.guadou.lib_baselib.font_text_view.TextViewLight
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_10dp"
+                                android:text="兑换须知"
+                                android:textColor="@color/black"
+                                android:textSize="@dimen/d_16sp" />
+
+
+                        </LinearLayout>
+
+                        <!--分割线-->
+                        <ImageView
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/d_1dp"
+                            android:src="@color/page_bg_f4" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewLight
+                            android:id="@+id/tv_promotion_rewards_detail_notice"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_15dp"
+                            android:layout_marginTop="@dimen/d_15dp"
+                            android:layout_marginRight="@dimen/d_15dp"
+                            android:layout_marginBottom="@dimen/d_15dp"
+                            android:text="-"
+                            android:textColor="@color/dark_gray_text"
+                            android:textSize="@dimen/d_15sp" />
+
+                    </LinearLayout>
+
+                    <!--分割线-->
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/d_10dp"
+                        android:src="@color/page_bg_f4" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/shape_rewards_white_15conner_bg"
+                        android:orientation="vertical">
+
+
+                        <!--Redemption Instructions-->
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal"
+                            android:paddingLeft="@dimen/d_15dp"
+                            android:paddingTop="@dimen/d_10dp"
+                            android:paddingRight="@dimen/d_15dp"
+                            android:paddingBottom="@dimen/d_10dp">
+
+                            <ImageView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:src="@drawable/iv_promotion_rewards_instruction" />
+
+                            <com.guadou.lib_baselib.font_text_view.TextViewLight
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_10dp"
+                                android:text="兑换说明"
+                                android:textColor="@color/black"
+                                android:textSize="@dimen/d_16sp" />
+
+                        </LinearLayout>
+
+                        <!--分割线-->
+                        <ImageView
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/d_1dp"
+                            android:src="@color/page_bg_f4" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewLight
+                            android:id="@+id/tv_promotion_rewards_detail_instructions"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_15dp"
+                            android:layout_marginTop="@dimen/d_15dp"
+                            android:layout_marginRight="@dimen/d_15dp"
+                            android:text="Reservation not required."
+                            android:textColor="@color/dark_gray_text"
+                            android:textSize="@dimen/d_15sp" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewLight
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_15dp"
+                            android:layout_marginRight="@dimen/d_15dp"
+                            android:layout_marginBottom="@dimen/d_15dp"
+                            android:text="请在店内出示您的YY Circle优惠券(在'我'页面查看)"
+                            android:textColor="@color/dark_gray_text"
+                            android:textSize="@dimen/d_15sp" />
+
+                    </LinearLayout>
+
+                    <!--分割线-->
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/d_10dp"
+                        android:src="@color/page_bg_f4" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/shape_rewards_white_15conner_bg"
+                        android:orientation="vertical">
+
+                        <!--Redeemable on-->
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal"
+                            android:paddingLeft="@dimen/d_15dp"
+                            android:paddingTop="@dimen/d_10dp"
+                            android:paddingRight="@dimen/d_15dp"
+                            android:paddingBottom="@dimen/d_10dp">
+
+                            <ImageView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:src="@drawable/iv_promotion_rewards_redeemable_on" />
+
+                            <com.guadou.lib_baselib.font_text_view.TextViewLight
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_10dp"
+                                android:text="兑换日期"
+                                android:textColor="@color/black"
+                                android:textSize="@dimen/d_16sp" />
+
+                        </LinearLayout>
+
+                        <!--分割线-->
+                        <ImageView
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/d_1dp"
+                            android:src="@color/page_bg_f4" />
+
+                        <LinearLayout
+                            android:id="@+id/ll_promotion_rewards_detail_redeemable"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/d_15dp"
+                            android:layout_marginBottom="@dimen/d_15dp"
+                            android:orientation="vertical">
+
+
+                        </LinearLayout>
+
+                    </LinearLayout>
+
+                    <!--分割线-->
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/d_10dp"
+                        android:src="@color/page_bg_f4" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone"
+                        android:background="@drawable/shape_rewards_white_top_15conner_bg"
+                        android:orientation="vertical">
+
+                        <!--Customer Reviews -->
+                        <LinearLayout
+                            android:id="@+id/ll_review_detail_customer_reviews"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/d_10dp"
+                            android:gravity="center_vertical"
+                            android:orientation="horizontal"
+                            android:paddingLeft="@dimen/d_15dp"
+                            android:paddingTop="@dimen/d_10dp"
+                            android:paddingRight="@dimen/d_15dp"
+                            android:paddingBottom="@dimen/d_10dp">
+
+                            <ImageView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:src="@drawable/iv_promotion_rewards_reviews" />
+
+                            <com.guadou.lib_baselib.font_text_view.TextViewLight
+                                android:id="@+id/tv_promotion_detail_customer_reviews_count"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_10dp"
+                                android:text="Customer Reviews (17)"
+                                android:textColor="@color/black"
+                                android:textSize="@dimen/d_16sp" />
+
+                            <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                android:id="@+id/tv_promotion_detail_average_customer_reviews"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_10dp"
+                                android:background="@drawable/shape_profile_red_3round"
+                                android:paddingLeft="@dimen/d_10dp"
+                                android:paddingTop="@dimen/d_2dp"
+                                android:paddingRight="@dimen/d_10dp"
+                                android:paddingBottom="@dimen/d_2dp"
+                                android:text="4.0"
+                                android:textColor="@color/white"
+                                android:textSize="@dimen/d_14sp" />
+
+                            <ImageView
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1" />
+
+                            <ImageView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:src="@drawable/iv_back" />
+
+
+                        </LinearLayout>
+
+                        <!--分割线-->
+                        <ImageView
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/d_1dp"
+                            android:src="@color/page_bg_f4" />
+
+                    </LinearLayout>
+
+                    <!--                <include layout="@layout/item_promotion_rewards_reviews" />-->
+
+                    <!--                <include layout="@layout/item_promotion_rewards_reviews" />-->
+
+                </LinearLayout>
+
+
+            </com.guadou.lib_baselib.view.MyScrollView>
+
+            <!--Title-->
+
+            <LinearLayout
+                android:id="@+id/ll_promotion_rewards_detail_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/transparent"
+                android:orientation="vertical">
+
+                <View
+                    android:id="@+id/status_bar_view_promotion_rewards_detail"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:background="@color/transparent"
+                    android:visibility="visible" />
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_48dp"
+                    android:orientation="horizontal"
+                    android:visibility="visible">
+
+                    <ImageView
+                        android:id="@+id/iv_promotion_rewards_detail_back"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="@dimen/d_10dp"
+                        android:padding="@dimen/d_5dp"
+                        android:src="@drawable/back_blue" />
+
+                    <ImageView
+                        android:id="@+id/iv_promotion_rewards_detail_share"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
+                        android:layout_marginRight="@dimen/d_10dp"
+                        android:src="@drawable/iv_promotion_rewards_share" />
+
+                </RelativeLayout>
+
+            </LinearLayout>
+
+        </FrameLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            android:paddingTop="@dimen/d_15dp"
+            android:paddingBottom="@dimen/d_25dp">
+
+            <com.guadou.lib_baselib.font_text_view.TextViewLight
+                android:id="@+id/tv_promotion_rewards_detail_purchase"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/d_40dp"
+                android:layout_marginLeft="@dimen/d_15dp"
+                android:layout_marginRight="@dimen/d_15dp"
+                android:background="@color/app_blue"
+                android:gravity="center"
+                android:text="兑换积分"
+                binding:clicks="@{click.gotoRewardsConfirmActivity}"
+                android:textColor="@color/white"
+                android:textSize="@dimen/d_15sp" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</layout>

+ 335 - 0
cpt_rewards/src/main/res/layout/activity_rewards_payment_success.xml

@@ -0,0 +1,335 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/page_bg_f4"
+        android:orientation="vertical">
+
+        <com.guadou.lib_baselib.view.titlebar.EasyTitleBar
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:Easy_title="兑换成功" />
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:overScrollMode="never"
+            android:scrollbars="none">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/shape_rewards_white_bottom_15conner_bg"
+                    android:orientation="vertical">
+
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/iv_rewards_payment_success_top_bg"
+                        android:gravity="center_horizontal"
+                        android:orientation="vertical">
+
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/d_30dp"
+                            android:src="@drawable/iv_rewards_payment_success_paid_icon" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewLight
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/d_8dp"
+                            android:text="恭喜!"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/d_17sp" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewRegular
+                            android:id="@+id/tv_payment_success_total_point"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="600"
+                            android:textColor="@color/app_blue"
+                            android:textSize="@dimen/d_30sp" />
+
+                    </LinearLayout>
+
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/d_1dp"
+                        android:src="@color/page_bg_f4" />
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:layout_marginTop="@dimen/d_15dp"
+                        android:layout_marginRight="@dimen/d_15dp">
+
+                        <com.guadou.cs_cptservices.widget.CustomRound6ImageView
+                            android:id="@+id/iv_payment_success_promotion_image"
+                            android:layout_width="match_parent"
+                            android:layout_height="0dp"
+                            android:src="@color/gray"
+                            app:conner_radius_left_bottom="0dp"
+                            app:conner_radius_left_top="@dimen/d_8dp"
+                            app:conner_radius_right_bottom="0dp"
+                            app:conner_radius_right_top="@dimen/d_8dp"
+                            app:layout_constraintDimensionRatio="345:228"
+                            app:layout_constraintLeft_toLeftOf="parent"
+                            app:layout_constraintRight_toRightOf="parent"
+                            tools:ignore="MissingConstraints" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:id="@+id/tv_payment_success_title"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:layout_marginTop="@dimen/d_20dp"
+                        android:layout_marginBottom="@dimen/d_20dp"
+                        android:text="Cute children multifunctional umbrella"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/d_16sp" />
+
+                </LinearLayout>
+
+
+                <!--分割线-->
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_10dp"
+                    android:src="@color/page_bg_f4" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/shape_rewards_white_15conner_bg"
+                    android:orientation="vertical">
+
+                    <!--Redeem deal at-->
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:paddingTop="@dimen/d_15dp"
+                        android:paddingBottom="@dimen/d_15dp">
+
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_15dp"
+                            android:src="@drawable/iv_promotion_rewards_redeem_at" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewLight
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_10dp"
+                            android:text="Redeem deal at"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/d_16sp" />
+
+                    </LinearLayout>
+
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/d_1dp"
+                        android:src="@color/page_bg_f4" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewLight
+                        android:id="@+id/tv_payment_success_redeem_location"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d_15dp"
+                        android:layout_marginBottom="@dimen/d_15dp"
+                        android:paddingLeft="@dimen/d_15dp"
+                        android:text="Available in 2 more locations"
+                        android:textColor="@color/dark_gray_text"
+                        android:textSize="@dimen/d_14sp" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewRegular
+                        android:id="@+id/tv_payment_success_see_more_location"
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/d_40dp"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:layout_marginRight="@dimen/d_15dp"
+                        android:layout_marginBottom="@dimen/d_20dp"
+                        android:background="@drawable/shape_gray_bg_with_blue_border_line_5conner"
+                        android:gravity="center"
+                        android:text="See more locations"
+                        android:textColor="@color/app_blue" />
+
+                </LinearLayout>
+
+                <!--分割线-->
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_10dp"
+                    android:src="@color/page_bg_f4" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/shape_rewards_white_15conner_bg"
+                    android:orientation="vertical">
+
+                    <!--Redeem from-->
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:paddingTop="@dimen/d_15dp"
+                        android:paddingBottom="@dimen/d_15dp">
+
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_15dp"
+                            android:src="@drawable/iv_promotion_rewards_redeem_from" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewLight
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_10dp"
+                            android:text="Redeem from"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/d_16sp" />
+
+                    </LinearLayout>
+
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/d_1dp"
+                        android:src="@color/page_bg_f4" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewLight
+                        android:id="@+id/tv_payment_success_redeem_from"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d_15dp"
+                        android:layout_marginBottom="@dimen/d_15dp"
+                        android:paddingLeft="@dimen/d_15dp"
+                        android:text="17 Mar 2020 until 15 Jul 2020"
+                        android:textColor="@color/dark_gray_text"
+                        android:textSize="@dimen/d_14sp" />
+
+                </LinearLayout>
+
+
+                <!--分割线-->
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_10dp"
+                    android:src="@color/page_bg_f4" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/shape_rewards_white_15conner_bg"
+                    android:orientation="vertical">
+
+                    <!--Date & Time:-->
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal"
+                        android:paddingLeft="@dimen/d_15dp"
+                        android:paddingTop="@dimen/d_15dp"
+                        android:paddingRight="@dimen/d_15dp"
+                        android:paddingBottom="@dimen/d_15dp">
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewLight
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:text="Date &#038; Time:"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/d_15sp" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewLight
+                            android:id="@+id/tv_payment_success_time"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="21 Jun 2021 20:18"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/d_15sp" />
+
+
+                    </LinearLayout>
+
+                    <!--分割线-->
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/d_1dp"
+                        android:src="@color/page_bg_f4" />
+
+                    <!--Transaction ID:-->
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal"
+                        android:paddingLeft="@dimen/d_15dp"
+                        android:paddingTop="@dimen/d_15dp"
+                        android:paddingRight="@dimen/d_15dp"
+                        android:paddingBottom="@dimen/d_15dp">
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewLight
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:text="Transaction ID:"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/d_15sp" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewLight
+                            android:id="@+id/tv_payment_success_transaction_id"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="PRO0021837HY"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/d_15sp" />
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="@dimen/d_20dp"
+                    android:paddingBottom="@dimen/d_20dp">
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewLight
+                        android:id="@+id/tv_payment_success_check_my_rewards"
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/d_40dp"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:layout_marginRight="@dimen/d_15dp"
+                        android:background="@color/app_blue"
+                        android:gravity="center"
+                        android:text="Check My Rewards"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/d_15sp" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </ScrollView>
+
+    </LinearLayout>
+
+</layout>

+ 26 - 26
cpt_rewards/src/main/res/layout/activity_rewards_search.xml

@@ -133,19 +133,19 @@
                 android:visibility="gone" />
 
             <!--流式布局-->
-<!--            <com.guadou.ninegrid.flownine.FlowLayout-->
-<!--                android:id="@+id/flow_layout_rewards_search_recent_search"-->
-<!--                android:layout_width="match_parent"-->
-<!--                android:layout_height="wrap_content"-->
-<!--                android:background="@color/white"-->
-<!--                android:paddingLeft="@dimen/d_15dp"-->
-<!--                android:paddingTop="@dimen/d_13dp"-->
-<!--                android:paddingRight="@dimen/d_15dp"-->
-<!--                android:visibility="gone"-->
-<!--                app:itemSpacing="7dp"-->
-<!--                app:lineSpacing="@dimen/d_5dp">-->
-
-<!--            </com.guadou.ninegrid.flownine.FlowLayout>-->
+            <com.guadou.ninegrid.flownine.FlowLayout
+                android:id="@+id/flow_layout_rewards_search_recent_search"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                android:paddingLeft="@dimen/d_15dp"
+                android:paddingTop="@dimen/d_13dp"
+                android:paddingRight="@dimen/d_15dp"
+                android:visibility="gone"
+                app:itemSpacing="7dp"
+                app:lineSpacing="@dimen/d_5dp">
+
+            </com.guadou.ninegrid.flownine.FlowLayout>
 
             <com.guadou.lib_baselib.font_text_view.TextViewMedium
                 android:id="@+id/tv_promotion_search_trending_search"
@@ -160,19 +160,19 @@
                 android:visibility="gone" />
 
             <!--流式布局-->
-<!--            <com.guadou.ninegrid.flownine.FlowLayout-->
-<!--                android:id="@+id/flow_layout_rewards_search_trending_searches"-->
-<!--                android:layout_width="match_parent"-->
-<!--                android:layout_height="wrap_content"-->
-<!--                android:background="@color/white"-->
-<!--                android:paddingLeft="@dimen/d_15dp"-->
-<!--                android:paddingTop="@dimen/d_13dp"-->
-<!--                android:paddingRight="@dimen/d_15dp"-->
-<!--                android:visibility="gone"-->
-<!--                app:itemSpacing="7dp"-->
-<!--                app:lineSpacing="@dimen/d_5dp">-->
-
-<!--            </com.guadou.ninegrid.flownine.FlowLayout>-->
+            <com.guadou.ninegrid.flownine.FlowLayout
+                android:id="@+id/flow_layout_rewards_search_trending_searches"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                android:paddingLeft="@dimen/d_15dp"
+                android:paddingTop="@dimen/d_13dp"
+                android:paddingRight="@dimen/d_15dp"
+                android:visibility="gone"
+                app:itemSpacing="7dp"
+                app:lineSpacing="@dimen/d_5dp">
+
+            </com.guadou.ninegrid.flownine.FlowLayout>
 
             <LinearLayout
                 android:id="@+id/ll_promotion_rewards_search_recent_viewed"

+ 71 - 0
cpt_rewards/src/main/res/layout/dialog_points_payment.xml

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.minminaya.widget.GeneralRoundLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@color/white"
+    android:orientation="vertical"
+    app:corner_radius="@dimen/d_5dp">
+
+    <LinearLayout
+        android:layout_width="293dp"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/app_blue">
+
+            <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:layout_marginTop="@dimen/d_20dp"
+                android:layout_marginBottom="@dimen/d_20dp"
+                android:text="积分支付"
+                android:textColor="@color/white"
+                android:textSize="@dimen/d_23sp" />
+
+            <ImageView
+                android:id="@+id/iv_dialog_points_payment_delete"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_marginTop="@dimen/d_7dp"
+                android:layout_marginRight="@dimen/d_7dp"
+                android:padding="@dimen/d_5dp"
+                android:src="@drawable/iv_payment_dialog_delete" />
+
+        </RelativeLayout>
+
+        <com.guadou.lib_baselib.font_text_view.TextViewLight
+            android:id="@+id/tv_dialog_points_payment_des"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/d_20dp"
+            android:layout_marginTop="@dimen/d_40dp"
+            android:layout_marginRight="@dimen/d_20dp"
+            android:layout_marginBottom="@dimen/d_40dp"
+            android:gravity="center"
+            android:text="Are you sure to redeem this item with xxx points? "
+            android:textColor="@color/black"
+            android:textSize="@dimen/d_16sp" />
+
+        <com.guadou.lib_baselib.font_text_view.TextViewLight
+            android:id="@+id/iv_dialog_points_payment_pay_now"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/d_40dp"
+            android:layout_marginLeft="@dimen/d_15dp"
+            android:layout_marginRight="@dimen/d_15dp"
+            android:layout_marginBottom="@dimen/d_25dp"
+            android:background="@color/profile_red"
+            android:gravity="center"
+            android:text="现在付款"
+            android:textColor="@color/white"
+            android:textSize="@dimen/d_16sp" />
+
+
+    </LinearLayout>
+
+</com.minminaya.widget.GeneralRoundLinearLayout>

BIN
cs_cptServices/src/main/res/drawable-xhdpi/iv_freelancer_default_photo.png


BIN
cs_cptServices/src/main/res/drawable-xhdpi/iv_me_app_setting.webp


BIN
cs_cptServices/src/main/res/drawable-xhdpi/iv_me_help_center.webp


BIN
cs_cptServices/src/main/res/drawable-xhdpi/iv_me_invite_friends.webp


BIN
cs_cptServices/src/main/res/drawable-xhdpi/iv_me_pet_farming_bg.webp


BIN
cs_cptServices/src/main/res/drawable-xhdpi/iv_payment_dialog_delete.webp


BIN
cs_cptServices/src/main/res/drawable-xhdpi/iv_profile_edit.webp


BIN
cs_cptServices/src/main/res/drawable-xhdpi/iv_promotion_detail_address_icon.webp


BIN
cs_cptServices/src/main/res/drawable-xhdpi/iv_promotion_home_default_picture.png


BIN
cs_cptServices/src/main/res/drawable-xxhdpi/iv_me_app_setting.webp


BIN
cs_cptServices/src/main/res/drawable-xxhdpi/iv_me_help_center.webp


BIN
cs_cptServices/src/main/res/drawable-xxhdpi/iv_me_invite_friends.webp


BIN
cs_cptServices/src/main/res/drawable-xxhdpi/iv_me_pet_farming_bg.webp


BIN
cs_cptServices/src/main/res/drawable-xxhdpi/iv_profile_edit.webp


BIN
cs_cptServices/src/main/res/drawable-xxhdpi/iv_promotion_detail_address_icon.webp


+ 7 - 0
cs_cptServices/src/main/res/drawable/shape_border_line.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="@color/white"/>
+    <stroke android:color="@color/divider_color" android:width="@dimen/d_0.5dp"/>
+
+</shape>

+ 10 - 0
cs_cptServices/src/main/res/drawable/shape_gray_bg_with_blue_border_line_5conner.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="#FFF3F9FF" />
+    <stroke
+        android:width="@dimen/d_0.5dp"
+        android:color="@color/app_blue" />
+    <corners android:radius="@dimen/d_5dp" />
+
+</shape>

+ 7 - 0
cs_cptServices/src/main/res/drawable/shape_profile_red_3round.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="@color/profile_red" />
+    <corners android:radius="@dimen/d_3dp" />
+
+</shape>

+ 8 - 0
cs_cptServices/src/main/res/drawable/shape_promotion_detail_image_count.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/dark_gray_text"/>
+    <corners android:topLeftRadius="@dimen/d_15dp" android:bottomLeftRadius="@dimen/d_15dp"/>
+
+</shape>

+ 7 - 0
cs_cptServices/src/main/res/drawable/transparent_bg_selector.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@color/page_background_pressed" android:state_pressed="true" />
+    <item android:drawable="@color/white" />
+
+</selector>

+ 4 - 0
cs_cptServices/src/main/res/values/colors.xml

@@ -51,5 +51,9 @@
     <color name="dark_gray_text">#666666</color>
     <color name="gray_promotion_rewards">#C7EAFF</color>
     <color name="food_gray_f7">#f7f7f7</color>
+    <color name="item_light_gray">#9f9f9f</color>
+    <color name="center_gray">#ccc</color>
+    <color name="page_background_pressed">#33000000</color>
+    <color name="progress_background">#22102A45</color>
 
 </resources>