1.钱包支付详情-工作的发票详情

2.工作发票详情的提交问题
3.工作发票详情的提交问题的详情

cpt_ewallet/src/main/AndroidManifest.xml

@@ -18,6 +18,12 @@
 
         <activity android:name=".ui.PaymentPsdActivity"/>
 
+        <activity android:name=".ui.EWalletHistoryDetailJobActivity"/>
+
+        <activity android:name=".ui.HistoryJobIssueActivity"/>
+
+        <activity android:name=".ui.HistoryJobIssueDetailActivity"/>
+
     </application>
 
 </manifest>

cpt_ewallet/src/main/java/com/hongyegroup/cpt_ewallet/mvvm/HistortyDetailJobViewModel.kt

@@ -0,0 +1,13 @@
+package com.hongyegroup.cpt_ewallet.mvvm
+
+import androidx.lifecycle.SavedStateHandle
+import com.guadou.lib_baselib.base.vm.BaseViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+
+@HiltViewModel
+class HistortyDetailJobViewModel @Inject constructor(
+    private val savedStateHandle: SavedStateHandle
+) : BaseViewModel() {
+
+}

cpt_ewallet/src/main/java/com/hongyegroup/cpt_ewallet/mvvm/HistoryJobIssueDetailViewModel.kt

@@ -0,0 +1,14 @@
+package com.hongyegroup.cpt_ewallet.mvvm
+
+import androidx.lifecycle.SavedStateHandle
+import com.guadou.lib_baselib.base.vm.BaseViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+
+
+@HiltViewModel
+class HistoryJobIssueDetailViewModel @Inject constructor(
+    private val savedStateHandle: SavedStateHandle
+) : BaseViewModel() {
+
+}

cpt_ewallet/src/main/java/com/hongyegroup/cpt_ewallet/mvvm/HistoryJobIssueViewModel.kt

@@ -0,0 +1,14 @@
+package com.hongyegroup.cpt_ewallet.mvvm
+
+import androidx.lifecycle.SavedStateHandle
+import com.guadou.lib_baselib.base.vm.BaseViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+
+
+@HiltViewModel
+class HistoryJobIssueViewModel @Inject constructor(
+    private val savedStateHandle: SavedStateHandle
+) : BaseViewModel() {
+
+}

cpt_ewallet/src/main/java/com/hongyegroup/cpt_ewallet/ui/EWalletHistoryActivity.kt

@@ -173,7 +173,7 @@ class EWalletHistoryActivity : YYBaseVDBLoadingActivity<EWalletHistoryViewModel,
 
         //去历史详情页面
         fun gotoHistoryDetailPage() {
-            toast("去历史详情页面")
+            EWalletHistoryDetailJobActivity.startInstance()
         }
 
     }

cpt_ewallet/src/main/java/com/hongyegroup/cpt_ewallet/ui/EWalletHistoryDetailJobActivity.kt

@@ -0,0 +1,51 @@
+package com.hongyegroup.cpt_ewallet.ui
+
+import android.os.Bundle
+import com.guadou.cs_cptservices.base.activity.YYBaseVDBActivity
+import com.guadou.lib_baselib.bean.DataBindingConfig
+import com.guadou.lib_baselib.ext.commContext
+import com.guadou.lib_baselib.ext.gotoActivity
+import com.hongyegroup.cpt_ewallet.BR
+import com.hongyegroup.cpt_ewallet.R
+import com.hongyegroup.cpt_ewallet.databinding.ActivityHistoryDetailJobBinding
+import com.hongyegroup.cpt_ewallet.mvvm.HistortyDetailJobViewModel
+import dagger.hilt.android.AndroidEntryPoint
+
+/**
+ * 历史记录详情-兼职工作的发票详情
+ */
+@AndroidEntryPoint
+class EWalletHistoryDetailJobActivity : YYBaseVDBActivity<HistortyDetailJobViewModel, ActivityHistoryDetailJobBinding>() {
+
+    companion object {
+        fun startInstance() {
+            commContext().gotoActivity<EWalletHistoryDetailJobActivity>()
+        }
+    }
+
+    override fun getDataBindingConfig(): DataBindingConfig {
+        return DataBindingConfig(R.layout.activity_history_detail_job, BR.viewModel, mViewModel)
+            .addBindingParams(BR.click, ClickProxy())
+    }
+
+    override fun init(savedInstanceState: Bundle?) {
+        setStatusBarBlackText()
+
+
+    }
+
+    override fun startObserve() {
+
+    }
+
+    /**
+     * DataBinding事件处理
+     */
+    inner class ClickProxy {
+
+        fun gotoIssueSubmitPage() {
+            HistoryJobIssueActivity.startInstance()
+        }
+
+    }
+}

cpt_ewallet/src/main/java/com/hongyegroup/cpt_ewallet/ui/EWalletMainFragment.kt

@@ -106,7 +106,7 @@ class EWalletMainFragment(private val needBackLayout: Boolean) : YYBaseVDBFragme
 
         //去历史详情页面
         fun gotoHistoryDetailPage() {
-            toast("去历史详情页面")
+            EWalletHistoryDetailJobActivity.startInstance()
         }
 
         //去年度报表发票页面

cpt_ewallet/src/main/java/com/hongyegroup/cpt_ewallet/ui/HistoryJobIssueActivity.kt

@@ -0,0 +1,52 @@
+package com.hongyegroup.cpt_ewallet.ui
+
+import android.os.Bundle
+import com.guadou.cs_cptservices.base.activity.YYBaseVDBActivity
+import com.guadou.lib_baselib.bean.DataBindingConfig
+import com.guadou.lib_baselib.engine.toast
+import com.guadou.lib_baselib.ext.commContext
+import com.guadou.lib_baselib.ext.gotoActivity
+import com.hongyegroup.cpt_ewallet.BR
+import com.hongyegroup.cpt_ewallet.R
+import com.hongyegroup.cpt_ewallet.databinding.ActivityHistoryJobIssueBinding
+import com.hongyegroup.cpt_ewallet.mvvm.HistoryJobIssueViewModel
+import dagger.hilt.android.AndroidEntryPoint
+
+/**
+ * 钱包历史详情中，兼职工作发票详情的问题提交页面
+ */
+@AndroidEntryPoint
+class HistoryJobIssueActivity : YYBaseVDBActivity<HistoryJobIssueViewModel, ActivityHistoryJobIssueBinding>() {
+
+    companion object {
+        fun startInstance() {
+            commContext().gotoActivity<HistoryJobIssueActivity>()
+        }
+    }
+
+    override fun getDataBindingConfig(): DataBindingConfig {
+        return DataBindingConfig(R.layout.activity_history_job_issue, BR.viewModel, mViewModel)
+            .addBindingParams(BR.click, ClickProxy())
+    }
+
+    override fun init(savedInstanceState: Bundle?) {
+        setStatusBarBlackText()
+
+    }
+
+    override fun startObserve() {
+
+    }
+
+    /**
+     * DataBinding事件处理
+     */
+    inner class ClickProxy {
+
+        fun submitIssue() {
+            toast("提交问题")
+
+            HistoryJobIssueDetailActivity.startInstance()
+        }
+    }
+}

cpt_ewallet/src/main/java/com/hongyegroup/cpt_ewallet/ui/HistoryJobIssueDetailActivity.kt

