liukai 2 years ago
parent
commit
0ef1c04834

+ 2 - 17
cpt_main/src/main/java/com/hongyegroup/cpt_main/ui/ProfileFragment.kt

@@ -1,14 +1,10 @@
 package com.hongyegroup.cpt_main.ui
 
 import android.os.Bundle
-import android.view.View
-import com.guadou.cs_cptservices.base.fragment.YYBaseVDBLoadingFragment
+import com.guadou.cs_cptservices.base.fragment.YYBaseVDBFragment
 import com.guadou.cs_cptservices.interfaces.IFragmentRefresh
 import com.guadou.lib_baselib.bean.DataBindingConfig
 import com.guadou.lib_baselib.utils.CommUtils
-import com.guadou.lib_baselib.view.gloading.GLoadingTitleStatus
-import com.guadou.lib_baselib.view.gloading.Gloading
-import com.guadou.lib_baselib.view.gloading.GloadingGlobalAdapter
 import com.hongyegroup.cpt_main.BR
 import com.hongyegroup.cpt_main.R
 import com.hongyegroup.cpt_main.databinding.FragmentProfileBinding
@@ -19,7 +15,7 @@ import com.scwang.smart.refresh.layout.listener.OnRefreshListener
 /**
  * 首页列表
  */
-class ProfileFragment : YYBaseVDBLoadingFragment<ProfileViewModel, FragmentProfileBinding>(), IFragmentRefresh,
+class ProfileFragment : YYBaseVDBFragment<ProfileViewModel, FragmentProfileBinding>(), IFragmentRefresh,
     OnRefreshListener {
 
     override fun getDataBindingConfig(): DataBindingConfig {
@@ -27,13 +23,6 @@ class ProfileFragment : YYBaseVDBLoadingFragment<ProfileViewModel, FragmentProfi
             .addBindingParams(BR.click, ClickProxy())
     }
 
-    //重新生成GLoading对象-跳动动画
-    override fun generateGLoading(view: View): Gloading.Holder {
-        return Gloading.from(GloadingGlobalAdapter())
-            .wrap(view, GLoadingTitleStatus(true, true, true))
-            .withRetry { onGoadingRetry() }
-    }
-
     override fun startObserve() {
     }
 
@@ -51,10 +40,6 @@ class ProfileFragment : YYBaseVDBLoadingFragment<ProfileViewModel, FragmentProfi
         }, 1500)
     }
 
-    override fun onGoadingRetry() {
-
-    }
-
     private fun initListener() {
 
     }

+ 12 - 31
cpt_parttime/src/main/java/com/hongyegroup/cpt_parttime/ui/main/PartTimeProfileFragment.kt

@@ -6,17 +6,14 @@ import com.guadou.cs_cptservices.base.fragment.YYBaseVDBLoadingFragment
 import com.guadou.cs_cptservices.interfaces.IFragmentRefresh
 import com.guadou.lib_baselib.bean.DataBindingConfig
 import com.guadou.lib_baselib.utils.CommUtils
-import com.guadou.lib_baselib.utils.StatusBarUtils
 import com.guadou.lib_baselib.view.gloading.GLoadingTitleStatus
 import com.guadou.lib_baselib.view.gloading.Gloading
 import com.guadou.lib_baselib.view.gloading.GloadingGlobalAdapter
-import com.guadou.lib_baselib.view.titlebar.EasyTitleBar
 import com.hongyegroup.cpt_parttime.BR
 import com.hongyegroup.cpt_parttime.R
 import com.hongyegroup.cpt_parttime.databinding.FragmentParttimeJobProfileBinding
 import com.hongyegroup.cpt_parttime.mvvm.PartJobProfileViewModel
 import com.hongyegroup.cpt_parttime.ui.PartJobEditProfileInfoActivity
-import com.hongyegroup.cpt_parttime.ui.SettingsActivity
 import com.hongyegroup.cpt_parttime.widget.UserUrgentAlertPopup
 import com.lxj.xpopup.XPopup
 import com.scwang.smart.refresh.layout.api.RefreshLayout
@@ -44,50 +41,40 @@ class PartTimeProfileFragment : YYBaseVDBLoadingFragment<PartJobProfileViewModel
     }
 
     override fun init(savedInstanceState: Bundle?) {
-
-        mBinding.viewStubRating.viewStub?.inflate()
-        setStatusBarPadding()
-        initRV()
         initData()
         initListener()
     }
 
