Merge remote-tracking branch 'origin/master'

cpt_main/src/main/AndroidManifest.xml

@@ -12,6 +12,10 @@
             android:name=".ui.NotificationActivity"
             android:launchMode="singleTop" />
 
+        <activity android:name=".ui.InviteFriendsActivity"/>
+
+        <activity android:name=".ui.SettingsActivity"/>
+
     </application>
 
 </manifest>

cpt_main/src/main/java/com/hongyegroup/cpt_main/ui/InviteFriendsActivity.kt

@@ -0,0 +1,36 @@
+package com.hongyegroup.cpt_main.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.hongyegroup.cpt_main.R
+
+class InviteFriendsActivity:BaseVDBActivity<BaseViewModel,ViewDataBinding>() {
+
+    companion object {
+        fun startInstance() {
+            val context = CommUtils.getContext()
+            val intent = Intent(context, InviteFriendsActivity::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_invite_friends)
+
+    }
+
+    override fun startObserve() {
+
+    }
+}

cpt_main/src/main/java/com/hongyegroup/cpt_main/ui/ProfileFragment.kt

@@ -62,6 +62,20 @@ class ProfileFragment : YYBaseVDBFragment<ProfileViewModel, FragmentProfileBindi
      */
     inner class ClickProxy {
 
+        //跳转到邀请朋友界面
+        fun gotoInviteFriendsActivity(){
+
+            InviteFriendsActivity.startInstance()
+
+        }
+
+        //跳转到Settings界面
+        fun  gotoSettingsActivity(){
+
+            SettingsActivity.startInstance()
+
+        }
+
     }
 
 

cpt_parttime/src/main/java/com/hongyegroup/cpt_parttime/ui/SettingsActivity.kt

@@ -1,15 +1,14 @@
-package com.hongyegroup.cpt_parttime.ui
+package com.hongyegroup.cpt_main.ui
 
 import android.content.Intent
 import android.os.Bundle
-import androidx.databinding.ViewDataBinding
 import com.guadou.cs_cptservices.base.activity.YYBaseVDBActivity
 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_parttime.BR
-import com.hongyegroup.cpt_parttime.R
-import com.hongyegroup.cpt_parttime.databinding.ActivitySettingsBinding
+import com.hongyegroup.cpt_main.BR
+import com.hongyegroup.cpt_main.R
+import com.hongyegroup.cpt_main.databinding.ActivitySettingsBinding
 
 class SettingsActivity : YYBaseVDBActivity<BaseViewModel, ActivitySettingsBinding>() {
 
@@ -46,7 +45,7 @@ class SettingsActivity : YYBaseVDBActivity<BaseViewModel, ActivitySettingsBindin
         //点击重置密码
         fun resetPassword() {
 
-            ResetPasswordActivity.startInstance()
+//            ResetPasswordActivity.startInstance()
 
         }
 

cpt_main/src/main/res/drawable/shape_intvite_bg.xml

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

cpt_main/src/main/res/layout/activity_invite_friends.xml

@@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tool="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white"
+        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:background="@color/white"
+            android:overScrollMode="never">
+
+            <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:orientation="vertical">
+
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/invite_friends_picture" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewBold
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_16dp"
+                        android:layout_marginTop="@dimen/d_10dp"
+                        android:text="邀请您的朋友"
+                        android:textColor="#0A273F"
+                        android:textSize="@dimen/d_20sp" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:layout_marginTop="@dimen/d_18dp"
+                        android:layout_marginRight="@dimen/d_10dp"
+                        android:gravity="bottom"
+                        android:orientation="horizontal">
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewLight
+                            android:id="@+id/tv_invite_content"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="-"
+                            android:textColor="@color/gray_text"
+                            android:textSize="@dimen/d_15sp" />
+
+                    </LinearLayout>
+
+
+                    <FrameLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_16dp"
+                        android:layout_marginTop="@dimen/d_15dp"
+                        android:layout_marginRight="@dimen/d_8dp">
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewLight
+                            android:id="@+id/tv_invite_friends_code"
+                            android:layout_width="300dp"
+                            android:layout_height="40dp"
+                            android:layout_marginTop="@dimen/d_8dp"
+                            android:background="@drawable/shape_intvite_bg"
+                            android:gravity="center_vertical"
+                            android:paddingLeft="85dp"
+                            android:textColor="@color/app_blue"
+                            android:textSize="16.5dp"
+                            tool:text="AbCD68778A" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewLight
+                            android:id="@+id/tv_invite_code_copy"
+                            android:layout_width="110dp"
+                            android:layout_height="63dp"
+                            android:layout_gravity="right"
+                            android:background="@drawable/btn_invites_copy_bg"
+                            android:gravity="center"
+                            android:paddingBottom="@dimen/d_8dp"
+                            android:text="复制"
+                            android:textColor="@color/white"
+                            android:textSize="@dimen/d_16sp" />
+
+                    </FrameLayout>
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewLight
+                        android:id="@+id/tv_invite_friends_send"
+                        android:layout_width="match_parent"
+                        android:layout_height="53dp"
+                        android:layout_marginLeft="@dimen/d_12dp"
+                        android:layout_marginRight="@dimen/d_12dp"
+                        android:background="@drawable/btn_send_invites_bg"
+                        android:clickable="true"
+                        android:gravity="center"
+                        android:paddingBottom="@dimen/d_6dp"
+                        android:text="发送邀请"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/d_17dp" />
+
+                </LinearLayout>
+
+
+                <LinearLayout
+                    android:id="@+id/ll_invite_success_box"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_60dp"
+                    android:layout_marginLeft="@dimen/d_10dp"
+                    android:layout_marginRight="@dimen/d_10dp"
+                    android:background="@drawable/btn_invites_white_bg"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:paddingTop="@dimen/d_10dp"
+                    android:paddingBottom="@dimen/d_10dp">
+
+                    <ImageView
+                        android:id="@+id/iv_invite_friends_term"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_20dp"
+                        android:src="@drawable/invite_friends_term" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewLight
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_14dp"
+                        android:layout_weight="1"
+                        android:text="成功邀请的好友"
+                        android:textColor="@color/gray_text_8e"
+                        android:textSize="@dimen/d_14sp" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewBold
+                        android:id="@+id/tv_success_count"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="@dimen/d_20dp"
+                        android:text="0"
+                        android:textColor="@color/profile_red"
+                        android:textSize="@dimen/d_14sp" />
+
+                </LinearLayout>
+
+                <!--Cash Rewards (YY Pay)-->
+                <LinearLayout
+                    android:id="@+id/ll_cash_rewards_box"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_60dp"
+                    android:layout_marginLeft="@dimen/d_10dp"
+                    android:layout_marginRight="@dimen/d_10dp"
+                    android:background="@drawable/btn_invites_white_bg"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:visibility="gone"
+                    android:paddingTop="@dimen/d_7dp"
+                    android:paddingBottom="@dimen/d_10dp">
+
+                    <ImageView
+
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_20dp"
+                        android:src="@drawable/invite_friends_points" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewLight
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_14dp"
+                        android:layout_weight="1"
+                        android:text="Cash Rewards (YY Pay)"
+                        android:textColor="@color/gray_text_8e"
+                        android:textSize="@dimen/d_14sp" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewBold
+                        android:id="@+id/tv_awarded_money"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="@dimen/d_20dp"
+                        android:text="$8"
+                        android:textColor="@color/app_blue"
+                        android:textSize="@dimen/d_14sp" />
+
+                </LinearLayout>
+
+                <!--Cash Rewards (Complete 1st Job)-->
+                <LinearLayout
+                    android:id="@+id/ll_cash_rewards_complete_1st_job"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_60dp"
+                    android:layout_marginLeft="@dimen/d_10dp"
+                    android:layout_marginRight="@dimen/d_10dp"
+                    android:background="@drawable/btn_invites_white_bg"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:paddingTop="@dimen/d_7dp"
+                    android:paddingBottom="@dimen/d_10dp">
+
+                    <ImageView
+
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_20dp"
+                        android:src="@drawable/invite_friends_points" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewLight
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_14dp"
+                        android:layout_weight="1"
+                        android:text="Cash Rewards (Complete 3 Jobs within a month)"
+                        android:textColor="@color/gray_text_8e"
+                        android:layout_marginRight="@dimen/d_5dp"
+                        android:textSize="@dimen/d_14sp" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewBold
+                        android:id="@+id/tv_awarded_money_complete_1st_job"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="@dimen/d_20dp"
+                        android:text="$8"
+                        android:textColor="@color/app_blue"
+                        android:textSize="@dimen/d_14sp" />
+
+                </LinearLayout>
+
+
+            </LinearLayout>
+
+        </ScrollView>
+
+
+    </LinearLayout>
+
+
+</layout>

cpt_parttime/src/main/res/layout/activity_settings.xml

@@ -8,7 +8,7 @@
 
         <variable
             name="click"
-            type="com.hongyegroup.cpt_parttime.ui.SettingsActivity.ClickProxy" />
+            type="com.hongyegroup.cpt_main.ui.SettingsActivity.ClickProxy" />
 
     </data>
 

cpt_main/src/main/res/layout/fragment_profile.xml

@@ -386,6 +386,7 @@
                                 android:paddingTop="@dimen/d_15dp"
                                 android:paddingRight="@dimen/d_25dp"
                                 android:paddingBottom="@dimen/d_15dp"
+                                binding:clicks="@{click.gotoInviteFriendsActivity}"
                                 android:visibility="visible">
 
                                 <ImageView
@@ -562,6 +563,7 @@
                                 android:background="@drawable/transparent_bg_selector"
                                 android:clickable="true"
                                 android:orientation="horizontal"
+                                binding:clicks="@{click.gotoSettingsActivity}"
                                 android:paddingLeft="@dimen/d_25dp"
                                 android:paddingTop="@dimen/d_15dp"
                                 android:paddingRight="@dimen/d_25dp"

cpt_parttime/src/main/AndroidManifest.xml

@@ -12,8 +12,6 @@
 
         <activity android:name=".ui.activity.PartJobAlbumActivity" />
 
-        <activity android:name=".ui.SettingsActivity"/>
-
         <activity android:name=".ui.PartJobEditProfileInfoActivity"/>
 
         <activity android:name=".ui.ResetPasswordActivity"/>

cpt_rewards/src/main/AndroidManifest.xml

@@ -20,6 +20,12 @@
 
         <activity android:name=".ui.MyRewardsActivity"/>
 
+        <activity android:name=".ui.RewardsVerificationCodeActivity"/>
+
+        <activity android:name=".ui.RewardsRedeemSuccessActivity"/>
+
+        <activity android:name=".ui.RewardsRedeemFailedActivity"/>
+
     </application>
 
 </manifest>

cpt_rewards/src/main/java/com/hongyegroup/cpt_rewards/ui/RewardsRedeemFailedActivity.kt

@@ -0,0 +1,38 @@
+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.hongyegroup.cpt_rewards.R
+
+class RewardsRedeemFailedActivity:BaseVDBActivity<BaseViewModel,ViewDataBinding>() {
+
+    companion object {
+
+        fun startInstance() {
+            val context = CommUtils.getContext()
+            val intent = Intent(context, RewardsRedeemFailedActivity::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_redeem_failed)
+
+    }
+
+    override fun startObserve() {
+
+    }
+}

cpt_rewards/src/main/java/com/hongyegroup/cpt_rewards/ui/RewardsRedeemSuccessActivity.kt

@@ -0,0 +1,39 @@
+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.hongyegroup.cpt_rewards.R
+import com.hongyegroup.cpt_rewards.databinding.ActivityRewardsRedeemSuccessBinding
+
+class RewardsRedeemSuccessActivity:BaseVDBActivity<BaseViewModel,ActivityRewardsRedeemSuccessBinding>() {
+
+    companion object {
+
+        fun startInstance() {
+            val context = CommUtils.getContext()
+            val intent = Intent(context, RewardsRedeemSuccessActivity::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_redeem_success)
+
+    }
+
+    override fun startObserve() {
+
+    }
+}

cpt_rewards/src/main/java/com/hongyegroup/cpt_rewards/ui/RewardsVerificationCodeActivity.kt

@@ -0,0 +1,46 @@
+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.hongyegroup.cpt_rewards.R
+import com.hongyegroup.cpt_rewards.databinding.ActivityRewardsVerificationCodeBinding
+
+class RewardsVerificationCodeActivity : BaseVDBActivity<BaseViewModel, ActivityRewardsVerificationCodeBinding>() {
+
+    companion object {
+
+        fun startInstance() {
+            val context = CommUtils.getContext()
+            val intent = Intent(context, RewardsVerificationCodeActivity::class.java)
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            context.startActivity(intent)
+        }
+
+    }
+
+    override fun init(savedInstanceState: Bundle?) {
+
+        CommUtils.getHandler().postDelayed(Runnable {
+
+//            RewardsRedeemSuccessActivity.startInstance()
+            RewardsRedeemFailedActivity.startInstance()
+
+        }, 1000)
+
+    }
+
+    override fun getDataBindingConfig(): DataBindingConfig {
+
+        return DataBindingConfig(R.layout.activity_rewards_verification_code)
+
+    }
+
+    override fun startObserve() {
+
+    }
+}

cpt_rewards/src/main/java/com/hongyegroup/cpt_rewards/ui/fragment/MyRewardsActiveFragment.kt

@@ -11,6 +11,7 @@ import com.guadou.lib_baselib.utils.CommUtils
 import com.hongyegroup.cpt_rewards.R
 import com.hongyegroup.cpt_rewards.databinding.FragmentMyRewardsActiveBinding
 import com.hongyegroup.cpt_rewards.mvvm.MyRewardsActiveViewModel
+import com.hongyegroup.cpt_rewards.ui.RewardsVerificationCodeActivity
 
 class MyRewardsActiveFragment : BaseVDBLazyLoadingFragment<MyRewardsActiveViewModel, FragmentMyRewardsActiveBinding>() {
 
@@ -27,6 +28,27 @@ class MyRewardsActiveFragment : BaseVDBLazyLoadingFragment<MyRewardsActiveViewMo
 
     override fun init(savedInstanceState: Bundle?) {
 
+        initListener()
+
+    }
+
+    private fun initListener() {
+
+
+        //添加点击事件
+        mViewModel.mActiveAdapter.addChildClickViewIds(R.id.tv_item_rewards_active_redeem_now)
+
+        //设置点击监听
+        mViewModel.mActiveAdapter.setOnItemChildClickListener { adapter, view, position ->
+
+            var viewId=view.id
+            if (viewId==R.id.tv_item_rewards_active_redeem_now){
+
+                RewardsVerificationCodeActivity.startInstance()
+
+            }
+
+        }
 
     }
 

cpt_rewards/src/main/res/layout/activity_rewards_payment_success.xml

@@ -49,7 +49,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/d_8dp"
-                            android:text="恭喜！"
+                            android:text="积分兑换成功"
                             android:textColor="@color/black"
                             android:textSize="@dimen/d_17sp" />
 

cpt_rewards/src/main/res/layout/activity_rewards_redeem_failed.xml

@@ -0,0 +1,54 @@
+<?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">
+
+    <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="兑换失败" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/shape_rewards_white_bottom_15conner_bg"
+            android:gravity="center_horizontal"
+            android:orientation="vertical">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/d_20dp"
+                android:src="@drawable/iv_rewards_redeem_failure_icon" />
+
+            <com.guadou.lib_baselib.font_text_view.TextViewRegular
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/d_25dp"
+                android:text="兑换失败"
+                android:layout_marginTop="@dimen/d_5dp"
+                android:textColor="@color/app_blue"
+                android:textSize="@dimen/d_17sp" />
+
+        </LinearLayout>
+
+        <com.guadou.lib_baselib.font_text_view.TextViewMedium
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/d_40dp"
+            android:text="请在试一次"
+            android:textSize="@dimen/d_16sp"
+            android:textColor="@color/white"
+            android:layout_marginLeft="@dimen/d_15dp"
+            android:layout_marginRight="@dimen/d_15dp"
+            android:gravity="center"
+            android:layout_marginTop="@dimen/d_50dp"
+            android:background="@color/app_blue"/>
+
+    </LinearLayout>
+
+</layout>

cpt_rewards/src/main/res/layout/activity_rewards_redeem_success.xml

@@ -0,0 +1,265 @@
+<?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"
+    tools:ignore="MissingDefaultResource">
+
+    <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:fillViewport="true"
+            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:gravity="center_horizontal"
+                    android:orientation="vertical">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d_20dp"
+                        android:src="@drawable/iv_rewards_redeem_success_icon" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewRegular
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="-20dp"
+                        android:layout_marginBottom="@dimen/d_25dp"
+                        android:text="恭喜"
+                        android:textColor="@color/app_blue"
+                        android:textSize="@dimen/d_17sp" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d_10dp"
+                    android:background="@drawable/shape_rewards_white_15conner_bg"
+                    android:orientation="vertical">
+
+                    <!--Redeem Date-->
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
+                        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_rewards_redeem_success_date" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewLight
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_8dp"
+                            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_redeem_success_redeem_date"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingLeft="@dimen/d_15dp"
+                        android:paddingTop="@dimen/d_20dp"
+                        android:paddingBottom="@dimen/d_20dp"
+                        android:text="21 Jun 2010, 20:18"
+                        android:textColor="@color/dark_gray_text"
+                        android:textSize="@dimen/d_16sp" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d_10dp"
+                    android:background="@drawable/shape_rewards_white_15conner_bg"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
+                        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_rewards_redeem_success_promotion_icon" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewLight
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_8dp"
+                            android:layout_marginRight="@dimen/d_5dp"
+                            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" />
+
+                    <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_redeem_success_promotion_rewards"
+                            android:layout_width="match_parent"
+                            android:layout_height="0dp"
+                            android:background="@color/page_bg_f4"
+                            app:layout_constraintCircleRadius="@dimen/d_8dp"
+                            app:layout_constraintDimensionRatio="345:227"
+                            tools:ignore="MissingConstraints" />
+
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:id="@+id/tv_redeem_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_marginRight="@dimen/d_5dp"
+                        android:text="Cute children multifunctional umbrella"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/d_16sp" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d_10dp"
+                        android:layout_marginBottom="@dimen/d_20dp"
+                        android:orientation="horizontal"
+                        android:paddingLeft="@dimen/d_15dp">
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewBold
+                            android:id="@+id/tv_redeem_success_point"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="300"
+                            android:textColor="@color/profile_red"
+                            android:textSize="@dimen/d_20sp" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewLight
+                            android:id="@+id/tv_redeem_success_original_point"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_3dp"
+                            android:text="350"
+                            android:textColor="@color/item_light_gray"
+                            android:textSize="@dimen/d_14sp" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewLight
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_3dp"
+                            android:text="积分"
+                            android:textColor="@color/item_light_gray"
+                            android:textSize="@dimen/d_14sp" />
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d_10dp"
+                    android:layout_marginBottom="@dimen/d_10dp"
+                    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:gravity="center_vertical"
+                        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_8dp"
+                            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_redeem_success_redeem_from"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingLeft="@dimen/d_15dp"
+                        android:paddingTop="@dimen/d_20dp"
+                        android:paddingBottom="@dimen/d_20dp"
+                        android:text="17 Mar 2020 until 15 Jul 2020"
+                        android:textColor="@color/dark_gray_text"
+                        android:textSize="@dimen/d_16sp" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </ScrollView>
+
+    </LinearLayout>
+
+</layout>

cpt_rewards/src/main/res/layout/activity_rewards_verification_code.xml

@@ -0,0 +1,133 @@
+<?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">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/app_blue"
+        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="wrap_content"
+            android:overScrollMode="never"
+            android:scrollbars="none">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/d_15dp"
+                android:layout_marginTop="@dimen/d_17dp"
+                android:layout_marginRight="@dimen/d_15dp"
+                android:layout_marginBottom="@dimen/d_50dp"
+                android:background="@color/white"
+                android:orientation="vertical">
+
+
+                <com.guadou.lib_baselib.font_text_view.TextViewBold
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/d_40dp"
+                    android:layout_marginTop="@dimen/d_40dp"
+                    android:layout_marginRight="@dimen/d_40dp"
+                    android:gravity="center"
+                    android:text="请您出示该二维码给商家验证"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/d_20sp" />
+
+
+                <ImageView
+                    android:id="@+id/iv_qr_code"
+                    android:layout_width="220dp"
+                    android:layout_height="220dp"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="@dimen/d_20dp"
+                    android:scaleType="centerCrop"
+                    android:src="@color/white" />
+
+                <ImageView
+                    android:id="@+id/iv_bar_code"
+                    android:layout_width="290dp"
+                    android:layout_height="@dimen/d_60dp"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="@dimen/d_20dp"
+                    android:visibility="gone" />
+
+
+                <com.guadou.lib_baselib.font_text_view.TextViewBold
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="@dimen/d_10dp"
+                    android:gravity="center"
+                    android:text="或者"
+                    android:textColor="@color/gray_76"
+                    android:textSize="18sp" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d_15dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/promotion_verty_right_round" />
+
+                    <com.guadou.cs_cptservices.widget.XuDividerView
+                        android:layout_width="0dp"
+                        android:layout_height="1dp"
+                        android:layout_weight="1"
+                        android:layerType="software"
+                        app:dashGap="8dp"
+                        app:dashLength="2dp"
+                        app:dashThickness="1dp"
+                        app:divider_line_color="@color/app_blue"
+                        app:divider_orientation="horizontal" />
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/promotion_verty_left_round" />
+
+                </LinearLayout>
+
+                <com.guadou.lib_baselib.font_text_view.TextViewBold
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="@dimen/d_10dp"
+                    android:gravity="center"
+                    android:text="验证码"
+                    android:textColor="@color/gray_76"
+                    android:textSize="@dimen/d_17sp" />
+
+
+                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                    android:id="@+id/tv_verty_code"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="@dimen/d_5dp"
+                    android:layout_marginBottom="@dimen/d_40dp"
+                    android:gravity="center"
+                    android:text="-"
+                    android:textColor="#0689fb"
+                    android:textSize="32sp" />
+
+            </LinearLayout>
+
+        </ScrollView>
+
+
+    </LinearLayout>
+
+</layout>

cs_cptServices/src/main/java/com/guadou/cs_cptservices/widget/XuDividerView.java

@@ -0,0 +1,70 @@
+package com.guadou.cs_cptservices.widget;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.DashPathEffect;
+import android.graphics.Paint;
+import android.util.AttributeSet;
+import android.view.View;
+
+
+import com.guadou.cs_cptservices.R;
+
+import androidx.annotation.Nullable;
+
+import static android.gesture.GestureOverlayView.ORIENTATION_HORIZONTAL;
+
+/**
+ * 虚线的自定义View
+ * 自定义属性可以设置方向，间距，长度，宽度，颜色
+ */
+public class XuDividerView extends View {
+
+    private final Paint mPaint;
+    private int orientation;
+
+    public XuDividerView(Context context) {
+        this(context, null);
+    }
+
+    public XuDividerView(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+
+        int dashGap, dashLength, dashThickness;
+        int color;
+
+        TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.DividerView, 0, 0);
+
+        try {
+            dashGap = a.getDimensionPixelSize(R.styleable.DividerView_dashGap, 5);
+            dashLength = a.getDimensionPixelSize(R.styleable.DividerView_dashLength, 5);
+            dashThickness = a.getDimensionPixelSize(R.styleable.DividerView_dashThickness, 3);
+            color = a.getColor(R.styleable.DividerView_divider_line_color, 0xff000000);
+            orientation = a.getInt(R.styleable.DividerView_divider_orientation, ORIENTATION_HORIZONTAL);
+        } finally {
+            a.recycle();
+        }
+
+        mPaint = new Paint();
+        mPaint.setAntiAlias(true);
+        mPaint.setColor(color);
+        mPaint.setStyle(Paint.Style.STROKE);
+        mPaint.setStrokeWidth(dashThickness);
+        mPaint.setPathEffect(new DashPathEffect(new float[]{dashGap, dashLength,}, 0));
+    }
+
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+
+        if (orientation == ORIENTATION_HORIZONTAL) {
+            float center = getHeight() * 0.5f;
+            canvas.drawLine(0, center, getWidth(), center, mPaint);
+        } else {
+            float center = getWidth() * 0.5f;
+            canvas.drawLine(center, 0, center, getHeight(), mPaint);
+        }
+    }
+}

cs_cptServices/src/main/res/values/colors.xml

@@ -57,5 +57,6 @@
     <color name="page_background_pressed">#33000000</color>
     <color name="progress_background">#22102A45</color>
     <color name="white_text_fe">#fefefe</color>
+    <color name="gray_text_8e">#8E8E8E</color>
 
 </resources>

cs_cptServices/src/main/res/values/styles.xml

@@ -11,4 +11,21 @@
 
     </declare-styleable>
 
+    <!-- 虚线 -->
+    <declare-styleable name="DividerView">
+        <!-- 虚线颜色 -->
+        <attr name="divider_line_color" format="color" />
+        <!-- 虚线宽度 -->
+        <attr name="dashThickness" format="dimension" />
+        <!-- 虚线dash宽度 -->
+        <attr name="dashLength" format="dimension" />
+        <!-- 虚线dash间隔 -->
+        <attr name="dashGap" format="dimension" />
+        <!-- 虚线朝向 -->
+        <attr name="divider_orientation" format="enum">
+            <enum name="horizontal" value="0" />
+            <enum name="vertical" value="1" />
+        </attr>
+    </declare-styleable>
+
 </resources>