@@ -0,0 +1,39 @@
+package com.hongyegroup.cpt_ewallet.ui
+
+import android.os.Bundle
+import com.guadou.cs_cptservices.base.activity.YYBaseVDBActivity
+import com.guadou.lib_baselib.bean.DataBindingConfig
+import com.guadou.lib_baselib.ext.commContext
+import com.guadou.lib_baselib.ext.gotoActivity
+import com.hongyegroup.cpt_ewallet.BR
+import com.hongyegroup.cpt_ewallet.R
+import com.hongyegroup.cpt_ewallet.databinding.ActivityHistoryJobIssueDetailBinding
+import com.hongyegroup.cpt_ewallet.mvvm.HistoryJobIssueDetailViewModel
+import dagger.hilt.android.AndroidEntryPoint
+
+/**
+ * 钱包历史详情中，兼职工作发票详情的问题提交页面详情展示
+ */
+@AndroidEntryPoint
+class HistoryJobIssueDetailActivity : YYBaseVDBActivity<HistoryJobIssueDetailViewModel, ActivityHistoryJobIssueDetailBinding>() {
+
+    companion object {
+        fun startInstance() {
+            commContext().gotoActivity<HistoryJobIssueDetailActivity>()
+        }
+    }
+
+    override fun getDataBindingConfig(): DataBindingConfig {
+        return DataBindingConfig(R.layout.activity_history_job_issue_detail, BR.viewModel, mViewModel)
+    }
+
+    override fun init(savedInstanceState: Bundle?) {
+        setStatusBarBlackText()
+
+    }
+
+    override fun startObserve() {
+
+    }
+
+}

cpt_ewallet/src/main/res/layout/activity_history_detail_job.xml

