2024-1-30 代码备份

1、养老金页面及关联子页面开发完成
2、实名认证及关联页面开发完成

app/build.gradle

@@ -43,46 +43,6 @@ android {
         includeInApk false
     }
 
-    //优化二
-    productFlavors {
-        Tencent {
-        }
-        Huawei {
-        }
-        Xiaomi {
-        }
-        Oppo {
-
-        }
-        VIVO {
-
-        }
-        Baidu {
-
-        }
-        Chan360 {
-
-        }
-        Dog {
-
-        }
-        Al {
-
-        }
-        PP {
-
-        }
-        UC {
-
-        }
-        Wandoujia {
-
-        }
-    }
-    productFlavors.all { flavor ->
-        flavor.manifestPlaceholders = [UMENG_CHANNEL_VALUE: name]
-    }
-
     applicationVariants.all { variant ->
         variant.outputs.all { output ->
             def outputFile = output.outputFile

app/src/main/AndroidManifest.xml

@@ -37,7 +37,7 @@
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <!-- 检查Wi-Fi网络状态 -->
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" /> <!-- 切换网络通道 -->
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" /> <!-- 开关Wi-Fi状态，解决国内机型移动网络权限问题需要 -->
-    <permission-group android:name="com.yihucha.hbyhc.andpermission" /> <!-- 必要权限，解决安全风险漏洞，发送和注册广播事件需要调用带有传递权限的接口 -->
+    <permission-group android:name=".andpermission" /> <!-- 必要权限，解决安全风险漏洞，发送和注册广播事件需要调用带有传递权限的接口 -->
     <permission
         android:name="com.yihucha.hbyhc.openadsdk.permission.TT_PANGOLIN"
         android:protectionLevel="signature" />
@@ -78,11 +78,15 @@
         tools:replace="android:theme"
         tools:targetApi="31">
         <activity
-            android:name=".presentation.home.YHCHomeSearchActivity"
+            android:name=".presentation.annuity.AnnuityRecordsActivity"
             android:exported="false"
             android:screenOrientation="portrait"
             />
         <activity
+            android:name=".presentation.home.YHCHomeSearchActivity"
+            android:exported="false"
+            android:screenOrientation="portrait" />
+        <activity
             android:name=".utils.explainpermissions.ExplainPermissionsUtil"
             android:exported="false"
             android:screenOrientation="portrait"
@@ -172,7 +176,7 @@
                 android:value="" />
         </activity>
         <activity
-            android:name="com.yihucha.hbyhc.presentation.shop.VipAreaActivity"
+            android:name=".presentation.shop.VipAreaActivity"
             android:exported="false"
             android:launchMode="singleTop"
             android:screenOrientation="portrait">
@@ -189,7 +193,7 @@
                 android:value="" />
         </activity>
         <activity
-            android:name="com.yihucha.hbyhc.presentation.integral.RedIntegralActivity"
+            android:name=".presentation.integral.RedIntegralActivity"
             android:exported="false"
             android:screenOrientation="portrait">
             <meta-data
@@ -201,7 +205,7 @@
             android:required="false" />
 
         <activity
-            android:name="com.yihucha.hbyhc.presentation.launch.SplashActivity"
+            android:name=".presentation.launch.SplashActivity"
             android:exported="true"
             android:label="@string/app_name">
             <intent-filter>
@@ -226,31 +230,31 @@
             android:value="812" />
 
         <activity
-            android:name="com.yihucha.hbyhc.presentation.MainActivity"
+            android:name=".presentation.MainActivity"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yihucha.hbyhc.presentation.login.LoginHomeActivity"
+            android:name=".presentation.login.LoginHomeActivity"
             android:label="@string/login"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yihucha.hbyhc.presentation.login.LoginActivity"
+            android:name=".presentation.login.LoginActivity"
             android:label="@string/phone_login"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yihucha.hbyhc.presentation.launch.IntroductoryActivity"
+            android:name=".presentation.launch.IntroductoryActivity"
             android:label="@string/phone_login"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yihucha.hbyhc.base.WebViewTitleBaseActivity"
+            android:name=".base.WebViewTitleBaseActivity"
             android:label=""
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yihucha.hbyhc.base.H5TitleActivity"
+            android:name=".base.H5TitleActivity"
             android:label=""
             android:launchMode="singleTask"
             android:screenOrientation="portrait" /> <!-- 搜索 -->
@@ -275,22 +279,22 @@
             android:launchMode="standard"
             android:screenOrientation="portrait" /> <!-- 提交订单 -->
         <activity
-            android:name="com.yihucha.hbyhc.presentation.members.AGuestMemberActivity"
+            android:name=".presentation.members.AGuestMemberActivity"
             android:label="创客会员"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yihucha.hbyhc.presentation.invitation.InviteFriendsActivity"
+            android:name=".presentation.invitation.InviteFriendsActivity"
             android:label="邀请好友"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yihucha.hbyhc.presentation.integral.MeetScanCodeActivity"
+            android:name=".presentation.integral.MeetScanCodeActivity"
             android:label=""
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yihucha.hbyhc.presentation.integral.IntegralListActivity"
+            android:name=".presentation.integral.IntegralListActivity"
             android:label="@string/the_integral_subsidiary"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
@@ -305,7 +309,7 @@
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yihucha.hbyhc.presentation.message.TheAnnouncementActivity"
+            android:name=".presentation.message.TheAnnouncementActivity"
             android:label="@string/gonggao"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
@@ -322,7 +326,7 @@
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yihucha.hbyhc.presentation.pay.PayActivity"
+            android:name=".presentation.pay.PayActivity"
             android:label="@string/pay_type"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
@@ -337,7 +341,7 @@
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yihucha.hbyhc.presentation.integral.InviteFriendsActivity"
+            android:name=".presentation.integral.InviteFriendsActivity"
             android:label="邀请好友"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
@@ -368,11 +372,11 @@
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yihucha.hbyhc.presentation.annuity.AnnuityActivity"
+            android:name=".presentation.annuity.AnnuityActivity"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yihucha.hbyhc.presentation.annuity.PensionAccountActivity"
+            android:name=".presentation.annuity.PensionAccountActivity"
             android:label="@string/my_annuity"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
@@ -382,17 +386,17 @@
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yihucha.hbyhc.presentation.annuity.RealNameAuthenticationActivity"
+            android:name=".presentation.annuity.RealNameAuthenticationActivity"
             android:label="@string/real_name_authentication"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yihucha.hbyhc.presentation.annuity.AutonymSucceedActivity"
+            android:name=".presentation.annuity.AutonymSucceedActivity"
             android:label="@string/real_name_authentication"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yihucha.hbyhc.presentation.annuity.PensionRecordsActivity"
+            android:name=".presentation.annuity.PensionRecordsActivity"
             android:label="@string/pension_record"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
@@ -417,22 +421,22 @@
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yihucha.hbyhc.presentation.shop.ShopActivity"
+            android:name=".presentation.shop.ShopActivity"
             android:label=""
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yihucha.hbyhc.presentation.annuity.PensionRecordsListActivity"
+            android:name=".presentation.annuity.PensionRecordsListActivity"
             android:label="@string/yanglaojin"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yihucha.hbyhc.presentation.annuity.PensionChoicePlatformActivity"
+            android:name=".presentation.annuity.PensionChoicePlatformActivity"
             android:label="@string/yanglaojinxiangqing"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yihucha.hbyhc.presentation.annuity.PensionDetailsActivity"
+            android:name=".presentation.annuity.PensionDetailsActivity"
             android:label=""
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
@@ -442,22 +446,22 @@
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yihucha.hbyhc.presentation.pay.PaySucceedActivity"
+            android:name=".presentation.pay.PaySucceedActivity"
             android:label="@string/pay_success1"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yihucha.hbyhc.presentation.message.MessageActivity"
+            android:name=".presentation.message.MessageActivity"
             android:label="@string/message"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yihucha.hbyhc.presentation.shop.ShopSearchActivity"
+            android:name=".presentation.shop.ShopSearchActivity"
             android:label=""
             android:launchMode="standard"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yihucha.hbyhc.presentation.integral.MyIntegralActivity"
+            android:name=".presentation.integral.MyIntegralActivity"
             android:label="@string/my_integral"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
@@ -472,11 +476,11 @@
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yihucha.hbyhc.presentation.apply_channel.ChannelOpenSuccessActivity"
+            android:name=".presentation.apply_channel.ChannelOpenSuccessActivity"
             android:label="@string/opened_successfully"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" /> <!-- <activity -->
-        <!-- android:name="com.yihucha.hbyhc.presentation.big_storehouse.DcMemberActivity" -->
+        <!-- android:name=".presentation.big_storehouse.DcMemberActivity" -->
         <!-- android:label="@string/chuxubao_member" -->
         <!-- android:launchMode="singleTask" -->
         <!-- android:screenOrientation="portrait" /> -->
@@ -513,7 +517,7 @@
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yihucha.hbyhc.presentation.apply_channel.ApplyChannelActivity"
+            android:name=".presentation.apply_channel.ApplyChannelActivity"
             android:label="申请渠道商"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
@@ -523,8 +527,8 @@
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yihucha.hbyhc.presentation.annuity.AlreadyRealNameActivity"
-            android:label=""
+            android:name=".presentation.annuity.AlreadyRealNameActivity"
+            android:label="实名认证"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
@@ -543,7 +547,7 @@
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yihucha.hbyhc.presentation.invitation.MyInvitationActivity"
+            android:name=".presentation.invitation.MyInvitationActivity"
             android:label=""
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
@@ -558,48 +562,48 @@
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yihucha.hbyhc.presentation.pay.PensionAccountPayActivity"
+            android:name=".presentation.pay.PensionAccountPayActivity"
             android:label="开通养老金账号"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yihucha.hbyhc.presentation.pay.PensionAccountPaySucceedActivity"
+            android:name=".presentation.pay.PensionAccountPaySucceedActivity"
             android:label="开通成功"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yihucha.hbyhc.presentation.invitation.InviteRulesActivity"
+            android:name=".presentation.invitation.InviteRulesActivity"
             android:label="@string/rule"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yihucha.hbyhc.presentation.invitation.InvitePartnersActivity"
+            android:name=".presentation.invitation.InvitePartnersActivity"
             android:label=""
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yihucha.hbyhc.presentation.invitation.RevenueSharingActivity"
+            android:name=".presentation.invitation.RevenueSharingActivity"
             android:label=""
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yihucha.hbyhc.presentation.invitation.ShareTheProductActivity"
+            android:name=".presentation.invitation.ShareTheProductActivity"
             android:label=""
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yihucha.hbyhc.presentation.invitation.AccumulatedincomeActivity"
+            android:name=".presentation.invitation.AccumulatedincomeActivity"
             android:label="累计收益"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yihucha.hbyhc.presentation.invitation.ImmediateWithdrawalActivity"
+            android:name=".presentation.invitation.ImmediateWithdrawalActivity"
             android:label="@string/immediate_withdrawal"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name="com.yihucha.hbyhc.presentation.invitation.WithdrawalRecordActivity"
+            android:name=".presentation.invitation.WithdrawalRecordActivity"
             android:label="@string/withdrawal_record"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
@@ -631,7 +635,7 @@
             android:name="com.kepler.jd.sdk.WebViewActivity"
             android:screenOrientation="portrait" /> <!-- 微信登录 -->
         <activity
-            android:name="com.yihucha.hbyhc.wxapi.WXEntryActivity"
+            android:name=".wxapi.WXEntryActivity"
             android:exported="true"
             android:label="WXEntryActivity"
             android:launchMode="singleTask"
@@ -654,12 +658,12 @@
             android:launchMode="singleTop"
             android:screenOrientation="behind" />
         <activity
-            android:name="com.yihucha.hbyhc.presentation.login.ali.OneKeyLoginActivity"
+            android:name=".presentation.login.ali.OneKeyLoginActivity"
             android:configChanges="orientation|keyboardHidden|screenSize|uiMode|fontScale"
             android:screenOrientation="sensorPortrait" /> <!-- 拍照用得 -->
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="com.yihucha.hbyhc.fileprovider"
+            android:authorities=".fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data
@@ -668,21 +672,13 @@
         </provider>
         <provider
             android:name="com.bytedance.sdk.openadsdk.TTFileProvider"
-            android:authorities="com.yihucha.hbyhc.TTFileProvider"
+            android:authorities=".TTFileProvider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/file_paths" />
         </provider>
-        <provider
-            android:name="com.bytedance.sdk.openadsdk.multipro.TTMultiProvider"
-            android:authorities="com.yihucha.hbyhc.TTMultiProvider"
-            android:exported="false"
-            tools:replace="android:authorities" /> <!-- 友盟多渠道打包 -->
-        <meta-data
-            android:name="UMENG_CHANNEL"
-            android:value="${UMENG_CHANNEL_VALUE}" />
     </application>
 
 </manifest>

app/src/main/java/com/yihucha/hbyhc/network/service/UserService.java

@@ -12,6 +12,7 @@ import com.yihucha.hbyhc.network.request_bean.SpreadNumberRequest;
 import com.yihucha.hbyhc.network.request_bean.UidRequest;
 import com.yihucha.hbyhc.network.request_bean.UpdateUserInfoRequest;
 import com.yihucha.hbyhc.presentation.annuity.model.AmountFromGzcBean;
+import com.yihucha.hbyhc.presentation.annuity.model.AnnuityRecordsBean;
 import com.yihucha.hbyhc.presentation.annuity.model.YanglaojinLogXSBean;
 import com.yihucha.hbyhc.presentation.annuity.model.YanglaojinLogXXBean;
 import com.yihucha.hbyhc.presentation.integral.model.IntegralListBean;
@@ -69,6 +70,12 @@ import retrofit2.http.QueryMap;
  * note:
  */
 public interface UserService {
+    /**
+     * 养老金列表
+     */
+    @GET("/api/user/yanglaolog")
+    Observable<DataResponse<AnnuityRecordsBean>> getYanglaoList(@QueryMap Map<String,Object> map);
+
     @GET("api/user/bill")
     Call<JiangjinBean> getJiangjin(@Query("page") int page, @Query("limit") int limit, @Query("is_red") boolean is_red);
 

app/src/main/java/com/yihucha/hbyhc/presentation/MainActivity.java

@@ -31,6 +31,7 @@ import com.yihucha.hbyhc.config.HttpUrl;
 import com.yihucha.hbyhc.databinding.ActivityMainBinding;
 import com.yihucha.hbyhc.db.UserDB;
 import com.yihucha.hbyhc.manager.AgreeToADealManager;
+import com.yihucha.hbyhc.presentation.annuity.AnnuityFragment;
 import com.yihucha.hbyhc.presentation.big_storehouse.BigWarehouseFragment;
 import com.yihucha.hbyhc.presentation.home.HomeFragment;
 import com.yihucha.hbyhc.presentation.mine.MineFragment;
@@ -70,7 +71,8 @@ public class MainActivity extends BaseActivity implements View.OnClickListener {
     private HomeFragment homeFragment;
     private MineFragment mineFragment;
     private ShoppingFragment shoppingFragment;
-    private NearbyFragment nearbyFragment;
+//    private NearbyFragment nearbyFragment;
+    private AnnuityFragment nearbyFragment;
     private BigWarehouseFragment bigWarehouseFragment;
 
     private ActivityMainBinding binding;
@@ -566,11 +568,14 @@ public class MainActivity extends BaseActivity implements View.OnClickListener {
     }
 
     private void showNearbyFragment() {
+        if (!LoginUtils.isLogin(this)) {
+            return;
+        }
         //开启事务,Fragment的切换是由事务控制
         FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
         //判断Fragment是否为空
         if (nearbyFragment == null) {
-            nearbyFragment = new NearbyFragment();
+            nearbyFragment = new AnnuityFragment();
             //添加Fragmet1到事务中
             transaction.add(R.id.content_layout, nearbyFragment);
         }

app/src/main/java/com/yihucha/hbyhc/presentation/annuity/AlreadyRealNameActivity.java

@@ -40,18 +40,15 @@ public class AlreadyRealNameActivity extends ViewBindingTitleBaseActivity<Activi
         Map<String, Object> map = new HashMap<>();
         map.put("type", "1");
         mRealNameAuthenticationViewModel.getAutonym(map);
-        mRealNameAuthenticationViewModel.mAutonymData.observe(this, new Observer<AutonymRequest>() {
-            @Override
-            public void onChanged(AutonymRequest autonymRequest) {
-                mViewBinding.tvUserName.setText(autonymRequest.getUser_name());
-                mViewBinding.tvUserCard.setText(StringsUtil.encodeIdCard(autonymRequest.getUser_card()));
-                GlideUtils.loadImage(context, autonymRequest.getCard_positive(), mViewBinding.ivCardPositive);
-                GlideUtils.loadImage(context, autonymRequest.getCard_reverse(), mViewBinding.ivCardReverse);
-            }
+        mRealNameAuthenticationViewModel.mAutonymData.observe(this, autonymRequest -> {
+            mViewBinding.tvUserName.setText("已认证("+autonymRequest.getUser_name()+")");
+            mViewBinding.tvUserCard.setText(StringsUtil.encodeIdCard(autonymRequest.getUser_card()));
         });
     }
 
     private void initClick() {
+        mViewBinding.tvBack.setOnClickListener(this);
+        mViewBinding.tvUpdate.setOnClickListener(this);
     }
 
     private void initView() {
@@ -60,6 +57,11 @@ public class AlreadyRealNameActivity extends ViewBindingTitleBaseActivity<Activi
     @Override
     public void onClick(View v) {
         super.onClick(v);
+        if (v==mViewBinding.tvBack){
+            finish();
+        }else if (v == mViewBinding.tvUpdate){
+            RealNameAuthenticationActivity.launch(this,2);
+        }
     }
     public static void launch(Context context) {
         Intent intent = new Intent(context, AlreadyRealNameActivity.class);

app/src/main/java/com/yihucha/hbyhc/presentation/annuity/AnnuityActivity.java

@@ -34,8 +34,8 @@ import com.tencent.mm.opensdk.openapi.WXAPIFactory;
  * @date 2022/7/13
  * note:养老金主页
  */
-public class AnnuityActivity extends ViewBindingChangeTitleColorTitleBaseActivity<ActivityAnnuityBinding> implements View.OnClickListener {
-    private MineViewModel mMineViewModel;
+public class AnnuityActivity/* extends ViewBindingChangeTitleColorTitleBaseActivity<ActivityAnnuityBinding> implements View.OnClickListener*/ {
+    /*private MineViewModel mMineViewModel;
     private   String is_certification;//是否实名认证:1是
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -59,13 +59,6 @@ public class AnnuityActivity extends ViewBindingChangeTitleColorTitleBaseActivit
                 mViewBinding.btvOnLineTakeNo.setText("¥" + NumberUtil.subtract(yanglaojinBean.getAll_yanglao(),yanglaojinBean.getAll_yanglao_a(),2));
             }
         });
-//        mMineViewModel.getYanglaojinInfo();
-//        mMineViewModel.userAnnuityInfoBeanMutableLiveData.observe(this, new Observer<UserAnnuityInfoBean>() {
-//            @Override
-//            public void onChanged(UserAnnuityInfoBean userAnnuityInfoBean) {
-//
-//            }
-//        });
 
         mMineViewModel.userAnnuityInfoBeanMutableLiveData.observe(this, new Observer<UserAnnuityInfoBean>() {
             @Override
@@ -81,8 +74,8 @@ public class AnnuityActivity extends ViewBindingChangeTitleColorTitleBaseActivit
                     mViewBinding.tvBirthday60.setText(userAnnuityInfoBean.getBirthday60());
                 } else {
                     //未认证
-                    /*mViewBinding.tvIsApprove.setText(R.string.real_name_authentication);
-                    mViewBinding.tvIsApprove.getPaint().setFlags(Paint.UNDERLINE_TEXT_FLAG);*/
+                    *//*mViewBinding.tvIsApprove.setText(R.string.real_name_authentication);
+                    mViewBinding.tvIsApprove.getPaint().setFlags(Paint.UNDERLINE_TEXT_FLAG);*//*
                     mViewBinding.imgRenzheng.setImageResource(R.mipmap.shimingrenzheng);
                     mViewBinding.tvBirthday60.setText("未实名认证");
                     CustomDialog.defaultDialog2(AnnuityActivity.this,
@@ -201,7 +194,7 @@ public class AnnuityActivity extends ViewBindingChangeTitleColorTitleBaseActivit
         //养老金信息
         mMineViewModel.getYanglaojinInfo();
     }
-
+*/
     public static void launch(Context context) {
         Intent intent = new Intent(context, AnnuityActivity.class);
         context.startActivity(intent);

app/src/main/java/com/yihucha/hbyhc/presentation/annuity/AnnuityFragment.kt

@@ -0,0 +1,166 @@
+package com.yihucha.hbyhc.presentation.annuity
+
+import android.annotation.SuppressLint
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.RelativeLayout
+import androidx.core.view.marginTop
+import androidx.core.view.setMargins
+import androidx.lifecycle.ViewModelProvider
+import com.tencent.mm.opensdk.modelbiz.WXLaunchMiniProgram
+import com.tencent.mm.opensdk.openapi.WXAPIFactory
+import com.yihucha.hbyhc.R
+import com.yihucha.hbyhc.base.BaseFragment
+import com.yihucha.hbyhc.base.WebViewTitleBaseActivity
+import com.yihucha.hbyhc.callback.TwoButtonsListener
+import com.yihucha.hbyhc.config.Constants
+import com.yihucha.hbyhc.config.HttpUrl
+import com.yihucha.hbyhc.databinding.ActivityAnnuityBinding
+import com.yihucha.hbyhc.presentation.mine.ThirdPartyBindingActivity
+import com.yihucha.hbyhc.presentation.mine.view_model.MineViewModel
+import com.yihucha.hbyhc.utils.GlideUtils
+import com.yihucha.hbyhc.utils.ImmersedStatusbarUtils
+import com.yihucha.hbyhc.utils.NumberUtil
+import com.yihucha.hbyhc.utils.ScreenUtils
+import com.yihucha.hbyhc.utils.StringUtils
+import com.yihucha.hbyhc.view.CustomDialog
+
+class AnnuityFragment : BaseFragment(), View.OnClickListener {
+    private val mViewBinding by lazy {
+        ActivityAnnuityBinding.inflate(layoutInflater)
+    }
+    private lateinit var mMineViewModel: MineViewModel
+    private var is_certification = ""//是否实名认证:1是
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        mMineViewModel = ViewModelProvider(this)[MineViewModel::class.java]
+        var statusBarHeight = ScreenUtils.getStatusBarHeight(activity)
+        var params = mViewBinding.customTitleBar.layoutParams as RelativeLayout.LayoutParams
+        params.setMargins(0, statusBarHeight, 0, 0)
+        initView()
+        initClick()
+        initData()
+        return mViewBinding.root
+    }
+
+    @SuppressLint("SetTextI18n")
+    private fun initData() {
+        //养老金数据
+        mMineViewModel.getYanglaojin()
+        mMineViewModel.yanglaojinBeanMutableLiveData.observe(
+            viewLifecycleOwner
+        ) { yanglaojinBean ->
+            mViewBinding.btvAllYanglao.text = "¥" + yanglaojinBean.all_yanglao
+            mViewBinding.btvAllYanglaoA.text = "¥" + yanglaojinBean.all_yanglao_a
+            mViewBinding.btvOnLineTakeNo.text = "¥" + NumberUtil.subtract(
+                yanglaojinBean.all_yanglao,
+                yanglaojinBean.all_yanglao_a,
+                2
+            )
+        }
+        mMineViewModel.userAnnuityInfoBeanMutableLiveData.observe(
+            viewLifecycleOwner
+        ) { userAnnuityInfoBean ->
+            is_certification = userAnnuityInfoBean.is_certification
+            if (is_certification == "1") {
+                //已认证
+                mViewBinding.imgRenzheng.setImageResource(R.mipmap.weirenzheng)
+                mViewBinding.tvAnnuityTime.text = userAnnuityInfoBean.birthday60 + ""
+            } else {
+                //未认证
+                mViewBinding.imgRenzheng.setImageResource(R.mipmap.shimingrenzheng)
+                mViewBinding.tvAnnuityTime.text = "未实名认证"
+                CustomDialog.defaultDialog2(activity,
+                    R.string.warm_prompt,
+                    "实名认证后才可查看获得的\n养老金哦~",
+                    R.string.cancel,
+                    R.string.go_real_name_authentication,
+                    object : TwoButtonsListener {
+                        override fun leftButton() {
+                        }
+
+                        override fun rightButton() {
+                            RealNameAuthenticationActivity.launch(context)
+                        }
+                    })
+            }
+        }
+        //用户信息
+        mMineViewModel.getUserInfo()
+        mMineViewModel.userModel.observe(viewLifecycleOwner) {
+            GlideUtils.loadCircleImage(
+                context,
+                it.avatar,
+                mViewBinding.ivAvatar,
+                R.mipmap.home_default_avatar_220614
+            )
+            mViewBinding.btvNickname.text = it.nickname
+            mViewBinding.tvPhoneNumber.text = StringUtils.resetPhone(it.phone)
+        }
+        //公证处养老金余额
+        mMineViewModel.getAmountFromGzc()
+        mMineViewModel.mAmount.observe(viewLifecycleOwner) {
+            mViewBinding.btvZxgzc.text = it.amount
+        }
+    }
+
+    private fun initClick() {
+        mViewBinding.tvAnnuityRules.setOnClickListener(this)
+        mViewBinding.llPensionRecord.setOnClickListener(this)
+        mViewBinding.imgRenzheng.setOnClickListener(this)
+        mViewBinding.llPaymentPlatformBinding.setOnClickListener(this)
+        mViewBinding.llCiticNotaryOfficeToCheck.setOnClickListener(this)
+        mViewBinding.llZxgzc.setOnClickListener(this)
+    }
+
+    private fun initView() {}
+
+    override fun onClick(view: View) {
+        if (view == mViewBinding.llPensionRecord) {
+            //养老金记录
+            AnnuityRecordsActivity.launch(activity)
+        } else if (view == mViewBinding.imgRenzheng) {
+            if ("1" != is_certification) {
+                //未实名认证
+                RealNameAuthenticationActivity.launch(context)
+            } else {
+                //已经实名
+                AlreadyRealNameActivity.launch(context)
+            }
+        } else if (view == mViewBinding.llPaymentPlatformBinding) {
+            ThirdPartyBindingActivity.launch(context)
+        } else if (
+            view == mViewBinding.llCiticNotaryOfficeToCheck ||
+            view == mViewBinding.llZxgzc
+        ) {
+            //中信公正
+            val api = WXAPIFactory.createWXAPI(context, Constants.WX_APP_ID)
+            val req = WXLaunchMiniProgram.Req()
+            req.userName = Constants.CITIC_NOTARY_OFFICE_APPLET_ID // 填小程序原始id
+            req.path =
+                Constants.CITIC_NOTARY_OFFICE_URL ////拉起小程序页面的可带参路径，不填默认拉起小程序首页，对于小游戏，可以只传入 query 部分，来实现传参效果，如：传入 "?foo=bar"。
+            req.miniprogramType =
+                if (HttpUrl.IS_RELEASE) WXLaunchMiniProgram.Req.MINIPTOGRAM_TYPE_RELEASE else WXLaunchMiniProgram.Req.MINIPROGRAM_TYPE_PREVIEW // 可选打开 开发版，体验版和正式版
+            api.sendReq(req)
+        } else if (view == mViewBinding.tvAnnuityRules) {
+            WebViewTitleBaseActivity.launch(
+                activity, getString(R.string.pension_rules),
+                Constants.PROTOCOL + Constants.PENSION_ACCOUNT_RULES
+            )
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        //养老金信息
+        mMineViewModel.getYanglaojinInfo()
+    }
+
+
+}

app/src/main/java/com/yihucha/hbyhc/presentation/annuity/AnnuityRecordsActivity.kt

@@ -0,0 +1,235 @@
+package com.yihucha.hbyhc.presentation.annuity
+
+import android.app.Activity
+import android.app.Dialog
+import android.content.Intent
+import android.graphics.Color
+import android.os.Bundle
+import android.util.Log
+import android.view.Gravity
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.ContextCompat
+import androidx.lifecycle.ViewModelProvider
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.bigkoo.pickerview.R
+import com.bigkoo.pickerview.builder.TimePickerBuilder
+import com.bigkoo.pickerview.view.TimePickerView
+import com.blankj.utilcode.util.ToastUtils
+import com.lcodecore.tkrefreshlayout.RefreshListenerAdapter
+import com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout
+import com.yihucha.hbyhc.base.ViewBindingBaseActivity
+import com.yihucha.hbyhc.databinding.ActivityAnnuityRecordsBinding
+import com.yihucha.hbyhc.presentation.annuity.adapter.AnnuityRecordsAdapter
+import com.yihucha.hbyhc.presentation.annuity.model.AnnuityRecordsBean
+import com.yihucha.hbyhc.presentation.mine.view_model.MineViewModel
+import com.yihucha.hbyhc.utils.*
+import com.yihucha.hbyhc.view.PopAnnuitySelector
+import java.util.*
+
+class AnnuityRecordsActivity : ViewBindingBaseActivity<ActivityAnnuityRecordsBinding>(),
+    View.OnClickListener {
+    private lateinit var mMineViewModel: MineViewModel
+    private var mPage = 1
+    private var source = "0"
+    private var status = 0
+    private lateinit var month: String
+    private lateinit var birthday: String
+    private lateinit var adapter: AnnuityRecordsAdapter
+    private var listDatas = mutableListOf<AnnuityRecordsBean.ListDTO>()
+    private lateinit var pvTime: TimePickerView
+    private lateinit var popWindow:PopAnnuitySelector
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        initView()
+        initData()
+        initLinstener()
+    }
+
+    private fun initView() {
+        mMineViewModel = ViewModelProvider(this)[MineViewModel::class.java]
+        mViewBinding.root.post {
+            var statusBarHeight = ScreenUtils.getStatusBarHeight(this)
+            var layoutParams = mViewBinding.imgvBack.layoutParams as ConstraintLayout.LayoutParams
+            layoutParams.setMargins(0, statusBarHeight, 0, 0)
+        }
+        var calendar = Calendar.getInstance()
+        month =
+            "${calendar.get(Calendar.YEAR)}-${StringUtils.formatNumber(calendar.get(Calendar.MONTH) + 1)}"
+        birthday =
+            "${calendar.get(Calendar.YEAR)}年${StringUtils.formatNumber(calendar.get(Calendar.MONTH) + 1)}月"
+        var manager = LinearLayoutManager(this)
+        mViewBinding.rvAnnuityRecords.layoutManager = manager
+        adapter = AnnuityRecordsAdapter(this, listDatas)
+        mViewBinding.rvAnnuityRecords.adapter = adapter
+
+        initTimePicker()
+        initSelector()
+    }
+
+    private fun initData() {
+        mMineViewModel.getYanglaojin()
+        mMineViewModel.yanglaojinBeanMutableLiveData.observe(this) {
+            it?.apply {
+                mViewBinding.tvTotal.text = "预估总额${all_yanglao_a}"
+
+                mViewBinding.tvValueYjs.text = all_yanglao_a
+                mViewBinding.tvYjs.text = "已结算${all_yanglao_a}"
+
+                var wjs = NumberUtil.subtract(all_yanglao_a, all_yanglao_a, 2)
+                mViewBinding.tvValueWjs.text = wjs
+                mViewBinding.tvWjs.text = "未结算${wjs}"
+            }
+        }
+        mMineViewModel.failed.observe(this) {
+            mViewBinding.refreshLayout?.apply {
+                finishLoadmore()
+                finishRefreshing()
+            }
+            ToastUtils.showLong(it)
+        }
+        loadYanglaoList()
+        mMineViewModel.annuityRecordsList.observe(this) {
+            mViewBinding.refreshLayout.apply {
+                finishLoadmore()
+                finishRefreshing()
+            }
+            it?.apply {
+                if (EmptyCheckUtils.isEmpty(this)) {
+                    if (mPage > 1) mPage--
+                    return@observe
+                }
+                if (mPage == 1) {
+                    listDatas.clear()
+                }
+                listDatas.addAll(list)
+                if (EmptyCheckUtils.isEmpty(listDatas)) {
+                    mViewBinding.layoutNoData.visibility = View.VISIBLE
+                    mViewBinding.rvAnnuityRecords.visibility = View.GONE
+                    return@observe
+                } else {
+                    mViewBinding.layoutNoData.visibility = View.GONE
+                    mViewBinding.rvAnnuityRecords.visibility = View.VISIBLE
+                }
+                adapter.setData(listDatas)
+            }
+
+        }
+    }
+
+    private fun initLinstener() {
+        mViewBinding.imgvBack.setOnClickListener(this)
+        mViewBinding.tvDate.setOnClickListener(this)
+        mViewBinding.tvSelector.setOnClickListener(this)
+        mViewBinding.refreshLayout.setEnableLoadmore(true)
+        mViewBinding.refreshLayout.setEnableRefresh(true)
+        mViewBinding.refreshLayout.setOnRefreshListener(object : RefreshListenerAdapter() {
+            override fun onRefresh(refreshLayout: TwinklingRefreshLayout) {
+                mPage = 1
+                loadYanglaoList()
+            }
+
+            override fun onLoadMore(refreshLayout: TwinklingRefreshLayout) {
+                mPage++
+                loadYanglaoList()
+            }
+        })
+    }
+
+    private fun loadYanglaoList() {
+        mMineViewModel.getYanglaoList(mPage, source, month, status)
+    }
+
+    /**
+     * 条件选择器
+     */
+    private fun initSelector(){
+        popWindow = PopAnnuitySelector(this)
+        popWindow.setOnDismissListener {
+            mViewBinding.viewBg.visibility = View.GONE
+        }
+    }
+
+    /**
+     * 时间选择器
+     */
+    private fun initTimePicker() { //Dialog 模式下，在底部弹出
+        val startDate = Calendar.getInstance()
+        startDate[1900, 1] = 1
+        val endDate = Calendar.getInstance()
+        endDate[DateUtil.getYear().toInt(), DateUtil.getMonth().toInt() - 1] =
+            DateUtil.getDay().toInt()
+        pvTime = TimePickerBuilder(this) { date, _ ->
+            Log.i("pvTime", "onTimeSelect")
+            birthday = DateUtil.getYearMonth(date.time)
+            mViewBinding.tvDate.text = birthday
+            month = birthday.replace("年", "-").replace("月", "")
+            loadYanglaoList()
+        }
+            .setTimeSelectChangeListener { Log.i("pvTime", "onTimeSelectChanged") }
+            .setType(booleanArrayOf(true, true, false, false, false, false))
+            .isDialog(true) //默认设置false ，内部实现将DecorView 作为它的父控件。
+            .addOnCancelClickListener { Log.i("pvTime", "onCancelClickListener") }
+            .setItemVisibleCount(9) //若设置偶数，实际值会加1（比如设置6，则最大可见条目为7）
+            .setLineSpacingMultiplier(2.0f)
+            .isAlphaGradient(true)
+            .setSubmitText("确定")
+            .setCancelText("取消")
+            .setSubmitColor(Color.parseColor("#fe0032")) //确定按钮文字颜色
+            .setCancelColor(Color.parseColor("#333333")) //取消按钮文字颜色
+            .setContentTextSize(15)
+            .setDate(endDate)
+            .setRangDate(startDate, endDate) //起始终止年月日设定
+            .setTitleBgColor(Color.parseColor("#FFFFFF")) //标题背景颜色 Night mode
+            .build()
+        val mDialog: Dialog = pvTime.dialog
+        if (mDialog != null) {
+            val params = FrameLayout.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.WRAP_CONTENT,
+                Gravity.BOTTOM
+            )
+            params.leftMargin = 0
+            params.rightMargin = 0
+            pvTime.dialogContainerLayout.layoutParams = params
+            mDialog.window?.apply {
+                setWindowAnimations(R.style.picker_view_slide_anim) //修改动画样式
+                setGravity(Gravity.BOTTOM) //改成Bottom,底部显示
+                setDimAmount(0.3f)
+            }
+        }
+    }
+
+
+    override fun onClick(v: View) {
+        when (v) {
+            mViewBinding.imgvBack -> finish()
+            mViewBinding.tvDate -> {
+                //日期筛选
+                pvTime?.apply {
+                    if (!isShowing) {
+                        show()
+                    }
+                }
+            }
+            mViewBinding.tvSelector -> {
+                //条件筛选
+                popWindow.showAsDropDown(mViewBinding.tvTotal)
+                mViewBinding.viewBg.visibility = View.VISIBLE
+            }
+        }
+    }
+
+    companion object {
+        @JvmStatic
+        fun launch(activity: Activity?) {
+            activity?.apply {
+                startActivity(Intent(this, AnnuityRecordsActivity::class.java))
+            }
+        }
+    }
+
+}

app/src/main/java/com/yihucha/hbyhc/presentation/annuity/RealNameAuthenticationActivity.java

@@ -19,6 +19,7 @@ import androidx.lifecycle.ViewModelProvider;
 import com.alibaba.fastjson.JSON;
 import com.blankj.utilcode.util.StringUtils;
 import com.blankj.utilcode.util.ToastUtils;
+import com.bumptech.glide.Glide;
 import com.huantansheng.easyphotos.Builder.AlbumBuilder;
 import com.huantansheng.easyphotos.EasyPhotos;
 import com.huantansheng.easyphotos.callback.SelectCallback;
@@ -34,6 +35,7 @@ import com.yihucha.hbyhc.utils.ImageEngineUtils.GlideEngine;
 import com.yihucha.hbyhc.utils.LogUtil;
 import com.yihucha.hbyhc.utils.MVUtils;
 import com.yihucha.hbyhc.utils.PermissionUtils;
+import com.yihucha.hbyhc.utils.StringsUtil;
 import com.yihucha.hbyhc.view.CustomDialog;
 import com.zs.easy.imgcompress.EasyImgCompress;
 import com.zs.easy.imgcompress.listener.OnCompressSinglePicListener;
@@ -41,6 +43,8 @@ import com.zs.easy.imgcompress.util.GBMBKBUtil;
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
 
 import okhttp3.MediaType;
 import okhttp3.MultipartBody;
@@ -64,8 +68,6 @@ public class RealNameAuthenticationActivity extends ViewBindingTitleBaseActivity
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mRealNameAuthenticationViewModel = new ViewModelProvider(this).get(RealNameAuthenticationViewModel.class);
-//        PermissionUtils.setTheCamera(this);
-//        checkPermissions();
         initView();
         initClick();
         initData();
@@ -97,6 +99,20 @@ public class RealNameAuthenticationActivity extends ViewBindingTitleBaseActivity
     }
 
     private void initData() {
+        flag = getIntent().getIntExtra("flag",0);
+        if (flag!=0){
+            Map<String, Object> map = new HashMap<>();
+            map.put("type", "1");
+            mRealNameAuthenticationViewModel.getAutonym(map);
+            mViewBinding.tvChangeImagePositive.setVisibility(View.VISIBLE);
+            mViewBinding.tvChangeImageReverse.setVisibility(View.VISIBLE);
+        }
+        mRealNameAuthenticationViewModel.mAutonymData.observe(this, autonymRequest -> {
+            mViewBinding.etUserName.setText("已认证(" + autonymRequest.getUser_name() + ")");
+            mViewBinding.etUserCard.setText(StringsUtil.encodeIdCard(autonymRequest.getUser_card()));
+            Glide.with(this).load(autonymRequest.getCard_positive()).into(mViewBinding.ivCardPositive);
+            Glide.with(this).load(autonymRequest.getCard_reverse()).into(mViewBinding.ivCardReverse);
+        });
         mRealNameAuthenticationViewModel.pathData.observe(this, pathBean -> {
             if ("1".equals(photoFlag)) {
                 //正面
@@ -131,6 +147,8 @@ public class RealNameAuthenticationActivity extends ViewBindingTitleBaseActivity
         mViewBinding.tvConfirmToSubmit.setOnClickListener(this);
         mViewBinding.ivCardPositive.setOnClickListener(this);
         mViewBinding.ivCardReverse.setOnClickListener(this);
+        mViewBinding.tvChangeImagePositive.setOnClickListener(this);
+        mViewBinding.tvChangeImageReverse.setOnClickListener(this);
     }
 
     private void initView() {
@@ -177,6 +195,18 @@ public class RealNameAuthenticationActivity extends ViewBindingTitleBaseActivity
                 getPhotoFunction();
             else
                 getPhotoFunction();
+        } else if (v == mViewBinding.tvChangeImagePositive) {
+            photoFlag = "1";
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU)
+                getPhotoFunction();
+            else
+                getPhotoFunction();
+        } else if (v == mViewBinding.tvChangeImageReverse) {
+            photoFlag = "2";
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU)
+                getPhotoFunction();
+            else
+                getPhotoFunction();
         }
     }
 
@@ -234,51 +264,6 @@ public class RealNameAuthenticationActivity extends ViewBindingTitleBaseActivity
         photoPickerIntent.setType("image/*");
         activity.startActivityForResult(photoPickerIntent, resultCode);
     }
-/*    @Override
-    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (resultCode == RESULT_OK) {
-            File imageFile = new File(getExternalFilesDir(DIRECTORY_DCIM), "/wy_head.jpg");
-            switch (requestCode) {
-                case CAMERA:
-                case PHOTO:
-                    if (requestCode != CAMERA) {
-                        imageFile = new File(data.getData().getPath());
-                    }
-                    RequestBody imageBody = RequestBody.create(MediaType.parse("multipart/form-data"), imageFile);
-                    MultipartBody.Part imageBodyPart = MultipartBody.Part.createFormData("field", imageFile.getName(), imageBody);
-
-                    mRealNameAuthenticationViewModel.uploadPictures(imageBodyPart);
-*//*                    EasyImgCompress.withSinglePic(context,requestCode==CAMERA?imageFile.getAbsolutePath():data.getData().getPath())
-                            .maxPx(1200)
-                            .maxSize(100)
-                            .enableLog(true)
-                            .setOnCompressSinglePicListener(new OnCompressSinglePicListener() {
-                                @Override
-                                public void onStart() {
-                                    Log.i("EasyImgCompress", "onStart");
-                                }
-
-                                @Override
-                                public void onSuccess(File file) {
-                                    Log.i("EasyImgCompress", "onSuccess size = " + GBMBKBUtil.getSize(file.length()) + " getAbsolutePath= " + file.getAbsolutePath());
-                                    RequestBody imageBody = RequestBody.create(MediaType.parse("multipart/form-data"), file);
-                                    MultipartBody.Part imageBodyPart = MultipartBody.Part.createFormData("field", file.getName(), imageBody);
-
-                                    mRealNameAuthenticationViewModel.uploadPictures(imageBodyPart);
-                                }
-
-                                @Override
-                                public void onError(String error) {
-                                    Log.e("EasyImgCompress", "onError error = " + error);
-                                }
-                            }).start();*//*
-                    break;
-                default:
-                    break;
-            }
-        }
-    }*/
 
     private void getPhotoFunction() {
         CustomDialog.BottomPhotoAlbumDialog(context, new TwoButtonsListener() {
@@ -382,4 +367,10 @@ public class RealNameAuthenticationActivity extends ViewBindingTitleBaseActivity
         Intent intent = new Intent(context, RealNameAuthenticationActivity.class);
         context.startActivity(intent);
     }
+    private int flag = 0;
+    public static void launch(Context context,int flag) {
+        Intent intent = new Intent(context, RealNameAuthenticationActivity.class);
+        intent.putExtra("flag",flag);
+        context.startActivity(intent);
+    }
 }

app/src/main/java/com/yihucha/hbyhc/presentation/annuity/adapter/AnnuityRecordsAdapter.kt

@@ -0,0 +1,86 @@
+package com.yihucha.hbyhc.presentation.annuity.adapter
+
+import android.content.Context
+import android.graphics.Color
+import android.text.Spannable
+import android.text.SpannableStringBuilder
+import android.text.style.ForegroundColorSpan
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView.Adapter
+import androidx.recyclerview.widget.RecyclerView.ViewHolder
+import com.bumptech.glide.Glide
+import com.bytedance.pangle.transform.ZeusTransformUtils.getResources
+import com.yihucha.hbyhc.R
+import com.yihucha.hbyhc.databinding.ItemAnnuityRecordsBinding
+import com.yihucha.hbyhc.presentation.annuity.model.AnnuityRecordsBean
+import com.yihucha.hbyhc.utils.EmptyCheckUtils
+
+/**
+ *  author : zhangbing
+ *  time   : 2024/1/30 14:13
+ *  com.yihucha.hbyhc.presentation.annuity.adapter
+ */
+class AnnuityRecordsAdapter(var context: Context, var listDatas: List<AnnuityRecordsBean.ListDTO>) :
+    Adapter<AnnuityRecordsAdapter.ARHolder>() {
+
+    val sb by lazy {
+        StringBuffer()
+    }
+    private val redSpan by lazy {
+        ForegroundColorSpan(Color.parseColor("#fe0032"))
+    }
+    private val blackSpan by lazy {
+        ForegroundColorSpan(Color.parseColor("#333333"))
+    }
+
+    fun setData(listDatas: List<AnnuityRecordsBean.ListDTO>) {
+        this.listDatas = listDatas
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ARHolder {
+        return ARHolder(
+            LayoutInflater.from(parent.context)
+                .inflate(R.layout.item_annuity_records, parent, false)
+        )
+    }
+
+    override fun getItemCount(): Int {
+        return if (EmptyCheckUtils.isEmpty(listDatas)) 0 else listDatas!!.size
+    }
+
+    override fun onBindViewHolder(holder: ARHolder, position: Int) {
+        listDatas[position]?.apply {
+            setTextContent(holder.binding.tvValueYlj, number)
+            Glide.with(context).load(product.product.image).into(holder.binding.imgvProduct)
+            holder.binding.tvProductOrderTime.text = "下单时间：${create_time}"
+            holder.binding.tvOrderNo.text = "订单号：${order_sn}"
+            holder.binding.tvProductName.text = product.product.store_name
+            holder.binding.tvStatus.text = if (status == "0") "未结算" else "已结算"
+        }
+
+    }
+
+    private fun setTextContent(tv: TextView, content: String?) {
+        if (EmptyCheckUtils.isEmpty(content)) {
+            return
+        }
+        sb.setLength(0)
+        sb.append("预估养老金")
+        sb.append(content)
+        sb.append("元")
+        var builder = SpannableStringBuilder(sb)
+        builder.setSpan(blackSpan, 0, 5, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+        builder.setSpan(redSpan, 5, sb.length - 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+        builder.setSpan(blackSpan, sb.length - 1, sb.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+        tv.text = builder
+    }
+
+    inner class ARHolder(itemView: View) : ViewHolder(itemView) {
+        val binding by lazy {
+            ItemAnnuityRecordsBinding.bind(itemView)
+        }
+    }
+}

app/src/main/java/com/yihucha/hbyhc/presentation/annuity/adapter/ItemAnnuitySelectorAdapter.kt

@@ -0,0 +1,89 @@
+package com.yihucha.hbyhc.presentation.annuity.adapter
+
+import android.content.Context
+import android.graphics.Color
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.RelativeLayout
+import androidx.recyclerview.widget.RecyclerView.Adapter
+import androidx.recyclerview.widget.RecyclerView.ViewHolder
+import com.yihucha.hbyhc.R
+import com.yihucha.hbyhc.databinding.ItemAnnuityRecordsBinding
+import com.yihucha.hbyhc.databinding.ItemAnnuitySelectorBinding
+import com.yihucha.hbyhc.presentation.annuity.model.SelectorBean
+import com.yihucha.hbyhc.utils.DensityUtils
+import com.yihucha.hbyhc.utils.EmptyCheckUtils
+import com.yihucha.hbyhc.utils.ScreenUtils
+
+/**
+ *  author : zhangbing
+ *  time   : 2024/1/30 20:44
+ *  com.yihucha.hbyhc.presentation.annuity.adapter
+ */
+class ItemAnnuitySelectorAdapter(var context: Context, var searchDatas: List<SelectorBean>) :
+    Adapter<ItemAnnuitySelectorAdapter.IASHolder>() {
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): IASHolder {
+        return IASHolder(
+            LayoutInflater.from(context).inflate(R.layout.item_annuity_selector, parent, false)
+        )
+    }
+
+    override fun getItemCount(): Int {
+        return if (EmptyCheckUtils.isEmpty(searchDatas)) 0 else searchDatas.size
+    }
+
+    override fun onBindViewHolder(holder: IASHolder, position: Int) {
+        var item = searchDatas[position]
+        holder.binding.apply {
+            tvItemName.text = item.name
+            if (item.isChecked) {
+                tvItemName.setTextColor(Color.parseColor("#fe0032"))
+                tvItemName.background =
+                    context.getDrawable(R.drawable.shape_line_fe0032_fff1f2_50dp)
+            } else {
+                tvItemName.setTextColor(Color.parseColor("#333333"))
+                tvItemName.background = context.getDrawable(R.drawable.shape_f5f5f5_50dp)
+            }
+            tvItemName.setOnClickListener {
+                linstener?.apply {
+                    onItemClick(position)
+                    onClick(position)
+                }
+            }
+        }
+
+    }
+
+    fun onClick(pos: Int) {
+        for (i in searchDatas.indices) {
+            searchDatas[i].isChecked = i == pos
+        }
+        notifyDataSetChanged()
+    }
+
+    inner class IASHolder(itemView: View) : ViewHolder(itemView) {
+        val binding: ItemAnnuitySelectorBinding by lazy {
+            ItemAnnuitySelectorBinding.bind(itemView)
+        }
+
+        init {
+            binding.apply {
+                var params = tvItemName.layoutParams as RelativeLayout.LayoutParams
+                params.width = (ScreenUtils.getScreenWidth() - DensityUtils.dip2px(58f)) / 3
+                tvItemName.layoutParams = params
+            }
+
+        }
+
+    }
+
+    private var linstener: OnItemClickListener? = null
+    fun setOnItemClickListener(linstener: OnItemClickListener) {
+        this.linstener = linstener
+    }
+
+    interface OnItemClickListener {
+        fun onItemClick(itemPos: Int)
+    }
+}

app/src/main/java/com/yihucha/hbyhc/presentation/annuity/model/AnnuityRecordsBean.java

@@ -0,0 +1,863 @@
+package com.yihucha.hbyhc.presentation.annuity.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.List;
+
+/**
+ * author : zhangbing
+ * time   : 2024/1/30 15:08
+ * com.yihucha.hbyhc.presentation.annuity.model
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class AnnuityRecordsBean {
+    private int count;
+    private List<ListDTO> list;
+
+    public int getCount() {
+        return count;
+    }
+
+    public void setCount(int count) {
+        this.count = count;
+    }
+
+    public List<ListDTO> getList() {
+        return list;
+    }
+
+    public void setList(List<ListDTO> list) {
+        this.list = list;
+    }
+
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public static class ListDTO {
+        private String bill_id;
+        private String uid;
+        private String link_id;
+        private String pm;
+        private String title;
+        private String category;
+        private String type;
+        private String number;
+        private String balance;
+        private String mark;
+        private String create_time;
+        private String status;
+        private String commission_type;
+        private String order_sn;
+        private String tripartite;
+        private String type_shop;
+        private String mer_id;
+        private String source;
+        private String order_type;
+        private String is_red_brokerage;
+        private String gzc;
+        private Object take_time;
+        private String district_id;
+        private String street_id;
+        private String is_record;
+        private String mer_name;
+        private String mer_avatar;
+        private ProductDTOX product;
+
+        public String getBill_id() {
+            return bill_id;
+        }
+
+        public void setBill_id(String bill_id) {
+            this.bill_id = bill_id;
+        }
+
+        public String getUid() {
+            return uid;
+        }
+
+        public void setUid(String uid) {
+            this.uid = uid;
+        }
+
+        public String getLink_id() {
+            return link_id;
+        }
+
+        public void setLink_id(String link_id) {
+            this.link_id = link_id;
+        }
+
+        public String getPm() {
+            return pm;
+        }
+
+        public void setPm(String pm) {
+            this.pm = pm;
+        }
+
+        public String getTitle() {
+            return title;
+        }
+
+        public void setTitle(String title) {
+            this.title = title;
+        }
+
+        public String getCategory() {
+            return category;
+        }
+
+        public void setCategory(String category) {
+            this.category = category;
+        }
+
+        public String getType() {
+            return type;
+        }
+
+        public void setType(String type) {
+            this.type = type;
+        }
+
+        public String getNumber() {
+            return number;
+        }
+
+        public void setNumber(String number) {
+            this.number = number;
+        }
+
+        public String getBalance() {
+            return balance;
+        }
+
+        public void setBalance(String balance) {
+            this.balance = balance;
+        }
+
+        public String getMark() {
+            return mark;
+        }
+
+        public void setMark(String mark) {
+            this.mark = mark;
+        }
+
+        public String getCreate_time() {
+            return create_time;
+        }
+
+        public void setCreate_time(String create_time) {
+            this.create_time = create_time;
+        }
+
+        public String getStatus() {
+            return status;
+        }
+
+        public void setStatus(String status) {
+            this.status = status;
+        }
+
+        public String getCommission_type() {
+            return commission_type;
+        }
+
+        public void setCommission_type(String commission_type) {
+            this.commission_type = commission_type;
+        }
+
+        public String getOrder_sn() {
+            return order_sn;
+        }
+
+        public void setOrder_sn(String order_sn) {
+            this.order_sn = order_sn;
+        }
+
+        public String getTripartite() {
+            return tripartite;
+        }
+
+        public void setTripartite(String tripartite) {
+            this.tripartite = tripartite;
+        }
+
+        public String getType_shop() {
+            return type_shop;
+        }
+
+        public void setType_shop(String type_shop) {
+            this.type_shop = type_shop;
+        }
+
+        public String getMer_id() {
+            return mer_id;
+        }
+
+        public void setMer_id(String mer_id) {
+            this.mer_id = mer_id;
+        }
+
+        public String getSource() {
+            return source;
+        }
+
+        public void setSource(String source) {
+            this.source = source;
+        }
+
+        public String getOrder_type() {
+            return order_type;
+        }
+
+        public void setOrder_type(String order_type) {
+            this.order_type = order_type;
+        }
+
+        public String getIs_red_brokerage() {
+            return is_red_brokerage;
+        }
+
+        public void setIs_red_brokerage(String is_red_brokerage) {
+            this.is_red_brokerage = is_red_brokerage;
+        }
+
+        public String getGzc() {
+            return gzc;
+        }
+
+        public void setGzc(String gzc) {
+            this.gzc = gzc;
+        }
+
+        public Object getTake_time() {
+            return take_time;
+        }
+
+        public void setTake_time(Object take_time) {
+            this.take_time = take_time;
+        }
+
+        public String getDistrict_id() {
+            return district_id;
+        }
+
+        public void setDistrict_id(String district_id) {
+            this.district_id = district_id;
+        }
+
+        public String getStreet_id() {
+            return street_id;
+        }
+
+        public void setStreet_id(String street_id) {
+            this.street_id = street_id;
+        }
+
+        public String getIs_record() {
+            return is_record;
+        }
+
+        public void setIs_record(String is_record) {
+            this.is_record = is_record;
+        }
+
+        public String getMer_name() {
+            return mer_name;
+        }
+
+        public void setMer_name(String mer_name) {
+            this.mer_name = mer_name;
+        }
+
+        public String getMer_avatar() {
+            return mer_avatar;
+        }
+
+        public void setMer_avatar(String mer_avatar) {
+            this.mer_avatar = mer_avatar;
+        }
+
+        public ProductDTOX getProduct() {
+            return product;
+        }
+
+        public void setProduct(ProductDTOX product) {
+            this.product = product;
+        }
+
+        @JsonIgnoreProperties(ignoreUnknown = true)
+        public static class ProductDTOX {
+            private ProductDTO product;
+            private ProductAttrDTO productAttr;
+            private String product_type;
+
+            public ProductDTO getProduct() {
+                return product;
+            }
+
+            public void setProduct(ProductDTO product) {
+                this.product = product;
+            }
+
+            public ProductAttrDTO getProductAttr() {
+                return productAttr;
+            }
+
+            public void setProductAttr(ProductAttrDTO productAttr) {
+                this.productAttr = productAttr;
+            }
+
+            public String getProduct_type() {
+                return product_type;
+            }
+
+            public void setProduct_type(String product_type) {
+                this.product_type = product_type;
+            }
+
+            @JsonIgnoreProperties(ignoreUnknown = true)
+            public static class ProductDTO {
+                private String product_id;
+                private String image;
+                private String store_name;
+                private String is_show;
+                private String status;
+                private String is_del;
+                private String unit_name;
+                private String price;
+                private String mer_status;
+                private String temp_id;
+                private String is_gift_bag;
+                private String is_used;
+                private String product_type;
+                private String old_product_id;
+                private TempDTO temp;
+                private List<?> give_coupon_ids;
+
+                public String getProduct_id() {
+                    return product_id;
+                }
+
+                public void setProduct_id(String product_id) {
+                    this.product_id = product_id;
+                }
+
+                public String getImage() {
+                    return image;
+                }
+
+                public void setImage(String image) {
+                    this.image = image;
+                }
+
+                public String getStore_name() {
+                    return store_name;
+                }
+
+                public void setStore_name(String store_name) {
+                    this.store_name = store_name;
+                }
+
+                public String getIs_show() {
+                    return is_show;
+                }
+
+                public void setIs_show(String is_show) {
+                    this.is_show = is_show;
+                }
+
+                public String getStatus() {
+                    return status;
+                }
+
+                public void setStatus(String status) {
+                    this.status = status;
+                }
+
+                public String getIs_del() {
+                    return is_del;
+                }
+
+                public void setIs_del(String is_del) {
+                    this.is_del = is_del;
+                }
+
+                public String getUnit_name() {
+                    return unit_name;
+                }
+
+                public void setUnit_name(String unit_name) {
+                    this.unit_name = unit_name;
+                }
+
+                public String getPrice() {
+                    return price;
+                }
+
+                public void setPrice(String price) {
+                    this.price = price;
+                }
+
+                public String getMer_status() {
+                    return mer_status;
+                }
+
+                public void setMer_status(String mer_status) {
+                    this.mer_status = mer_status;
+                }
+
+                public String getTemp_id() {
+                    return temp_id;
+                }
+
+                public void setTemp_id(String temp_id) {
+                    this.temp_id = temp_id;
+                }
+
+                public String getIs_gift_bag() {
+                    return is_gift_bag;
+                }
+
+                public void setIs_gift_bag(String is_gift_bag) {
+                    this.is_gift_bag = is_gift_bag;
+                }
+
+                public String getIs_used() {
+                    return is_used;
+                }
+
+                public void setIs_used(String is_used) {
+                    this.is_used = is_used;
+                }
+
+                public String getProduct_type() {
+                    return product_type;
+                }
+
+                public void setProduct_type(String product_type) {
+                    this.product_type = product_type;
+                }
+
+                public String getOld_product_id() {
+                    return old_product_id;
+                }
+
+                public void setOld_product_id(String old_product_id) {
+                    this.old_product_id = old_product_id;
+                }
+
+                public TempDTO getTemp() {
+                    return temp;
+                }
+
+                public void setTemp(TempDTO temp) {
+                    this.temp = temp;
+                }
+
+                public List<?> getGive_coupon_ids() {
+                    return give_coupon_ids;
+                }
+
+                public void setGive_coupon_ids(List<?> give_coupon_ids) {
+                    this.give_coupon_ids = give_coupon_ids;
+                }
+
+                @JsonIgnoreProperties(ignoreUnknown = true)
+                public static class TempDTO {
+                    private String shipping_template_id;
+                    private String name;
+                    private String type;
+                    private String appoint;
+                    private String undelivery;
+                    private String mer_id;
+                    private String is_default;
+                    private String sort;
+                    private String create_time;
+                    private RegionAddressDTO regionAddress;
+                    private Object undelives;
+                    private FreeAddressDTO freeAddress;
+
+                    public String getShipping_template_id() {
+                        return shipping_template_id;
+                    }
+
+                    public void setShipping_template_id(String shipping_template_id) {
+                        this.shipping_template_id = shipping_template_id;
+                    }
+
+                    public String getName() {
+                        return name;
+                    }
+
+                    public void setName(String name) {
+                        this.name = name;
+                    }
+
+                    public String getType() {
+                        return type;
+                    }
+
+                    public void setType(String type) {
+                        this.type = type;
+                    }
+
+                    public String getAppoint() {
+                        return appoint;
+                    }
+
+                    public void setAppoint(String appoint) {
+                        this.appoint = appoint;
+                    }
+
+                    public String getUndelivery() {
+                        return undelivery;
+                    }
+
+                    public void setUndelivery(String undelivery) {
+                        this.undelivery = undelivery;
+                    }
+
+                    public String getMer_id() {
+                        return mer_id;
+                    }
+
+                    public void setMer_id(String mer_id) {
+                        this.mer_id = mer_id;
+                    }
+
+                    public String getIs_default() {
+                        return is_default;
+                    }
+
+                    public void setIs_default(String is_default) {
+                        this.is_default = is_default;
+                    }
+
+                    public String getSort() {
+                        return sort;
+                    }
+
+                    public void setSort(String sort) {
+                        this.sort = sort;
+                    }
+
+                    public String getCreate_time() {
+                        return create_time;
+                    }
+
+                    public void setCreate_time(String create_time) {
+                        this.create_time = create_time;
+                    }
+
+                    public RegionAddressDTO getRegionAddress() {
+                        return regionAddress;
+                    }
+
+                    public void setRegionAddress(RegionAddressDTO regionAddress) {
+                        this.regionAddress = regionAddress;
+                    }
+
+                    public Object getUndelives() {
+                        return undelives;
+                    }
+
+                    public void setUndelives(Object undelives) {
+                        this.undelives = undelives;
+                    }
+
+                    public FreeAddressDTO getFreeAddress() {
+                        return freeAddress;
+                    }
+
+                    public void setFreeAddress(FreeAddressDTO freeAddress) {
+                        this.freeAddress = freeAddress;
+                    }
+
+                    @JsonIgnoreProperties(ignoreUnknown = true)
+                    public static class RegionAddressDTO {
+                        private String shipping_template_region_id;
+                        private String temp_id;
+                        private String city_id;
+                        private String first;
+                        private String first_price;
+                        @JsonProperty("continue")
+                        private String continueX;
+                        private String continue_price;
+
+                        public String getShipping_template_region_id() {
+                            return shipping_template_region_id;
+                        }
+
+                        public void setShipping_template_region_id(String shipping_template_region_id) {
+                            this.shipping_template_region_id = shipping_template_region_id;
+                        }
+
+                        public String getTemp_id() {
+                            return temp_id;
+                        }
+
+                        public void setTemp_id(String temp_id) {
+                            this.temp_id = temp_id;
+                        }
+
+                        public String getCity_id() {
+                            return city_id;
+                        }
+
+                        public void setCity_id(String city_id) {
+                            this.city_id = city_id;
+                        }
+
+                        public String getFirst() {
+                            return first;
+                        }
+
+                        public void setFirst(String first) {
+                            this.first = first;
+                        }
+
+                        public String getFirst_price() {
+                            return first_price;
+                        }
+
+                        public void setFirst_price(String first_price) {
+                            this.first_price = first_price;
+                        }
+
+                        public String getContinueX() {
+                            return continueX;
+                        }
+
+                        public void setContinueX(String continueX) {
+                            this.continueX = continueX;
+                        }
+
+                        public String getContinue_price() {
+                            return continue_price;
+                        }
+
+                        public void setContinue_price(String continue_price) {
+                            this.continue_price = continue_price;
+                        }
+                    }
+
+                    @JsonIgnoreProperties(ignoreUnknown = true)
+                    public static class FreeAddressDTO {
+                        private String shipping_template_free_id;
+                        private String temp_id;
+                        private String city_id;
+                        private String number;
+                        private String price;
+
+                        public String getShipping_template_free_id() {
+                            return shipping_template_free_id;
+                        }
+
+                        public void setShipping_template_free_id(String shipping_template_free_id) {
+                            this.shipping_template_free_id = shipping_template_free_id;
+                        }
+
+                        public String getTemp_id() {
+                            return temp_id;
+                        }
+
+                        public void setTemp_id(String temp_id) {
+                            this.temp_id = temp_id;
+                        }
+
+                        public String getCity_id() {
+                            return city_id;
+                        }
+
+                        public void setCity_id(String city_id) {
+                            this.city_id = city_id;
+                        }
+
+                        public String getNumber() {
+                            return number;
+                        }
+
+                        public void setNumber(String number) {
+                            this.number = number;
+                        }
+
+                        public String getPrice() {
+                            return price;
+                        }
+
+                        public void setPrice(String price) {
+                            this.price = price;
+                        }
+                    }
+                }
+            }
+
+            @JsonIgnoreProperties(ignoreUnknown = true)
+            public static class ProductAttrDTO {
+                private Object gong_mer_profit;
+                private Object gong_pension;
+                private Object gong_market_price;
+                private Object cost_price;
+                private String product_id;
+                private String stock;
+                private String price;
+                private String unique;
+                private String sku;
+                private String volume;
+                private String weight;
+                private String ot_price;
+                private String dacang_price;
+                private Object gong_sku_id;
+                private String cost;
+                private int bc_extension_one;
+                private int bc_extension_two;
+                private int seckill;
+
+                public Object getGong_mer_profit() {
+                    return gong_mer_profit;
+                }
+
+                public void setGong_mer_profit(Object gong_mer_profit) {
+                    this.gong_mer_profit = gong_mer_profit;
+                }
+
+                public Object getGong_pension() {
+                    return gong_pension;
+                }
+
+                public void setGong_pension(Object gong_pension) {
+                    this.gong_pension = gong_pension;
+                }
+
+                public Object getGong_market_price() {
+                    return gong_market_price;
+                }
+
+                public void setGong_market_price(Object gong_market_price) {
+                    this.gong_market_price = gong_market_price;
+                }
+
+                public Object getCost_price() {
+                    return cost_price;
+                }
+
+                public void setCost_price(Object cost_price) {
+                    this.cost_price = cost_price;
+                }
+
+                public String getProduct_id() {
+                    return product_id;
+                }
+
+                public void setProduct_id(String product_id) {
+                    this.product_id = product_id;
+                }
+
+                public String getStock() {
+                    return stock;
+                }
+
+                public void setStock(String stock) {
+                    this.stock = stock;
+                }
+
+                public String getPrice() {
+                    return price;
+                }
+
+                public void setPrice(String price) {
+                    this.price = price;
+                }
+
+                public String getUnique() {
+                    return unique;
+                }
+
+                public void setUnique(String unique) {
+                    this.unique = unique;
+                }
+
+                public String getSku() {
+                    return sku;
+                }
+
+                public void setSku(String sku) {
+                    this.sku = sku;
+                }
+
+                public String getVolume() {
+                    return volume;
+                }
+
+                public void setVolume(String volume) {
+                    this.volume = volume;
+                }
+
+                public String getWeight() {
+                    return weight;
+                }
+
+                public void setWeight(String weight) {
+                    this.weight = weight;
+                }
+
+                public String getOt_price() {
+                    return ot_price;
+                }
+
+                public void setOt_price(String ot_price) {
+                    this.ot_price = ot_price;
+                }
+
+                public String getDacang_price() {
+                    return dacang_price;
+                }
+
+                public void setDacang_price(String dacang_price) {
+                    this.dacang_price = dacang_price;
+                }
+
+                public Object getGong_sku_id() {
+                    return gong_sku_id;
+                }
+
+                public void setGong_sku_id(Object gong_sku_id) {
+                    this.gong_sku_id = gong_sku_id;
+                }
+
+                public String getCost() {
+                    return cost;
+                }
+
+                public void setCost(String cost) {
+                    this.cost = cost;
+                }
+
+                public int getBc_extension_one() {
+                    return bc_extension_one;
+                }
+
+                public void setBc_extension_one(int bc_extension_one) {
+                    this.bc_extension_one = bc_extension_one;
+                }
+
+                public int getBc_extension_two() {
+                    return bc_extension_two;
+                }
+
+                public void setBc_extension_two(int bc_extension_two) {
+                    this.bc_extension_two = bc_extension_two;
+                }
+
+                public int getSeckill() {
+                    return seckill;
+                }
+
+                public void setSeckill(int seckill) {
+                    this.seckill = seckill;
+                }
+            }
+        }
+    }
+}

app/src/main/java/com/yihucha/hbyhc/presentation/annuity/model/SelectorBean.kt

@@ -0,0 +1,8 @@
+package com.yihucha.hbyhc.presentation.annuity.model
+
+/**
+ *  author : zhangbing
+ *  time   : 2024/1/30 20:30
+ *  com.yihucha.hbyhc.presentation.annuity.model
+ */
+class SelectorBean(var name: String, var key: String?, var isChecked: Boolean = false)

app/src/main/java/com/yihucha/hbyhc/presentation/mine/MineFragment_copy.java

@@ -1,517 +0,0 @@
-package com.yihucha.hbyhc.presentation.mine;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-
-import com.yihucha.hbyhc.base.BaseFragment;
-
-/**
- * @author qmzh
- * @date 2022/6/20
- * note:
- */
-public class MineFragment_copy extends BaseFragment {
-/*    private FragmentMineBinding binding;
-    private MineViewModel mMineViewModel;
-    private UserInfoModel mUserInfoModel;
-    private boolean isAnnuity;
-    private boolean isBangfu = false;*/
-
-    public View onCreateView(@NonNull LayoutInflater inflater,
-                             ViewGroup container, Bundle savedInstanceState) {
-/*        mMineViewModel =
-                new ViewModelProvider(this).get(MineViewModel.class);
-
-        binding = FragmentMineBinding.inflate(inflater, container, false);
-        View root = binding.getRoot();
-//        ImmersedStatusbarUtils.initAfterSetContentView(getActivity(), binding.viewOccupy);
-        initView();
-        initClick();*/
-//        return root;
-        return null;
-    }
-/*
-    private void initData() {
-        if (!"".equals(MVUtils.getString(Constants.TOKEN))) {
-            //用户信息
-            mMineViewModel.getUserInfo();
-            mMineViewModel.userModel.observe(getActivity(), new Observer<UserInfoModel>() {
-                @Override
-                public void onChanged(UserInfoModel uesrInfoModel) {
-                    mUserInfoModel = uesrInfoModel;
-                    if (!TextUtils.isEmpty(uesrInfoModel.getAvatar())) {
-                        GlideUtils.loadCircleImage(getActivity(), uesrInfoModel.getAvatar(), binding.ivAvatar, R.mipmap.home_default_avatar_220614);
-//                        GlideUtils.loadGif(getActivity(), R.mipmap.refresh_header3, binding.ivAvatar);
-                    }
-                    //我的邀请码
-                    MVUtils.put(Constants.USER_NUMBER, uesrInfoModel.getUser_number());
-                    //昵称
-                    MVUtils.put(Constants.NICK_NAME, uesrInfoModel.getNickname());
-                    binding.tvNickname.setText(uesrInfoModel.getNickname());
-                    String tel = StringsUtil.encodeTel(uesrInfoModel.getPhone());
-                    binding.tvPhone.setText(tel);
-//                    binding.tvAnnuity.setText(uesrInfoModel.getAnnuity());
-                    binding.tvMyIntegral.setText(uesrInfoModel.getScore());
-//                    if (uesrInfoModel.getIs_da_cang_vip().equals("0")) {
-//                        //非会员
-//                        binding.ivMember.setVisibility(View.GONE);
-//                    } else if (uesrInfoModel.getIs_da_cang_vip().equals("1")) {
-//                        //金卡
-//                        binding.ivMember.setVisibility(View.VISIBLE);
-//                        binding.ivMember.setImageResource(R.mipmap.jinka_220815);
-//                    } else if (uesrInfoModel.getIs_da_cang_vip().equals("2")) {
-//                        //银卡
-//                        binding.ivMember.setVisibility(View.VISIBLE);
-//                        binding.ivMember.setImageResource(R.mipmap.yinka_220815);
-//                    }
-                    binding.tvRedIntegral.setText(mUserInfoModel.getRed());
-                    binding.tvTeamCount.setText(mUserInfoModel.getSbreak());
-
-                    binding.tvMember.setVisibility(View.GONE);
-                    binding.imgvUser.setVisibility(View.VISIBLE);
-                    binding.imgvCwdl.setVisibility(View.GONE);
-                    String member = mUserInfoModel.getUser_rich_type();
-                    isBangfu = false;
-                    if ("0".equals(member)) {
-                        binding.imgvUser.setImageResource(R.mipmap.user);
-                        binding.imgvCwdl.setVisibility(View.VISIBLE);
-                    } else if ("1".equals(member)) {
-                        binding.imgvUser.setImageResource(R.mipmap.vip);
-                        binding.imgvCwdl.setVisibility(View.VISIBLE);
-                    } else if ("5".equals(member)) {
-                        binding.imgvUser.setImageResource(R.mipmap.cdaili);
-                    } else if ("3".equals(member)) {
-                        binding.tvMember.setVisibility(View.VISIBLE);
-                        binding.imgvUser.setVisibility(View.GONE);
-                        binding.tvMember.setText("创始人");
-                    } else if ("4".equals(member)) {
-                        binding.imgvUser.setImageResource(R.mipmap.high_vip);
-                        binding.imgvCwdl.setVisibility(View.VISIBLE);
-                    } else if ("6".equals(member)) {
-                        binding.imgvUser.setImageResource(R.mipmap.jdaili);
-                    } else if ("7".equals(member)) {
-                        binding.imgvUser.setImageResource(R.mipmap.xdaili);
-                    } else {
-                        binding.tvMember.setVisibility(View.VISIBLE);
-                        binding.imgvUser.setVisibility(View.GONE);
-                        binding.tvMember.setText("帮扶中心");
-                        isBangfu = true;
-                    }
-                    *//*if (uesrInfoModel.getIs_da_cang_vip().equals("1")||uesrInfoModel.getIs_da_cang_vip().equals("2")
-                            ||uesrInfoModel.getIs_da_cang_vip().equals("3")){
-                        //会员
-                        binding.ivMember.setImageResource(R.mipmap.me_member_221013);
-                    }else if (uesrInfoModel.getIs_da_cang_vip().equals("4")){
-                        //银卡
-                        binding.ivMember.setImageResource(R.mipmap.me_silver_member_221013);
-                    }else if (uesrInfoModel.getIs_da_cang_vip().equals("5")){
-                        //金卡
-                        binding.ivMember.setImageResource(R.mipmap.me_the_gold_card_members_221013);
-                    }else if (uesrInfoModel.getIs_da_cang_vip().equals("6")){
-                        //钻石
-                        binding.ivMember.setImageResource(R.mipmap.me_diamond_members_221013);
-                    }else if (uesrInfoModel.getIs_da_cang_vip().equals("7")){
-                        //董事
-                        binding.ivMember.setImageResource(R.mipmap.me_dongshi_221013);
-                    }else {
-                        //普通用户
-                        binding.ivMember.setVisibility(View.GONE);
-                    }*//*
-//                    if (uesrInfoModel.getIs_channel().equals("0")) {
-//                        //非渠道商
-//                        binding.ivChannel.setVisibility(View.GONE);
-//                    } else {
-//                        //渠道商
-//                        binding.ivChannel.setVisibility(View.VISIBLE);
-//                    }
-                    if (uesrInfoModel.getIdentity().equals("1")
-                            || uesrInfoModel.getIdentity().equals("2")
-                            || uesrInfoModel.getIdentity().equals("3")) {
-                        //代理商
-//                        binding.ivAgent.setVisibility(View.VISIBLE);
-                    } else {
-                        //非代理商
-//                        binding.ivAgent.setVisibility(View.GONE);
-                    }
-                }
-            });
-
-            mMineViewModel.getOrderQuantity();
-            mMineViewModel.orderQuantityData.observe(getActivity(), new Observer<OrderQuantityBean>() {
-                @Override
-                public void onChanged(OrderQuantityBean orderQuantityBean) {
-                    //待付款
-                    if (!orderQuantityBean.getNoPay().equals("0")) {
-                        binding.llPaymentRequired.setVisibility(View.VISIBLE);
-                        binding.tvPaymentRequired.setText(orderQuantityBean.getNoPay());
-                    } else {
-                        binding.llPaymentRequired.setVisibility(View.GONE);
-                    }
-                    //代发货
-                    if (!orderQuantityBean.getNoPostage().equals("0")) {
-                        binding.llWaitForDelivery.setVisibility(View.VISIBLE);
-                        binding.tvWaitForDelivery.setText(orderQuantityBean.getNoPostage());
-                    } else {
-                        binding.llWaitForDelivery.setVisibility(View.GONE);
-                    }
-                    //待收货
-                    if (!orderQuantityBean.getNoDeliver().equals("0")) {
-                        binding.llWaitingForTheGoods.setVisibility(View.VISIBLE);
-                        binding.tvWaitingForTheGoods.setText(orderQuantityBean.getNoDeliver());
-                    } else {
-                        binding.llWaitingForTheGoods.setVisibility(View.GONE);
-                    }
-                    //待评价
-                    if (!orderQuantityBean.getNoComment().equals("0")) {
-//                        tv_waiting_for_the_evaluation
-                        binding.llWaitingForTheEvaluation.setVisibility(View.VISIBLE);
-                        binding.tvWaitingForTheEvaluation.setText(orderQuantityBean.getNoComment());
-                    } else {
-                        binding.llWaitingForTheEvaluation.setVisibility(View.GONE);
-                    }
-                    //退款收货
-                    if (!orderQuantityBean.getRefund().equals("0")) {
-//                        tv_after_sale
-                        binding.llAfterSale.setVisibility(View.VISIBLE);
-                        binding.tvAfterSale.setText(orderQuantityBean.getRefund());
-                    } else {
-                        binding.llAfterSale.setVisibility(View.GONE);
-                    }
-                }
-            });
-            //养老金
-            mMineViewModel.getYanglaojin();
-            mMineViewModel.yanglaojinBeanMutableLiveData.observe(getActivity(), new Observer<YanglaojinBean>() {
-                @Override
-                public void onChanged(YanglaojinBean yanglaojinBean) {
-                    binding.tvAnnuity.setText(yanglaojinBean.getAll_yanglao() + "");
-                }
-            });
-            //网络请求失败
-            mMineViewModel.failed.observe(getActivity(), new Observer<String>() {
-                @Override
-                public void onChanged(String s) {
-                    ToastUtils.showLong(s);
-                }
-            });
-            //我的邀请
-            mMineViewModel.getMyInvitation();
-            mMineViewModel.myInvitationBeanMutableLiveData.observe(getActivity(), new Observer<MyInvitationBean>() {
-                @Override
-                public void onChanged(MyInvitationBean myInvitationBean) {
-                    binding.tvMyCommission.setText(myInvitationBean.getBrokerage_price());
-                }
-            });
-
-        }
-
-    }
-
-    private void initClick() {
-        binding.llAddress.setOnClickListener(this);
-        binding.ivAvatar.setOnClickListener(this);
-        binding.llPersonalData.setOnClickListener(this);
-        binding.llAllOrder.setOnClickListener(this);
-
-        binding.llClickPaymentRequired.setOnClickListener(this);
-        binding.llClickWaitForDelivery.setOnClickListener(this);
-        binding.llClickWaitingForTheGoods.setOnClickListener(this);
-        binding.llClickWaitingForTheEvaluation.setOnClickListener(this);
-        binding.llClickAfterSale.setOnClickListener(this);
-
-        binding.llAnnuity.setOnClickListener(this);
-        binding.llSettingup.setOnClickListener(this);
-        binding.llMyFavorite.setOnClickListener(this);
-        binding.llWodeguanzhu.setOnClickListener(this);
-        binding.llBangzhuzhongxin.setOnClickListener(this);
-        binding.llWodepingjia.setOnClickListener(this);
-        binding.llWodeerweima.setOnClickListener(this);
-        binding.llMyInvitation.setOnClickListener(this);
-        binding.llSanfangdingdan.setOnClickListener(this);
-        binding.llMyCommission.setOnClickListener(this);
-        binding.llMyIntegral.setOnClickListener(this);
-        binding.llShangpuruzhu.setOnClickListener(this);
-        binding.llChuangfubao.setOnClickListener(this);
-        binding.llAccountServiceFee.setOnClickListener(this);
-
-        binding.llRedIntegral.setOnClickListener(this);
-        binding.tvMember.setOnClickListener(this);
-
-        binding.imgvUser.setOnClickListener(this);
-        binding.llBangfuzhongxin.setOnClickListener(this);
-        binding.llConnectUs.setOnClickListener(this);
-        binding.imgvCwdl.setOnClickListener(this);
-    }
-
-    private void initView() {
-
-        *//**
-         * 检测用户年费状态
-         *//*
-//        mMineViewModel.mAccountServiceFeedData.observe(getActivity(), accountServiceFeeBean -> {
-//            LogUtil.LogInfo("QQQQ","0000");
-//            if ("0".equals(accountServiceFeeBean.getStatus())||"1".equals(accountServiceFeeBean.getStatus())){
-//                mMineViewModel.getCreateAnnualOrder();
-//            }else if ("2".equals(accountServiceFeeBean.getStatus())){
-//                CustomDialog.getUnverified(getActivity());
-//            }else {
-//                if (isAnnuity){
-//                    //养老金
-//                    AnnuityActivity.launch(getActivity());
-//                }else {
-//                    PensionAccountPaySucceedActivity.launch(getActivity());
-//                }
-//
-//            }
-//        });
-
-        *//**
-         * 创建订单
-         *//*
-//        mMineViewModel.mCreateAnnualOrderData.observe(getActivity(), new Observer<CreateAnnualOrderBean>() {
-//            @Override
-//            public void onChanged(CreateAnnualOrderBean createAnnualOrderBean) {
-//                LogUtil.LogInfo("QQQQ","1111");
-//                PensionAccountPayActivity.launch(getActivity(),createAnnualOrderBean.getOrder_id());
-//            }
-//        });
-    }
-
-    @Override
-    public void onClick(View view) {
-        if (view == binding.imgvCwdl) {
-            int flag = 0;
-            String user_rich_type = mUserInfoModel.getUser_rich_type();
-            String str = "用户";
-            if ("0".equals(user_rich_type)){
-                str = "用户";
-                flag = 0;
-            }else if ("1".equals(user_rich_type)) {
-                flag = 1;
-                str = "会员";
-            }else if ("4".equals(user_rich_type)){
-                flag = 4;
-            }
-            if (flag <=1) {
-                String notice = "亲爱的"+str+",请先升级到高级会员再申请区域代理~";
-                CustomDialog.defaultDialog(getActivity(), R.string.warm_prompt, notice, R.string.cancel, R.string.go_up, new TwoButtonsListener() {
-                    @Override
-                    public void leftButton() {
-                    }
-
-                    @Override
-                    public void rightButton() {
-                        VipAreaActivity.lanuch(getActivity());
-                    }
-                });
-            }else {
-
-            }
-
-        } else if (view == binding.llAddress) {
-            //我的地址
-            MyAddressActivity.launch(getActivity());
-        } else if (view == binding.ivAvatar) {
-            //个人资料
-            MyProfileActivity.launch(getActivity());
-        } else if (view == binding.llPersonalData) {
-            //个人资料
-            MyProfileActivity.launch(getActivity());
-        } else if (view == binding.llAllOrder) {
-            //我的订单
-            OrderActivity.launch(getActivity(), Constants.ALL_ORDER);
-        } else if (view == binding.llClickPaymentRequired) {
-            //待付款
-            OrderActivity.launch(getActivity(), Constants.OBLIGATION);
-        } else if (view == binding.llClickWaitForDelivery) {
-            //待发货
-            OrderActivity.launch(getActivity(), Constants.TO_SEND_THE_GOODS);
-        } else if (view == binding.llClickWaitingForTheGoods) {
-            //待收货
-            OrderActivity.launch(getActivity(), Constants.WAIT_FOR_RECEIVING);
-        } else if (view == binding.llClickWaitingForTheEvaluation) {
-            //待评价
-            OrderActivity.launch(getActivity(), Constants.EVALUATE);
-        } else if (view == binding.llClickAfterSale) {
-            //退款售后
-            AfterSalesOrderListActivity.launch(getActivity());
-        } else if (view == binding.llAnnuity) {
-            isAnnuity = true;
-            //账号服务费
-//            mMineViewModel.getAccountServiceFee();
-            if (isAnnuity) {
-                //养老金
-                AnnuityActivity.launch(getActivity());
-            } else {
-                PensionAccountPaySucceedActivity.launch(getActivity());
-            }
-        } else if (view == binding.llSettingup) {
-            //设置
-            SettingUpActivity.launch(getActivity());
-        } else if (view == binding.llMyFavorite) {
-            //我的收藏
-            MyFavoriteActivity.launch(getActivity());
-        } else if (view == binding.llWodeguanzhu) {
-            //我的关注
-            MyFocusActivity.launch(getActivity());
-        } else if (view == binding.llBangzhuzhongxin) {
-            //帮助中心
-            HelpCenterActivity.launch(getActivity());
-        } else if (view == binding.llWodepingjia) {
-            //我的评价
-            MyEvaluateActivity.launch(getActivity());
-        } else if (view == binding.llWodeerweima) {
-            //我的二维码
-//            MyQRCodeActivity.launch(getActivity());
-            //邀请好友
-            InviteFriendsActivity.launch(getActivity());
-        } else if (view == binding.llMyInvitation) {
-            //我的邀请
-            MyInvitationActivity.launch(getActivity());
-        } else if (view == binding.llSanfangdingdan) {
-            //三方订单
-            TripartiteOrderActivity.launch(getActivity());
-        } else if (view == binding.llMyCommission) {
-            //点击我的佣金进入我的邀请
-            MyInvitationActivity.launch(getActivity());
-        } else if (view == binding.llMyIntegral) {
-            //我的积分
-//            MyIntegralActivity.launch(getActivity());
-//            MyIncomeActivity.launch(getActivity());
-            AgentRegionalDistributionActivity.launch(getActivity());
-        } else if (view == binding.llShangpuruzhu) {
-            //商铺入驻
-            IWXAPI api = WXAPIFactory.createWXAPI(getActivity(), Constants.WX_APP_ID);
-
-            WXLaunchMiniProgram.Req req = new WXLaunchMiniProgram.Req();
-            req.userName = Constants.SHOPS_IN_APPLET_ID; // 填小程序原始id
-            req.path = Constants.SHOPS_IN_OFFICE_URL;                  ////拉起小程序页面的可带参路径，不填默认拉起小程序首页，对于小游戏，可以只传入 query 部分，来实现传参效果，如：传入 "?foo=bar"。
-            req.miniprogramType = HttpUrl.IS_RELEASE ? WXLaunchMiniProgram.Req.MINIPTOGRAM_TYPE_RELEASE :
-                    WXLaunchMiniProgram.Req.MINIPROGRAM_TYPE_PREVIEW;// 可选打开 开发版，体验版和正式版
-
-            api.sendReq(req);
-        } else if (view == binding.llChuangfubao) {
-            H5TitleActivity.launch(getActivity(), "",
-                    Constants.CHUANGFUBAO + MVUtils.getString(Constants.TOKEN));
-        } else if (view == binding.llAccountServiceFee) {
-            //账号服务费
-            isAnnuity = false;
-//            mMineViewModel.getAccountServiceFee();
-            if (isAnnuity) {
-                //养老金
-                AnnuityActivity.launch(getActivity());
-            } else {
-                PensionAccountPaySucceedActivity.launch(getActivity());
-            }
-        } else if (view == binding.llRedIntegral) {
-            //红积分
-            Bundle bundle = new Bundle();
-            bundle.putString("nickname", mUserInfoModel.getNickname());
-            bundle.putString("phone", mUserInfoModel.getPhone());
-            bundle.putString("avatar", mUserInfoModel.getAvatar());
-            bundle.putString("member", mUserInfoModel.getUser_rich_type());
-            bundle.putString("member_brokerage_price", mUserInfoModel.getMember_brokerage_price());
-            bundle.putString("red", mUserInfoModel.getRed());
-            bundle.putBoolean("is_bangfu", isBangfu);
-            RedIntegralActivity_copy.launch(getContext(), bundle);
-        } else if (view == binding.tvMember) {
-            if (isBangfu) {
-                //帮扶中心
-                Bundle bundle = new Bundle();
-                bundle.putString("nickname", mUserInfoModel.getNickname());
-                bundle.putString("phone", mUserInfoModel.getPhone());
-                bundle.putString("avatar", mUserInfoModel.getAvatar());
-                bundle.putString("member", mUserInfoModel.getUser_rich_type());
-
-                bundle.putString("annuity", binding.tvAnnuity.getText().toString());
-                bundle.putString("commission", binding.tvMyCommission.getText().toString());
-                bundle.putString("integral", binding.tvMyIntegral.getText().toString());
-                bundle.putString("red_integral", binding.tvRedIntegral.getText().toString());
-                bundle.putString("team_count", binding.tvTeamCount.getText().toString());
-                bundle.putBoolean("is_bangfu", isBangfu);
-                BangfuzhongxinActivity_copy.launch(getActivity(), bundle);
-            } else {
-                //会员中心
-                Bundle bundle = new Bundle();
-                bundle.putString("nickname", mUserInfoModel.getNickname());
-                bundle.putString("phone", mUserInfoModel.getPhone());
-                bundle.putString("avatar", mUserInfoModel.getAvatar());
-                bundle.putString("member", mUserInfoModel.getUser_rich_type());
-
-                bundle.putString("annuity", binding.tvAnnuity.getText().toString());
-                bundle.putString("commission", binding.tvMyCommission.getText().toString());
-                bundle.putString("integral", binding.tvMyIntegral.getText().toString());
-                bundle.putString("red_integral", binding.tvRedIntegral.getText().toString());
-                bundle.putString("team_count", binding.tvTeamCount.getText().toString());
-                RulesActivity_copy.launch(getActivity(), bundle);
-            }
-        } else if (view == binding.imgvUser) {
-            //会员中心
-            Bundle bundle = new Bundle();
-            bundle.putString("nickname", mUserInfoModel.getNickname());
-            bundle.putString("phone", mUserInfoModel.getPhone());
-            bundle.putString("avatar", mUserInfoModel.getAvatar());
-            bundle.putString("member", mUserInfoModel.getUser_rich_type());
-
-            bundle.putString("annuity", binding.tvAnnuity.getText().toString());
-            bundle.putString("commission", binding.tvMyCommission.getText().toString());
-            bundle.putString("integral", binding.tvMyIntegral.getText().toString());
-            bundle.putString("red_integral", binding.tvRedIntegral.getText().toString());
-            bundle.putString("team_count", binding.tvTeamCount.getText().toString());
-            RulesActivity_copy.launch(getActivity(), bundle);
-        } else if (view == binding.llBangfuzhongxin) {
-            Bundle bundle = new Bundle();
-            bundle.putString("nickname", mUserInfoModel.getNickname());
-            bundle.putString("phone", mUserInfoModel.getPhone());
-            bundle.putString("avatar", mUserInfoModel.getAvatar());
-            bundle.putString("member", mUserInfoModel.getUser_rich_type());
-
-            bundle.putString("annuity", binding.tvAnnuity.getText().toString());
-            bundle.putString("commission", binding.tvMyCommission.getText().toString());
-            bundle.putString("integral", binding.tvMyIntegral.getText().toString());
-            bundle.putString("red_integral", binding.tvRedIntegral.getText().toString());
-            bundle.putString("team_count", binding.tvTeamCount.getText().toString());
-            bundle.putBoolean("is_bangfu", isBangfu);
-            BangfuzhongxinActivity_copy.launch(getActivity(), bundle);
-        } else if (view == binding.llConnectUs) {
-//            ToastUtils.showLong("联系我们");
-//            WebViewTitleBaseActivity.launch(getActivity(),"联系我们","https://work.weixin.qq.com/kfid/kfce29f31a08fd53ee0");
-           *//* Intent intent = new Intent(Intent.ACTION_VIEW);
-            Uri content= Uri.parse("https://work.weixin.qq.com/kfid/kfce29f31a08fd53ee0");
-            intent.setData(content);
-            startActivity(intent);*//*
-            String appId = "wxbf753066ac8686ba";
-            IWXAPI wxapi = WXAPIFactory.createWXAPI(getActivity(), appId);
-            if (wxapi.getWXAppSupportAPI() >= Build.SUPPORT_OPEN_CUSTOMER_SERVICE_CHAT) {
-                WXOpenCustomerServiceChat.Req req = new WXOpenCustomerServiceChat.Req();
-                req.corpId = "wwaeb55681929a37ae";
-                req.url = "https://work.weixin.qq.com/kfid/kfc8bd3f11a28aa81db";
-                wxapi.sendReq(req);
-            }
-
-        }
-//        else if (view == binding.llChannel) {
-//            //渠道商申请
-////            if (mUserInfoModel.getIs_channel().equals("0")) {
-////                //非渠道商
-////                ApplyChannelActivity.launch(getActivity());
-////            } else {
-////                //渠道商
-////                ChannelOpenSuccessActivity.launch(getActivity());
-////
-////            }
-//        }
-
-    }
-
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        initData();
-    }*/
-}

app/src/main/java/com/yihucha/hbyhc/presentation/mine/view_model/MineViewModel.java

@@ -17,6 +17,7 @@ import com.yihucha.hbyhc.network.request_bean.UidRequest;
 import com.yihucha.hbyhc.network.service.OrderService;
 import com.yihucha.hbyhc.network.service.UserService;
 import com.yihucha.hbyhc.presentation.annuity.model.AmountFromGzcBean;
+import com.yihucha.hbyhc.presentation.annuity.model.AnnuityRecordsBean;
 import com.yihucha.hbyhc.presentation.annuity.model.YanglaojinLogXSBean;
 import com.yihucha.hbyhc.presentation.annuity.model.YanglaojinLogXXBean;
 import com.yihucha.hbyhc.presentation.integral.model.IntegralListBean;
@@ -41,6 +42,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import io.reactivex.Observer;
+
 /**
  * @author qmzh
  * @date 2022/6/21
@@ -55,20 +58,21 @@ public class MineViewModel extends BaseViewModel {
     public MutableLiveData<MyInvitationBean> myInvitationBeanMutableLiveData = new MutableLiveData<>();//我的邀请
     public MutableLiveData<MyFavoriteBean> mMyFavoriteData = new MutableLiveData<>();//我的收藏
     public MutableLiveData<MyFocusBean> mMyFocusData = new MutableLiveData<>();//我的关注
-    public MutableLiveData<MyEvaluateBean> mMyEvaluateData=new MutableLiveData<>();//评论列表
-    public MutableLiveData<String> deleteEvaluateSuccess=new MutableLiveData<>();//删除评论成
-    public MutableLiveData<YanglaojinLogXXBean> mYanglaojinLogXXData=new MutableLiveData<>();//养老金记录线下
-    public MutableLiveData<YanglaojinLogXSBean> mYanglaojinLogXSData=new MutableLiveData<>();//养老金记录线上
+    public MutableLiveData<MyEvaluateBean> mMyEvaluateData = new MutableLiveData<>();//评论列表
+    public MutableLiveData<String> deleteEvaluateSuccess = new MutableLiveData<>();//删除评论成
+    public MutableLiveData<YanglaojinLogXXBean> mYanglaojinLogXXData = new MutableLiveData<>();//养老金记录线下
+    public MutableLiveData<YanglaojinLogXSBean> mYanglaojinLogXSData = new MutableLiveData<>();//养老金记录线上
 
-    public MutableLiveData<ThirdOrderBean> mThirdOrderData=new MutableLiveData<>();//三方订单
-    public MutableLiveData<SignInInfoBean> mSignInInfoData=new MutableLiveData<>();//签到信息
-    public MutableLiveData<SignInBean> mSignInSucceed=new MutableLiveData<>();//签到
-    public MutableLiveData<RewardsocrBean> mRewardsocrData=new MutableLiveData<>();//广告积分数据
-    public MutableLiveData<IntegralListBean> mIntegralListData=new MutableLiveData<>();//积分数据列表
+    public MutableLiveData<ThirdOrderBean> mThirdOrderData = new MutableLiveData<>();//三方订单
+    public MutableLiveData<SignInInfoBean> mSignInInfoData = new MutableLiveData<>();//签到信息
+    public MutableLiveData<SignInBean> mSignInSucceed = new MutableLiveData<>();//签到
+    public MutableLiveData<RewardsocrBean> mRewardsocrData = new MutableLiveData<>();//广告积分数据
+    public MutableLiveData<IntegralListBean> mIntegralListData = new MutableLiveData<>();//积分数据列表
 
-    public MutableLiveData<AmountFromGzcBean>mAmount=new MutableLiveData();//公证处养老金余额
+    public MutableLiveData<AmountFromGzcBean> mAmount = new MutableLiveData();//公证处养老金余额
 
-    public MutableLiveData<UserVipInfoBean> mUserVipInfoData=new MutableLiveData<>();//会员资料
+    public MutableLiveData<UserVipInfoBean> mUserVipInfoData = new MutableLiveData<>();//会员资料
+    public MutableLiveData<AnnuityRecordsBean> annuityRecordsList = new MutableLiveData<>();//养老金列表
 
     public MutableLiveData<Boolean> cancleCollectState = new MutableLiveData<>();
     /**
@@ -109,9 +113,9 @@ public class MineViewModel extends BaseViewModel {
         orderService.getOrderNumber().compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<OrderQuantityBean>>() {
             @Override
             public void onSuccess(DataResponse<OrderQuantityBean> orderQuantityBeanDataResponse) {
-                if (orderQuantityBeanDataResponse.responseCode == 200){
+                if (orderQuantityBeanDataResponse.responseCode == 200) {
                     orderQuantityData.postValue(orderQuantityBeanDataResponse.getData());
-                }else {
+                } else {
                     ToastUtils.showLong(orderQuantityBeanDataResponse.responseError);
                 }
 
@@ -143,6 +147,34 @@ public class MineViewModel extends BaseViewModel {
     }
 
     /**
+     * 养老金列表
+     */
+    @SuppressLint("CheckResult")
+    public void getYanglaoList(int page,String sorce,String month,int status) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("page",page);
+        map.put("limit",10);
+        map.put("sorce",sorce);
+        map.put("month",month);
+        map.put("status",status);
+        UserService service = NetworkApi.createService(UserService.class);
+        service.getYanglaoList(map).compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<AnnuityRecordsBean>>() {
+            @Override
+            public void onSuccess(DataResponse<AnnuityRecordsBean> response) {
+                if (response.responseCode==200) {
+                    annuityRecordsList.postValue(response.getData());
+                }else {
+                    failed.postValue(response.responseError);
+                }
+            }
+            @Override
+            public void onFailure(Throwable e) {
+                LogUtil.LogError(TAG,e.getMessage());
+            }
+        }));
+    }
+
+    /**
      * 养老金信息
      */
     public void getYanglaojinInfo() {
@@ -178,6 +210,7 @@ public class MineViewModel extends BaseViewModel {
 
     /**
      * 我的收藏
+     *
      * @param map
      */
     @SuppressLint("CheckResult")
@@ -203,6 +236,7 @@ public class MineViewModel extends BaseViewModel {
 
     /**
      * 我的关注
+     *
      * @param map
      */
     @SuppressLint("CheckResult")
@@ -225,12 +259,13 @@ public class MineViewModel extends BaseViewModel {
             }
         }));
     }
+
     /**
      * 取消收藏
      *
      * @param request
      */
-    public void getRelationDelete(RelationRequest request,int position) {
+    public void getRelationDelete(RelationRequest request, int position) {
         UserRepository.getDeleteAttention(request, new NormalListener<DataResponse>() {
             @Override
             public void success(DataResponse dataResponse) {
@@ -251,14 +286,15 @@ public class MineViewModel extends BaseViewModel {
 
     /**
      * 评价列表
+     *
      * @param page
      */
     @SuppressLint("CheckResult")
-    public void getEvaluateList(int page){
-        Map<String,Object> map =new HashMap<>();
-        map.put("page",page);
-        map.put("limit",10);
-        UserService userService=NetworkApi.createService(UserService.class);
+    public void getEvaluateList(int page) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("page", page);
+        map.put("limit", 10);
+        UserService userService = NetworkApi.createService(UserService.class);
         userService.getMyEvaluate(map).compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<MyEvaluateBean>>() {
             @Override
             public void onSuccess(DataResponse<MyEvaluateBean> myEvaluateBeanDataResponse) {
@@ -279,11 +315,12 @@ public class MineViewModel extends BaseViewModel {
 
     /**
      * 删除评论
+     *
      * @param reply_id
      */
     @SuppressLint("CheckResult")
-    public void getDeleteEvaluate(String reply_id){
-        UserService userService=NetworkApi.createService(UserService.class);
+    public void getDeleteEvaluate(String reply_id) {
+        UserService userService = NetworkApi.createService(UserService.class);
         userService.deleteEvaluate(reply_id).compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse>() {
             @Override
             public void onSuccess(DataResponse dataResponse) {
@@ -303,44 +340,44 @@ public class MineViewModel extends BaseViewModel {
     }
 
     @SuppressLint("CheckResult")
-    public void getYanglaojinLog(String source, int page){
-        Map<String,Object> map=new HashMap<>();
-        map.put("page",page);
-        map.put("limit",10);
-        map.put("source",source);
-        UserService userService=NetworkApi.createService(UserService.class);
-        if (source.equals("1")){
+    public void getYanglaojinLog(String source, int page) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("page", page);
+        map.put("limit", 10);
+        map.put("source", source);
+        UserService userService = NetworkApi.createService(UserService.class);
+        if (source.equals("1")) {
             //线下
             userService.getYanglaojinLogXX(map).compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<YanglaojinLogXXBean>>() {
                 @Override
                 public void onSuccess(DataResponse<YanglaojinLogXXBean> yanglaojinLogXXBeanDataResponse) {
-                    if (yanglaojinLogXXBeanDataResponse.responseCode==200){
+                    if (yanglaojinLogXXBeanDataResponse.responseCode == 200) {
                         mYanglaojinLogXXData.postValue(yanglaojinLogXXBeanDataResponse.getData());
-                    }else {
+                    } else {
                         ToastUtils.showLong(yanglaojinLogXXBeanDataResponse.responseError);
                     }
                 }
 
                 @Override
                 public void onFailure(Throwable e) {
-                    LogUtil.LogInfo("Throwable",e.getMessage());
+                    LogUtil.LogInfo("Throwable", e.getMessage());
 //                    failed.postValue(getString(R.string.failed_string));
                 }
             }));
-        }else {
+        } else {
             userService.getYanglaojinLogXS(map).compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<YanglaojinLogXSBean>>() {
                 @Override
                 public void onSuccess(DataResponse<YanglaojinLogXSBean> yanglaojinLogXSBeanDataResponse) {
-                    if (yanglaojinLogXSBeanDataResponse.responseCode==200){
+                    if (yanglaojinLogXSBeanDataResponse.responseCode == 200) {
                         mYanglaojinLogXSData.postValue(yanglaojinLogXSBeanDataResponse.getData());
-                    }else {
+                    } else {
                         ToastUtils.showLong(yanglaojinLogXSBeanDataResponse.responseError);
                     }
                 }
 
                 @Override
                 public void onFailure(Throwable e) {
-                    LogUtil.LogInfo("Throwable",e.getMessage());
+                    LogUtil.LogInfo("Throwable", e.getMessage());
 //                    failed.postValue(getString(R.string.failed_string));
                 }
             }));
@@ -350,22 +387,23 @@ public class MineViewModel extends BaseViewModel {
 
     /**
      * 三方订单
+     *
      * @param type
      * @param page
      */
     @SuppressLint("CheckResult")
-    public void getThirdOrder(String type, int page){
-        Map<String,Object> map=new HashMap<>();
-        map.put("type",type);
-        map.put("page",page);
-        map.put("limit",10);
+    public void getThirdOrder(String type, int page) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("type", type);
+        map.put("page", page);
+        map.put("limit", 10);
         OrderService orderService = NetworkApi.createService(OrderService.class);
         orderService.getThirdOrder(map).compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<ThirdOrderBean>>() {
             @Override
             public void onSuccess(DataResponse<ThirdOrderBean> thirdOrderBeanDataResponse) {
                 if (thirdOrderBeanDataResponse.responseCode == 200) {
                     mThirdOrderData.postValue(thirdOrderBeanDataResponse.getData());
-                }else {
+                } else {
                     ToastUtils.showLong(thirdOrderBeanDataResponse.responseError);
                 }
             }
@@ -380,7 +418,7 @@ public class MineViewModel extends BaseViewModel {
     /**
      * 签到信息
      */
-    public  void getSignInInfo(){
+    public void getSignInInfo() {
         UserRepository.getSignInInfo(new NormalListener<SignInInfoBean>() {
             @Override
             public void success(SignInInfoBean signInInfoBean) {
@@ -393,10 +431,11 @@ public class MineViewModel extends BaseViewModel {
             }
         });
     }
+
     /**
      * 签到
      */
-    public  void getSignIn(){
+    public void getSignIn() {
         UserRepository.getSignIn(new NormalListener<SignInBean>() {
             @Override
             public void success(SignInBean s) {
@@ -414,16 +453,16 @@ public class MineViewModel extends BaseViewModel {
      * 看广告的积分
      */
     @SuppressLint("CheckResult")
-    public void getAddADCredits(){
-        UserService userService=NetworkApi.createService(UserService.class);
-        UidRequest request =new UidRequest();
+    public void getAddADCredits() {
+        UserService userService = NetworkApi.createService(UserService.class);
+        UidRequest request = new UidRequest();
         request.setUid(MVUtils.getString(Constants.USER_ID));
         userService.getAddADCredits(request).compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<RewardsocrBean>>() {
             @Override
             public void onSuccess(DataResponse<RewardsocrBean> rewardsocrBeanDataResponse) {
-                if (rewardsocrBeanDataResponse.responseCode==200){
+                if (rewardsocrBeanDataResponse.responseCode == 200) {
                     mRewardsocrData.postValue(rewardsocrBeanDataResponse.getData());
-                }else {
+                } else {
                     ToastUtils.showLong(rewardsocrBeanDataResponse.responseError);
                 }
             }
@@ -435,18 +474,19 @@ public class MineViewModel extends BaseViewModel {
             }
         }));
     }
+
     /**
      * 中心公证处养老金
      */
     @SuppressLint("CheckResult")
-    public void getAmountFromGzc(){
-        UserService userService=NetworkApi.createService(UserService.class);
+    public void getAmountFromGzc() {
+        UserService userService = NetworkApi.createService(UserService.class);
         userService.getAmountFromGzc().compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<AmountFromGzcBean>>() {
             @Override
             public void onSuccess(DataResponse<AmountFromGzcBean> amountFromGzcBeanDataResponse) {
-                if (amountFromGzcBeanDataResponse.responseCode==200){
+                if (amountFromGzcBeanDataResponse.responseCode == 200) {
                     mAmount.postValue(amountFromGzcBeanDataResponse.getData());
-                }else {
+                } else {
                     ToastUtils.showLong("网络请求失败");
                 }
             }
@@ -462,12 +502,12 @@ public class MineViewModel extends BaseViewModel {
      * 会员页面信息
      */
     @SuppressLint("CheckResult")
-    public void getUserVipInfo(){
-        UserService userService=NetworkApi.createService(UserService.class);
+    public void getUserVipInfo() {
+        UserService userService = NetworkApi.createService(UserService.class);
         userService.userVipInfo().compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<UserVipInfoBean>>() {
             @Override
             public void onSuccess(DataResponse<UserVipInfoBean> userVipInfoBeanDataResponse) {
-                if (userVipInfoBeanDataResponse.responseCode==200){
+                if (userVipInfoBeanDataResponse.responseCode == 200) {
                     mUserVipInfoData.postValue(userVipInfoBeanDataResponse.getData());
                 }
             }
@@ -483,17 +523,17 @@ public class MineViewModel extends BaseViewModel {
      * 积分记录
      */
     @SuppressLint("CheckResult")
-    public void getIntegralList(int page){
-        Map<String,Object>map=new HashMap<>();
-        map.put("page",page);
-        map.put("limit",10);
-        UserService userService=NetworkApi.createService(UserService.class);
+    public void getIntegralList(int page) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("page", page);
+        map.put("limit", 10);
+        UserService userService = NetworkApi.createService(UserService.class);
         userService.getIntegralList(map).compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<IntegralListBean>>() {
             @Override
             public void onSuccess(DataResponse<IntegralListBean> integralListBeanDataResponse) {
-                if (integralListBeanDataResponse.responseCode==200){
+                if (integralListBeanDataResponse.responseCode == 200) {
                     mIntegralListData.postValue(integralListBeanDataResponse.getData());
-                }else {
+                } else {
                     ToastUtils.showLong(integralListBeanDataResponse.responseError);
                 }
             }
@@ -508,18 +548,19 @@ public class MineViewModel extends BaseViewModel {
 
     /**
      * 取消收藏  关注
+     *
      * @param type 10 删除关注   1  删除 收藏
      * @param ids  商品或者店铺的ID
      */
-    public void cancleCollect(int type, List<String> ids){
-        CancleCollectBean bean = new CancleCollectBean(type,ids);
+    public void cancleCollect(int type, List<String> ids) {
+        CancleCollectBean bean = new CancleCollectBean(type, ids);
         NetworkApi.createService(UserService.class).cancleCollect(bean)
                 .compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse>() {
                     @Override
                     public void onSuccess(DataResponse dataResponse) {
                         if (dataResponse.responseCode == 200) {
                             deleteAttentionStatus.postValue(0);
-                        }else {
+                        } else {
                             failed.postValue(dataResponse.responseError);
                         }
                     }

app/src/main/java/com/yihucha/hbyhc/utils/DateUtil.java

@@ -332,6 +332,13 @@ public class DateUtil {
     }
 
     /**
+     * 毫秒转换成年月
+     */
+    public static String getYearMonth(long timeMillis){
+        String yearMonthDay = getYearMonthDay(timeMillis);
+        return yearMonthDay.substring(0,yearMonthDay.indexOf("月")+1);
+    }
+    /**
      * 将毫秒转换为年月日
      *
      * @author GaoHuanjie

app/src/main/java/com/yihucha/hbyhc/view/PopAnnuitySelector.java

@@ -0,0 +1,131 @@
+package com.yihucha.hbyhc.view;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.LinearLayout;
+import android.widget.PopupWindow;
+
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import com.lcodecore.tkrefreshlayout.utils.DensityUtil;
+import com.yihucha.hbyhc.R;
+import com.yihucha.hbyhc.databinding.PopStoreCheckBinding;
+import com.yihucha.hbyhc.databinding.PopwindowAnnuityRecordsSelectorBinding;
+import com.yihucha.hbyhc.presentation.annuity.adapter.ItemAnnuitySelectorAdapter;
+import com.yihucha.hbyhc.presentation.annuity.model.SelectorBean;
+import com.yihucha.hbyhc.utils.EmptyCheckUtils;
+import com.yihucha.hbyhc.utils.SpaceItemDecoration;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * author : zhangbing
+ * time   : 2023/10/21 20:47
+ * com.laolaixiang.bjtdba.view
+ */
+public class PopAnnuitySelector extends PopupWindow implements View.OnClickListener {
+    private PopwindowAnnuityRecordsSelectorBinding binding;
+    private List<SelectorBean> sourceBeans = new ArrayList<>();
+    private List<SelectorBean> statusBeans = new ArrayList<>();
+    private Context context;
+    private ItemAnnuitySelectorAdapter sourceAdapter, statusAdapter;
+
+    private int sourcePos = 0;
+    private int sourcePosL = 0;
+
+    private int statusPos = 0;
+    private int statusPosL = 0;
+
+    public PopAnnuitySelector(Context context) {
+        super(context);
+        this.context = context;
+        View view = LayoutInflater.from(context).inflate(R.layout.popwindow_annuity_records_selector, null);
+        binding = PopwindowAnnuityRecordsSelectorBinding.bind(view);
+        //设置SelectPicPopupWindow的View
+        this.setContentView(view);
+        //设置SelectPicPopupWindow弹出窗体的宽
+        this.setWidth(WindowManager.LayoutParams.MATCH_PARENT);
+        //设置SelectPicPopupWindow弹出窗体的高
+        this.setHeight(WindowManager.LayoutParams.WRAP_CONTENT);
+        //设置SelectPicPopupWindow弹出窗体可点击
+        this.setFocusable(true);
+
+        //设置SelectPicPopupWindow弹出窗体动画效果
+//        this.setAnimationStyle(R.style.mystyle);
+        //实例化一个ColorDrawable颜色为半透明
+        ColorDrawable dw = new ColorDrawable(0x00000000);
+        //设置SelectPicPopupWindow弹出窗体的背景
+        this.setBackgroundDrawable(dw);
+        initView();
+        initClick();
+    }
+
+    private void initView() {
+        sourceBeans.add(new SelectorBean("全部", null, true));
+        sourceBeans.add(new SelectorBean("线上订单", "0", false));
+        sourceBeans.add(new SelectorBean("线下实体订单", "1", false));
+
+        statusBeans.add(new SelectorBean("全部状态", null, true));
+        statusBeans.add(new SelectorBean("已结算", "0", false));
+        statusBeans.add(new SelectorBean("未结算", "1", false));
+        statusBeans.add(new SelectorBean("已取消", "2", false));
+
+        GridLayoutManager sourceManager = new GridLayoutManager(context, 3);
+        GridLayoutManager statusManager = new GridLayoutManager(context, 3);
+        binding.rvSourceItem.setLayoutManager(sourceManager);
+        binding.rvStatusItem.setLayoutManager(statusManager);
+        sourceAdapter = new ItemAnnuitySelectorAdapter(context, sourceBeans);
+        statusAdapter = new ItemAnnuitySelectorAdapter(context, statusBeans);
+//        binding.rvSourceItem.addItemDecoration(new SpaceItemDecoration(DensityUtil.dp2px(context, 13)));
+//        binding.rvStatusItem.addItemDecoration(new SpaceItemDecoration(DensityUtil.dp2px(context, 13)));
+        binding.rvSourceItem.setAdapter(sourceAdapter);
+        binding.rvStatusItem.setAdapter(statusAdapter);
+        sourceAdapter.setOnItemClickListener(itemPos -> {
+            sourcePosL = itemPos;
+        });
+        statusAdapter.setOnItemClickListener(itemPos -> {
+            statusPosL = itemPos;
+        });
+    }
+
+    private void initClick() {
+        binding.tvReset.setOnClickListener(this::onClick);
+        binding.tvConfirm.setOnClickListener(this::onClick);
+        binding.viewBg.setOnClickListener(this::onClick);
+    }
+
+    @Override
+    public void onClick(View view) {
+        if (view == binding.tvReset) {
+            sourcePos = sourcePosL = 0;
+            sourceAdapter.onClick(sourcePos);
+            statusPos = statusPosL = 0;
+            statusAdapter.onClick(statusPos);
+        } else if (view == binding.tvConfirm) {
+            sourcePos = sourcePosL;
+            statusPos = statusPosL;
+            if (EmptyCheckUtils.isNotEmpty(onSelectListener)) {
+                onSelectListener.onSelect(sourcePos, statusPos);
+            }
+            dismiss();
+        } else if (view == binding.viewBg){
+            dismiss();
+        }
+    }
+
+    private OnSelectListener onSelectListener;
+
+    public void setOnSelectListener(OnSelectListener onSelectListener) {
+        this.onSelectListener = onSelectListener;
+    }
+
+    public interface OnSelectListener {
+        void onSelect(int sourcePos, int statusPos);
+    }
+}

app/src/main/res/drawable/shape_annuity_rules.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="50dp"/>
+    <gradient
+        android:startColor="#FFC5C6"
+        android:endColor="#FE0032"/>
+</shape>

app/src/main/res/drawable/shape_f5f5f5_50dp.xml

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

app/src/main/res/drawable/shape_line_999999_50dp.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <!-- 填充 -->
+    <solid android:color="@color/white" />
+
+    <!-- 圆角 -->
+    <corners android:radius="50dp" />
+
+    <stroke
+        android:color="@color/gray_999999"
+        android:width="1dp"/>
+
+
+</shape>

app/src/main/res/drawable/shape_line_fe0032_fff1f2_50dp.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    >
+    <stroke
+        android:width="1dp"
+        android:color="#fffe0032" />
+    <solid android:color="#fffff1f2" />
+    <corners android:radius="18dp" />
+</shape>

app/src/main/res/drawable/shaple_black_50dp.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"   android:shape="rectangle" >
+
+    <solid android:color="#000000" />
+
+    <!--    <stroke-->
+    <!--        android:color="@color/gray_9e9e9e"-->
+    <!--        android:width="0.5dp"/>-->
+
+    <corners android:radius="50dp"/>
+
+
+</shape>

app/src/main/res/layout/activity_alreadyrealname.xml

@@ -1,37 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:background="@color/white_f8f8f8"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-<LinearLayout
     android:layout_width="match_parent"
-    android:layout_height="153dp"
-    android:background="@color/white"
-    android:gravity="center"
+    android:layout_height="match_parent"
+    android:background="@color/white_f8f8f8"
     android:orientation="vertical">
 
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@mipmap/shimingrenzheng_220816"/>
-
+        android:src="@mipmap/img_real_name"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="30dp"
+        />
     <TextView
         android:layout_width="wrap_content"
-        android:layout_marginTop="20dp"
-        android:text="您已通过实名认证"
-        android:textColor="@color/black_333333"
-        android:textSize="18sp"
         android:layout_height="wrap_content"
+        android:text="您已完成实名认证！"
+        android:textSize="18sp"
+        android:layout_gravity="center_horizontal"
+        android:textColor="@color/black_333333"
+        android:layout_marginTop="20dp"
         />
-</LinearLayout>
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="16dp"
         android:background="@color/white"
         android:orientation="vertical"
-        >
+        android:layout_marginTop="35dp"
+        android:padding="16dp">
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -41,79 +38,87 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textSize="16sp"
-                android:textColor="@color/black_333333"
                 android:text="真实姓名："
-                />
+                android:textColor="@color/black_333333"
+                android:textSize="15sp" />
 
             <TextView
                 android:id="@+id/tv_user_name"
                 android:layout_width="0dp"
+                android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="right"
-                android:layout_height="wrap_content"
-                android:textColor="@color/gray_999999"
-                android:text="琳琳"/>
-
-            <TextView
-                android:layout_width="43dp"
-                android:layout_marginLeft="10dp"
-                android:layout_height="19dp"
-                android:background="@drawable/shape_line_fe0032_2dp"
-                android:textColor="@color/red_fe0032"
-                android:textSize="11sp"
-                android:gravity="center"
-                android:text="已认证"/>
+                android:text="琳琳"
+                android:textSize="16sp"
+                android:textColor="@color/gray_999999" />
         </LinearLayout>
 
         <View
             android:layout_width="match_parent"
             android:layout_height="0.5dp"
-            android:background="@color/gray_e5e5e5"
             android:layout_marginTop="16dp"
-            />
+            android:background="@color/gray_e5e5e5" />
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical"
             android:layout_marginTop="16dp"
+            android:gravity="center_vertical"
             android:orientation="horizontal">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textSize="16sp"
-                android:textColor="@color/black_333333"
                 android:text="证件号码："
-                />
+                android:textColor="@color/black_333333"
+                android:textSize="15sp" />
 
             <TextView
                 android:id="@+id/tv_user_card"
                 android:layout_width="0dp"
+                android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="right"
-                android:layout_height="wrap_content"
-                android:textColor="@color/gray_999999"
-                android:text="琳琳"/>
-
-
+                android:text="琳琳"
+                android:textSize="16sp"
+                android:textColor="@color/gray_999999" />
         </LinearLayout>
-
-        <ImageView
-            android:id="@+id/iv_card_positive"
-            android:layout_width="match_parent"
-            android:layout_marginLeft="40dp"
-            android:layout_marginTop="16dp"
-            android:scaleType="fitXY"
-            android:layout_marginRight="40dp"
-            android:layout_height="139.5dp" />
-        <ImageView
-            android:id="@+id/iv_card_reverse"
-            android:scaleType="fitXY"
-            android:layout_width="match_parent"
-            android:layout_marginLeft="40dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginRight="40dp"
-            android:layout_height="139.5dp" />
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="44dp"
+        android:orientation="horizontal"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:layout_marginTop="50dp"
+        >
+        <TextView
+            android:id="@+id/tv_update"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:text="修改实名信息"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:background="@drawable/shape_line_999999_50dp"
+            android:layout_marginRight="5dp"
+            android:textColor="@color/black_333333"
+            android:textSize="16sp"
+            android:layout_marginTop="2dp"
+            android:layout_marginBottom="2dp"
+            />
+        <TextView
+            android:id="@+id/tv_back"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:text="返回"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:layout_marginLeft="5dp"
+            android:background="@drawable/shape_fe0032_50dp"
+            android:textColor="@color/white"
+            android:textSize="16sp"
+            android:layout_marginTop="2dp"
+            android:layout_marginBottom="2dp"
+            />
     </LinearLayout>
 </LinearLayout>

app/src/main/res/layout/activity_annuity.xml

@@ -11,15 +11,17 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:scaleType="fitXY"
-        android:src="@mipmap/annuitytop_bg_220713" />
+        android:src="@mipmap/bg_annuity_top" />
 
-    <com.yihucha.hbyhc.view.CustomTitleBarView
+    <TextView
         android:id="@+id/custom_title_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:custom_title_bar_action_text="@string/pension_rules"
-        app:custom_title_bar_title="@string/my_annuity"
-        app:custom_title_default_is_white="true" />
+        android:gravity="center_horizontal"
+        android:paddingTop="10dp"
+        android:text="养老金"
+        android:textColor="@color/white"
+        android:textSize="18sp" />
 
     <ScrollView
         android:id="@+id/scrollView"
@@ -34,17 +36,17 @@
             android:paddingLeft="16dp"
             android:paddingRight="16sp">
 
-            <LinearLayout
+            <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="22dp"
                 android:background="@drawable/shape_ffffff_8dp"
-                android:orientation="vertical"
                 android:padding="16dp">
 
                 <LinearLayout
+                    android:id="@+id/layout_info"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="51dp"
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
 
@@ -54,36 +56,45 @@
                         android:layout_height="51dp"
                         android:src="@mipmap/mine_user_220620" />
 
-                    <com.yihucha.hbyhc.view.BoldText
-                        android:id="@+id/btv_nickname"
+                    <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="12dp"
-                        android:text="@string/copy"
-                        android:textColor="@color/black_333333"
-                        android:textSize="14sp" />
+                        android:orientation="vertical">
+
+                        <com.yihucha.hbyhc.view.BoldText
+                            android:id="@+id/btv_nickname"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="12dp"
+                            android:text="@string/name"
+                            android:textColor="@color/black_333333"
+                            android:textSize="16sp" />
+
+                        <TextView
+                            android:id="@+id/tv_phone_number"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="4dp"
+                            android:paddingLeft="12dp"
+                            android:text="188****3836" />
+                    </LinearLayout>
 
                     <ImageView
                         android:id="@+id/img_renzheng"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
+                        android:layout_gravity="top"
                         android:layout_marginLeft="3dp"
                         android:src="@mipmap/shimingrenzheng" />
-                    <!--<TextView
-                        android:id="@+id/tv_is_approve"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="8dp"
-                        android:text="@string/real_name_authentication"
-                        android:textColor="@color/red_fe0032"
-                        android:textSize="12sp" />-->
                 </LinearLayout>
 
                 <LinearLayout
+                    android:id="@+id/layout_annuity_total"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:gravity="center"
+                    android:layout_below="@+id/layout_info"
+                    android:layout_marginTop="16dp"
+                    android:gravity="center_vertical"
                     android:orientation="vertical">
 
                     <TextView
@@ -91,7 +102,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="8dp"
                         android:text="@string/total_pension"
-                        android:textColor="@color/gray_999999"
+                        android:textColor="@color/black_333333"
                         android:textSize="13sp" />
 
                     <com.yihucha.hbyhc.view.BoldText
@@ -99,15 +110,31 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="0"
-                        android:textColor="@color/red_fe0032"
+                        android:textColor="@color/black_333333"
                         android:textSize="25sp" />
-
-
                 </LinearLayout>
 
+                <TextView
+                    android:id="@+id/tv_annuity_rules"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignTop="@+id/layout_annuity_total"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginRight="-10dp"
+                    android:background="@drawable/shape_annuity_rules"
+                    android:paddingLeft="5dp"
+                    android:paddingTop="2dp"
+                    android:paddingRight="15dp"
+                    android:paddingBottom="2dp"
+                    android:text="养老金规则"
+                    android:textColor="@color/white"
+                    android:textSize="12sp" />
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_below="@+id/layout_annuity_total"
                     android:layout_marginTop="25dp"
                     android:orientation="horizontal">
 
@@ -115,9 +142,16 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:gravity="center"
                         android:orientation="vertical">
 
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="8dp"
+                            android:text="预估养老金(元)"
+                            android:textColor="@color/black_333333"
+                            android:textSize="13sp" />
+
                         <com.yihucha.hbyhc.view.BoldText
                             android:id="@+id/btv_onLine_take_no"
                             android:layout_width="wrap_content"
@@ -125,14 +159,6 @@
                             android:text="0"
                             android:textColor="@color/black_333333"
                             android:textSize="15sp" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8dp"
-                            android:text="预估养老金"
-                            android:textColor="@color/gray_999999"
-                            android:textSize="13sp" />
                     </LinearLayout>
 
                     <LinearLayout
@@ -140,9 +166,16 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:gravity="center"
                         android:orientation="vertical">
 
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="8dp"
+                            android:text="已结算(元)"
+                            android:textColor="@color/black_333333"
+                            android:textSize="13sp" />
+
                         <com.yihucha.hbyhc.view.BoldText
                             android:id="@+id/btv_all_yanglao_a"
                             android:layout_width="wrap_content"
@@ -151,13 +184,7 @@
                             android:textColor="@color/black_333333"
                             android:textSize="15sp" />
 
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8dp"
-                            android:text="@string/have_already_settled"
-                            android:textColor="@color/gray_999999"
-                            android:textSize="13sp" />
+
                     </LinearLayout>
 
                     <LinearLayout
@@ -165,9 +192,16 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:gravity="center"
                         android:orientation="vertical">
 
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="8dp"
+                            android:text="中信公证处(元)"
+                            android:textColor="@color/black_333333"
+                            android:textSize="13sp" />
+
                         <com.yihucha.hbyhc.view.BoldText
                             android:id="@+id/btv_zxgzc"
                             android:layout_width="wrap_content"
@@ -175,17 +209,9 @@
                             android:text="0"
                             android:textColor="@color/black_333333"
                             android:textSize="15sp" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8dp"
-                            android:text="@string/citicnotaryoffice"
-                            android:textColor="@color/gray_999999"
-                            android:textSize="13sp" />
                     </LinearLayout>
                 </LinearLayout>
-            </LinearLayout>
+            </RelativeLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -209,152 +235,6 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="18dp"
-                    android:orientation="horizontal"
-                    android:visibility="gone">
-
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:gravity="center_horizontal"
-                        android:orientation="vertical">
-
-                        <ImageView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:src="@mipmap/annuity_yuan_220713" />
-
-                        <View
-                            android:layout_width="1dp"
-                            android:layout_height="37.5dp"
-                            android:background="@color/red_fe0032" />
-
-                        <ImageView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:src="@mipmap/annuity_yuan_220713" />
-
-                        <View
-                            android:layout_width="1dp"
-                            android:layout_height="37.5dp"
-                            android:background="@color/red_fe0032" />
-
-                        <ImageView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:src="@mipmap/annuity_yuan_220713" />
-
-                        <View
-                            android:layout_width="1dp"
-                            android:layout_height="37.5dp"
-                            android:background="@color/red_fe0032" />
-
-                        <ImageView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:src="@mipmap/annuity_yuan_220713" />
-
-                        <View
-                            android:layout_width="1dp"
-                            android:layout_height="37.5dp"
-                            android:background="@color/red_fe0032" />
-
-                        <ImageView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:src="@mipmap/annuity_yuan_220713" />
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="10dp"
-                        android:orientation="vertical">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="实名认证"
-                            android:textColor="@color/black_333333"
-                            android:textSize="15sp" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="7dp"
-                            android:text="实名认证"
-                            android:textColor="@color/gray_999999"
-                            android:textSize="14sp" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8.5dp"
-                            android:text="绑定支付"
-                            android:textColor="@color/black_333333"
-                            android:textSize="15sp" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="7dp"
-                            android:text="绑定微信、支付宝"
-                            android:textColor="@color/gray_999999"
-                            android:textSize="14sp" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8.5dp"
-                            android:text="补贴养老金"
-                            android:textColor="@color/black_333333"
-                            android:textSize="15sp" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="7dp"
-                            android:text="购买返养老金商品"
-                            android:textColor="@color/gray_999999"
-                            android:textSize="14sp" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8.5dp"
-                            android:text="已结算养老金"
-                            android:textColor="@color/black_333333"
-                            android:textSize="15sp" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="7dp"
-                            android:text="平台结算"
-                            android:textColor="@color/gray_999999"
-                            android:textSize="14sp" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8.5dp"
-                            android:text="开通"
-                            android:textColor="@color/black_333333"
-                            android:textSize="15sp" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="7dp"
-                            android:text="计入账号开通"
-                            android:textColor="@color/gray_999999"
-                            android:textSize="14sp" />
-                    </LinearLayout>
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="18dp"
                     android:gravity="center"
                     android:orientation="horizontal">
 
@@ -385,7 +265,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="12dp"
                         android:layout_marginRight="12dp"
-                        android:src="@mipmap/ylj_fh_220914" />
+                        android:src="@mipmap/icon_jt_right_333333" />
 
                     <LinearLayout
                         android:layout_width="0dp"
@@ -404,7 +284,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2.5dp"
                             android:gravity="center"
-                            android:text="绑定微信\n支付宝"
+                            android:text="消费获得\养老金"
                             android:textColor="@color/black_333333"
                             android:textSize="12sp" />
                     </LinearLayout>
@@ -414,7 +294,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="12dp"
                         android:layout_marginRight="12dp"
-                        android:src="@mipmap/ylj_fh_220914" />
+                        android:src="@mipmap/icon_jt_right_333333" />
 
                     <LinearLayout
                         android:layout_width="0dp"
@@ -433,7 +313,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2.5dp"
                             android:gravity="center"
-                            android:text="平台结算\n "
+                            android:text="平台结算\n养老金 "
                             android:textColor="@color/black_333333"
                             android:textSize="12sp" />
                     </LinearLayout>
@@ -443,7 +323,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="12dp"
                         android:layout_marginRight="12dp"
-                        android:src="@mipmap/ylj_fh_220914" />
+                        android:src="@mipmap/icon_jt_right_333333" />
 
                     <LinearLayout
                         android:layout_width="0dp"
@@ -471,116 +351,6 @@
                 </LinearLayout>
             </LinearLayout>
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="13dp"
-                android:background="@drawable/shape_ffffff_8dp"
-                android:orientation="vertical"
-                android:paddingLeft="13dp"
-                android:paddingTop="16dp"
-                android:paddingRight="13dp"
-                android:paddingBottom="13dp">
-
-                <com.yihucha.hbyhc.view.BoldText
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="养老金账户余额提取"
-                    android:textColor="@color/black_333333"
-                    android:textSize="15sp" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    android:orientation="vertical">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal">
-
-                        <ImageView
-                            android:layout_width="20dp"
-                            android:layout_height="20dp"
-                            android:layout_marginLeft="56dp"
-                            android:src="@mipmap/annuity_yuan_220713" />
-
-                        <View
-                            android:layout_width="0dp"
-                            android:layout_height="1dp"
-                            android:layout_weight="1"
-                            android:background="@color/red_fe0032" />
-
-                        <ImageView
-                            android:layout_width="20dp"
-                            android:layout_height="20dp"
-                            android:layout_marginRight="66dp"
-                            android:src="@mipmap/agreement_checked" />
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="10dp"
-                        android:orientation="horizontal">
-
-                        <LinearLayout
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="35dp"
-                            android:gravity="center"
-                            android:orientation="vertical">
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="加入时间"
-                                android:textColor="@color/black_333333"
-                                android:textSize="15sp" />
-
-                            <TextView
-                                android:id="@+id/tv_create_time"
-                                android:layout_width="80dp"
-                                android:layout_height="wrap_content"
-                                android:gravity="center"
-                                android:text=""
-                                android:textColor="@color/gray_999999"
-                                android:textSize="12sp" />
-                        </LinearLayout>
-
-                        <View
-                            android:layout_width="0dp"
-                            android:layout_height="1dp"
-                            android:layout_weight="1"></View>
-
-                        <LinearLayout
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginRight="30dp"
-                            android:gravity="center"
-                            android:orientation="vertical">
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="法定提取时间"
-                                android:textColor="@color/black_333333"
-                                android:textSize="15sp" />
-
-                            <TextView
-                                android:id="@+id/tv_birthday60"
-                                android:layout_width="70dp"
-                                android:layout_height="wrap_content"
-                                android:gravity="center"
-                                android:text=""
-                                android:textColor="@color/gray_999999"
-                                android:textSize="12sp" />
-                        </LinearLayout>
-                    </LinearLayout>
-                </LinearLayout>
-            </LinearLayout>
 
             <LinearLayout
                 android:id="@+id/ll_payment_platform_binding"
@@ -591,30 +361,6 @@
                 android:orientation="vertical"
                 android:paddingLeft="13dp"
                 android:paddingRight="13dp">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:orientation="horizontal"
-                    android:paddingTop="16dp"
-                    android:paddingBottom="16dp"
-                    android:visibility="gone">
-
-                    <com.yihucha.hbyhc.view.BoldText
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:text="@string/payment_platform_binding"
-                        android:textColor="@color/black_333333"
-                        android:textSize="15sp" />
-
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:src="@mipmap/order_store_entry_220624" />
-                </LinearLayout>
-
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="0.5dp"
@@ -622,20 +368,19 @@
                     android:visibility="gone" />
 
                 <LinearLayout
-                    android:id="@+id/ll_pension_accounts"
+                    android:id="@+id/ll_pension_record"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:gravity="center_vertical"
                     android:orientation="horizontal"
                     android:paddingTop="16dp"
-                    android:paddingBottom="16dp"
-                    android:visibility="gone">
+                    android:paddingBottom="16dp">
 
-                    <com.yihucha.hbyhc.view.BoldText
+                    <TextView
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:text="@string/pension_accounts"
+                        android:text="@string/pension_record"
                         android:textColor="@color/black_333333"
                         android:textSize="15sp" />
 
@@ -648,12 +393,10 @@
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="0.5dp"
-                    android:background="@color/gray_e5e5e5"
-                    android:visibility="gone"
-                    />
+                    android:background="@color/gray_e5e5e5" />
 
                 <LinearLayout
-                    android:id="@+id/ll_pension_record"
+                    android:id="@+id/ll_citic_notary_office_to_check"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:gravity="center_vertical"
@@ -661,11 +404,11 @@
                     android:paddingTop="16dp"
                     android:paddingBottom="16dp">
 
-                    <com.yihucha.hbyhc.view.BoldText
+                    <TextView
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:text="@string/pension_record"
+                        android:text="@string/citicnotaryoffice"
                         android:textColor="@color/black_333333"
                         android:textSize="15sp" />
 
@@ -681,55 +424,32 @@
                     android:background="@color/gray_e5e5e5" />
 
                 <LinearLayout
-                    android:id="@+id/ll_citic_notary_office_to_check"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:orientation="horizontal"
                     android:paddingTop="16dp"
-                    android:paddingBottom="16dp">
+                    android:paddingBottom="16dp"
+                    android:orientation="horizontal">
 
-                    <com.yihucha.hbyhc.view.BoldText
+                    <TextView
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:text="@string/citic_notary_office_to_check"
+                        android:text="养老金法定提取时间"
                         android:textColor="@color/black_333333"
-                        android:textSize="15sp" />
-
-                    <ImageView
+                        android:textSize="15sp"
+                        />
+                    <TextView
+                        android:id="@+id/tv_annuity_time"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:src="@mipmap/order_store_entry_220624" />
+                        android:text="2026-3-5"
+                        android:textColor="@color/black_333333"
+                        android:textSize="14sp"
+                        />
                 </LinearLayout>
             </LinearLayout>
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="31.5dp"
-                android:background="@drawable/shape_fff9ed_8dp"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:paddingLeft="13dp"
-                android:paddingTop="6dp"
-                android:paddingRight="13dp"
-                android:paddingBottom="6dp">
-
-                <TextView
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="个人消费养老金规范管理计划\n合规管理 有计划养老"
-                    android:textColor="@color/yellow_ff6010"
-                    android:textSize="15sp" />
 
-                <ImageView
-                    android:id="@+id/iv_liaojie"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@mipmap/get_to_know_buttons_220713" />
-            </LinearLayout>
         </LinearLayout>
     </ScrollView>
 </RelativeLayout>

app/src/main/res/layout/activity_annuity_records.xml

@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white_f8f8f8"
+    tools:context=".presentation.annuity.AnnuityRecordsActivity">
+
+    <ImageView
+        android:id="@+id/imgv_back"
+        android:layout_width="45dp"
+        android:layout_height="45dp"
+        android:scaleType="centerInside"
+        android:src="@mipmap/icon_title_back"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.yihucha.hbyhc.view.BoldText
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:text="@string/pension_record"
+        android:textColor="@color/black_333333"
+        android:textSize="18sp"
+        app:layout_constraintBottom_toBottomOf="@+id/imgv_back"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/imgv_back" />
+
+    <ImageView
+        android:id="@+id/imgv_bg"
+        android:layout_width="match_parent"
+        android:layout_height="100dp"
+        android:scaleType="fitXY"
+        android:src="@mipmap/bg_annuity_record"
+        app:layout_constraintTop_toBottomOf="@+id/imgv_back" />
+
+    <View
+        android:layout_width="0.5dp"
+        android:layout_height="25dp"
+        android:background="@color/white_f8f8f8"
+        app:layout_constraintBottom_toBottomOf="@+id/imgv_bg"
+        app:layout_constraintLeft_toLeftOf="@+id/imgv_bg"
+        app:layout_constraintRight_toRightOf="@+id/imgv_bg"
+        app:layout_constraintTop_toTopOf="@+id/imgv_bg" />
+
+    <TextView
+        android:id="@+id/tv_title_yjs"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:text="已结算养老金"
+        android:textColor="@color/white"
+        android:textSize="13sp"
+        app:layout_constraintBottom_toTopOf="@+id/tv_value_yjs"
+        app:layout_constraintHorizontal_weight="1"
+        app:layout_constraintLeft_toLeftOf="@+id/imgv_bg"
+        app:layout_constraintRight_toLeftOf="@+id/tv_title_wjs"
+        app:layout_constraintTop_toTopOf="@+id/imgv_bg"
+        app:layout_constraintVertical_chainStyle="packed" />
+
+    <TextView
+        android:id="@+id/tv_title_wjs"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:text="未结算养老金"
+        android:textColor="@color/white"
+        android:textSize="13sp"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_title_yjs"
+        app:layout_constraintHorizontal_weight="1"
+        app:layout_constraintLeft_toRightOf="@+id/tv_title_yjs"
+        app:layout_constraintRight_toRightOf="@+id/imgv_bg"
+        app:layout_constraintTop_toTopOf="@+id/tv_title_yjs" />
+
+    <TextView
+        android:id="@+id/tv_value_yjs"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="3dp"
+        android:gravity="center_horizontal"
+        android:text="9999999.99"
+        android:textColor="@color/white"
+        android:textSize="18sp"
+        app:layout_constraintBottom_toBottomOf="@+id/imgv_bg"
+        app:layout_constraintHorizontal_weight="1"
+        app:layout_constraintLeft_toLeftOf="@+id/imgv_bg"
+        app:layout_constraintRight_toLeftOf="@+id/tv_value_wjs"
+        app:layout_constraintTop_toBottomOf="@+id/tv_title_yjs" />
+
+    <TextView
+        android:id="@+id/tv_value_wjs"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:text="123456"
+        android:textColor="@color/white"
+        android:textSize="18sp"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_value_yjs"
+        app:layout_constraintHorizontal_weight="1"
+        app:layout_constraintLeft_toRightOf="@+id/tv_value_yjs"
+        app:layout_constraintRight_toRightOf="@+id/imgv_bg"
+        app:layout_constraintTop_toTopOf="@+id/tv_value_yjs" />
+
+    <TextView
+        android:id="@+id/tv_date"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="16dp"
+        android:layout_marginTop="16dp"
+        android:drawableRight="@mipmap/tuijian_xiala"
+        android:drawablePadding="5dp"
+        android:text="2023年12月"
+        android:textColor="@color/black_333333"
+        android:textSize="15sp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/imgv_bg" />
+
+    <TextView
+        android:id="@+id/tv_selector"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="16dp"
+        android:drawableRight="@mipmap/tuijian_xiala"
+        android:drawablePadding="5dp"
+        android:text="筛选"
+        android:textColor="@color/black_333333"
+        android:textSize="15sp"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_date"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/tv_date" />
+
+    <TextView
+        android:id="@+id/tv_total"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:text="预估总额￥99999.99"
+        android:textColor="@color/black_333333"
+        android:textSize="12sp"
+        android:paddingBottom="13dp"
+        app:layout_constraintLeft_toLeftOf="@+id/tv_date"
+        app:layout_constraintRight_toLeftOf="@+id/tv_yjs"
+        app:layout_constraintTop_toBottomOf="@+id/tv_date" />
+
+    <TextView
+        android:id="@+id/tv_yjs"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="未结算￥99999.99"
+        android:textColor="@color/black_333333"
+        android:textSize="12sp"
+        android:paddingBottom="13dp"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_total"
+        app:layout_constraintLeft_toRightOf="@+id/tv_total"
+        app:layout_constraintRight_toLeftOf="@+id/tv_wjs"
+        app:layout_constraintTop_toTopOf="@+id/tv_total" />
+
+    <TextView
+        android:id="@+id/tv_wjs"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="已结算￥99999.99"
+        android:textColor="@color/black_333333"
+        android:textSize="12sp"
+        android:paddingBottom="13dp"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_total"
+        app:layout_constraintLeft_toRightOf="@+id/tv_yjs"
+        app:layout_constraintRight_toRightOf="@+id/tv_selector"
+        app:layout_constraintTop_toTopOf="@+id/tv_total" />
+
+    <com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout
+        android:id="@+id/refresh_layout"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tv_total">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv_annuity_records"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+    </com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout>
+    <View
+        android:id="@+id/view_bg"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:background="@color/black"
+        android:alpha="0.5"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tv_total"
+        />
+    <LinearLayout
+        android:id="@+id/layout_no_data"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:orientation="vertical"
+        android:visibility="gone"
+        >
+        <ImageView
+            android:id="@+id/imgv_no_data"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="64dp"
+            android:layout_gravity="center"
+            android:src="@mipmap/search_zanwuxiangguan_220617"/>
+
+        <TextView
+            android:id="@+id/tv_no_data"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginTop="16dp"
+            android:textColor="@color/black_333333"
+            android:textSize="15sp"
+            android:text="@string/noSearch_tes"/>
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/activity_main.xml

@@ -5,35 +5,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
-
-    <!--    <fragment-->
-    <!--        android:id="@+id/nav_host_fragment_activity_main"-->
-    <!--        android:name="androidx.navigation.fragment.NavHostFragment"-->
-    <!--        android:layout_width="match_parent"-->
-    <!--        android:layout_height="0dp"-->
-    <!--        android:layout_weight="1"-->
-    <!--        app:defaultNavHost="true"-->
-    <!--        app:layout_constraintBottom_toTopOf="@id/nav_view"-->
-    <!--        app:layout_constraintLeft_toLeftOf="parent"-->
-    <!--        app:layout_constraintRight_toRightOf="parent"-->
-    <!--        app:layout_constraintTop_toTopOf="parent"-->
-    <!--        app:navGraph="@navigation/mobile_navigation" />-->
-    <!--    <com.google.android.material.bottomnavigation.BottomNavigationView-->
-    <!--        android:id="@+id/nav_view"-->
-    <!--        android:layout_width="match_parent"-->
-    <!--        android:layout_height="wrap_content"-->
-    <!--        android:layout_marginStart="0dp"-->
-    <!--        android:layout_marginEnd="0dp"-->
-    <!--        app:layout_constraintBottom_toBottomOf="parent"-->
-    <!--        app:itemIconTint="@drawable/main_bottom"-->
-    <!--        app:itemTextColor="@drawable/main_bottom"-->
-    <!--        app:itemBackground="@color/white"-->
-    <!--        app:layout_constraintLeft_toLeftOf="parent"-->
-    <!--        app:layout_constraintRight_toRightOf="parent"-->
-    <!--        app:labelVisibilityMode="labeled"-->
-    <!--        app:menu="@menu/bottom_nav_menu" />-->
-
-
     <LinearLayout
         android:id="@+id/content_layout"
         android:layout_width="match_parent"
@@ -75,8 +46,10 @@
                 android:textSize="10sp" />
         </LinearLayout>
 
+
+
         <LinearLayout
-            android:id="@+id/ll_nearby"
+            android:id="@+id/ll_big_warehouse"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
@@ -84,23 +57,23 @@
             android:orientation="vertical">
 
             <ImageView
-                android:id="@+id/iv_nearby"
+                android:id="@+id/iv_big_warehouse"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@mipmap/nearby_220607" />
+                android:src="@mipmap/big_warehouse_220607"/>
             <TextView
-                android:id="@+id/tv_nearby"
+                android:id="@+id/tv_big_warehouse"
                 android:layout_marginTop="4dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="@color/gray_999999"
                 android:gravity="center"
-                android:text="@string/title_chuangke"
+                android:text="商城"
                 android:textSize="10sp" />
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/ll_big_warehouse"
+            android:id="@+id/ll_nearby"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
@@ -108,18 +81,18 @@
             android:orientation="vertical">
 
             <ImageView
-                android:id="@+id/iv_big_warehouse"
+                android:id="@+id/iv_nearby"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@mipmap/big_warehouse_220607"/>
+                android:src="@mipmap/nearby_220607" />
             <TextView
-                android:id="@+id/tv_big_warehouse"
+                android:id="@+id/tv_nearby"
                 android:layout_marginTop="4dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="@color/gray_999999"
                 android:gravity="center"
-                android:text="@string/title_big_warehouse"
+                android:text="养老金"
                 android:textSize="10sp" />
         </LinearLayout>
 

app/src/main/res/layout/activity_real_name_authentication.xml

@@ -101,6 +101,24 @@
                 android:src="@mipmap/front_220714"
                 android:layout_height="139.5dp"/>
             <TextView
+                android:id="@+id/tv_change_image_positive"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="更换图片"
+                android:layout_alignRight="@+id/iv_card_positive"
+                android:layout_alignBottom="@+id/iv_card_positive"
+                android:layout_marginRight="7dp"
+                android:layout_marginBottom="10dp"
+                android:textColor="@color/white"
+                android:paddingLeft="13dp"
+                android:paddingRight="13dp"
+                android:paddingTop="3dp"
+                android:paddingBottom="3dp"
+                android:textSize="11sp"
+                android:visibility="gone"
+                android:background="@drawable/shaple_black_50dp"
+                />
+            <TextView
                 android:id="@+id/tv_notice1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -132,6 +150,24 @@
                 android:src="@mipmap/front_220714"
                 android:layout_height="139.5dp"/>
             <TextView
+                android:id="@+id/tv_change_image_reverse"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="更换图片"
+                android:layout_alignRight="@+id/iv_card_reverse"
+                android:layout_alignBottom="@+id/iv_card_reverse"
+                android:layout_marginRight="7dp"
+                android:layout_marginBottom="10dp"
+                android:textColor="@color/white"
+                android:paddingLeft="13dp"
+                android:paddingRight="13dp"
+                android:paddingTop="3dp"
+                android:paddingBottom="3dp"
+                android:textSize="11sp"
+                android:visibility="gone"
+                android:background="@drawable/shaple_black_50dp"
+                />
+            <TextView
                 android:id="@+id/tv_notice2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"

app/src/main/res/layout/activity_settingup.xml

@@ -5,332 +5,341 @@
     android:background="@color/white_f8f8f8"
     android:orientation="vertical">
 
-    <LinearLayout
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="13dp"
-        android:background="@drawable/shape_ffffff_8dp"
-        android:orientation="vertical"
-        android:padding="16dp">
+        android:scrollbars="none"
+        android:layout_weight="1">
 
         <LinearLayout
-            android:id="@+id/ll_feedback"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="0dp"
+            android:layout_marginTop="13dp"
+            android:background="@drawable/shape_ffffff_8dp"
+            android:orientation="vertical"
+            android:padding="16dp">
+
+            <LinearLayout
+                android:id="@+id/ll_feedback"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/feedback_to_reply"
-                android:textColor="@color/black_333333"
-                android:textSize="15sp" />
-            <ImageView
-                android:layout_width="wrap_content"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/feedback_to_reply"
+                    android:textColor="@color/black_333333"
+                    android:textSize="15sp" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:src="@mipmap/goin_220619" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0.5dp"
+                android:layout_marginTop="16dp"
+                android:background="@color/gray_e5e5e5" />
+
+            <LinearLayout
+                android:id="@+id/ll_about_us"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:src="@mipmap/goin_220619" />
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0.5dp"
-            android:layout_marginTop="16dp"
-            android:background="@color/gray_e5e5e5" />
-
-        <LinearLayout
-            android:id="@+id/ll_about_us"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="0dp"
+                android:layout_marginTop="16dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/about_us"
+                    android:textColor="@color/black_333333"
+                    android:textSize="15sp" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:src="@mipmap/goin_220619" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0.5dp"
+                android:layout_marginTop="16dp"
+                android:background="@color/gray_e5e5e5" />
+
+            <LinearLayout
+                android:id="@+id/ll_version_updating"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/about_us"
-                android:textColor="@color/black_333333"
-                android:textSize="15sp" />
-
-            <ImageView
-                android:layout_width="wrap_content"
+                android:layout_marginTop="16dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/version_updating"
+                    android:textColor="@color/black_333333"
+                    android:textSize="15sp" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:src="@mipmap/goin_220619" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0.5dp"
+                android:layout_marginTop="16dp"
+                android:background="@color/gray_e5e5e5" />
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:src="@mipmap/goin_220619" />
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0.5dp"
-            android:layout_marginTop="16dp"
-            android:background="@color/gray_e5e5e5" />
-
-        <LinearLayout
-            android:id="@+id/ll_version_updating"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="0dp"
+                android:layout_marginTop="16dp"
+                android:orientation="horizontal"
+                android:visibility="gone">
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/safety_certificate"
+                    android:textColor="@color/black_333333"
+                    android:textSize="15sp" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:src="@mipmap/goin_220619" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0.5dp"
+                android:layout_marginTop="16dp"
+                android:background="@color/gray_e5e5e5"
+                android:visibility="gone" />
+
+            <LinearLayout
+                android:id="@+id/ll_real_name_authentication"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/version_updating"
-                android:textColor="@color/black_333333"
-                android:textSize="15sp" />
-
-            <ImageView
-                android:layout_width="wrap_content"
+                android:layout_marginTop="16dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/real_name_authentication"
+                    android:textColor="@color/black_333333"
+                    android:textSize="15sp" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:src="@mipmap/goin_220619" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0.5dp"
+                android:layout_marginTop="16dp"
+                android:background="@color/gray_e5e5e5" />
+
+            <LinearLayout
+                android:id="@+id/ll_third_party_binding"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:src="@mipmap/goin_220619" />
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0.5dp"
-            android:layout_marginTop="16dp"
-            android:background="@color/gray_e5e5e5" />
-
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:orientation="horizontal"
-            android:visibility="gone">
-
-            <TextView
-                android:layout_width="0dp"
+                android:layout_marginTop="16dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/three_party_account_binding"
+                    android:textColor="@color/black_333333"
+                    android:textSize="15sp" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:src="@mipmap/goin_220619" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0.5dp"
+                android:layout_marginTop="16dp"
+                android:background="@color/gray_e5e5e5" />
+
+            <LinearLayout
+                android:id="@+id/ll_personalization_options"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/safety_certificate"
-                android:textColor="@color/black_333333"
-                android:textSize="15sp" />
-
-            <ImageView
-                android:layout_width="wrap_content"
+                android:layout_marginTop="16dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/personalization_options"
+                    android:textColor="@color/black_333333"
+                    android:textSize="15sp" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:src="@mipmap/goin_220619" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0.5dp"
+                android:layout_marginTop="16dp"
+                android:background="@color/gray_e5e5e5" />
+
+            <LinearLayout
+                android:id="@+id/ll_service_agreement"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:src="@mipmap/goin_220619" />
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0.5dp"
-            android:layout_marginTop="16dp"
-            android:background="@color/gray_e5e5e5"
-            android:visibility="gone" />
-
-        <LinearLayout
-            android:id="@+id/ll_real_name_authentication"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="0dp"
+                android:layout_marginTop="16dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/service_agreement"
+                    android:textColor="@color/black_333333"
+                    android:textSize="15sp" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:src="@mipmap/goin_220619" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0.5dp"
+                android:layout_marginTop="16dp"
+                android:background="@color/gray_e5e5e5" />
+
+            <LinearLayout
+                android:id="@+id/ll_privacy_agreement"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/real_name_authentication"
-                android:textColor="@color/black_333333"
-                android:textSize="15sp" />
-
-            <ImageView
-                android:layout_width="wrap_content"
+                android:layout_marginTop="16dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/privacy_agreement"
+                    android:textColor="@color/black_333333"
+                    android:textSize="15sp" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:src="@mipmap/goin_220619" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0.5dp"
+                android:layout_marginTop="16dp"
+                android:background="@color/gray_e5e5e5" />
+
+            <LinearLayout
+                android:id="@+id/ll_clear_cache"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:src="@mipmap/goin_220619" />
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0.5dp"
-            android:layout_marginTop="16dp"
-            android:background="@color/gray_e5e5e5" />
-
-        <LinearLayout
-            android:id="@+id/ll_third_party_binding"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="0dp"
+                android:layout_marginTop="16dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/clear_cache"
+                    android:textColor="@color/black_333333"
+                    android:textSize="15sp" />
+
+                <TextView
+                    android:id="@+id/tv_cache_size"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingRight="5dp"
+                    android:text="0B"
+                    android:textColor="@color/black_5f6060"
+                    android:textSize="13sp" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:src="@mipmap/goin_220619" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0.5dp"
+                android:layout_marginTop="16dp"
+                android:background="@color/gray_e5e5e5" />
+
+            <LinearLayout
+                android:id="@+id/ll_log_out_of_an_account"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/three_party_account_binding"
-                android:textColor="@color/black_333333"
-                android:textSize="15sp" />
+                android:layout_marginTop="16dp"
+                android:orientation="horizontal">
 
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:src="@mipmap/goin_220619" />
-        </LinearLayout>
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/log_out_of_an_account"
+                    android:textColor="@color/black_333333"
+                    android:textSize="15sp" />
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0.5dp"
-            android:layout_marginTop="16dp"
-            android:background="@color/gray_e5e5e5" />
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:src="@mipmap/goin_220619" />
+            </LinearLayout>
 
-        <LinearLayout
-            android:id="@+id/ll_personalization_options"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/personalization_options"
-                android:textColor="@color/black_333333"
-                android:textSize="15sp" />
 
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:src="@mipmap/goin_220619" />
         </LinearLayout>
+    </ScrollView>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0.5dp"
-            android:layout_marginTop="16dp"
-            android:background="@color/gray_e5e5e5"
-       />
-
-        <LinearLayout
-            android:id="@+id/ll_service_agreement"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/service_agreement"
-                android:textColor="@color/black_333333"
-                android:textSize="15sp" />
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:src="@mipmap/goin_220619" />
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0.5dp"
-            android:layout_marginTop="16dp"
-            android:background="@color/gray_e5e5e5" />
-
-        <LinearLayout
-            android:id="@+id/ll_privacy_agreement"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/privacy_agreement"
-                android:textColor="@color/black_333333"
-                android:textSize="15sp" />
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:src="@mipmap/goin_220619" />
-        </LinearLayout>
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0.5dp"
-            android:layout_marginTop="16dp"
-            android:background="@color/gray_e5e5e5" />
-
-        <LinearLayout
-            android:id="@+id/ll_clear_cache"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/clear_cache"
-                android:textColor="@color/black_333333"
-                android:textSize="15sp" />
-            <TextView
-                android:id="@+id/tv_cache_size"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="0B"
-                android:textColor="@color/black_5f6060"
-                android:textSize="13sp"
-                android:paddingRight="5dp"
-                />
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@mipmap/goin_220619"
-                android:layout_gravity="center_vertical"
-                />
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0.5dp"
-            android:layout_marginTop="16dp"
-            android:background="@color/gray_e5e5e5" />
-
-        <LinearLayout
-            android:id="@+id/ll_log_out_of_an_account"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/log_out_of_an_account"
-                android:textColor="@color/black_333333"
-                android:textSize="15sp" />
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:src="@mipmap/goin_220619" />
-        </LinearLayout>
-
-
-    </LinearLayout>
 
     <View
         android:layout_width="1dp"
         android:layout_height="0dp"
-        android:layout_weight="1"></View>
+        android:layout_weight="1" />
 
     <TextView
         android:id="@+id/tv_log_out"

app/src/main/res/layout/item_annuity_records.xml

@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="150dp"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:padding="16dp"
+    android:layout_marginBottom="10dp"
+    android:background="@color/white">
+    <TextView
+        android:id="@+id/tv_order_no"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:text="订单号：123456789"
+        android:textSize="12sp"
+        android:textColor="@color/black_333333"
+        />
+    <TextView
+        android:id="@+id/tv_status"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:text="未结算"
+        android:textSize="12sp"
+        android:textColor="@color/gray_666666"
+        />
+    <ImageView
+        android:id="@+id/imgv_product"
+        android:layout_width="95dp"
+        android:layout_height="95dp"
+        app:layout_constraintTop_toBottomOf="@+id/tv_order_no"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="@+id/tv_order_no"
+        android:layout_marginTop="13dp"
+        />
+    <TextView
+        android:id="@+id/tv_product_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toRightOf="@+id/imgv_product"
+        app:layout_constraintTop_toTopOf="@+id/imgv_product"
+        android:text="这是商品名称这是商品名称这是商品名称这是商品名称这是商品名称这是…"
+        android:textSize="14sp"
+        android:textColor="@color/black_333333"
+        android:layout_marginLeft="8dp"
+        android:maxLines="2"
+        android:ellipsize="end"
+        />
+    <TextView
+        android:id="@+id/tv_product_order_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toLeftOf="@+id/tv_product_name"
+        app:layout_constraintTop_toBottomOf="@+id/tv_product_name"
+        android:text="下单时间：2023-12-31 09:06:30"
+        android:textSize="12sp"
+        android:textColor="@color/gray_666666"
+        android:maxLines="2"
+        android:ellipsize="end"
+        android:layout_marginTop="6dp"
+        />
+    <TextView
+        android:id="@+id/tv_value_ylj"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toLeftOf="@+id/tv_product_name"
+        app:layout_constraintBottom_toBottomOf="@+id/imgv_product"
+        android:text="预估养老金0.14元"
+        android:textSize="13sp"
+        android:textColor="@color/black_333333"
+        android:paddingBottom="2dp"
+        />
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/item_annuity_selector.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:paddingTop="6dp"
+    android:paddingBottom="6dp"
+    >
+    <TextView
+        android:id="@+id/tv_item_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="全部"
+        android:textColor="@color/red_fe0032"
+        android:textSize="14sp"
+        android:background="@drawable/shape_line_fe0032_fff1f2_50dp"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        android:layout_marginLeft="3dp"
+        android:layout_marginRight="3dp"
+        android:gravity="center"
+        />
+</RelativeLayout>

app/src/main/res/layout/popwindow_annuity_records_selector.xml

@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white"
+    android:paddingTop="16dp"
+    >
+
+    <TextView
+        android:id="@+id/tv_source_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="订单来源"
+        android:textColor="@color/black_333333"
+        android:textSize="15sp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rv_source_item"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tv_source_title" />
+
+    <TextView
+        android:id="@+id/tv_status_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="13dp"
+        android:text="订单来源"
+        android:textColor="@color/black_333333"
+        android:textSize="15sp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/rv_source_item" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rv_status_item"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tv_status_title" />
+
+    <TextView
+        android:id="@+id/tv_reset"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="3dp"
+        android:background="@drawable/shape_line_999999_50dp"
+        android:gravity="center"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp"
+        android:text="重置"
+        android:layout_marginLeft="16dp"
+        android:textColor="@color/black_333333"
+        android:textSize="17sp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toLeftOf="@+id/tv_confirm"
+        app:layout_constraintTop_toBottomOf="@+id/rv_status_item"
+        android:layout_marginTop="20dp"
+        />
+
+    <TextView
+        android:id="@+id/tv_confirm"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="3dp"
+        android:layout_marginRight="16dp"
+        android:background="@drawable/shape_fe0032_50dp"
+        android:gravity="center"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp"
+        android:text="确定"
+        android:textColor="@color/white"
+        android:textSize="17sp"
+        app:layout_constraintLeft_toRightOf="@+id/tv_reset"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/tv_reset" />
+    <View
+        android:id="@+id/view_bg"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:background="@color/black"
+        app:layout_constraintVertical_weight="1"
+        android:alpha="0.5"
+        android:layout_marginTop="25dp"
+        app:layout_constraintTop_toBottomOf="@+id/tv_reset"
+        app:layout_constraintBottom_toBottomOf="parent"
+        />
+</androidx.constraintlayout.widget.ConstraintLayout>