-    private fun setStatusBarPadding() {
-
-        StatusBarUtils.setHeightAndPadding(mContext, mBinding.statusView)
-
-    }
 
     private fun initData() {
         showStateLoading()
         CommUtils.getHandler().postDelayed({
             showStateSuccess()
+
+//            popupPartTimeProfile()
         }, 1500)
     }
 
+//    private fun popupPartTimeProfile() {
+//        val mRatingView = mBinding.viewStubRating.viewStub?.inflate()
+//
+//        val mRateBinding = DataBindingUtil.bind<IncludePensonalTurnUpRateBinding>(mRatingView!!)
+//
+//        mRateBinding?.turnUpProgress?.setValue("60", 100f)
+//    }
+
     override fun onGoadingRetry() {
 
     }
 
     private fun initListener() {
 
-        mBinding.titleBarParttimeJobProfile.addRightText("设置", EasyTitleBar.MenuBuilder.OnMenuClickListener {
-
-            SettingsActivity.startInstance()
-
-        })
-
     }
 
     override fun onRefresh(refreshLayout: RefreshLayout) {
 
     }
 
-
-    private fun initRV() {
-
-    }
-
     override fun scrollTopRefresh() {
 
     }
@@ -98,25 +85,19 @@ class PartTimeProfileFragment : YYBaseVDBLoadingFragment<PartJobProfileViewModel
     inner class ClickProxy {
 
         //跳转到编辑个人信息界面
-        fun editProfileInfo(){
-
+        fun editProfileInfo() {
             PartJobEditProfileInfoActivity.startInstance()
-
         }
 
         //审核个人信息加急
-        fun userUrgent(){
-
+        fun userUrgent() {
             //弹窗展示以及申请成功
-
             XPopup.Builder(mActivity)
                 .hasShadowBg(true)
                 .asCustom(UserUrgentAlertPopup(mActivity))
                 .show()
-
         }
 
     }
 
-
 }

+ 24 - 32
cpt_parttime/src/main/res/layout/fragment_parttime_job_profile.xml

@@ -23,18 +23,11 @@
         android:background="@color/white"
         android:orientation="vertical">
 
-        <LinearLayout
+        <FrameLayout
             android:id="@+id/ll_title_box"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/shape_gradient_proifle_title_top"
-            android:gravity="center_vertical"
-            android:orientation="vertical">
-
-            <com.guadou.lib_baselib.view.titlebar.StatusbarGrayView
-                android:id="@+id/status_view"
-                android:layout_width="match_parent"
-                android:layout_height="0dp" />
+            android:background="@drawable/shape_gradient_proifle_title_top">
 
             <com.guadou.lib_baselib.view.titlebar.EasyTitleBar
                 android:id="@+id/title_bar_parttime_job_profile"
@@ -42,12 +35,13 @@
                 android:layout_height="wrap_content"
                 android:textSize="@dimen/d_18sp"
                 app:Easy_backRes="@null"
-                app:Easy_title="我的"
-                app:Easy_titleColor="@color/white"
+                app:Easy_hasStatusPadding="true"
                 app:Easy_lineState="gone"
-                app:Easy_titleBarBackground="@color/transparent" />
+                app:Easy_title="我的"
+                app:Easy_titleBarBackground="@color/transparent"
+                app:Easy_titleColor="@color/white" />
 
-        </LinearLayout>
+        </FrameLayout>
 
         <com.scwang.smart.refresh.layout.SmartRefreshLayout
             android:id="@+id/refresh_layout"
@@ -55,13 +49,14 @@
             android:layout_height="match_parent"
             android:focusable="true"
             android:focusableInTouchMode="true"
+            app:srlAccentColor="#03A3FE"
             app:srlEnablePreviewInEditMode="true"
-            app:srlPrimaryColor="@color/white">
+            app:srlPrimaryColor="@color/app_blue">
 
             <com.scwang.smart.refresh.header.ClassicsHeader
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
+                android:layout_height="wrap_content"
+                app:srlAccentColor="@color/white" />
 
             <ScrollView
                 android:id="@+id/scroll_view_view_profile"
@@ -192,9 +187,9 @@
                         android:layout_marginRight="@dimen/d_5dp"
                         android:background="@drawable/profile_white_shadow_comm_bg"
                         android:orientation="vertical"
-                        binding:clicks="@{click.editProfileInfo}"
                         android:paddingTop="@dimen/d_20dp"
-                        android:paddingBottom="@dimen/d_20dp">
+                        android:paddingBottom="@dimen/d_20dp"
+                        binding:clicks="@{click.editProfileInfo}">
 
                         <LinearLayout
                             android:layout_width="match_parent"
@@ -256,7 +251,7 @@
                             android:textSize="@dimen/d_14sp" />
 
                         <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                                android:id="@+id/btn_urgent"
+                            android:id="@+id/btn_urgent"
                             android:layout_width="match_parent"
                             android:layout_height="@dimen/d_35dp"
                             android:layout_marginLeft="@dimen/d_23dp"
@@ -266,14 +261,13 @@
                             android:background="@drawable/selector_app_blue_button_round5_bg"
                             android:gravity="center"
                             android:text="加急"
-                            binding:clicks="@{click.userUrgent}"
                             android:textColor="@color/white"
                             android:textSize="@dimen/d_15sp"
-                            android:visibility="visible" />
+                            android:visibility="visible"
+                            binding:clicks="@{click.userUrgent}" />
 
                     </LinearLayout>
 
-
                     <!--    基本信息     -->
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -438,7 +432,6 @@
 
                     </LinearLayout>
 
-
                     <!-- 技能的选择 -->
                     <LinearLayout
                         android:id="@+id/ll_edit_profile_work_type"
@@ -591,7 +584,7 @@
 
                     </LinearLayout>
 
-                    <!--   证书      -->
+                    <!--  证书  -->
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -651,13 +644,13 @@
 
                     </LinearLayout>
 
-
-                    <ViewStub
-                        android:id="@+id/view_stub_rating"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout="@layout/include_pensonal_turn_up_rate"
-                        tools:ignore="TooManyViews" />
+                    <!--  个人信息的到达率等懒加载信息   -->
+                    <!--                    <ViewStub-->
+                    <!--                        android:id="@+id/view_stub_rating"-->
+                    <!--                        android:layout_width="match_parent"-->
+                    <!--                        android:layout_height="match_parent"-->
+                    <!--                        android:layout="@layout/include_pensonal_turn_up_rate"-->
+                    <!--                        />-->
 
                     <View
                         android:layout_width="1dp"
@@ -667,7 +660,6 @@
 
             </ScrollView>
 
-
         </com.scwang.smart.refresh.layout.SmartRefreshLayout>
 
     </LinearLayout>

+ 362 - 353
cpt_parttime/src/main/res/layout/include_pensonal_turn_up_rate.xml

@@ -1,420 +1,429 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    xmlns:binding="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
-    <LinearLayout
-        android:id="@+id/ll_edit_profile_work_type"
+    <data>
+
+    </data>
+
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/d_5dp"
-        android:layout_marginRight="@dimen/d_5dp"
-        android:background="@drawable/profile_white_shadow_comm_bg"
-        android:orientation="vertical"
-        android:paddingTop="@dimen/d_25dp"
-        android:paddingBottom="@dimen/d_38dp">
-
-        <com.guadou.lib_baselib.font_text_view.TextViewBold
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:id="@+id/ll_edit_profile_work_type"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/d_23dp"
-            android:layout_marginRight="@dimen/d_23dp"
-            android:text="个人评价"
-            android:textColor="@color/profile_black_28394a"
-            android:textSize="17dp" />
+            android:layout_marginLeft="@dimen/d_5dp"
+            android:layout_marginRight="@dimen/d_5dp"
+            android:background="@drawable/profile_white_shadow_comm_bg"
+            android:orientation="vertical"
+            android:paddingTop="@dimen/d_25dp"
+            android:paddingBottom="@dimen/d_38dp">
+
+            <com.guadou.lib_baselib.font_text_view.TextViewBold
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/d_23dp"
+                android:layout_marginRight="@dimen/d_23dp"
+                android:text="个人评价"
+                android:textColor="@color/profile_black_28394a"
+                android:textSize="17dp" />
 
 
-        <LinearLayout
-            android:id="@+id/ll_edit_profile_work_type1"
-            android:layout_width="match_parent"
-            android:layout_height="160dp"
-            android:layout_marginLeft="@dimen/d_20dp"
-            android:layout_marginTop="@dimen/d_15dp"
-            android:layout_marginRight="@dimen/d_15dp"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
+            <LinearLayout
+                android:id="@+id/ll_edit_profile_work_type1"
+                android:layout_width="match_parent"
+                android:layout_height="160dp"
+                android:layout_marginLeft="@dimen/d_20dp"
+                android:layout_marginTop="@dimen/d_15dp"
+                android:layout_marginRight="@dimen/d_15dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+
+                        <View
+                            android:id="@+id/view_zi"
+                            android:layout_width="2dp"
+                            android:layout_height="@dimen/d_45dp"
+                            android:background="@drawable/shape_5round_zi"
+                            app:layout_constraintLeft_toLeftOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                            android:id="@+id/tv_no_show_text"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_13dp"
+                            android:text="缺勤率"
+                            android:textColor="#FF8098B2"
+                            android:textSize="@dimen/d_15sp"
+                            app:layout_constraintLeft_toRightOf="@id/view_zi"
+                            app:layout_constraintTop_toTopOf="@id/view_zi" />
+
+                        <ImageView
+                            android:id="@+id/iv_no_show_icon"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_13dp"
+                            android:layout_marginTop="5dp"
+                            android:src="@drawable/no_show_rate_icon"
+                            app:layout_constraintBottom_toBottomOf="@id/tv_no_show_value"
+                            app:layout_constraintLeft_toRightOf="@id/view_zi"
+                            app:layout_constraintTop_toTopOf="@id/tv_no_show_value" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewBold
+                            android:id="@+id/tv_no_show_value"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_10dp"
+                            android:layout_marginTop="@dimen/d_2dp"
+                            android:text="10%"
+                            android:textColor="#FF3C3C4F"
+                            android:textSize="@dimen/d_19sp"
+                            app:layout_constraintLeft_toRightOf="@id/iv_no_show_icon"
+                            app:layout_constraintTop_toBottomOf="@id/tv_no_show_text" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="28dp">
+
+                        <View
+                            android:id="@+id/view_fen"
+                            android:layout_width="2dp"
+                            android:layout_height="@dimen/d_45dp"
+                            android:background="@drawable/shape_5round_pink"
+                            app:layout_constraintLeft_toLeftOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                            android:id="@+id/tv_cancel_text"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_13dp"
+                            android:text="取消率"
+                            android:textColor="#FF8098B2"
+                            android:textSize="@dimen/d_15sp"
+                            app:layout_constraintLeft_toRightOf="@id/view_fen"
+                            app:layout_constraintTop_toTopOf="@id/view_fen" />
+
+                        <ImageView
+                            android:id="@+id/iv_cancel_icon"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_13dp"
+                            android:layout_marginTop="@dimen/d_5dp"
+                            android:src="@drawable/cancellation_rate_icon"
+                            app:layout_constraintBottom_toBottomOf="@id/tv_cancel_value"
+                            app:layout_constraintLeft_toRightOf="@id/view_fen"
+                            app:layout_constraintTop_toTopOf="@id/tv_cancel_value" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewBold
+                            android:id="@+id/tv_cancel_value"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_10dp"
+                            android:layout_marginTop="@dimen/d_2dp"
+                            android:text="15%"
+                            android:textColor="#FF3C3C4F"
+                            android:textSize="@dimen/d_19sp"
+                            app:layout_constraintLeft_toRightOf="@id/iv_cancel_icon"
+                            app:layout_constraintTop_toBottomOf="@id/tv_cancel_text" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                </LinearLayout>
+
+
+                <com.guadou.cs_cptservices.widget.MyCircleProgressView
+                    android:id="@+id/turn_up_progress"
+                    android:layout_width="136dp"
+                    android:layout_height="wrap_content"
+                    android:minHeight="200dp"
+
+                    app:animTime="1000"
+                    app:antiAlias="true"
+                    app:digit="0"
+                    app:hint="出勤率"
+
+                    app:hintColor="#8098B2"
+                    app:hintSize="13sp"
+
+                    app:isanim="false"
+
+                    app:mBgCirColor="#DDE3F6"
+                    app:mBgCirWidth="5sp"
+                    app:mCirColor="#3277f9"
+                    app:mCirWidth="15sp"
 
+                    app:shadowColor="#734947B2"
+                    app:shadowShow="true"
+                    app:shadowSize="9"
+
+                    app:startAngle="270"
+                    app:sweepAngle="360"
+                    app:unit="%"
+
+                    app:value="0"
+                    app:valueColor="#5456A4"
+                    app:valueSize="25dp" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginLeft="@dimen/d_23dp"
+                android:layout_marginTop="@dimen/d_10dp"
+                android:layout_marginRight="@dimen/d_23dp"
+                android:background="#FFD9E1ED" />
 
             <LinearLayout
-                android:layout_width="0dp"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="vertical">
+                android:layout_marginLeft="@dimen/d_23dp"
+                android:layout_marginTop="17dp"
+                android:layout_marginRight="@dimen/d_10dp"
+                android:orientation="horizontal">
 
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <View
-                        android:id="@+id/view_zi"
-                        android:layout_width="2dp"
-                        android:layout_height="@dimen/d_45dp"
-                        android:background="@drawable/shape_5round_zi"
-                        app:layout_constraintLeft_toLeftOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1.2"
+                    android:orientation="vertical">
 
                     <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                        android:id="@+id/tv_no_show_text"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="@dimen/d_13dp"
-                        android:text="缺勤率"
-                        android:textColor="#FF8098B2"
-                        android:textSize="@dimen/d_15sp"
-                        app:layout_constraintLeft_toRightOf="@id/view_zi"
-                        app:layout_constraintTop_toTopOf="@id/view_zi" />
-
-                    <ImageView
-                        android:id="@+id/iv_no_show_icon"
+                        android:id="@+id/tv_grooming_text"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="@dimen/d_13dp"
-                        android:layout_marginTop="5dp"
-                        android:src="@drawable/no_show_rate_icon"
-                        app:layout_constraintBottom_toBottomOf="@id/tv_no_show_value"
-                        app:layout_constraintLeft_toRightOf="@id/view_zi"
-                        app:layout_constraintTop_toTopOf="@id/tv_no_show_value" />
+                        android:text="着装"
+                        android:textColor="#FF3C3C4F"
+                        android:textSize="14sp" />
+
+                    <ProgressBar
+                        android:id="@+id/pb_grooming"
+                        android:layout_width="@dimen/d_70dp"
+                        android:layout_height="6dp"
+                        android:layout_marginTop="@dimen/d_8dp"
+                        android:indeterminateOnly="false"
+                        android:max="5"
+                        android:progress="3"
+                        android:progressDrawable="@drawable/progress_horizontal_grooming" />
 
                     <com.guadou.lib_baselib.font_text_view.TextViewBold
-                        android:id="@+id/tv_no_show_value"
+                        android:id="@+id/tv_grooming_value"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="@dimen/d_10dp"
-                        android:layout_marginTop="@dimen/d_2dp"
-                        android:text="10%"
-                        android:textColor="#FF3C3C4F"
-                        android:textSize="@dimen/d_19sp"
-                        app:layout_constraintLeft_toRightOf="@id/iv_no_show_icon"
-                        app:layout_constraintTop_toBottomOf="@id/tv_no_show_text" />
+                        android:layout_marginTop="@dimen/d_3dp"
+                        android:text="3.7"
+                        android:textColor="#FF5C75C6"
+                        android:textSize="16sp" />
+
+                </LinearLayout>
 
-                </androidx.constraintlayout.widget.ConstraintLayout>
 
                 <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="28dp">
+                    android:layout_weight="1.2"
+                    android:orientation="vertical">
 
-                    <View
-                        android:id="@+id/view_fen"
-                        android:layout_width="2dp"
-                        android:layout_height="@dimen/d_45dp"
-                        android:background="@drawable/shape_5round_pink"
+                    <TextView
+                        android:id="@+id/tv_average_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="平均评级"
+                        android:textColor="#FF3C3C4F"
+                        android:textSize="14sp"
                         app:layout_constraintLeft_toLeftOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
-                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                        android:id="@+id/tv_cancel_text"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="@dimen/d_13dp"
-                        android:text="取消率"
-                        android:textColor="#FF8098B2"
-                        android:textSize="@dimen/d_15sp"
-                        app:layout_constraintLeft_toRightOf="@id/view_fen"
-                        app:layout_constraintTop_toTopOf="@id/view_fen" />
-
-                    <ImageView
-                        android:id="@+id/iv_cancel_icon"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="@dimen/d_13dp"
-                        android:layout_marginTop="@dimen/d_5dp"
-                        android:src="@drawable/cancellation_rate_icon"
-                        app:layout_constraintBottom_toBottomOf="@id/tv_cancel_value"
-                        app:layout_constraintLeft_toRightOf="@id/view_fen"
-                        app:layout_constraintTop_toTopOf="@id/tv_cancel_value" />
+                    <ProgressBar
+                        android:id="@+id/pb_average"
+                        android:layout_width="@dimen/d_70dp"
+                        android:layout_height="6dp"
+                        android:layout_marginTop="@dimen/d_8dp"
+                        android:indeterminateOnly="false"
+                        android:max="5"
+                        android:progress="3"
+                        android:progressDrawable="@drawable/progress_horizontal_average"
+                        app:layout_constraintLeft_toLeftOf="@id/tv_average_text"
+                        app:layout_constraintTop_toBottomOf="@id/tv_average_text" />
 
                     <com.guadou.lib_baselib.font_text_view.TextViewBold
-                        android:id="@+id/tv_cancel_value"
+                        android:id="@+id/tv_average_value"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="@dimen/d_10dp"
-                        android:layout_marginTop="@dimen/d_2dp"
-                        android:text="15%"
-                        android:textColor="#FF3C3C4F"
-                        android:textSize="@dimen/d_19sp"
-                        app:layout_constraintLeft_toRightOf="@id/iv_cancel_icon"
-                        app:layout_constraintTop_toBottomOf="@id/tv_cancel_text" />
+                        android:layout_marginTop="@dimen/d_3dp"
+                        android:text="3.7"
+                        android:textColor="#FFF03C74"
+                        android:textSize="16sp"
+                        app:layout_constraintLeft_toLeftOf="@id/tv_average_text"
+                        app:layout_constraintTop_toBottomOf="@id/pb_average" />
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
-            </LinearLayout>
-
 
-            <com.guadou.cs_cptservices.widget.MyCircleProgressView
-                android:id="@+id/turn_up_progress"
-                android:layout_width="136dp"
-                android:layout_height="wrap_content"
-                android:minHeight="200dp"
-
-                app:animTime="1000"
-                app:antiAlias="true"
-                app:digit="0"
-                app:hint="出勤率"
-
-                app:hintColor="#8098B2"
-                app:hintSize="13sp"
-
-                app:isanim="false"
-
-                app:mBgCirColor="#DDE3F6"
-                app:mBgCirWidth="5sp"
-                app:mCirColor="#3277f9"
-                app:mCirWidth="15sp"
-
-                app:shadowColor="#734947B2"
-                app:shadowShow="true"
-                app:shadowSize="9"
-
-                app:startAngle="270"
-                app:sweepAngle="360"
-                app:unit="%"
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
 
-                app:value="0"
-                app:valueColor="#5456A4"
-                app:valueSize="25dp" />
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:id="@+id/tv_attitude_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="态度"
+                        android:textColor="#FF3C3C4F"
+                        android:textSize="14sp"
+                        app:layout_constraintLeft_toLeftOf="@id/pb_attitude"
+                        app:layout_constraintTop_toTopOf="parent" />
 
-        </LinearLayout>
+                    <ProgressBar
+                        android:id="@+id/pb_attitude"
+                        android:layout_width="@dimen/d_70dp"
+                        android:layout_height="6dp"
+                        android:layout_marginTop="@dimen/d_8dp"
+                        android:indeterminateOnly="false"
+                        android:max="5"
+                        android:progress="3"
+                        android:progressDrawable="@drawable/progress_horizontal_attitude"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/tv_attitude_text" />
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginLeft="@dimen/d_23dp"
-            android:layout_marginTop="@dimen/d_10dp"
-            android:layout_marginRight="@dimen/d_23dp"
-            android:background="#FFD9E1ED" />
+                    <com.guadou.lib_baselib.font_text_view.TextViewBold
+                        android:id="@+id/tv_attitude_value"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d_3dp"
+                        android:text="3.7"
+                        android:textColor="#FFFCC917"
+                        android:textSize="16sp"
+                        app:layout_constraintLeft_toLeftOf="@id/tv_attitude_text"
+                        app:layout_constraintTop_toBottomOf="@id/pb_attitude" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/d_23dp"
-            android:layout_marginTop="17dp"
-            android:layout_marginRight="@dimen/d_10dp"
-            android:orientation="horizontal">
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
+            </LinearLayout>
 
             <LinearLayout
-                android:layout_width="0dp"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1.2"
-                android:orientation="vertical">
+                android:layout_marginLeft="@dimen/d_23dp"
+                android:layout_marginTop="@dimen/d_23dp"
+                android:layout_marginRight="@dimen/d_10dp"
+                android:orientation="horizontal">
 
-                <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                    android:id="@+id/tv_grooming_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="着装"
-                    android:textColor="#FF3C3C4F"
-                    android:textSize="14sp" />
-
-                <ProgressBar
-                    android:id="@+id/pb_grooming"
-                    android:layout_width="@dimen/d_70dp"
-                    android:layout_height="6dp"
-                    android:layout_marginTop="@dimen/d_8dp"
-                    android:indeterminateOnly="false"
-                    android:max="5"
-                    android:progress="3"
-                    android:progressDrawable="@drawable/progress_horizontal_grooming" />
-
-                <com.guadou.lib_baselib.font_text_view.TextViewBold
-                    android:id="@+id/tv_grooming_value"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/d_3dp"
-                    android:text="3.7"
-                    android:textColor="#FF5C75C6"
-                    android:textSize="16sp" />
-
-            </LinearLayout>
 
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1.2"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/tv_average_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="平均评级"
-                    android:textColor="#FF3C3C4F"
-                    android:textSize="14sp"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <ProgressBar
-                    android:id="@+id/pb_average"
-                    android:layout_width="@dimen/d_70dp"
-                    android:layout_height="6dp"
-                    android:layout_marginTop="@dimen/d_8dp"
-                    android:indeterminateOnly="false"
-                    android:max="5"
-                    android:progress="3"
-                    android:progressDrawable="@drawable/progress_horizontal_average"
-                    app:layout_constraintLeft_toLeftOf="@id/tv_average_text"
-                    app:layout_constraintTop_toBottomOf="@id/tv_average_text" />
-
-                <com.guadou.lib_baselib.font_text_view.TextViewBold
-                    android:id="@+id/tv_average_value"
-                    android:layout_width="wrap_content"
+                <LinearLayout
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/d_3dp"
-                    android:text="3.7"
-                    android:textColor="#FFF03C74"
-                    android:textSize="16sp"
-                    app:layout_constraintLeft_toLeftOf="@id/tv_average_text"
-                    app:layout_constraintTop_toBottomOf="@id/pb_average" />
+                    android:layout_weight="1.2"
+                    android:orientation="vertical">
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:id="@+id/tv_perforamnce_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="个人能力"
+                        android:textColor="#FF3C3C4F"
+                        android:textSize="14sp" />
+
+                    <ProgressBar
+                        android:id="@+id/pb_perforamnce"
+                        android:layout_width="@dimen/d_70dp"
+                        android:layout_height="6dp"
+                        android:layout_marginTop="@dimen/d_8dp"
+                        android:indeterminateOnly="false"
+                        android:max="5"
+                        android:progress="3"
+                        android:progressDrawable="@drawable/progress_horizontal_perforamnce" />
 
-            </androidx.constraintlayout.widget.ConstraintLayout>
+                    <com.guadou.lib_baselib.font_text_view.TextViewBold
+                        android:id="@+id/tv_perforamnce_value"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d_3dp"
+                        android:text="3.7"
+                        android:textColor="#FFF99620"
+                        android:textSize="16sp" />
 
+                </LinearLayout>
 
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="vertical">
 
-                <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                    android:id="@+id/tv_attitude_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="态度"
-                    android:textColor="#FF3C3C4F"
-                    android:textSize="14sp"
-                    app:layout_constraintLeft_toLeftOf="@id/pb_attitude"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <ProgressBar
-                    android:id="@+id/pb_attitude"
-                    android:layout_width="@dimen/d_70dp"
-                    android:layout_height="6dp"
-                    android:layout_marginTop="@dimen/d_8dp"
-                    android:indeterminateOnly="false"
-                    android:max="5"
-                    android:progress="3"
-                    android:progressDrawable="@drawable/progress_horizontal_attitude"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tv_attitude_text" />
-
-                <com.guadou.lib_baselib.font_text_view.TextViewBold
-                    android:id="@+id/tv_attitude_value"
-                    android:layout_width="wrap_content"
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/d_3dp"
-                    android:text="3.7"
-                    android:textColor="#FFFCC917"
-                    android:textSize="16sp"
-                    app:layout_constraintLeft_toLeftOf="@id/tv_attitude_text"
-                    app:layout_constraintTop_toBottomOf="@id/pb_attitude" />
+                    android:layout_weight="1.2"
+                    android:orientation="vertical">
 
-            </androidx.constraintlayout.widget.ConstraintLayout>
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:id="@+id/tv_experience_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="经验"
+                        android:textColor="#FF3C3C4F"
+                        android:textSize="14sp"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
 
-        </LinearLayout>
+                    <ProgressBar
+                        android:id="@+id/pb_experience"
+                        android:layout_width="@dimen/d_70dp"
+                        android:layout_height="6dp"
+                        android:layout_marginTop="@dimen/d_8dp"
+                        android:indeterminateOnly="false"
+                        android:max="5"
+                        android:progress="3"
+                        android:progressDrawable="@drawable/progress_horizontal_experience"
+                        app:layout_constraintLeft_toLeftOf="@id/tv_experience_text"
+                        app:layout_constraintTop_toBottomOf="@id/tv_experience_text" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/d_23dp"
-            android:layout_marginTop="@dimen/d_23dp"
-            android:layout_marginRight="@dimen/d_10dp"
-            android:orientation="horizontal">
+                    <com.guadou.lib_baselib.font_text_view.TextViewBold
+                        android:id="@+id/tv_experience_value"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d_3dp"
+                        android:text="3.7"
+                        android:textColor="#FF40C5A7"
+                        android:textSize="16sp"
+                        app:layout_constraintLeft_toLeftOf="@id/tv_experience_text"
+                        app:layout_constraintTop_toBottomOf="@id/pb_experience" />
 
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1.2"
-                android:orientation="vertical">
 
-                <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                    android:id="@+id/tv_perforamnce_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="个人能力"
-                    android:textColor="#FF3C3C4F"
-                    android:textSize="14sp" />
-
-                <ProgressBar
-                    android:id="@+id/pb_perforamnce"
-                    android:layout_width="@dimen/d_70dp"
-                    android:layout_height="6dp"
-                    android:layout_marginTop="@dimen/d_8dp"
-                    android:indeterminateOnly="false"
-                    android:max="5"
-                    android:progress="3"
-                    android:progressDrawable="@drawable/progress_horizontal_perforamnce" />
-
-                <com.guadou.lib_baselib.font_text_view.TextViewBold
-                    android:id="@+id/tv_perforamnce_value"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/d_3dp"
-                    android:text="3.7"
-                    android:textColor="#FFF99620"
-                    android:textSize="16sp" />
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_weight="1" />
 
             </LinearLayout>
 
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1.2"
-                android:orientation="vertical">
-
-                <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                    android:id="@+id/tv_experience_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="经验"
-                    android:textColor="#FF3C3C4F"
-                    android:textSize="14sp"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <ProgressBar
-                    android:id="@+id/pb_experience"
-                    android:layout_width="@dimen/d_70dp"
-                    android:layout_height="6dp"
-                    android:layout_marginTop="@dimen/d_8dp"
-                    android:indeterminateOnly="false"
-                    android:max="5"
-                    android:progress="3"
-                    android:progressDrawable="@drawable/progress_horizontal_experience"
-                    app:layout_constraintLeft_toLeftOf="@id/tv_experience_text"
-                    app:layout_constraintTop_toBottomOf="@id/tv_experience_text" />
-
-                <com.guadou.lib_baselib.font_text_view.TextViewBold
-                    android:id="@+id/tv_experience_value"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/d_3dp"
-                    android:text="3.7"
-                    android:textColor="#FF40C5A7"
-                    android:textSize="16sp"
-                    app:layout_constraintLeft_toLeftOf="@id/tv_experience_text"
-                    app:layout_constraintTop_toBottomOf="@id/pb_experience" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-
             <View
-                android:layout_width="0dp"
-                android:layout_height="1dp"
-                android:layout_weight="1" />
+                android:layout_width="1dp"
+                android:layout_height="20dp" />
 
         </LinearLayout>
 
-        <View
-            android:layout_width="1dp"
-            android:layout_height="20dp" />
-
-    </LinearLayout>
+    </RelativeLayout>
 
-</RelativeLayout>
+</layout>