@@ -0,0 +1,569 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:binding="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="RtlHardcoded">
+
+    <data>
+
+        <variable
+            name="viewModel"
+            type="com.hongyegroup.cpt_ewallet.mvvm.HistortyDetailJobViewModel" />
+
+        <variable
+            name="click"
+            type="com.hongyegroup.cpt_ewallet.ui.EWalletHistoryDetailJobActivity.ClickProxy" />
+
+        <import type="android.text.TextUtils" />
+
+    </data>
+
+    <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: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="170dp"
+                    android:layout_marginLeft="@dimen/d_15dp"
+                    android:layout_marginTop="@dimen/d_15dp"
+                    android:layout_marginRight="@dimen/d_15dp"
+                    android:background="@drawable/iv_job_detail_bg"
+                    android:orientation="vertical">
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_20dp"
+                        android:layout_marginTop="@dimen/d_15dp"
+                        android:text="你的收入"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/d_16sp" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewBold
+                        android:id="@+id/tv_job_detail_earned"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_20dp"
+                        android:layout_marginTop="@dimen/d_5dp"
+                        android:text="93,026"
+                        android:textColor="@color/text_yellow_fed849"
+                        android:textSize="32sp" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d_30dp"
+                        android:orientation="horizontal"
+                        android:paddingLeft="@dimen/d_20dp">
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="付款人: "
+                            android:textColor="@color/white"
+                            android:textSize="@dimen/d_13sp" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                            android:id="@+id/tv_job_detail_paid_by"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_3dp"
+                            android:text="武汉瓜豆科技有限公司"
+                            android:textColor="@color/white"
+                            android:textSize="@dimen/d_13sp" />
+
+                    </LinearLayout>
+
+                    <TextView
+                        android:id="@+id/tv_job_detail_paid_date"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_20dp"
+                        android:layout_marginTop="@dimen/d_5dp"
+                        android:text="2022/07/08 10:30"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/d_12sp" />
+
+                </LinearLayout>
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_10dp"
+                    android:layout_marginTop="@dimen/d_17dp"
+                    android:background="@color/page_bg" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:paddingLeft="@dimen/d_20dp"
+                    android:paddingTop="@dimen/d_20dp"
+                    android:paddingBottom="@dimen/d_10dp">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/iv_job_detail_date" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:id="@+id/tv_job_detail_job_date"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_12dp"
+                        android:text="2022/07/08 周五"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/d_16sp" />
+
+                </LinearLayout>
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_0.5dp"
+                    android:background="@color/main_divide" />
+
+                <com.guadou.lib_baselib.font_text_view.TextViewBold
+                    android:id="@+id/tv_job_detail_employer_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d_15dp"
+                    android:paddingLeft="@dimen/d_20dp"
+                    android:text="香格里拉酒店宴会"
+                    android:textColor="@color/notify_dark_blue"
+                    android:textSize="@dimen/d_18sp" />
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="@dimen/d_20dp"
+                    android:paddingTop="@dimen/d_15dp"
+                    android:paddingBottom="@dimen/d_15dp">
+
+                    <ImageView
+                        android:id="@+id/iv_job_detail_image"
+                        android:layout_width="93.5dp"
+                        android:layout_height="68dp"
+                        android:background="@drawable/placeholder_img_job_img"
+                        android:scaleType="centerCrop" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:id="@+id/tv_job_detail_job_title"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_20dp"
+                        android:layout_toRightOf="@id/iv_job_detail_image"
+                        android:text="宴会服务"
+                        android:textColor="@color/text_yellow_ff9300"
+                        android:textSize="@dimen/d_16sp" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:id="@+id/tv_job_detail_job_time"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@id/tv_job_detail_job_title"
+                        android:layout_marginLeft="@dimen/d_20dp"
+                        android:layout_marginTop="@dimen/d_2dp"
+                        android:layout_toRightOf="@id/iv_job_detail_image"
+                        android:text="07:00-22:00"
+                        android:textColor="@color/gray_76"
+                        android:textSize="@dimen/d_14sp" />
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentBottom="true"
+                        android:layout_marginLeft="@dimen/d_20dp"
+                        android:layout_marginTop="@dimen/d_5dp"
+                        android:layout_toRightOf="@id/iv_job_detail_image"
+                        android:orientation="horizontal">
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="状态："
+                            android:textColor="@color/gray_76"
+                            android:textSize="@dimen/d_14sp" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                            android:id="@+id/tv_job_invoice_details_status"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="付款处理"
+                            android:textColor="@color/green_text_21b209"
+                            android:textSize="@dimen/d_14sp" />
+
+                    </LinearLayout>
+
+                </RelativeLayout>
+
+                <!--签到时间-->
+                <LinearLayout
+                    android:id="@+id/ll_job_details_start_time"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:paddingLeft="@dimen/d_15dp">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="1.5dp"
+                        android:src="@drawable/iv_job_detail_start_time" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:layout_width="83dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_4dp"
+                        android:text="开始时间："
+                        android:textColor="@color/gray_76"
+                        android:textSize="@dimen/d_14sp" />
+
+                    <TextView
+                        android:id="@+id/tv_job_detail_start_time"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="06:59"
+                        android:textColor="@color/gray_76"
+                        android:textSize="@dimen/d_14sp" />
+
+                </LinearLayout>
+
+                <!--签出时间-->
+                <LinearLayout
+                    android:id="@+id/ll_job_details_end_time"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d_5dp"
+                    android:gravity="center_vertical"
+                    android:paddingLeft="@dimen/d_15dp">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="1.5dp"
+                        android:src="@drawable/iv_job_detail_endtime" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:layout_width="83dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_4dp"
+                        android:text="结束时间："
+                        android:textColor="@color/gray_76"
+                        android:textSize="@dimen/d_14sp" />
+
+                    <TextView
+                        android:id="@+id/tv_job_detail_end_time"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="22:05"
+                        android:textColor="@color/gray_76"
+                        android:textSize="@dimen/d_14sp" />
+
+                </LinearLayout>
+
+                <!--额外时间-->
+                <LinearLayout
+                    android:id="@+id/ll_job_details_extra_time"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d_5dp"
+                    android:gravity="center_vertical"
+                    android:paddingLeft="@dimen/d_15dp">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="1.5dp"
+                        android:src="@drawable/iv_job_detail_sign" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:layout_width="83dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_4dp"
+                        android:text="+/- 小时："
+                        android:textColor="@color/gray_76"
+                        android:textSize="@dimen/d_14sp" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:id="@+id/tv_job_detail_hours"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="0"
+                        android:textColor="@color/gray_76"
+                        android:textSize="@dimen/d_14sp" />
+
+                </LinearLayout>
+
+                <!--总共时间-->
+                <LinearLayout
+                    android:id="@+id/ll_job_details_total_hours"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d_5dp"
+                    android:gravity="center_vertical"
+                    android:paddingLeft="@dimen/d_15dp">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="1.5dp"
+                        android:src="@drawable/iv_job_detail_t" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:layout_width="83dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_4dp"
+                        android:text="总时长："
+                        android:textColor="@color/gray_76"
+                        android:textSize="@dimen/d_14sp" />
+
+                    <TextView
+                        android:id="@+id/tv_job_detail_total_hours"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="12"
+                        android:textColor="@color/gray_76"
+                        android:textSize="@dimen/d_14sp" />
+
+                </LinearLayout>
+
+                <!--Hourly Rate-->
+                <LinearLayout
+                    android:id="@+id/ll_job_details_hourly_rate"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d_5dp"
+                    android:gravity="center_vertical"
+                    android:paddingLeft="@dimen/d_15dp">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="1.5dp"
+                        android:src="@drawable/iv_job_detail_rate" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:layout_width="83dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_4dp"
+                        android:text="小时单价："
+                        android:textColor="@color/gray_76"
+                        android:textSize="@dimen/d_14sp" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:id="@+id/tv_job_detail_hourly_rate"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="8.5 / 小时"
+                        android:textColor="@color/gray_76"
+                        android:textSize="@dimen/d_14sp" />
+
+                </LinearLayout>
+
+                <!--Deduction-->
+                <LinearLayout
+                    android:id="@+id/ll_job_details_deduction"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d_5dp"
+                    android:gravity="center_vertical"
+                    android:paddingLeft="@dimen/d_15dp">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/iv_job_detail_deduction" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:layout_width="83dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_4dp"
+                        android:text="扣除:"
+                        android:textColor="@color/gray_76"
+                        android:textSize="@dimen/d_14sp" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:id="@+id/tv_job_detail_deduction"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="￥15"
+                        android:textColor="@color/text_yellow_ff9300"
+                        android:textSize="@dimen/d_14sp" />
+
+                </LinearLayout>
+
+                <!--CPF-->
+                <!--                <LinearLayout-->
+                <!--                    android:layout_width="match_parent"-->
+                <!--                    android:layout_height="wrap_content"-->
+                <!--                    android:paddingLeft="@dimen/d_15dp"-->
+                <!--                    android:paddingTop="@dimen/d_5dp"-->
+                <!--                    android:paddingBottom="@dimen/d_5dp">-->
+
+                <!--                    <ImageView-->
+                <!--                        android:layout_width="wrap_content"-->
+                <!--                        android:layout_height="wrap_content"-->
+                <!--                        android:src="@drawable/iv_job_detail_deduction" />-->
+
+                <!--                    <com.guadou.componentservice.font_text_view.TextViewRegular-->
+                <!--                        android:layout_width="wrap_content"-->
+                <!--                        android:layout_height="wrap_content"-->
+                <!--                        android:layout_marginLeft="@dimen/d_4dp"-->
+                <!--                        android:text="@string/job_detail_cpf_deduction"-->
+                <!--                        android:textColor="@color/gray_item_transaction_history"-->
+                <!--                        android:textSize="@dimen/sp_14" />-->
+
+                <!--                    <TextView-->
+                <!--                        android:id="@+id/tv_job_detail_cpf_deduction"-->
+                <!--                        android:layout_width="wrap_content"-->
+                <!--                        android:layout_height="wrap_content"-->
+                <!--                        android:layout_marginLeft="@dimen/d_5dp"-->
+                <!--                        android:text="S$-"-->
+                <!--                        android:textColor="@color/gray_item_transaction_history"-->
+                <!--                        android:textSize="@dimen/d_14sp" />-->
+
+                <!--                </LinearLayout>-->
+
+                <!--Employer-->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d_5dp"
+                    android:gravity="center_vertical"
+                    android:paddingLeft="@dimen/d_15dp">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="1.5dp"
+                        android:src="@drawable/iv_job_details_employer" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:layout_width="83dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_4dp"
+                        android:text="雇主:"
+                        android:textColor="@color/gray_76"
+                        android:textSize="@dimen/sp_14" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:id="@+id/tv_job_detail_employer"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="杰森"
+                        android:textColor="@color/gray_76"
+                        android:textSize="@dimen/d_14sp" />
+
+                </LinearLayout>
+
+                <!--Remark-->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d_5dp"
+                    android:gravity="center_vertical"
+                    android:paddingLeft="@dimen/d_15dp">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="1.5dp"
+                        android:src="@drawable/iv_job_detail_remark" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:layout_width="83dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_4dp"
+                        android:text="备注："
+                        android:textColor="@color/gray_76"
+                        android:textSize="@dimen/d_14sp" />
+
+                    <TextView
+                        android:id="@+id/tv_giro_detail_remark"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="无"
+                        android:textColor="@color/gray_76"
+                        android:textSize="@dimen/d_14sp" />
+
+                </LinearLayout>
+
+                <!--Note-->
+                <LinearLayout
+                    android:id="@+id/ll_job_detail_note"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d_5dp"
+                    android:gravity="start"
+                    android:paddingLeft="@dimen/d_15dp">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/iv_job_detail_note" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:layout_width="83dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_4dp"
+                        android:layout_marginTop="1.5dp"
+                        android:text="说明："
+                        android:textColor="@color/gray_76"
+                        android:textSize="@dimen/d_14sp" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:id="@+id/tv_giro_detail_note"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="1.5dp"
+                        android:paddingRight="@dimen/d_10dp"
+                        android:text="有一些修改，请注意。 这是一个额外的记录。如果您想查看整个记录，请到交易历史页面查看详细信息。"
+                        android:textColor="@color/gray_76"
+                        android:textSize="@dimen/d_14sp" />
+
+                </LinearLayout>
+
+                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/d_35dp"
+                    android:layout_marginTop="@dimen/d_35dp"
+                    android:layout_marginRight="@dimen/d_35dp"
+                    android:layout_marginBottom="@dimen/d_40dp"
+                    android:background="@drawable/selector_app_blue_button_round2_bg"
+                    android:gravity="center"
+                    android:padding="@dimen/d_12dp"
+                    android:text="报告问题"
+                    android:textColor="@color/white_text_fe"
+                    android:textSize="@dimen/d_16sp"
+                    binding:clicks="@{click.gotoIssueSubmitPage}" />
+
+            </LinearLayout>
+
+        </ScrollView>
+
+    </LinearLayout>
+
+</layout>

cpt_ewallet/src/main/res/layout/activity_history_job_issue.xml

@@ -0,0 +1,729 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:binding="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="RtlHardcoded">
+
+    <data>
+
+        <variable
+            name="viewModel"
+            type="com.hongyegroup.cpt_ewallet.mvvm.HistoryJobIssueViewModel" />
+
+        <variable
+            name="click"
+            type="com.hongyegroup.cpt_ewallet.ui.HistoryJobIssueActivity.ClickProxy" />
+
+        <import type="android.text.TextUtils" />
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        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">
+
+                <!--Employer Name-->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d_10dp"
+                    android:orientation="horizontal"
+                    android:paddingTop="@dimen/d_10dp"
+                    android:paddingBottom="@dimen/d_10dp">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:src="@drawable/iv_part_time_employer_name_icon" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_10dp"
+                        android:layout_marginRight="@dimen/d_5dp"
+                        android:orientation="vertical">
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="雇主名字"
+                            android:textColor="@color/gray_text"
+                            android:textSize="@dimen/d_15sp" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                            android:id="@+id/tv_submit_issue_employer_name"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/d_5dp"
+                            android:layout_marginRight="@dimen/d_15dp"
+                            android:text="武汉瓜豆科技有限公司"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/d_15sp" />
+
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_1dp"
+                    android:layout_marginLeft="@dimen/d_15dp"
+                    android:layout_marginRight="@dimen/d_15dp"
+                    android:src="@color/page_bg" />
+
+                <!--Job Date-->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="52dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:src="@drawable/iv_part_time_job_date_icon" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_10dp"
+                        android:layout_weight="1"
+                        android:text="工作日期"
+                        android:textColor="@color/gray_text"
+                        android:textSize="@dimen/d_15sp" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:id="@+id/tv_submit_issue_date"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="@dimen/d_15dp"
+                        android:text="2022/07/08"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/d_15sp" />
+
+                </LinearLayout>
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_1dp"
+                    android:layout_marginLeft="@dimen/d_15dp"
+                    android:layout_marginRight="@dimen/d_15dp"
+                    android:src="@color/page_bg" />
+
+                <!--Start Time-->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="52dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:src="@drawable/iv_part_time_start_time_icon" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_10dp"
+                        android:layout_weight="1"
+                        android:text="开始时间"
+                        android:textColor="@color/gray_text"
+                        android:textSize="@dimen/d_15sp" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:id="@+id/tv_submit_issue_start_time"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="@dimen/d_15dp"
+                        android:text="08:00"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/d_15sp" />
+
+                </LinearLayout>
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_1dp"
+                    android:layout_marginLeft="@dimen/d_15dp"
+                    android:layout_marginRight="@dimen/d_15dp"
+                    android:src="@color/page_bg" />
+
+                <!--End Time-->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="52dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:src="@drawable/iv_part_time_end_time_icon" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_10dp"
+                        android:layout_weight="1"
+                        android:text="结束时间"
+                        android:textColor="@color/gray_text"
+                        android:textSize="@dimen/d_15sp" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:id="@+id/tv_submit_issue_end_time"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="@dimen/d_15dp"
+                        android:text="21:00"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/d_15sp" />
+
+                </LinearLayout>
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_1dp"
+                    android:layout_marginLeft="@dimen/d_15dp"
+                    android:layout_marginRight="@dimen/d_15dp"
+                    android:src="@color/page_bg" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="52dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:src="@drawable/iv_part_time_end_time_icon" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_10dp"
+                        android:text="总时长"
+                        android:textColor="@color/gray_text"
+                        android:textSize="@dimen/d_15sp" />
+
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="1dp"
+                        android:layout_weight="1" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:id="@+id/tv_issue_top_total_hours"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="@dimen/d_3dp"
+                        android:text="8"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/d_15sp"
+                        tools:text="5" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="@dimen/d_15dp"
+                        android:text="小时"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/d_15sp" />
+
+                </LinearLayout>
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_1dp"
+                    android:layout_marginLeft="@dimen/d_15dp"
+                    android:layout_marginRight="@dimen/d_15dp"
+                    android:src="@color/page_bg" />
+
+                <!--My Hourly Rate-->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="52dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:src="@drawable/iv_part_time_hourly_rate_icon" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_10dp"
+                        android:layout_weight="1"
+                        android:text="小时单价"
+                        android:textColor="@color/gray_text"
+                        android:textSize="@dimen/d_15sp" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:id="@+id/tv_submit_issue_hourly_rate"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="@dimen/d_15dp"
+                        android:text="8.5/小时"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/d_15sp" />
+
+                </LinearLayout>
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_1dp"
+                    android:layout_marginLeft="@dimen/d_15dp"
+                    android:layout_marginRight="@dimen/d_15dp"
+                    android:src="@color/page_bg" />
+
+                <!--My Payment-->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="52dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:src="@drawable/iv_part_time_hourly_rate_icon" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_10dp"
+                        android:layout_weight="1"
+                        android:text="总付款"
+                        android:textColor="@color/gray_text"
+                        android:textSize="@dimen/d_15sp" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:id="@+id/tv_submit_issue_my_payment"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="@dimen/d_15dp"
+                        android:text="119"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/d_15sp" />
+
+                </LinearLayout>
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_1dp"
+                    android:layout_marginLeft="@dimen/d_15dp"
+                    android:layout_marginRight="@dimen/d_15dp"
+                    android:src="@color/page_bg" />
+
+                <!--      CPF Deduction      -->
+                <!--                <LinearLayout-->
+                <!--                    android:id="@+id/ll_cpf_deduction"-->
+                <!--                    android:layout_width="match_parent"-->
+                <!--                    android:layout_height="wrap_content"-->
+                <!--                    android:orientation="vertical">-->
+
+                <!--                    <LinearLayout-->
+                <!--                        android:layout_width="match_parent"-->
+                <!--                        android:layout_height="52dp"-->
+                <!--                        android:gravity="center_vertical"-->
+                <!--                        android:orientation="horizontal">-->
+
+                <!--                        <ImageView-->
+                <!--                            android:layout_width="wrap_content"-->
+                <!--                            android:layout_height="wrap_content"-->
+                <!--                            android:layout_marginLeft="@dimen/d_15dp"-->
+                <!--                            android:src="@drawable/iv_part_time_hourly_rate_icon" />-->
+
+                <!--                        <com.guadou.componentservice.font_text_view.TextViewRegular-->
+                <!--                            android:layout_width="0dp"-->
+                <!--                            android:layout_height="wrap_content"-->
+                <!--                            android:layout_marginLeft="@dimen/d_10dp"-->
+                <!--                            android:layout_weight="1"-->
+                <!--                            android:text="@string/cpf_deduction"-->
+                <!--                            android:textColor="@color/gray_text"-->
+                <!--                            android:textSize="@dimen/d_14sp" />-->
+
+                <!--                        <com.guadou.componentservice.font_text_view.TextViewRegular-->
+                <!--                            android:id="@+id/tv_cpf_deduction"-->
+                <!--                            android:layout_width="wrap_content"-->
+                <!--                            android:layout_height="wrap_content"-->
+                <!--                            android:layout_marginRight="@dimen/d_15dp"-->
+                <!--                            android:text="-"-->
+                <!--                            android:textColor="@color/black"-->
+                <!--                            android:textSize="@dimen/d_14sp" />-->
+
+                <!--                    </LinearLayout>-->
+
+                <!--                    <ImageView-->
+                <!--                        android:layout_width="match_parent"-->
+                <!--                        android:layout_height="@dimen/d_1dp"-->
+                <!--                        android:layout_marginLeft="@dimen/d_15dp"-->
+                <!--                        android:layout_marginRight="@dimen/d_15dp"-->
+                <!--                        android:src="@color/diver" />-->
+
+                <!--                </LinearLayout>-->
+
+                <!--Appeal Type-->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="52dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:src="@drawable/iv_part_time_issue_appeal_type_icon" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_10dp"
+                        android:text="上述类型"
+                        android:textColor="@color/gray_text"
+                        android:textSize="@dimen/d_15sp" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:id="@+id/tv_issue_appeal_type"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:layout_marginRight="@dimen/d_15dp"
+                        android:layout_weight="1"
+                        android:gravity="right"
+                        android:text="付款方式的调整"
+                        android:textColor="@color/app_blue"
+                        android:textSize="@dimen/d_14sp" />
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="@dimen/d_15dp"
+                        android:src="@drawable/drop_down"
+                        android:visibility="gone"
+                        app:tint="#919191"
+                        tools:tint="#FF919191" />
+
+                </LinearLayout>
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_1dp"
+                    android:layout_marginLeft="@dimen/d_15dp"
+                    android:layout_marginRight="@dimen/d_15dp"
+                    android:src="@color/page_bg" />
+
+                <LinearLayout
+                    android:id="@+id/ll_appeal_type_box"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:orientation="vertical"
+                    android:visibility="visible">
+
+                    <!--   修订时薪   -->
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="52dp"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
+
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_15dp"
+                            android:src="@drawable/iv_part_time_total_amount_icon" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_10dp"
+                            android:drawableRight="@drawable/bitian_icon"
+                            android:text="修订时薪"
+                            android:textColor="@color/gray_text"
+                            android:textSize="@dimen/d_15sp" />
+
+                        <View
+                            android:layout_width="0dp"
+                            android:layout_height="1dp"
+                            android:layout_weight="1" />
+
+                        <EditText
+                            android:id="@+id/et_hourly_rate"
+                            android:layout_width="68dp"
+                            android:layout_height="@dimen/d_35dp"
+                            android:layout_marginRight="@dimen/d_7dp"
+                            android:background="@drawable/shape_gray_bg_border_line"
+                            android:gravity="right|center_vertical"
+                            android:inputType="numberDecimal"
+                            android:paddingLeft="@dimen/d_10dp"
+                            android:paddingRight="@dimen/d_10dp"
+                            android:textColor="@color/app_blue"
+                            android:textSize="@dimen/d_15sp"
+                            tools:text="8.5" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginRight="@dimen/d_15dp"
+                            android:text="/小时"
+                            android:textColor="@color/app_blue"
+                            android:textSize="@dimen/d_15sp" />
+
+                    </LinearLayout>
+
+                    <!--  修订小时  -->
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="52dp"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
+
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_15dp"
+                            android:src="@drawable/iv_part_time_issue_total_hours_icon" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_10dp"
+                            android:drawableRight="@drawable/bitian_icon"
+                            android:text="修订总时数"
+                            android:textColor="@color/gray_text"
+                            android:textSize="@dimen/d_15sp" />
+
+                        <View
+                            android:layout_width="0dp"
+                            android:layout_height="1dp"
+                            android:layout_weight="1" />
+
+                        <EditText
+                            android:layout_width="68dp"
+                            android:layout_height="@dimen/d_35dp"
+                            android:layout_marginRight="@dimen/d_7dp"
+                            android:background="@drawable/shape_gray_bg_border_line"
+                            android:gravity="right|center_vertical"
+                            android:inputType="numberDecimal"
+                            android:paddingLeft="@dimen/d_10dp"
+                            android:paddingRight="@dimen/d_10dp"
+                            android:textColor="@color/app_blue"
+                            android:textSize="@dimen/d_15sp"
+                            tools:text="8.5" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginRight="@dimen/d_15dp"
+                            android:text="小时"
+                            android:textColor="@color/app_blue"
+                            android:textSize="@dimen/d_15sp" />
+
+                    </LinearLayout>
+
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/d_1dp"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:layout_marginRight="@dimen/d_15dp"
+                        android:src="@color/page_bg" />
+
+                </LinearLayout>
+
+                <!--总金额差额-->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="52dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:paddingTop="@dimen/d_10dp"
+                    android:paddingBottom="@dimen/d_10dp">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:src="@drawable/iv_part_time_total_amount_icon" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_10dp"
+                        android:drawableRight="@drawable/bitian_icon"
+                        android:text="总金额差额"
+                        android:textColor="@color/gray_text"
+                        android:textSize="@dimen/d_14sp" />
+
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="1dp"
+                        android:layout_weight="1" />
+
+                    <com.guadou.cs_cptservices.widget.LoadRetryTextView
+                        android:id="@+id/loadview_total_amount"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d_5dp"
+                        android:layout_marginRight="@dimen/d_15dp"
+                        android:layout_marginBottom="@dimen/d_5dp" />
+
+                </LinearLayout>
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_1dp"
+                    android:layout_marginLeft="@dimen/d_15dp"
+                    android:layout_marginRight="@dimen/d_15dp"
+                    android:src="@color/page_bg" />
+
+                <!--  公积金短缺 -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="52dp"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
+
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_15dp"
+                            android:src="@drawable/iv_part_time_total_amount_icon" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_10dp"
+                            android:text="公积金差额"
+                            android:textColor="@color/gray_text"
+                            android:textSize="@dimen/d_15sp" />
+
+                        <View
+                            android:layout_width="0dp"
+                            android:layout_height="1dp"
+                            android:layout_weight="1" />
+
+                        <com.guadou.cs_cptservices.widget.LoadRetryTextView
+                            android:id="@+id/loadview_cpf_shortage"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/d_5dp"
+                            android:layout_marginRight="@dimen/d_15dp"
+                            android:layout_marginBottom="@dimen/d_5dp" />
+
+                    </LinearLayout>
+
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/d_1dp"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:layout_marginRight="@dimen/d_15dp"
+                        android:src="@color/page_bg" />
+
+                </LinearLayout>
+
+                <!--Issue Description-->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d_10dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:paddingTop="@dimen/d_10dp"
+                    android:paddingBottom="@dimen/d_10dp">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:src="@drawable/iv_part_time_write_blue_icon" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_10dp"
+                        android:drawableRight="@drawable/bitian_icon"
+                        android:text="问题描述"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/d_15sp" />
+
+                </LinearLayout>
+
+                <EditText
+                    android:id="@+id/et_submit_issue_des"
+                    android:layout_width="match_parent"
+                    android:layout_height="196dp"
+                    android:layout_marginLeft="@dimen/d_15dp"
+                    android:layout_marginTop="@dimen/d_10dp"
+                    android:layout_marginRight="@dimen/d_15dp"
+                    android:background="@drawable/shape_gray_bg_border_line"
+                    android:gravity="top|left"
+                    android:maxLines="9999"
+                    android:paddingLeft="@dimen/d_10dp"
+                    android:paddingTop="@dimen/d_15dp"
+                    android:paddingRight="@dimen/d_10dp"
+                    android:paddingBottom="@dimen/d_15dp"
+                    android:textColor="@color/black"
+                    binding:typefaceMedium="@{true}"
+                    android:textSize="@dimen/d_15sp" />
+
+                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_42dp"
+                    android:layout_marginLeft="@dimen/d_20dp"
+                    android:layout_marginTop="@dimen/d_30dp"
+                    android:layout_marginRight="@dimen/d_20dp"
+                    android:layout_marginBottom="@dimen/d_50dp"
+                    android:background="@drawable/selector_app_blue_button_round2_bg"
+                    android:gravity="center"
+                    android:text="提交"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/d_16sp"
+                    binding:clicks="@{click.submitIssue}" />
+
+            </LinearLayout>
+
+        </ScrollView>
+
+    </LinearLayout>
+
+</layout>

cpt_ewallet/src/main/res/layout/activity_history_job_issue_detail.xml

@@ -0,0 +1,792 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:binding="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="RtlHardcoded">
+
+    <data>
+
+        <variable
+            name="viewModel"
+            type="com.hongyegroup.cpt_ewallet.mvvm.HistoryJobIssueDetailViewModel" />
+
+        <import type="android.text.TextUtils" />
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        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">
+
+                <!--Employer Name-->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d_10dp"
+                    android:orientation="horizontal"
+                    android:paddingTop="@dimen/d_10dp"
+                    android:paddingBottom="@dimen/d_10dp">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:src="@drawable/iv_part_time_employer_name_icon" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_10dp"
+                        android:layout_marginRight="@dimen/d_5dp"
+                        android:orientation="vertical">
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="雇主名字"
+                            android:textColor="@color/gray_text"
+                            android:textSize="@dimen/d_15sp" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                            android:id="@+id/tv_submit_issue_employer_name"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/d_5dp"
+                            android:layout_marginRight="@dimen/d_15dp"
+                            android:text="武汉瓜豆科技有限公司"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/d_15sp" />
+
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_1dp"
+                    android:layout_marginLeft="@dimen/d_15dp"
+                    android:layout_marginRight="@dimen/d_15dp"
+                    android:src="@color/page_bg" />
+
+                <!--Job Date-->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="52dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:src="@drawable/iv_part_time_job_date_icon" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_10dp"
+                        android:layout_weight="1"
+                        android:text="工作日期"
+                        android:textColor="@color/gray_text"
+                        android:textSize="@dimen/d_15sp" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:id="@+id/tv_submit_issue_date"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="@dimen/d_15dp"
+                        android:text="2022/07/08"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/d_15sp" />
+
+                </LinearLayout>
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_1dp"
+                    android:layout_marginLeft="@dimen/d_15dp"
+                    android:layout_marginRight="@dimen/d_15dp"
+                    android:src="@color/page_bg" />
+
+                <!--Start Time-->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="52dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:src="@drawable/iv_part_time_start_time_icon" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_10dp"
+                        android:layout_weight="1"
+                        android:text="开始时间"
+                        android:textColor="@color/gray_text"
+                        android:textSize="@dimen/d_15sp" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:id="@+id/tv_submit_issue_start_time"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="@dimen/d_15dp"
+                        android:text="08:00"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/d_15sp" />
+
+                </LinearLayout>
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_1dp"
+                    android:layout_marginLeft="@dimen/d_15dp"
+                    android:layout_marginRight="@dimen/d_15dp"
+                    android:src="@color/page_bg" />
+
+                <!--End Time-->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="52dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:src="@drawable/iv_part_time_end_time_icon" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_10dp"
+                        android:layout_weight="1"
+                        android:text="结束时间"
+                        android:textColor="@color/gray_text"
+                        android:textSize="@dimen/d_15sp" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:id="@+id/tv_submit_issue_end_time"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="@dimen/d_15dp"
+                        android:text="21:00"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/d_15sp" />
+
+                </LinearLayout>
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_1dp"
+                    android:layout_marginLeft="@dimen/d_15dp"
+                    android:layout_marginRight="@dimen/d_15dp"
+                    android:src="@color/page_bg" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="52dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:src="@drawable/iv_part_time_end_time_icon" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_10dp"
+                        android:text="总时长"
+                        android:textColor="@color/gray_text"
+                        android:textSize="@dimen/d_15sp" />
+
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="1dp"
+                        android:layout_weight="1" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:id="@+id/tv_issue_top_total_hours"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="@dimen/d_3dp"
+                        android:text="8"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/d_15sp"
+                        tools:text="5" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="@dimen/d_15dp"
+                        android:text="小时"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/d_15sp" />
+
+                </LinearLayout>
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_1dp"
+                    android:layout_marginLeft="@dimen/d_15dp"
+                    android:layout_marginRight="@dimen/d_15dp"
+                    android:src="@color/page_bg" />
+
+                <!--My Hourly Rate-->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="52dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:src="@drawable/iv_part_time_hourly_rate_icon" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_10dp"
+                        android:layout_weight="1"
+                        android:text="小时单价"
+                        android:textColor="@color/gray_text"
+                        android:textSize="@dimen/d_15sp" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:id="@+id/tv_submit_issue_hourly_rate"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="@dimen/d_15dp"
+                        android:text="8.5/小时"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/d_15sp" />
+
+                </LinearLayout>
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_1dp"
+                    android:layout_marginLeft="@dimen/d_15dp"
+                    android:layout_marginRight="@dimen/d_15dp"
+                    android:src="@color/page_bg" />
+
+                <!--My Payment-->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="52dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:src="@drawable/iv_part_time_hourly_rate_icon" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_10dp"
+                        android:layout_weight="1"
+                        android:text="总付款"
+                        android:textColor="@color/gray_text"
+                        android:textSize="@dimen/d_15sp" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:id="@+id/tv_submit_issue_my_payment"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="@dimen/d_15dp"
+                        android:text="119"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/d_15sp" />
+
+                </LinearLayout>
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_1dp"
+                    android:layout_marginLeft="@dimen/d_15dp"
+                    android:layout_marginRight="@dimen/d_15dp"
+                    android:src="@color/page_bg" />
+
+                <!--      CPF Deduction      -->
+                <!--                <LinearLayout-->
+                <!--                    android:id="@+id/ll_cpf_deduction"-->
+                <!--                    android:layout_width="match_parent"-->
+                <!--                    android:layout_height="wrap_content"-->
+                <!--                    android:orientation="vertical">-->
+
+                <!--                    <LinearLayout-->
+                <!--                        android:layout_width="match_parent"-->
+                <!--                        android:layout_height="52dp"-->
+                <!--                        android:gravity="center_vertical"-->
+                <!--                        android:orientation="horizontal">-->
+
+                <!--                        <ImageView-->
+                <!--                            android:layout_width="wrap_content"-->
+                <!--                            android:layout_height="wrap_content"-->
+                <!--                            android:layout_marginLeft="@dimen/d_15dp"-->
+                <!--                            android:src="@drawable/iv_part_time_hourly_rate_icon" />-->
+
+                <!--                        <com.guadou.componentservice.font_text_view.TextViewRegular-->
+                <!--                            android:layout_width="0dp"-->
+                <!--                            android:layout_height="wrap_content"-->
+                <!--                            android:layout_marginLeft="@dimen/d_10dp"-->
+                <!--                            android:layout_weight="1"-->
+                <!--                            android:text="@string/cpf_deduction"-->
+                <!--                            android:textColor="@color/gray_text"-->
+                <!--                            android:textSize="@dimen/d_14sp" />-->
+
+                <!--                        <com.guadou.componentservice.font_text_view.TextViewRegular-->
+                <!--                            android:id="@+id/tv_cpf_deduction"-->
+                <!--                            android:layout_width="wrap_content"-->
+                <!--                            android:layout_height="wrap_content"-->
+                <!--                            android:layout_marginRight="@dimen/d_15dp"-->
+                <!--                            android:text="-"-->
+                <!--                            android:textColor="@color/black"-->
+                <!--                            android:textSize="@dimen/d_14sp" />-->
+
+                <!--                    </LinearLayout>-->
+
+                <!--                    <ImageView-->
+                <!--                        android:layout_width="match_parent"-->
+                <!--                        android:layout_height="@dimen/d_1dp"-->
+                <!--                        android:layout_marginLeft="@dimen/d_15dp"-->
+                <!--                        android:layout_marginRight="@dimen/d_15dp"-->
+                <!--                        android:src="@color/diver" />-->
+
+                <!--                </LinearLayout>-->
+
+                <!--Appeal Type-->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="52dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:src="@drawable/iv_part_time_issue_appeal_type_icon" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_10dp"
+                        android:text="上述类型"
+                        android:textColor="@color/gray_text"
+                        android:textSize="@dimen/d_15sp" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:id="@+id/tv_issue_appeal_type"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:layout_marginRight="@dimen/d_15dp"
+                        android:layout_weight="1"
+                        android:gravity="right"
+                        android:text="付款方式的调整"
+                        android:textColor="@color/app_blue"
+                        android:textSize="@dimen/d_14sp" />
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="@dimen/d_15dp"
+                        android:src="@drawable/drop_down"
+                        android:visibility="gone"
+                        app:tint="#919191"
+                        tools:tint="#FF919191" />
+
+                </LinearLayout>
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_1dp"
+                    android:layout_marginLeft="@dimen/d_15dp"
+                    android:layout_marginRight="@dimen/d_15dp"
+                    android:src="@color/page_bg" />
+
+                <LinearLayout
+                    android:id="@+id/ll_appeal_type_box"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:orientation="vertical"
+                    android:visibility="visible">
+
+                    <!--   修订时薪   -->
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="52dp"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
+
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_15dp"
+                            android:src="@drawable/iv_part_time_total_amount_icon" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_10dp"
+                            android:drawableRight="@drawable/bitian_icon"
+                            android:text="修订时薪"
+                            android:textColor="@color/gray_text"
+                            android:textSize="@dimen/d_15sp" />
+
+                        <View
+                            android:layout_width="0dp"
+                            android:layout_height="1dp"
+                            android:layout_weight="1" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginRight="@dimen/d_15dp"
+                            android:text="8.5 / 小时"
+                            android:textColor="@color/app_blue"
+                            android:textSize="@dimen/d_15sp" />
+
+                    </LinearLayout>
+
+                    <!--  修订小时  -->
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="52dp"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
+
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_15dp"
+                            android:src="@drawable/iv_part_time_issue_total_hours_icon" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_10dp"
+                            android:drawableRight="@drawable/bitian_icon"
+                            android:text="修订总时数"
+                            android:textColor="@color/gray_text"
+                            android:textSize="@dimen/d_15sp" />
+
+                        <View
+                            android:layout_width="0dp"
+                            android:layout_height="1dp"
+                            android:layout_weight="1" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginRight="@dimen/d_15dp"
+                            android:text="8 小时"
+                            android:textColor="@color/app_blue"
+                            android:textSize="@dimen/d_15sp" />
+
+                    </LinearLayout>
+
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/d_1dp"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:layout_marginRight="@dimen/d_15dp"
+                        android:src="@color/page_bg" />
+
+                </LinearLayout>
+
+                <!--总金额差额-->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="52dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:paddingTop="@dimen/d_10dp"
+                    android:paddingBottom="@dimen/d_10dp">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:src="@drawable/iv_part_time_total_amount_icon" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_10dp"
+                        android:drawableRight="@drawable/bitian_icon"
+                        android:text="总金额差额"
+                        android:textColor="@color/gray_text"
+                        android:textSize="@dimen/d_14sp" />
+
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="1dp"
+                        android:layout_weight="1" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="@dimen/d_15dp"
+                        android:text="23.00"
+                        android:textColor="@color/app_blue"
+                        android:textSize="@dimen/d_15sp" />
+
+                </LinearLayout>
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_1dp"
+                    android:layout_marginLeft="@dimen/d_15dp"
+                    android:layout_marginRight="@dimen/d_15dp"
+                    android:src="@color/page_bg" />
+
+                <!--  公积金短缺 -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="52dp"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
+
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_15dp"
+                            android:src="@drawable/iv_part_time_total_amount_icon" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_10dp"
+                            android:text="公积金差额"
+                            android:textColor="@color/gray_text"
+                            android:textSize="@dimen/d_15sp" />
+
+                        <View
+                            android:layout_width="0dp"
+                            android:layout_height="1dp"
+                            android:layout_weight="1" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginRight="@dimen/d_15dp"
+                            android:text="6"
+                            android:textColor="@color/app_blue"
+                            android:textSize="@dimen/d_15sp" />
+
+                    </LinearLayout>
+
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/d_1dp"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:layout_marginRight="@dimen/d_15dp"
+                        android:src="@color/page_bg" />
+
+                </LinearLayout>
+
+                <!--Issue Description-->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d_10dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:paddingTop="@dimen/d_10dp"
+                    android:paddingBottom="@dimen/d_10dp">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:src="@drawable/iv_enquiry_giro_status_date" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_10dp"
+                        android:text="上诉日期: 2022/07/08"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/d_15sp" />
+
+                </LinearLayout>
+
+                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                    android:id="@+id/et_submit_issue_des"
+                    android:layout_width="match_parent"
+                    android:layout_height="196dp"
+                    android:layout_marginLeft="@dimen/d_15dp"
+                    android:layout_marginTop="@dimen/d_10dp"
+                    android:layout_marginRight="@dimen/d_15dp"
+                    android:background="@drawable/shape_gray_bg_border_line"
+                    android:gravity="top|left"
+                    android:maxLines="9999"
+                    android:paddingLeft="@dimen/d_10dp"
+                    android:paddingTop="@dimen/d_15dp"
+                    android:paddingRight="@dimen/d_10dp"
+                    android:paddingBottom="@dimen/d_15dp"
+                    android:text="我已经提交申请很久了，为什么状态还悬而未决，我想知道为什么，请尽快回复我，谢谢。"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/d_15sp" />
+
+                <!--   当前报告的状态      -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d_10dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:paddingTop="@dimen/d_10dp">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:src="@drawable/iv_issue_status_icon" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_10dp"
+                        android:text="你现时的上诉状态:"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/d_16sp" />
+
+                </LinearLayout>
+
+                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                    android:id="@+id/tv_issue_appeal_status"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="52dp"
+                    android:text="等待批准"
+                    android:textColor="@color/app_blue"
+                    android:textSize="@dimen/d_16sp" />
+
+
+                <!--   需要等待的时间      -->
+                <LinearLayout
+                    android:id="@+id/ll_wait_time"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d_15dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:paddingTop="@dimen/d_10dp">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:src="@drawable/iv_issue_wait_icon" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:id="@+id/tv_wait_time"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_10dp"
+                        android:layout_marginRight="@dimen/d_30dp"
+                        android:text="审批流程需要3个工作日，请知悉。"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/d_15sp" />
+
+                </LinearLayout>
+
+                <!--Reply Date-->
+                <LinearLayout
+                    android:id="@+id/ll_issue_detail_reply_date"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d_15dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:paddingTop="@dimen/d_10dp"
+                    android:paddingBottom="@dimen/d_10dp">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:src="@drawable/iv_enquiry_giro_status_reply" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:id="@+id/tv_issue_detail_reply_date"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_10dp"
+                        android:text="回复日期: 2022/07/08 15:30:54"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/d_16sp" />
+
+                </LinearLayout>
+
+                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                    android:id="@+id/tv_issue_detail_reply"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/d_15dp"
+                    android:layout_marginTop="@dimen/d_10dp"
+                    android:layout_marginRight="@dimen/d_15dp"
+                    android:layout_marginBottom="@dimen/d_40dp"
+                    android:background="@drawable/shape_gray_bg_border_line"
+                    android:minHeight="160dp"
+                    android:paddingLeft="@dimen/d_10dp"
+                    android:paddingTop="@dimen/d_15dp"
+                    android:paddingRight="@dimen/d_10dp"
+                    android:paddingBottom="@dimen/d_15dp"
+                    android:text="很抱歉让您久等了。由于公司的系统问题和银行账户问题，我们已经很久没有收到你的申请了。现在我们正在帮你尽快处理，请耐心等待三天。"
+                    android:textColor="@color/profile_red"
+                    android:textSize="@dimen/d_15sp" />
+
+            </LinearLayout>
+
+        </ScrollView>
+
+    </LinearLayout>
+
+</layout>

cpt_ewallet/src/main/res/layout/fragment_ewallet_main.xml

@@ -109,7 +109,7 @@
                                 android:layout_height="wrap_content"
                                 android:text="提现金额:"
                                 android:textColor="@color/white"
-                                android:textSize="@dimen/d_13sp" />
+                                android:textSize="@dimen/d_12sp" />
 
                             <com.guadou.lib_baselib.font_text_view.TextViewBold
                                 android:id="@+id/tv_giro"
@@ -120,7 +120,7 @@
                                 android:singleLine="true"
                                 android:text="0.0"
                                 android:textColor="#f3d774"
-                                android:textSize="@dimen/d_15sp" />
+                                android:textSize="@dimen/d_13sp" />
 
                         </LinearLayout>
 
@@ -145,7 +145,7 @@
                                 android:layout_height="wrap_content"
                                 android:text="可用余额:"
                                 android:textColor="@color/white"
-                                android:textSize="@dimen/d_13sp" />
+                                android:textSize="@dimen/d_12sp" />
 
                             <com.guadou.lib_baselib.font_text_view.TextViewBold
                                 android:id="@+id/tv_available"
@@ -156,7 +156,7 @@
                                 android:singleLine="true"
                                 android:text="0.0"
                                 android:textColor="#f3d774"
-                                android:textSize="@dimen/d_15sp" />
+                                android:textSize="@dimen/d_14sp" />
 
                         </LinearLayout>
 

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

@@ -181,7 +181,7 @@
         <FrameLayout
             android:id="@+id/fl_bottom_btns"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/d_50dp"
+            android:layout_height="@dimen/d_48dp"
             android:orientation="vertical">
 
             <!-- 分享与申请/取消  -->
@@ -211,7 +211,7 @@
                         android:gravity="center"
                         android:text="分享"
                         android:textColor="@color/profile_red"
-                        android:textSize="@dimen/d_18sp" />
+                        android:textSize="@dimen/d_17sp" />
 
                 </LinearLayout>
 
@@ -236,7 +236,7 @@
                         android:gravity="center"
                         android:text="立即申请"
                         android:textColor="@color/white"
-                        android:textSize="@dimen/d_18sp" />
+                        android:textSize="@dimen/d_17sp" />
 
                 </LinearLayout>
 

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

@@ -39,7 +39,7 @@
                 android:text="香格里拉大酒店需要大量经验丰富的员工，至少10人"
                 android:textAllCaps="true"
                 android:textColor="@color/notify_dark_blue"
-                android:textSize="@dimen/d_17sp" />
+                android:textSize="@dimen/d_16sp" />
 
             <ImageView
                 android:id="@+id/iv_toping"

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

@@ -0,0 +1,125 @@
+package com.guadou.cs_cptservices.widget;
+
+import android.content.Context;
+import android.graphics.Typeface;
+import android.util.AttributeSet;
+import android.util.TypedValue;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.guadou.cs_cptservices.R;
+import com.guadou.lib_baselib.utils.log.YYLogUtils;
+
+/**
+ * Loading + Retry 展示的TextView
+ */
+public class LoadRetryTextView extends FrameLayout {
+
+    private TextView mTvContent;
+    private View mPbLoading;
+    private View mIvRetry;
+
+    public LoadRetryTextView(@NonNull Context context) {
+        this(context, null, 0);
+    }
+
+    public LoadRetryTextView(@NonNull Context context, @Nullable AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public LoadRetryTextView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+
+        inflate(context, R.layout.view_load_retry_textview, this);
+
+        mTvContent = findViewById(R.id.tv_content);
+        mPbLoading = findViewById(R.id.pb_loading);
+        mIvRetry = findViewById(R.id.iv_retry);
+
+        mIvRetry.setOnClickListener(v -> {
+            if (mListener != null) mListener.onRetry();
+        });
+    }
+
+    public void setCustomStyle(Typeface typeface, int textSize, int textColor) {
+        this.setCustomStyle(typeface, textSize, textColor, 0, 0);
+    }
+
+    public void setCustomStyle(Typeface typeface, int textSize, int textColor, int gravity, int iconSize) {
+        if (typeface != null) {
+            mTvContent.setTypeface(typeface);
+        }
+        if (textSize != 0) {
+            mTvContent.setTextSize(TypedValue.COMPLEX_UNIT_SP, textSize);
+        }
+        if (textColor != 0) {
+            mTvContent.setTextColor(textColor);
+        }
+        if (gravity != 0) {
+            LayoutParams layoutParams1 = (LayoutParams) mTvContent.getLayoutParams();
+            layoutParams1.gravity = gravity;
+            mTvContent.setLayoutParams(layoutParams1);
+
+            LayoutParams layoutParams2 = (LayoutParams) mPbLoading.getLayoutParams();
+            layoutParams2.gravity = gravity;
+            if (iconSize != 0) {
+                layoutParams2.width = iconSize;
+                layoutParams2.height = iconSize;
+            }
+            mPbLoading.setLayoutParams(layoutParams2);
+
+            LayoutParams layoutParams3 = (LayoutParams) mIvRetry.getLayoutParams();
+            layoutParams3.gravity = gravity;
+            if (iconSize != 0) {
+                layoutParams3.width = iconSize;
+                layoutParams3.height = iconSize;
+            }
+            mIvRetry.setLayoutParams(layoutParams3);
+        }
+    }
+
+    public TextView getTextView() {
+        return mTvContent;
+    }
+
+    public void showLoadingState() {
+        mIvRetry.setVisibility(GONE);
+        mTvContent.setVisibility(GONE);
+        mPbLoading.setVisibility(VISIBLE);
+    }
+
+    public void showTextState(String text) {
+        mIvRetry.setVisibility(GONE);
+        mTvContent.setVisibility(VISIBLE);
+        mPbLoading.setVisibility(GONE);
+        YYLogUtils.w("赋值："+text);
+        mTvContent.setText(text);
+
+
+    }
+
+    public void showRetryState() {
+        mIvRetry.setVisibility(VISIBLE);
+        mTvContent.setVisibility(GONE);
+        mPbLoading.setVisibility(GONE);
+    }
+
+    public String getText() {
+        return mTvContent.getText().toString();
+    }
+
+    private OnRetryListener mListener;
+
+    public void setOnRetryListener(OnRetryListener listener) {
+        mListener = listener;
+    }
+
+
+    public interface OnRetryListener {
+        void onRetry();
+    }
+}

cs_cptServices/src/main/res/layout/view_load_retry_textview.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/tv_content"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        tools:text="Text Content" />
+
+    <ProgressBar
+        android:id="@+id/pb_loading"
+        android:layout_width="@dimen/d_20dp"
+        android:layout_height="@dimen/d_20dp"
+        android:layout_gravity="center"
+        android:indeterminate="true"
+        android:indeterminateDrawable="@drawable/progressloading2"
+        android:indeterminateDuration="1500"
+        android:indeterminateOnly="true"
+        android:visibility="gone" />
+
+    <ImageView
+        android:id="@+id/iv_retry"
+        android:layout_width="@dimen/d_20dp"
+        android:layout_height="@dimen/d_20dp"
+        android:layout_gravity="center"
+        android:src="@drawable/load_retry"
+        android:visibility="gone" />
+
+</FrameLayout>

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

@@ -31,13 +31,14 @@
     <color name="light_gray_divider">#EDF0F3</color>
     <color name="text_black_37">#373737</color>
     <color name="text_yellow_ff9300">#FF9300</color>
+    <color name="text_yellow_fed849">#FED849</color>
     <color name="dark_yellow_9f5f09">#9F5F09</color>
-
     <color name="profile_black_28394a">#28394A</color>
     <color name="main_topitem_selected_bg">#0689FB</color>
     <color name="profile_black_8098b2">#8098B2</color>
     <color name="orange">#FF9300</color>
     <color name="green">#78D966</color>
+    <color name="green_text_21b209">#21B209</color>
     <color name="home_item_title_color">#2956B7</color>
     <color name="main_date_unselected">#0689FB</color>
     <color name="gray_text">#767676</color>